1 |
commit: 355a3ef752f941c91748ce4fa74d9dd477379586 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 4 08:26:54 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 4 08:26:54 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=355a3ef7 |
7 |
|
8 |
sci-biology/embassy-emnu: Bump eclass, Drop old |
9 |
|
10 |
Package-Manager: portage-2.2.15 |
11 |
|
12 |
--- |
13 |
sci-biology/embassy-emnu/ChangeLog | 7 +- |
14 |
.../embassy-emnu/embassy-emnu-1.05-r7.ebuild | 15 - |
15 |
.../embassy-emnu/embassy-emnu-1.05.650.ebuild | 2 +- |
16 |
.../embassy-emnu/files/embassy-emnu-1.05-r7.patch | 359 --------------------- |
17 |
sci-biology/embassy-emnu/metadata.xml | 2 +- |
18 |
5 files changed, 8 insertions(+), 377 deletions(-) |
19 |
|
20 |
diff --git a/sci-biology/embassy-emnu/ChangeLog b/sci-biology/embassy-emnu/ChangeLog |
21 |
index 94f00fd..a497db7 100644 |
22 |
--- a/sci-biology/embassy-emnu/ChangeLog |
23 |
+++ b/sci-biology/embassy-emnu/ChangeLog |
24 |
@@ -1,7 +1,12 @@ |
25 |
# ChangeLog for sci-biology/embassy-emnu |
26 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
28 |
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-emnu/ChangeLog,v 1.29 2010/01/01 21:55:20 fauli Exp $ |
29 |
|
30 |
+ 04 Feb 2015; Justin Lecher <jlec@g.o> -embassy-emnu-1.05-r7.ebuild, |
31 |
+ embassy-emnu-1.05.650.ebuild, -files/embassy-emnu-1.05-r7.patch, |
32 |
+ metadata.xml: |
33 |
+ Bump eclass, Drop old |
34 |
+ |
35 |
25 Jun 2011; Justin Lecher <jlec@g.o> embassy-emnu-1.05-r7.ebuild: |
36 |
Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035 |
37 |
|
38 |
|
39 |
diff --git a/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild b/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild |
40 |
deleted file mode 100644 |
41 |
index b698af1..0000000 |
42 |
--- a/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild |
43 |
+++ /dev/null |
44 |
@@ -1,15 +0,0 @@ |
45 |
-# Copyright 1999-2014 Gentoo Foundation |
46 |
-# Distributed under the terms of the GNU General Public License v2 |
47 |
-# $Header: $ |
48 |
- |
49 |
-EAPI="4" |
50 |
- |
51 |
-EBO_DESCRIPTION="Simple menu of EMBOSS applications" |
52 |
-EBO_EXTRA_ECONF="$(use_with ncurses curses)" |
53 |
- |
54 |
-inherit emboss |
55 |
- |
56 |
-KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" |
57 |
-IUSE+=" ncurses" |
58 |
- |
59 |
-RDEPEND+=" ncurses? ( sys-libs/ncurses )" |
60 |
|
61 |
diff --git a/sci-biology/embassy-emnu/embassy-emnu-1.05.650.ebuild b/sci-biology/embassy-emnu/embassy-emnu-1.05.650.ebuild |
62 |
index 46b89b5..fe88b98 100644 |
63 |
--- a/sci-biology/embassy-emnu/embassy-emnu-1.05.650.ebuild |
64 |
+++ b/sci-biology/embassy-emnu/embassy-emnu-1.05.650.ebuild |
65 |
@@ -7,7 +7,7 @@ EAPI=5 |
66 |
EBO_DESCRIPTION="Simple menu of EMBOSS applications" |
67 |
EBO_EXTRA_ECONF="$(use_enable ncurses curses)" |
68 |
|
69 |
-inherit emboss |
70 |
+inherit emboss-r1 |
71 |
|
72 |
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" |
73 |
IUSE+=" ncurses" |
74 |
|
75 |
diff --git a/sci-biology/embassy-emnu/files/embassy-emnu-1.05-r7.patch b/sci-biology/embassy-emnu/files/embassy-emnu-1.05-r7.patch |
76 |
deleted file mode 100644 |
77 |
index 30cd344..0000000 |
78 |
--- a/sci-biology/embassy-emnu/files/embassy-emnu-1.05-r7.patch |
79 |
+++ /dev/null |
80 |
@@ -1,359 +0,0 @@ |
81 |
-diff --git a/Makefile.am b/Makefile.am |
82 |
-index 6bfb6f0..d547b12 100644 |
83 |
---- a/Makefile.am |
84 |
-+++ b/Makefile.am |
85 |
-@@ -1,5 +1,6 @@ |
86 |
- # |
87 |
- |
88 |
-+ACLOCAL_AMFLAGS = -I m4 |
89 |
- SUBDIRS = src emboss_acd emboss_doc |
90 |
- |
91 |
- EXTRA_DIST = depcomp ltmain.sh install-sh config.sub config.guess |
92 |
-diff --git a/configure.in b/configure.in |
93 |
-index 9a44a39..94fd067 100644 |
94 |
---- a/configure.in |
95 |
-+++ b/configure.in |
96 |
-@@ -187,15 +187,6 @@ AC_PROG_INSTALL |
97 |
- AC_PROG_LN_S |
98 |
- AC_PROG_MAKE_SET |
99 |
- |
100 |
--dnl Intel MacOSX 10.6 puts X11 in a non-standard place |
101 |
--if test "${with_x}" != "no" ; then |
102 |
--if test "`uname -a | grep Darwin`"; then |
103 |
--OSXX=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'` |
104 |
--if test ${OSXX} '>' '10.4'; then |
105 |
--CFLAGS="$CFLAGS -I/usr/X11/include -L/usr/X11/lib" |
106 |
--fi |
107 |
--fi |
108 |
--fi |
109 |
- |
110 |
- dnl Check for header files |
111 |
- AC_PATH_XTRA |
112 |
-@@ -248,10 +239,10 @@ AX_LIB_MYSQL |
113 |
- AX_LIB_POSTGRESQL |
114 |
- |
115 |
- CFLAGS="$CFLAGS $MYSQL_CFLAGS" |
116 |
--LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS" |
117 |
-+LIBS="${MYSQL_LIBS} ${LIBS}" |
118 |
- |
119 |
--CFLAGS="$CFLAGS $POSTGRESQL_CFLAGS" |
120 |
--LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS" |
121 |
-+CFLAGS="$POSTGRESQL_CFLAGS $CFLAGS" |
122 |
-+LIBS="$POSTGRESQL_LIBS $LIBS" |
123 |
- |
124 |
- |
125 |
- dnl "Export" these variables for PCRE |
126 |
-@@ -387,9 +378,30 @@ AC_ARG_ENABLE(systemlibs, |
127 |
- AS_HELP_STRING([--enable-systemlibs], [Use system versions of zlib/expat])) |
128 |
- if test "${enable_systemlibs}" = "yes" ; then |
129 |
- have_systemlibs=yes |
130 |
-+ DEFINE_USE_SYSTEM_PCRE="#define" |
131 |
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd]) |
132 |
-+ PKG_CHECK_MODULES([ZLIB], [zlib]) |
133 |
-+else |
134 |
-+ dnl X11 is only used by plplot |
135 |
-+ dnl Intel MacOSX 10.6 puts X11 in a non-standard place |
136 |
-+ if test "${with_x}" != "no" ; then |
137 |
-+ if test "`uname -a | grep Darwin`"; then |
138 |
-+ OSXX=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'` |
139 |
-+ if test ${OSXX} '>' '10.4'; then |
140 |
-+ CFLAGS="$CFLAGS -I/usr/X11/include -L/usr/X11/lib" |
141 |
-+ fi |
142 |
-+ fi |
143 |
-+ fi |
144 |
-+ if test "${with_x}" != "no" ; then |
145 |
-+ LF_EMBOSS_PATH_XLIB |
146 |
-+ fi |
147 |
-+ AC_MSG_NOTICE(USING bundled LIBS) |
148 |
- fi |
149 |
- AM_CONDITIONAL(ESYSTEMLIBS, test "$have_systemlibs" = "yes") |
150 |
- AC_SUBST(ESYSTEMLIBS) |
151 |
-+AC_SUBST(DEFINE_USE_SYSTEM_PCRE) |
152 |
-+AC_SUBST(PLPLOT_CFLAGS) |
153 |
-+AC_SUBST(PLPLOT_LIBS) |
154 |
- |
155 |
- |
156 |
- |
157 |
-@@ -420,10 +432,10 @@ AC_ARG_WITH(curses, |
158 |
- [ --with-curses curses (or ncurses)]) |
159 |
- if test "${with_curses}" ; then |
160 |
- AC_MSG_CHECKING(for with_curses) |
161 |
--CPPFLAGS="$CPPFLAGS -I${with_curses}/include -I${with_curses}/include/ncurses" |
162 |
--LDFLAGS="$LDFLAGS -L${with_curses}/lib" |
163 |
-+AC_CHECK_PROG([CURSES_CONFIG],[ncurses5-config]) |
164 |
-+CPPFLAGS="$CPPFLAGS -I`ncurses5-config --includedir`" |
165 |
- fi |
166 |
--AC_CHECK_LIB(ncurses, main, LIBS="$LIBS -lncurses", LIBS="$LIBS -lcurses") |
167 |
-+AC_CHECK_LIB(ncurses, main, LIBS="$LIBS `ncurses5-config --libs`", LIBS="$LIBS `ncurses5-config --libs`") |
168 |
- |
169 |
- |
170 |
- |
171 |
-diff --git a/emboss_doc/html/Makefile.am b/emboss_doc/html/Makefile.am |
172 |
-index 26bd629..b4b8fe1 100644 |
173 |
---- a/emboss_doc/html/Makefile.am |
174 |
-+++ b/emboss_doc/html/Makefile.am |
175 |
-@@ -1,4 +1,4 @@ |
176 |
- pkgdata_DATA = index.html \ |
177 |
- emnu.html |
178 |
- |
179 |
--pkgdatadir=$(prefix)/share/EMBOSS/doc/html/embassy/emnu |
180 |
-+pkgdatadir=$(docdir)/html/embassy/emnu |
181 |
-diff --git a/emboss_doc/text/Makefile.am b/emboss_doc/text/Makefile.am |
182 |
-index 462168a..5b26dff 100644 |
183 |
---- a/emboss_doc/text/Makefile.am |
184 |
-+++ b/emboss_doc/text/Makefile.am |
185 |
-@@ -1,3 +1,3 @@ |
186 |
- pkgdata_DATA = emnu.txt |
187 |
- |
188 |
--pkgdatadir=$(prefix)/share/EMBOSS/doc/programs/text |
189 |
-+pkgdatadir=$(docdir)/programs/text |
190 |
-diff --git a/m4/hpdf.m4 b/m4/hpdf.m4 |
191 |
-index a37940f..80b329c 100644 |
192 |
---- a/m4/hpdf.m4 |
193 |
-+++ b/m4/hpdf.m4 |
194 |
-@@ -33,8 +33,8 @@ ALT_HOME=/usr |
195 |
- # |
196 |
- # Locate hpdf |
197 |
- # |
198 |
--if test -d "${ALT_HOME}" |
199 |
--then |
200 |
-+#if test -d "${ALT_HOME}" |
201 |
-+#then |
202 |
- |
203 |
- # |
204 |
- # Keep a copy if it fails |
205 |
-@@ -45,13 +45,13 @@ then |
206 |
- # |
207 |
- # Set |
208 |
- # |
209 |
-- LDFLAGS="${LDFLAGS} -L${ALT_HOME}/lib" |
210 |
-- CPPFLAGS="$CPPFLAGS -I$ALT_HOME/include" |
211 |
-+# LDFLAGS="${LDFLAGS} -L${ALT_HOME}/lib" |
212 |
-+# CPPFLAGS="$CPPFLAGS -I$ALT_HOME/include" |
213 |
- |
214 |
- # |
215 |
- # Check for libharu in ALT_HOME |
216 |
- # |
217 |
-- AC_CHECK_LIB(hpdf, HPDF_New, CHECK=1, CHECK=0, -L${ALT_HOME}/lib) |
218 |
-+ AC_CHECK_LIB(hpdf, HPDF_New, CHECK=1, CHECK=0) |
219 |
- # |
220 |
- # |
221 |
- # If everything found okay then proceed to include png driver in config. |
222 |
-@@ -80,10 +80,4 @@ then |
223 |
- echo "No pdf support (libhpdf) found." |
224 |
- fi |
225 |
- |
226 |
--else |
227 |
-- if test $withval != "no"; then |
228 |
-- echo "Directory $ALT_HOME does not exist" |
229 |
-- exit 0 |
230 |
-- fi |
231 |
--fi |
232 |
- ]) |
233 |
-diff --git a/m4/mysql.m4 b/m4/mysql.m4 |
234 |
-index 12f8fe9..5cd8b90 100644 |
235 |
---- a/m4/mysql.m4 |
236 |
-+++ b/m4/mysql.m4 |
237 |
-@@ -26,7 +26,7 @@ |
238 |
- # This macro calls: |
239 |
- # |
240 |
- # AC_SUBST(MYSQL_CFLAGS) |
241 |
--# AC_SUBST(MYSQL_LDFLAGS) |
242 |
-+# AC_SUBST(MYSQL_LIBS) |
243 |
- # AC_SUBST(MYSQL_VERSION) |
244 |
- # |
245 |
- # And sets: |
246 |
-@@ -68,7 +68,7 @@ AC_DEFUN([AX_LIB_MYSQL], |
247 |
- ) |
248 |
- |
249 |
- MYSQL_CFLAGS="" |
250 |
-- MYSQL_LDFLAGS="" |
251 |
-+ MYSQL_LIBS="" |
252 |
- MYSQL_VERSION="" |
253 |
- |
254 |
- dnl |
255 |
-@@ -86,7 +86,7 @@ AC_DEFUN([AX_LIB_MYSQL], |
256 |
- |
257 |
- dnl MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" |
258 |
- MYSQL_CFLAGS="`$MYSQL_CONFIG --include`" |
259 |
-- MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" |
260 |
-+ MYSQL_LIBS="`$MYSQL_CONFIG --libs`" |
261 |
- |
262 |
- MYSQL_VERSION=`$MYSQL_CONFIG --version` |
263 |
- |
264 |
-@@ -97,7 +97,7 @@ dnl not be installed |
265 |
- EMBCFLAGS=$CFLAGS |
266 |
- EMBLDFLAGS=$LDFLAGS |
267 |
- CFLAGS="$MYSQL_CFLAGS $EMBCFLAGS" |
268 |
-- LDFLAGS="$MYSQL_LDFLAGS $EMBLDFLAGS" |
269 |
-+ LIBS="${MYSQL_LIBS} ${LIBS}" |
270 |
- |
271 |
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> |
272 |
- #include "mysql.h"]], |
273 |
-@@ -115,7 +115,7 @@ dnl not be installed |
274 |
- AC_MSG_RESULT([yes]) |
275 |
- else |
276 |
- MYSQL_CFLAGS="" |
277 |
-- MYSQL_LDFLAGS="" |
278 |
-+ MYSQL_LIBS="" |
279 |
- found_mysql="no" |
280 |
- AC_MSG_RESULT([no]) |
281 |
- fi |
282 |
-@@ -172,5 +172,5 @@ dnl not be installed |
283 |
- |
284 |
- AC_SUBST([MYSQL_VERSION]) |
285 |
- AC_SUBST([MYSQL_CFLAGS]) |
286 |
-- AC_SUBST([MYSQL_LDFLAGS]) |
287 |
-+ AC_SUBST([MYSQL_LIBS]) |
288 |
- ]) |
289 |
-diff --git a/m4/pngdriver.m4 b/m4/pngdriver.m4 |
290 |
-index 5934321..de970ae 100644 |
291 |
---- a/m4/pngdriver.m4 |
292 |
-+++ b/m4/pngdriver.m4 |
293 |
-@@ -44,8 +44,8 @@ ALT_HOME=/usr |
294 |
- # |
295 |
- # Locate png/gd/zlib, if wanted |
296 |
- # |
297 |
--if test -d "${ALT_HOME}" |
298 |
--then |
299 |
-+#if test -d "${ALT_HOME}" |
300 |
-+#then |
301 |
- |
302 |
- # |
303 |
- # Keep a copy if it fails |
304 |
-@@ -69,20 +69,26 @@ then |
305 |
- fi |
306 |
- |
307 |
- |
308 |
-+PKG_CHECK_MODULES([PNG], [libpng]) |
309 |
-+PKG_CHECK_MODULES([ZLIB], [zlib]) |
310 |
-+AC_CHECK_PROG(GD_LIBS, [gdlib-config]) |
311 |
-+GD_LIBS="`gdlib-config --libs` -lgd" |
312 |
-+GD_CFLAGS="`gdlib-config --cflags`" |
313 |
-+ |
314 |
- |
315 |
- |
316 |
- |
317 |
- # |
318 |
- # Check for zlib in ALT_HOME |
319 |
- # |
320 |
-- AC_CHECK_LIB(z, inflateEnd, CHECK=1, CHECK=0, -L${ALT_HOME}/lib -lz) |
321 |
-+ AC_CHECK_LIB(z, inflateEnd, CHECK=1, CHECK=0, ${ZLIB_LIBS}) |
322 |
- # |
323 |
- |
324 |
- # |
325 |
- # Check for png |
326 |
- # |
327 |
- if test $CHECK = "1" ; then |
328 |
-- AC_CHECK_LIB(png, png_destroy_read_struct, CHECK=1, CHECK=0 , -L${ALT_HOME}/lib -lz) |
329 |
-+ AC_CHECK_LIB(png, png_destroy_read_struct, CHECK=1, CHECK=0 , ${ZLIB_LIBS}) |
330 |
- fi |
331 |
- |
332 |
- |
333 |
-@@ -92,7 +98,7 @@ then |
334 |
- # Check for gd |
335 |
- # |
336 |
- if test $CHECK = "1"; then |
337 |
-- AC_CHECK_LIB(gd, gdImageCreateFromPng, CHECK=1, CHECK=0 , -L${ALT_HOME}/lib -lgd -lpng -lz -lm) |
338 |
-+ AC_CHECK_LIB(gd, gdImageCreateFromPng, CHECK=1, CHECK=0 , ${PNG_LIBS} ${ZLIB_LIBS} ${GD_LIBS}) |
339 |
- if test $CHECK = "0"; then |
340 |
- echo need to upgrade gd for png driver for plplot |
341 |
- fi |
342 |
-@@ -101,7 +107,7 @@ then |
343 |
- # If everything found okay then proceed to include png driver in config. |
344 |
- # |
345 |
- if test $CHECK = "1" ; then |
346 |
-- LIBS="$LIBS -lgd -lpng -lz -lm" |
347 |
-+ LIBS="$LIBS ${PNG_LIBS} ${ZLIB_LIBS} ${GD_LIBS}" |
348 |
- |
349 |
- if test $ICCHECK = "1" ; then |
350 |
- LIBS="$LIBS -liconv" |
351 |
-@@ -114,10 +120,11 @@ then |
352 |
- AC_DEFINE(PLD_png) |
353 |
- AM_CONDITIONAL(AMPNG, true) |
354 |
- echo PNG libraries found |
355 |
-- if test $ALT_HOME = "/usr" ; then |
356 |
-+# if test $ALT_HOME = "/usr" ; then |
357 |
- LDFLAGS="$ALT_LDFLAGS" |
358 |
- CPPFLAGS="$ALT_CPPFLAGS" |
359 |
-- fi |
360 |
-+ CFLAGS="${CFLAGS} ${PNG_CFLAGS} ${ZLIB_CFLAGS} ${GD_CFLAGS}" |
361 |
-+# fi |
362 |
- else |
363 |
- # |
364 |
- # If not okay then reset FLAGS. |
365 |
-@@ -134,10 +141,4 @@ then |
366 |
- # echo CPPFLAGS = $CPPFLAGS |
367 |
- |
368 |
- |
369 |
--else |
370 |
-- if test $withval != "no"; then |
371 |
-- echo "Directory $ALT_HOME does not exist" |
372 |
-- exit 0 |
373 |
-- fi |
374 |
--fi |
375 |
- ]) |
376 |
-diff --git a/m4/postgresql.m4 b/m4/postgresql.m4 |
377 |
-index e6a804d..ef4d49c 100644 |
378 |
---- a/m4/postgresql.m4 |
379 |
-+++ b/m4/postgresql.m4 |
380 |
-@@ -26,7 +26,7 @@ |
381 |
- # This macro calls: |
382 |
- # |
383 |
- # AC_SUBST(POSTGRESQL_CFLAGS) |
384 |
--# AC_SUBST(POSTGRESQL_LDFLAGS) |
385 |
-+# AC_SUBST(POSTGRESQL_LIBS) |
386 |
- # AC_SUBST(POSTGRESQL_VERSION) |
387 |
- # |
388 |
- # And sets: |
389 |
-@@ -65,7 +65,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL], |
390 |
- ) |
391 |
- |
392 |
- POSTGRESQL_CFLAGS="" |
393 |
-- POSTGRESQL_LDFLAGS="" |
394 |
-+ POSTGRESQL_LIBS="" |
395 |
- POSTGRESQL_POSTGRESQL="" |
396 |
- |
397 |
- dnl |
398 |
-@@ -82,7 +82,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL], |
399 |
- AC_MSG_CHECKING([for PostgreSQL libraries]) |
400 |
- |
401 |
- POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`" |
402 |
-- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" |
403 |
-+ POSTGRESQL_LIBS="-L`$PG_CONFIG --libdir` `$PG_CONFIG --libs`" |
404 |
- |
405 |
- POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` |
406 |
- |
407 |
-@@ -144,5 +144,5 @@ AC_DEFUN([AX_LIB_POSTGRESQL], |
408 |
- |
409 |
- AC_SUBST([POSTGRESQL_VERSION]) |
410 |
- AC_SUBST([POSTGRESQL_CFLAGS]) |
411 |
-- AC_SUBST([POSTGRESQL_LDFLAGS]) |
412 |
-+ AC_SUBST([POSTGRESQL_LIBS]) |
413 |
- ]) |
414 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
415 |
-index 85de482..f9d8af8 100644 |
416 |
---- a/src/Makefile.am |
417 |
-+++ b/src/Makefile.am |
418 |
-@@ -17,9 +17,9 @@ INCLUDES = -I../../../nucleus -I../../../ajax/pcre \ |
419 |
- -I../../../ajax/ensembl -I../../../ajax/ajaxdb \ |
420 |
- -I../../../ajax/acd -I../../../plplot |
421 |
- else |
422 |
--INCLUDES = -I${embprefix}/include -I${embprefix}/include/eplplot \ |
423 |
-- $(NLINCLUDES) \ |
424 |
-- -I${embprefix}/include/epcre |
425 |
-+INCLUDES = -I${embprefix}/include $(PLPLOT_CFLAGS) \ |
426 |
-+ $(NLINCLUDES) -I${embprefix}/include/emboss \ |
427 |
-+ -I${embprefix}/include/pcre |
428 |
- endif |
429 |
- |
430 |
- if ISSHARED |
431 |
-@@ -56,6 +56,6 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ |
432 |
- ../../../ajax/pcre/libepcre.la \ |
433 |
- ../../../plplot/libeplplot.la -lmenu -lform $(XLIB) |
434 |
- else |
435 |
--LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
436 |
-- -lajax -lepcre $(NLADD) -leplplot -lmenu -lform $(XLIB) |
437 |
-+LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ |
438 |
-+ -lajax -lpcre $(NLADD) $(PLPLOT_LIBS) $(XLIB) -lmenu -lform |
439 |
- endif |
440 |
|
441 |
diff --git a/sci-biology/embassy-emnu/metadata.xml b/sci-biology/embassy-emnu/metadata.xml |
442 |
index d464821..f17a827 100644 |
443 |
--- a/sci-biology/embassy-emnu/metadata.xml |
444 |
+++ b/sci-biology/embassy-emnu/metadata.xml |
445 |
@@ -1,5 +1,5 @@ |
446 |
<?xml version="1.0" encoding="UTF-8"?> |
447 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
448 |
<pkgmetadata> |
449 |
- <herd>sci-biology</herd> |
450 |
+ <herd>sci-biology</herd> |
451 |
</pkgmetadata> |