| 1 |
commit: 9909afafdb9beef28ae10121c08e48105f3c51f0 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 3 07:31:03 2013 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 3 07:31:03 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9909afaf |
| 7 |
|
| 8 |
Merge branch 'billyonthemountain-master' into asd |
| 9 |
|
| 10 |
* billyonthemountain-master: |
| 11 |
sci-libs/elmer-eio: Bump EAPI; fix license; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure |
| 12 |
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 |
| 13 |
sci-misc/elmer-gui: Make x11-libs/qwt an optional dependency |
| 14 |
sci-libs/opencascade: Verion bump |
| 15 |
dev-python/pythonqt: New package |
| 16 |
sci-mathematics/netgen: Version bump |
| 17 |
sci-misc/elmer-meta: New ebuilds for Elmer FEM packages |
| 18 |
|
| 19 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 20 |
|
| 21 |
Conflicts: |
| 22 |
dev-python/pythonqt/Manifest |
| 23 |
dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
| 24 |
dev-python/pythonqt/files/pythonqt-9999-lib_location.patch |
| 25 |
dev-python/pythonqt/pythonqt-2.1.ebuild |
| 26 |
dev-python/pythonqt/pythonqt-9999.ebuild |
| 27 |
sci-libs/elmer-eio/Manifest |
| 28 |
sci-libs/elmer-eio/elmer-eio-9999.ebuild |
| 29 |
|
| 30 |
|
| 31 |
dev-python/pythonqt/ChangeLog | 11 ++++ |
| 32 |
dev-python/pythonqt/Manifest | 1 - |
| 33 |
.../pythonqt/files/pythonqt-2.1-lib_location.patch | 6 +- |
| 34 |
.../files/pythonqt-9999-lib_location.patch | 6 +- |
| 35 |
dev-python/{omniorbpy => pythonqt}/metadata.xml | 0 |
| 36 |
dev-python/pythonqt/pythonqt-1.1.ebuild | 75 ---------------------- |
| 37 |
dev-python/pythonqt/pythonqt-2.1.ebuild | 29 +++++---- |
| 38 |
dev-python/pythonqt/pythonqt-9999.ebuild | 28 +++++--- |
| 39 |
sci-libs/elmer-eio/ChangeLog | 11 ++++ |
| 40 |
sci-libs/elmer-eio/Manifest | 2 - |
| 41 |
sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild | 30 +++++++++ |
| 42 |
sci-libs/elmer-eio/elmer-eio-9999.ebuild | 30 ++------- |
| 43 |
.../omniorbpy => sci-libs/elmer-eio}/metadata.xml | 0 |
| 44 |
13 files changed, 102 insertions(+), 127 deletions(-) |
| 45 |
|
| 46 |
diff --cc dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
| 47 |
index 41d4dbf,1bba03a..dd3bcc6 |
| 48 |
--- a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
| 49 |
+++ b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
| 50 |
@@@ -1,22 -1,22 +1,22 @@@ |
| 51 |
--- PythonQt2.1_Qt4.8/CMakeLists.txt.auto-diff-temp 2012-11-30 16:38:06.374358937 +0100 |
| 52 |
+++ PythonQt2.1_Qt4.8/CMakeLists.txt 2012-11-30 16:39:37.421438916 +0100 |
| 53 |
@@ -215,7 +215,7 @@ |
| 54 |
- # See http://blog.onesadcookie.com/2008/01/installname-magic.html |
| 55 |
- # |
| 56 |
- set_target_properties(PythonQt PROPERTIES |
| 57 |
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" |
| 58 |
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" |
| 59 |
- ) |
| 60 |
- |
| 61 |
- target_link_libraries(PythonQt |
| 62 |
+ # See http://blog.onesadcookie.com/2008/01/installname-magic.html |
| 63 |
+ # |
| 64 |
+ set_target_properties(PythonQt PROPERTIES |
| 65 |
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" |
| 66 |
- + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib64" |
| 67 |
+++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" |
| 68 |
+ ) |
| 69 |
+ |
| 70 |
+ target_link_libraries(PythonQt |
| 71 |
@@ -228,8 +228,8 @@ |
| 72 |
- |
| 73 |
- install(TARGETS PythonQt |
| 74 |
- RUNTIME DESTINATION bin |
| 75 |
-- LIBRARY DESTINATION lib |
| 76 |
-- ARCHIVE DESTINATION lib) |
| 77 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
| 78 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
| 79 |
- install(FILES ${headers} DESTINATION include/PythonQt) |
| 80 |
+ |
| 81 |
+ install(TARGETS PythonQt |
| 82 |
+ RUNTIME DESTINATION bin |
| 83 |
+- LIBRARY DESTINATION lib |
| 84 |
+- ARCHIVE DESTINATION lib) |
| 85 |
- + LIBRARY DESTINATION lib64 |
| 86 |
- + ARCHIVE DESTINATION lib64) |
| 87 |
+++ LIBRARY DESTINATION lib${LIB_SUFFIX} |
| 88 |
+++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
| 89 |
+ install(FILES ${headers} DESTINATION include/PythonQt) |
| 90 |
|
| 91 |
MESSAGE(STATUS "<<< Gentoo configuration >>> |
Archives