1 |
commit: 2337c391c8eef3fa7af39ac32045dbf124433b28 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 28 19:15:02 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 19:19:59 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2337c391 |
7 |
|
8 |
Revert "sci-chemistry/avogadro: Drop old" |
9 |
|
10 |
This reverts commit 0db137e6da3ecb14cebbb6ac595c235cba1c38b1. |
11 |
|
12 |
sci-chemistry/avogadro/Manifest | 1 + |
13 |
sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild | 55 +++++++++++++++++++++++++ |
14 |
sci-chemistry/avogadro/files/1.0.1-gl2ps.patch | 39 ++++++++++++++++++ |
15 |
3 files changed, 95 insertions(+) |
16 |
|
17 |
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest |
18 |
index 9dbb71c..9a4d897 100644 |
19 |
--- a/sci-chemistry/avogadro/Manifest |
20 |
+++ b/sci-chemistry/avogadro/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
+DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92 |
23 |
DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d |
24 |
DIST avogadro-1.1.1.tar.bz2 11118046 SHA256 fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827 WHIRLPOOL 6bea2c25675ba29729785b561cbaed33929aeb4638180454b1aed8913160cd6d0315bb09e6ee4033a8d27ce84fd7a4573851fd02c76b64b6aa86e615a19b8c38 |
25 |
|
26 |
diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..ae73ee5 |
29 |
--- /dev/null |
30 |
+++ b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild |
31 |
@@ -0,0 +1,55 @@ |
32 |
+# Copyright 1999-2015 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=5 |
37 |
+ |
38 |
+PYTHON_COMPAT=( python2_7 ) |
39 |
+ |
40 |
+inherit cmake-utils eutils python-single-r1 |
41 |
+ |
42 |
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" |
43 |
+HOMEPAGE="http://avogadro.openmolecules.net/" |
44 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
45 |
+ |
46 |
+LICENSE="GPL-2" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86" |
49 |
+IUSE="+glsl python cpu_flags_x86_sse2" |
50 |
+ |
51 |
+RDEPEND=" |
52 |
+ >=sci-chemistry/openbabel-2.2.3 |
53 |
+ >=dev-qt/qtgui-4.5.3:4 |
54 |
+ >=dev-qt/qtopengl-4.5.3:4 |
55 |
+ x11-libs/gl2ps |
56 |
+ glsl? ( >=media-libs/glew-1.5.0 ) |
57 |
+ python? ( |
58 |
+ >=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}] |
59 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
60 |
+ dev-python/sip[${PYTHON_USEDEP}] |
61 |
+ )" |
62 |
+DEPEND="${RDEPEND} |
63 |
+ dev-cpp/eigen:2" |
64 |
+ |
65 |
+PATCHES=( |
66 |
+ "${FILESDIR}"/1.0.1-gl2ps.patch |
67 |
+) |
68 |
+ |
69 |
+pkg_setup() { |
70 |
+ use python && python-single-r1_pkg_setup |
71 |
+} |
72 |
+ |
73 |
+src_configure() { |
74 |
+ local mycmakeargs=( |
75 |
+ -DENABLE_THREADGL=OFF |
76 |
+ -DENABLE_RPATH=OFF |
77 |
+ -DENABLE_UPDATE_CHECKER=OFF |
78 |
+ -DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs" |
79 |
+ -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs |
80 |
+ $(cmake-utils_use_enable glsl) |
81 |
+ $(cmake-utils_use_with cpu_flags_x86_sse2 SSE2) |
82 |
+ $(cmake-utils_use_enable python) |
83 |
+ ) |
84 |
+ |
85 |
+ cmake-utils_src_configure |
86 |
+} |
87 |
|
88 |
diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch |
89 |
new file mode 100644 |
90 |
index 0000000..d8a0c0f |
91 |
--- /dev/null |
92 |
+++ b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch |
93 |
@@ -0,0 +1,39 @@ |
94 |
+diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt |
95 |
+index 75b6dfb..d87ac2c 100644 |
96 |
+--- a/avogadro/src/CMakeLists.txt |
97 |
++++ b/avogadro/src/CMakeLists.txt |
98 |
+@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER) |
99 |
+ FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp") |
100 |
+ set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS}) |
101 |
+ # Add GL2PS to the executable |
102 |
+-set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c") |
103 |
++#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c") |
104 |
+ |
105 |
+ if( WIN32 ) |
106 |
+ set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc) |
107 |
+diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp |
108 |
+index 66785fd..2933953 100644 |
109 |
+--- a/avogadro/src/mainwindow.cpp |
110 |
++++ b/avogadro/src/mainwindow.cpp |
111 |
+@@ -51,7 +51,7 @@ |
112 |
+ //#endif |
113 |
+ |
114 |
+ // Include the GL2PS header |
115 |
+-#include "../gl2ps/gl2ps.h" |
116 |
++#include <gl2ps.h> |
117 |
+ |
118 |
+ #include <avogadro/pluginmanager.h> |
119 |
+ |
120 |
+diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt |
121 |
+index cce8ece..cc084fb 100644 |
122 |
+--- a/libavogadro/src/CMakeLists.txt |
123 |
++++ b/libavogadro/src/CMakeLists.txt |
124 |
+@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS}) |
125 |
+ add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) |
126 |
+ set_target_properties(avogadro |
127 |
+ PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) |
128 |
+-target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) |
129 |
++target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps) |
130 |
+ |
131 |
+ install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR}) |
132 |
+ install(FILES ${libavogadro_HDRS} |