Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/arb/files/, sci-biology/arb/
Date: Thu, 02 May 2019 18:44:29
Message-Id: 1556822658.1dda583691843fed4b3b2363558c7944ad91e429.zlogene@gentoo
1 commit: 1dda583691843fed4b3b2363558c7944ad91e429
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 2 18:44:18 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu May 2 18:44:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dda5836
7
8 sci-biology/arb: remove last rited package
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 sci-biology/arb/Manifest | 1 -
13 sci-biology/arb/arb-6.0.6.ebuild | 100 ----------------------
14 sci-biology/arb/files/arb-6.0.6-arb_install.patch | 99 ---------------------
15 sci-biology/arb/files/arb-6.0.6-glapi.patch | 15 ----
16 sci-biology/arb/files/arb-6.0.6-tc-flags.patch | 58 -------------
17 sci-biology/arb/metadata.xml | 8 --
18 6 files changed, 281 deletions(-)
19
20 diff --git a/sci-biology/arb/Manifest b/sci-biology/arb/Manifest
21 deleted file mode 100644
22 index 4f19d30ed17..00000000000
23 --- a/sci-biology/arb/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST arb-6.0.6.tgz 13286019 BLAKE2B fd9591321111363013084030aef7130ccac580aeb9b16e93e72613dc0b3922873aa3f3b1e76d28c1ed14846c0b0d2d497257366fc5deebf4c40c79f0b7eee859 SHA512 053d4d964d8a299f86d4cab9113f0d2181780bf51e0ccec0459a4d568d09bb4e9723fa8493d8e4fa5c72e6d1f022241721cadf7ceb75ee27142d48f2f9f269b4
27
28 diff --git a/sci-biology/arb/arb-6.0.6.ebuild b/sci-biology/arb/arb-6.0.6.ebuild
29 deleted file mode 100644
30 index e2f81e08471..00000000000
31 --- a/sci-biology/arb/arb-6.0.6.ebuild
32 +++ /dev/null
33 @@ -1,100 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit toolchain-funcs
40 -
41 -DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis"
42 -HOMEPAGE="http://www.arb-home.de/"
43 -SRC_URI="http://download.arb-home.de/release/${P}/${P}-source.tgz -> ${P}.tgz"
44 -
45 -SLOT="0"
46 -LICENSE="arb"
47 -IUSE="debug +opengl test"
48 -KEYWORDS="~amd64 ~x86"
49 -
50 -CDEPEND="app-text/sablotron
51 - media-libs/libpng:=
52 - media-libs/tiff:=
53 - www-client/lynx
54 - x11-libs/libXaw
55 - x11-libs/libXpm
56 - x11-libs/motif:0
57 - opengl? (
58 - media-libs/glew:=
59 - media-libs/freeglut
60 - || (
61 - media-libs/mesa[motif]
62 - ( media-libs/mesa x11-libs/libGLw ) ) )"
63 -DEPEND="${CDEPEND}
64 - sys-process/time
65 - x11-misc/makedepend"
66 -RDEPEND="${CDEPEND}
67 - sci-visualization/gnuplot"
68 -
69 -# Almost half of tests are broken with debug
70 -RESTRICT="debug? ( test )"
71 -
72 -PATCHES=(
73 - "${FILESDIR}"/${PN}-6.0.6-glapi.patch
74 - "${FILESDIR}"/${PN}-6.0.6-tc-flags.patch
75 - "${FILESDIR}"/${PN}-6.0.6-arb_install.patch
76 -)
77 -
78 -src_unpack() {
79 - default
80 - mv arbsrc* ${P} || die
81 -}
82 -
83 -src_prepare() {
84 - default
85 -
86 - cp config.makefile.template config.makefile
87 - mkdir "${S}"/patches.arb || die # Test script expects ${ARBHOME}/patches.arb to exist
88 -
89 - if use amd64; then
90 - sed -i -e 's@ARB_64 := 0@ARB_64 := 1@' config.makefile || die
91 - fi
92 - if use opengl; then
93 - sed -i -e 's@OPENGL := 0@OPENGL := 1@' config.makefile || die
94 - fi
95 - if use test; then
96 - sed -i -e 's@UNIT_TESTS := 0@UNIT_TESTS := 1@' config.makefile || die
97 - fi
98 - if use debug; then
99 - sed -i -e 's@DEBUG := 0@DEBUG := 1@' \
100 - -e 's@DEBUG_GRAPHICS := 0@DEBUG_GRAPHICS := 1@' config.makefile || die
101 - fi
102 -}
103 -
104 -src_compile() {
105 - emake ARBHOME="${S}" PATH="${S}/bin:${PATH}" LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
106 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" build
107 -}
108 -
109 -src_test() {
110 - emake ARBHOME="${S}" PATH="${S}/bin:${PATH}" LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
111 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" run_tests
112 -}
113 -
114 -src_install() {
115 - emake ARBHOME="${S}" PATH="${S}/bin:${PATH}" LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
116 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" prepare_libdir
117 - "${S}"/util/arb_compress || die
118 - if use amd64; then
119 - mv arb.tgz arb.64.gentoo.tgz || die
120 - fi
121 - if use x86; then
122 - mv arb.tgz arb.32.gentoo.tgz || die
123 - fi
124 - ln -s arb.*.tgz arb.tgz || die
125 - ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die
126 -
127 - cat <<- EOF > "${S}/99${PN}" || die
128 - ARBHOME=/opt/arb
129 - PATH=/opt/arb/bin
130 - LD_LIBRARY_PATH=/opt/arb/lib
131 - EOF
132 - doenvd "${S}/99${PN}"
133 -}
134
135 diff --git a/sci-biology/arb/files/arb-6.0.6-arb_install.patch b/sci-biology/arb/files/arb-6.0.6-arb_install.patch
136 deleted file mode 100644
137 index 926c8e0e289..00000000000
138 --- a/sci-biology/arb/files/arb-6.0.6-arb_install.patch
139 +++ /dev/null
140 @@ -1,99 +0,0 @@
141 ---- a/arb_install.sh
142 -+++ b/arb_install.sh
143 -@@ -13,7 +13,6 @@
144 - cont() {
145 - echo "Warning: $@" 1>&2
146 - echo 'Do you want to continue [y]'
147 -- read var
148 - case "$var" in
149 - n) err "Script aborted by user" ;;
150 - *) echo 'Continuing...' ;;
151 -@@ -79,7 +78,6 @@
152 - fi
153 -
154 - echo "Enter full installation path: [${ARBHOME:-/usr/arb}]"
155 --read ARBHOMEI
156 - echo
157 - echo
158 -
159 -@@ -127,7 +125,6 @@
160 - echo ' You can delete the old directory before installing ARB'
161 - echo ' or only update/change options of the old version.'
162 - echo 'Delete old directory (y/n)[n]?'
163 -- read delete_dir
164 - echo
165 - case "$delete_dir" in
166 - y)
167 -@@ -163,7 +160,6 @@
168 - separator
169 - echo "Old ARB package found (type n to change only some options)."
170 - echo " Do you want to update the old package: (y/n)[y]"
171 -- read var;
172 - case "$var" in
173 - n)
174 - echo "Old version unchanged";;
175 -@@ -197,7 +193,6 @@
176 - echo ' 2. "Path" to link pt_server data directory to'
177 - echo " (if you choose this option you won't loose your PT-Servers when doing future software updates)"
178 - echo 'Enter path:'
179 --read pt_dir
180 - echo
181 - case "$pt_dir" in
182 - "")
183 -@@ -222,7 +217,6 @@
184 - if test -d ${ARBHOME}/lib/pts; then
185 - echo ">>> data in default location found"
186 - echo 'Do you want to remove old ptserver data (recommended)? [y]'
187 -- read ANSWER
188 - case "$ANSWER" in
189 - n) echo 'data not deleted' ;;
190 - *) rm -r lib/pts
191 -@@ -247,7 +241,6 @@
192 - echo ' n: if PT_SERVER files shall only be changable by administrator'
193 - echo ' or simply press return to keep the settings of an old installation.'
194 - echo 'Should everybody be allowed to build/update PT_SERVER files (y/n/dont_change)[dont_change]?'
195 --read var
196 - echo
197 - case "$var" in
198 - y)
199 -@@ -273,7 +266,6 @@
200 - echo ' n: if there are some mean untrusty users'
201 - echo ' or simply press return to keep the old settings'
202 - echo 'Do you trust your users (y/n/dont_change)[dont_change]?'
203 --read var
204 - echo
205 - case "$var" in
206 - y)
207 -@@ -310,7 +302,6 @@
208 - echo 'Choose (s/n)[s]?'
209 -
210 - fi
211 --read var
212 - echo
213 -
214 -
215 -@@ -322,7 +313,6 @@
216 - n)
217 - separator
218 - echo "Enter the name of your host for the pt_server"
219 -- read host
220 - echo "Checking connection to $host"
221 - if ssh $host ls >/dev/zero; then
222 - echo ">>> ssh $host ok"
223 -@@ -341,7 +331,7 @@
224 - echo ">>> Installation Complete"
225 -
226 - separator
227 --SHELL_ANS=0
228 -+SHELL_ANS=1
229 -
230 - while [ "$SHELL_ANS" = "0" ]; do
231 -
232 -@@ -359,7 +349,6 @@
233 -
234 - echo "Enter (1,2 or 3) to achieve further installation instructions:"
235 -
236 -- read var
237 -
238 - echo '';
239 - echo '**********************************************************************************************';
240
241 diff --git a/sci-biology/arb/files/arb-6.0.6-glapi.patch b/sci-biology/arb/files/arb-6.0.6-glapi.patch
242 deleted file mode 100644
243 index 755cb685862..00000000000
244 --- a/sci-biology/arb/files/arb-6.0.6-glapi.patch
245 +++ /dev/null
246 @@ -1,15 +0,0 @@
247 -When built with USE=opengl, the macro GLAPI either doesn't get defined
248 -or gets undefed in some header. Header <GL/GLwMDrawA.h> seems to expect
249 -it to be defined as 'extern', as defining it as '__attribute__((visibility("default")))'
250 -leads to multiple definition errors.
251 -
252 ---- a/RNA3D/RNA3D_GlobalHeader.hxx
253 -+++ b/RNA3D/RNA3D_GlobalHeader.hxx
254 -@@ -44,6 +44,7 @@
255 - // Undefining it here does the job:
256 - #undef __GLX_glx_h__
257 - #include <GL/glx.h>
258 -+#define GLAPI extern
259 - #endif // OPEN_GL_WAY_TO_INCLUDE == 3
260 - // ------------------------------
261 -
262
263 diff --git a/sci-biology/arb/files/arb-6.0.6-tc-flags.patch b/sci-biology/arb/files/arb-6.0.6-tc-flags.patch
264 deleted file mode 100644
265 index 4c8f22d7940..00000000000
266 --- a/sci-biology/arb/files/arb-6.0.6-tc-flags.patch
267 +++ /dev/null
268 @@ -1,58 +0,0 @@
269 ---- a/Makefile
270 -+++ b/Makefile
271 -@@ -61,8 +61,8 @@
272 - # compiler settings:
273 - ifneq ($(CC),use__A_CC__instead_of__CC)
274 -
275 --A_CC:=$(CC)# compile C
276 --A_CXX:=$(CXX)# compile C++
277 -+A_CC:=${CC}# compile C
278 -+A_CXX:=${CXX}# compile C++
279 -
280 - # uncomment to ensure no submakefile uses CC and CXX directly
281 - override CC:=use__A_CC__instead_of__CC
282 -@@ -119,12 +119,7 @@
283 - endif
284 - endif
285 -
286 --ifeq ($(USE_CLANG),1)
287 --# accept all clang versions:
288 - ALLOWED_COMPILER_VERSIONS=$(COMPILER_VERSION)
289 --else
290 --ALLOWED_COMPILER_VERSIONS=$(ALLOWED_gcc_VERSIONS)
291 --endif
292 -
293 - COMPILER_VERSION_ALLOWED=$(strip $(subst ___,,$(foreach version,$(ALLOWED_COMPILER_VERSIONS),$(findstring ___$(version)___,___$(COMPILER_VERSION)___))))
294 -
295 -@@ -184,20 +179,13 @@
296 -
297 - shared_cflags :=# flags for shared lib compilation
298 - lflags :=# linker flags
299 --clflags :=# linker flags (when passed through gcc)
300 -+clflags := ${LDFLAGS} # linker flags (when passed through gcc)
301 - extended_warnings :=# warning flags for C and C++-compiler
302 - extended_cpp_warnings :=# warning flags for C++-compiler only
303 -
304 -
305 - ifeq ($(DEBUG),0)
306 - dflags := -DNDEBUG# defines
307 -- ifeq ($(USE_CLANG),1)
308 -- cflags := -O3# compiler flags (C and C++)
309 -- else
310 -- cflags := -O3# compiler flags (C and C++)
311 -- lflags += -O2# linker flags
312 -- clflags += -Wl,-O2# passthrough linker flags
313 -- endif
314 - endif
315 -
316 - ifeq ($(DEBIAN),1)
317 -@@ -526,6 +514,9 @@
318 - cxxflags += $(CPPFLAGS)
319 - endif
320 -
321 -+cflags := ${CFLAGS} $(cflags)
322 -+cxxflags += ${CXXFLAGS}
323 -+
324 - ifeq ('$(USE_GCC_47_OR_HIGHER)','yes')
325 - cxxflags += -std=gnu++11# see also TEMPLATES/cxxforward.h@USE_Cxx11
326 - else
327
328 diff --git a/sci-biology/arb/metadata.xml b/sci-biology/arb/metadata.xml
329 deleted file mode 100644
330 index 959160fe46b..00000000000
331 --- a/sci-biology/arb/metadata.xml
332 +++ /dev/null
333 @@ -1,8 +0,0 @@
334 -<?xml version="1.0" encoding="UTF-8"?>
335 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
336 -<pkgmetadata>
337 - <maintainer type="project">
338 - <email>sci-biology@g.o</email>
339 - <name>Gentoo Biology Project</name>
340 - </maintainer>
341 -</pkgmetadata>