diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-12-03 08:31:03 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-12-03 08:31:03 +0100 |
| commit | 9909afafdb9beef28ae10121c08e48105f3c51f0 (patch) | |
| tree | 46ff91cb8f491948edad6f15830f7d8ed5b77782 /dev-python/pythonqt/files | |
| parent | sci-misc/elmer-gui: Make x11-libs/qwt an optional dependency (diff) | |
| parent | Merge branch 'master' into billyonthemountain-master (diff) | |
| download | sci-9909afafdb9beef28ae10121c08e48105f3c51f0.tar.gz sci-9909afafdb9beef28ae10121c08e48105f3c51f0.tar.bz2 sci-9909afafdb9beef28ae10121c08e48105f3c51f0.zip | |
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 <jlec@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
Diffstat (limited to 'dev-python/pythonqt/files')
| -rw-r--r-- | dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch | 6 | ||||
| -rw-r--r-- | dev-python/pythonqt/files/pythonqt-9999-lib_location.patch | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch index 41d4dbfb0..dd3bcc624 100644 --- a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch +++ b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch @@ -5,7 +5,7 @@ # 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 @@ -15,8 +15,8 @@ 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 >>> diff --git a/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch index 5f810c562..111db4780 100644 --- a/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch +++ b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch @@ -5,7 +5,7 @@ # 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 @@ -15,6 +15,6 @@ 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) |