1 |
commit: c399a8bb15acd06ffef54b9c1b7f0e9c36f77c86 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 10 04:03:09 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 10 04:05:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c399a8bb |
7 |
|
8 |
sci-chemistry/coot: Remove |
9 |
|
10 |
Closes: https://bugs.gentoo.org/639760 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
sci-chemistry/coot/Manifest | 2 - |
14 |
sci-chemistry/coot/coot-0.8.2-r1.ebuild | 181 --------------------- |
15 |
sci-chemistry/coot/files/coot-0.8.2-desktop.patch | 21 --- |
16 |
sci-chemistry/coot/files/coot-0.8.2-libguile.patch | 29 ---- |
17 |
sci-chemistry/coot/files/coot-0.8.2-libtool.patch | 39 ----- |
18 |
.../coot/files/coot-0.8.2-sandbox-icons.patch | 16 -- |
19 |
sci-chemistry/coot/metadata.xml | 8 - |
20 |
7 files changed, 296 deletions(-) |
21 |
|
22 |
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest |
23 |
deleted file mode 100644 |
24 |
index 0ef426fb410..00000000000 |
25 |
--- a/sci-chemistry/coot/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1,2 +0,0 @@ |
28 |
-DIST coot-0.8.2-greg-data.tar.gz 8677037 BLAKE2B bb2eac183598fed429c4977f9512e90335ccb988f154a3a29985668e6d3a90a19cb77ec61e0453e7294243b8dffd9b5ef6bb318bac2280b26eab37e2de25a18a SHA512 28396a5fa64af61e8932b565c6593ed27c4708e6a59158d62c94005bea9fa8c46562b6caba97011209a40705e5ec6711b949138dd8a23bb954df2ab4dfa9bb33 |
29 |
-DIST coot-0.8.2.tar.gz 15772937 BLAKE2B 8ee8fb827ef4ec6470f17eea4a91db8c57699c8c3a3d7cce3388c53389ba15c90a7610d8f2592320acdaee0b6c09fe8e9452cd45857659d71d363abc3322bf6f SHA512 a323608df7b63f22eb2d1ac679fc047bba9fe23fe6366ae1d6ae29ca00a567aafb3d29840878e8c5123421037e26b6463f0bb845ef28dcbb4f3647cda2f74575 |
30 |
|
31 |
diff --git a/sci-chemistry/coot/coot-0.8.2-r1.ebuild b/sci-chemistry/coot/coot-0.8.2-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index b4fa2b21f7b..00000000000 |
34 |
--- a/sci-chemistry/coot/coot-0.8.2-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,181 +0,0 @@ |
37 |
-# Copyright 1999-2017 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 ) |
43 |
- |
44 |
-AUTOTOOLS_AUTORECONF="true" |
45 |
- |
46 |
-inherit autotools-utils python-single-r1 toolchain-funcs versionator |
47 |
- |
48 |
-MY_S2_PV=$(replace_version_separator 2 - ${PV}) |
49 |
-MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1} |
50 |
-MY_S_P=${MY_S2_P}-${PR/r/revision-} |
51 |
-MY_PV=${PV} |
52 |
-MY_P=${PN}-${MY_PV} |
53 |
- |
54 |
-DESCRIPTION="Crystallographic Object-Oriented Toolkit" |
55 |
-HOMEPAGE="https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/" |
56 |
-SRC_URI=" |
57 |
- http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz |
58 |
- test? ( https://dev.gentoo.org/~jlec/distfiles/${P}-greg-data.tar.gz )" |
59 |
- |
60 |
-SLOT="0" |
61 |
-LICENSE="GPL-3" |
62 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
63 |
-IUSE="+openmp static-libs test" |
64 |
- |
65 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
66 |
- |
67 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
68 |
- |
69 |
-SCIDEPS=" |
70 |
- sci-libs/libccp4 |
71 |
- sci-libs/clipper |
72 |
- >=sci-libs/coot-data-2 |
73 |
- >=sci-libs/gsl-1.3 |
74 |
- sci-libs/fftw:2.1= |
75 |
- sci-libs/mmdb:2 |
76 |
- sci-libs/monomer-db |
77 |
- sci-libs/ssm |
78 |
- sci-chemistry/reduce |
79 |
- sci-chemistry/probe" |
80 |
- |
81 |
-XDEPS=" |
82 |
- gnome-base/libgnomecanvas |
83 |
- gnome-base/librsvg:2 |
84 |
- media-libs/libpng:0= |
85 |
- media-libs/freeglut |
86 |
- x11-libs/gtk+:2 |
87 |
- x11-libs/goocanvas:0 |
88 |
- x11-libs/gtkglext |
89 |
- virtual/opengl" |
90 |
- |
91 |
-SCHEMEDEPS=" |
92 |
- <dev-scheme/guile-2 |
93 |
- dev-scheme/net-http |
94 |
- dev-scheme/guile-gui |
95 |
- >=dev-scheme/guile-lib-0.1.6 |
96 |
- dev-scheme/guile-www |
97 |
- >=x11-libs/guile-gtk-2.1" |
98 |
- |
99 |
-RDEPEND=" |
100 |
- ${SCIDEPS} |
101 |
- ${XDEPS} |
102 |
- ${SCHEMEDEPS} |
103 |
- ${PYTHON_DEPS} |
104 |
- dev-db/sqlite:3 |
105 |
- dev-libs/boost:0=[python,${PYTHON_USEDEP}] |
106 |
- dev-libs/glib:2 |
107 |
- >=dev-libs/gmp-4.2.2-r2:0= |
108 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
109 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
110 |
- >=net-misc/curl-7.19.6 |
111 |
- net-dns/libidn |
112 |
- sys-libs/readline:0= |
113 |
- " |
114 |
-DEPEND="${RDEPEND} |
115 |
- virtual/pkgconfig |
116 |
- >=sys-devel/libtool-2.4-r2 |
117 |
- dev-lang/swig |
118 |
- sys-devel/bc |
119 |
- test? ( dev-scheme/greg )" |
120 |
- |
121 |
-S="${WORKDIR}/${MY_P}" |
122 |
- |
123 |
-pkg_setup() { |
124 |
- if use openmp; then |
125 |
- tc-has-openmp || die "Please use an OPENMP capable compiler" |
126 |
- fi |
127 |
- python-single-r1_pkg_setup |
128 |
-} |
129 |
- |
130 |
-PATCHES=( |
131 |
- "${FILESDIR}"/${P}-desktop.patch |
132 |
- "${FILESDIR}"/${P}-sandbox-icons.patch |
133 |
- "${FILESDIR}"/${P}-libtool.patch |
134 |
- "${FILESDIR}"/${P}-libguile.patch |
135 |
-) |
136 |
- |
137 |
-src_unpack() { |
138 |
- default |
139 |
- if use test; then |
140 |
- cd "${S}" || die |
141 |
- ln -sf ../greg-data || die |
142 |
- fi |
143 |
-} |
144 |
- |
145 |
-src_prepare() { |
146 |
- sed \ |
147 |
- -e '/export LD_LIBRARY/s:^:#:g' \ |
148 |
- -i src/coot.in || die |
149 |
- |
150 |
- sed \ |
151 |
- -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \ |
152 |
- -i configure.ac || die |
153 |
- |
154 |
- autotools-utils_src_prepare |
155 |
-} |
156 |
- |
157 |
-src_configure() { |
158 |
- # All the --with's are used to activate various parts. |
159 |
- # Yes, this is broken behavior. |
160 |
- local myeconfargs=( |
161 |
- --with-goocanvas-prefix="${EPREFIX}/usr" |
162 |
- --with-guile="${EPREFIX}/usr" |
163 |
- --with-python="${EPREFIX}/usr" |
164 |
- --with-guile-gtk |
165 |
- --with-pygtk="${EPREFIX}/usr" |
166 |
- --with-sqlite3 |
167 |
- --with-boost="${EPREFIX}/usr" |
168 |
- ) |
169 |
- autotools-utils_src_configure |
170 |
-} |
171 |
- |
172 |
-src_test() { |
173 |
- source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh" |
174 |
- mkdir "${T}"/coot_test || die |
175 |
- |
176 |
- export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb" |
177 |
- export COOT_SCHEME_DIR="${S}/scheme/" |
178 |
- export COOT_RESOURCES_FILE="${S}/cootrc" |
179 |
- export COOT_PIXMAPS_DIR="${S}/pixmaps/" |
180 |
- export COOT_DATA_DIR="${S}/" |
181 |
- export COOT_PYTHON_DIR="${S}/python/" |
182 |
- export PYTHONPATH="${COOT_PYTHON_DIR}:${S}/src:${PYTHONPATH}" |
183 |
- export PYTHONHOME="${EPREFIX}"/usr/ |
184 |
- export CCP4_SCR="${T}"/coot_test/ |
185 |
- export CLIBD_MON="${EPREFIX}/usr/share/data/monomers/" |
186 |
- export COOT_REF_STRUCTS="${EPREFIX}/usr/share/data/monomers/" |
187 |
- export SYMINFO="${S}/syminfo.lib" |
188 |
- |
189 |
- export COOT_TEST_DATA_DIR="${S}"/greg-data/ |
190 |
- |
191 |
- cat > command-line-greg.scm <<- EOF |
192 |
- (use-modules (ice-9 greg)) |
193 |
- (set! greg-tools (list "greg-tests")) |
194 |
- (set! greg-debug #t) |
195 |
- (set! greg-verbose 5) |
196 |
- (let ((r (greg-test-run))) |
197 |
- (if r |
198 |
- (coot-real-exit 0) |
199 |
- (coot-real-exit 1))) |
200 |
- EOF |
201 |
- |
202 |
- einfo "Running test with following paths ..." |
203 |
- einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES" |
204 |
- einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR" |
205 |
- einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE" |
206 |
- einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR" |
207 |
- einfo "COOT_DATA_DIR $COOT_DATA_DIR" |
208 |
- einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR" |
209 |
- einfo "PYTHONPATH $PYTHONPATH" |
210 |
- einfo "PYTHONHOME $PYTHONHOME" |
211 |
- einfo "CCP4_SCR ${CCP4_SCR}" |
212 |
- einfo "CLIBD_MON ${CLIBD_MON}" |
213 |
- einfo "SYMINFO ${SYMINFO}" |
214 |
- |
215 |
- "${S}"/src/coot-bin --no-graphics --script command-line-greg.scm || die |
216 |
- "${S}"/src/coot-bin --no-graphics --script python-tests/coot_unittest.py || die |
217 |
-} |
218 |
|
219 |
diff --git a/sci-chemistry/coot/files/coot-0.8.2-desktop.patch b/sci-chemistry/coot/files/coot-0.8.2-desktop.patch |
220 |
deleted file mode 100644 |
221 |
index c264dd5a762..00000000000 |
222 |
--- a/sci-chemistry/coot/files/coot-0.8.2-desktop.patch |
223 |
+++ /dev/null |
224 |
@@ -1,21 +0,0 @@ |
225 |
- coot.desktop | 7 +++---- |
226 |
- 1 file changed, 3 insertions(+), 4 deletions(-) |
227 |
- |
228 |
-diff --git a/coot.desktop b/coot.desktop |
229 |
-index 74aecf3..8668018 100644 |
230 |
---- a/coot.desktop |
231 |
-+++ b/coot.desktop |
232 |
-@@ -1,10 +1,9 @@ |
233 |
- [Desktop Entry] |
234 |
- Type=Application |
235 |
--Encoding=UTF-8 |
236 |
- Name=Coot |
237 |
- Comment=Macromolecular model builder |
238 |
- Exec=coot |
239 |
--Icon=coot.png |
240 |
-+Icon=coot |
241 |
- Terminal=true |
242 |
--Categories=Science;Graphics |
243 |
--MimeType=chemical/x-pdb;chemical/x-mmcif;chemical/x-mdl-molfile |
244 |
-+Categories=Science;Graphics; |
245 |
-+MimeType=chemical/x-pdb;chemical/x-mmcif;chemical/x-mdl-molfile; |
246 |
|
247 |
diff --git a/sci-chemistry/coot/files/coot-0.8.2-libguile.patch b/sci-chemistry/coot/files/coot-0.8.2-libguile.patch |
248 |
deleted file mode 100644 |
249 |
index cbaccefb294..00000000000 |
250 |
--- a/sci-chemistry/coot/files/coot-0.8.2-libguile.patch |
251 |
+++ /dev/null |
252 |
@@ -1,29 +0,0 @@ |
253 |
- src/graphics-info-modelling.cc | 1 + |
254 |
- src/graphics-info.cc | 2 ++ |
255 |
- 2 files changed, 3 insertions(+) |
256 |
- |
257 |
-diff --git a/src/graphics-info-modelling.cc b/src/graphics-info-modelling.cc |
258 |
-index 05a63ad..4b7d129 100644 |
259 |
---- a/src/graphics-info-modelling.cc |
260 |
-+++ b/src/graphics-info-modelling.cc |
261 |
-@@ -102,6 +102,7 @@ |
262 |
- |
263 |
- #include "utils/coot-utils.hh" |
264 |
- |
265 |
-+#include <libguile.h> |
266 |
- |
267 |
- // Idealize the geometry without considering the map. |
268 |
- // |
269 |
-diff --git a/src/graphics-info.cc b/src/graphics-info.cc |
270 |
-index e2f9d52..76b6769 100644 |
271 |
---- a/src/graphics-info.cc |
272 |
-+++ b/src/graphics-info.cc |
273 |
-@@ -92,6 +92,8 @@ |
274 |
- #include "cc-interface-scripting.hh" |
275 |
- #endif |
276 |
- |
277 |
-+#include <libguile.h> |
278 |
-+ |
279 |
- // A few non-class members - should be somewhere else, I guess. |
280 |
- // |
281 |
- void initialize_graphics_molecules() { |
282 |
|
283 |
diff --git a/sci-chemistry/coot/files/coot-0.8.2-libtool.patch b/sci-chemistry/coot/files/coot-0.8.2-libtool.patch |
284 |
deleted file mode 100644 |
285 |
index 10c43ad5559..00000000000 |
286 |
--- a/sci-chemistry/coot/files/coot-0.8.2-libtool.patch |
287 |
+++ /dev/null |
288 |
@@ -1,39 +0,0 @@ |
289 |
- configure.ac | 2 +- |
290 |
- lbg/Makefile.am | 11 ----------- |
291 |
- 2 files changed, 1 insertion(+), 12 deletions(-) |
292 |
- |
293 |
-diff --git a/configure.ac b/configure.ac |
294 |
-index 73d6ed7..b04dcd6 100644 |
295 |
---- a/configure.ac |
296 |
-+++ b/configure.ac |
297 |
-@@ -69,7 +69,7 @@ AC_LIB_PREPARE_MULTILIB |
298 |
- |
299 |
- AC_SUBST(COOT_STDTYPES) |
300 |
- |
301 |
--EXPORT_DYNAMIC_FLAG_SPEC=$export_dynamic_flag_spec |
302 |
-+eval EXPORT_DYNAMIC_FLAG_SPEC=\"$export_dynamic_flag_spec\" |
303 |
- AC_SUBST(EXPORT_DYNAMIC_FLAG_SPEC) |
304 |
- |
305 |
- |
306 |
-diff --git a/lbg/Makefile.am b/lbg/Makefile.am |
307 |
-index 1277afe..a79ebe0 100644 |
308 |
---- a/lbg/Makefile.am |
309 |
-+++ b/lbg/Makefile.am |
310 |
-@@ -43,17 +43,6 @@ pkginclude_HEADERS = lbg.hh wmolecule.hh flev-annotations.hh graphics-c-interfa |
311 |
- lbg-drag-and-drop.hh qed-interface.hh alerts.hh pi-stacking.hh |
312 |
- pkgincludedir = $(includedir)/coot/lbg |
313 |
- |
314 |
--# 20140521 |
315 |
--# lidia_LDFLAGS = -Wl,--export-dynamic |
316 |
--# |
317 |
--# Now we use EXPORT_DYNAMIC_FLAG_SPEC which usually evaluates to ${wl}--export-dynamic |
318 |
--# (but not for MacOSX, where it Does The Right Thing (hopefully)). |
319 |
--# We manually set the value of wl here, but maybe the Right Thing To Do for that is |
320 |
--# run (eval) $($LIBTOOL --config | grep ^wl). How do I do that here though? |
321 |
--# I don't understand. Maybe the setting of wl should be done in configure? But then |
322 |
--# I have to force the output of libtool. Bleugh. Hmm... |
323 |
--# Anyway, thankyou Gary Vaughan. |
324 |
--wl=-Wl, |
325 |
- lidia_LDFLAGS = $(EXPORT_DYNAMIC_FLAG_SPEC) |
326 |
- |
327 |
- # res spec output operator means we include libcoot-coord-utils |
328 |
|
329 |
diff --git a/sci-chemistry/coot/files/coot-0.8.2-sandbox-icons.patch b/sci-chemistry/coot/files/coot-0.8.2-sandbox-icons.patch |
330 |
deleted file mode 100644 |
331 |
index 2a9ff2d7177..00000000000 |
332 |
--- a/sci-chemistry/coot/files/coot-0.8.2-sandbox-icons.patch |
333 |
+++ /dev/null |
334 |
@@ -1,16 +0,0 @@ |
335 |
- pixmaps/icons/Makefile.am | 4 ++-- |
336 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
337 |
- |
338 |
-diff --git a/pixmaps/icons/Makefile.am b/pixmaps/icons/Makefile.am |
339 |
-index 0c183ae..dddc11a 100644 |
340 |
---- a/pixmaps/icons/Makefile.am |
341 |
-+++ b/pixmaps/icons/Makefile.am |
342 |
-@@ -11,6 +11,6 @@ install-data-local: |
343 |
- CONTEXT=` echo $$icon | cut -d_ -f2`; \ |
344 |
- SIZE=` echo $$icon | cut -d_ -f3`; \ |
345 |
- ICONFILE=`echo $$icon | cut -d_ -f4`; \ |
346 |
-- mkdir -p $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ |
347 |
-- $(INSTALL_DATA) $(srcdir)/$$icon $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ |
348 |
-+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ |
349 |
-+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ |
350 |
- done; |
351 |
|
352 |
diff --git a/sci-chemistry/coot/metadata.xml b/sci-chemistry/coot/metadata.xml |
353 |
deleted file mode 100644 |
354 |
index 8937bad0b17..00000000000 |
355 |
--- a/sci-chemistry/coot/metadata.xml |
356 |
+++ /dev/null |
357 |
@@ -1,8 +0,0 @@ |
358 |
-<?xml version="1.0" encoding="UTF-8"?> |
359 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
360 |
-<pkgmetadata> |
361 |
- <maintainer type="project"> |
362 |
- <email>sci-chemistry@g.o</email> |
363 |
- <name>Gentoo Chemistry Project</name> |
364 |
- </maintainer> |
365 |
-</pkgmetadata> |