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