From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DBBCA1387B2 for ; Tue, 3 Dec 2013 14:53:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BC85E0B84; Tue, 3 Dec 2013 14:53:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A3C7E0B94 for ; Tue, 3 Dec 2013 14:53:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22A9633F43E for ; Tue, 3 Dec 2013 14:53:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1EA85E5539 for ; Tue, 3 Dec 2013 14:53:01 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1386055863.9909afafdb9beef28ae10121c08e48105f3c51f0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 9909afafdb9beef28ae10121c08e48105f3c51f0 X-VCS-Branch: master Date: Tue, 3 Dec 2013 14:53:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2a9b3008-053b-4e1a-9160-d506e742baf9 X-Archives-Hash: e30a5b160d9af09d68eab87c70f10a36 commit: 9909afafdb9beef28ae10121c08e48105f3c51f0 Author: Justin Lecher gentoo org> AuthorDate: Tue Dec 3 07:31:03 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Dec 3 07:31:03 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9909afaf Merge branch 'billyonthemountain-master' into asd * billyonthemountain-master: sci-libs/elmer-eio: Bump EAPI; fix license; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure dev-python/pythonqt: Add metadata.xml; bump to new pyhton eclasses; fix patch for multilib to do it the gentoo way; drop '.' from DESCRIPTION; add missing deps sci-misc/elmer-gui: Make x11-libs/qwt an optional dependency sci-libs/opencascade: Verion bump dev-python/pythonqt: New package sci-mathematics/netgen: Version bump sci-misc/elmer-meta: New ebuilds for Elmer FEM packages Signed-off-by: Justin Lecher gentoo.org> Conflicts: dev-python/pythonqt/Manifest dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch dev-python/pythonqt/files/pythonqt-9999-lib_location.patch dev-python/pythonqt/pythonqt-2.1.ebuild dev-python/pythonqt/pythonqt-9999.ebuild sci-libs/elmer-eio/Manifest sci-libs/elmer-eio/elmer-eio-9999.ebuild dev-python/pythonqt/ChangeLog | 11 ++++ dev-python/pythonqt/Manifest | 1 - .../pythonqt/files/pythonqt-2.1-lib_location.patch | 6 +- .../files/pythonqt-9999-lib_location.patch | 6 +- dev-python/{omniorbpy => pythonqt}/metadata.xml | 0 dev-python/pythonqt/pythonqt-1.1.ebuild | 75 ---------------------- dev-python/pythonqt/pythonqt-2.1.ebuild | 29 +++++---- dev-python/pythonqt/pythonqt-9999.ebuild | 28 +++++--- sci-libs/elmer-eio/ChangeLog | 11 ++++ sci-libs/elmer-eio/Manifest | 2 - sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild | 30 +++++++++ sci-libs/elmer-eio/elmer-eio-9999.ebuild | 30 ++------- .../omniorbpy => sci-libs/elmer-eio}/metadata.xml | 0 13 files changed, 102 insertions(+), 127 deletions(-) diff --cc dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch index 41d4dbf,1bba03a..dd3bcc6 --- a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch +++ b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch @@@ -1,22 -1,22 +1,22 @@@ --- PythonQt2.1_Qt4.8/CMakeLists.txt.auto-diff-temp 2012-11-30 16:38:06.374358937 +0100 +++ PythonQt2.1_Qt4.8/CMakeLists.txt 2012-11-30 16:39:37.421438916 +0100 @@ -215,7 +215,7 @@ - # See http://blog.onesadcookie.com/2008/01/installname-magic.html - # - set_target_properties(PythonQt PROPERTIES -- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" -+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" - ) - - target_link_libraries(PythonQt + # See http://blog.onesadcookie.com/2008/01/installname-magic.html + # + set_target_properties(PythonQt PROPERTIES +- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" - + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib64" +++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" + ) + + target_link_libraries(PythonQt @@ -228,8 +228,8 @@ - - install(TARGETS PythonQt - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - install(FILES ${headers} DESTINATION include/PythonQt) + + install(TARGETS PythonQt + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) - + LIBRARY DESTINATION lib64 - + ARCHIVE DESTINATION lib64) +++ LIBRARY DESTINATION lib${LIB_SUFFIX} +++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + install(FILES ${headers} DESTINATION include/PythonQt) MESSAGE(STATUS "<<< Gentoo configuration >>>