summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-21 09:18:27 +0000
committerJustin Lecher <jlec@gentoo.org>2015-06-21 09:18:27 +0000
commit609992e8e730a2f883e43399c2d06406102a08a6 (patch)
treeeda0114aa3c8bf435aa0f5976a184f77288524f7 /sci-biology
parentDrop unneeded -ppc. (diff)
downloadhistorical-609992e8e730a2f883e43399c2d06406102a08a6.tar.gz
historical-609992e8e730a2f883e43399c2d06406102a08a6.tar.bz2
historical-609992e8e730a2f883e43399c2d06406102a08a6.zip
Update buildsystem for latest plplot, bug #552492
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/embassy-esim4/ChangeLog6
-rw-r--r--sci-biology/embassy-esim4/Manifest34
-rw-r--r--sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch47
-rw-r--r--sci-biology/embassy-hmmer/ChangeLog6
-rw-r--r--sci-biology/embassy-hmmer/Manifest34
-rw-r--r--sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch30
-rw-r--r--sci-biology/embassy-iprscan/ChangeLog6
-rw-r--r--sci-biology/embassy-iprscan/Manifest34
-rw-r--r--sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch47
-rw-r--r--sci-biology/embassy-meme/ChangeLog6
-rw-r--r--sci-biology/embassy-meme/Manifest34
-rw-r--r--sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch30
-rw-r--r--sci-biology/embassy-mse/ChangeLog6
-rw-r--r--sci-biology/embassy-mse/Manifest34
-rw-r--r--sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch74
-rw-r--r--sci-biology/embassy-phylipnew/ChangeLog6
-rw-r--r--sci-biology/embassy-phylipnew/Manifest34
-rw-r--r--sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch47
-rw-r--r--sci-biology/embassy-signature/ChangeLog6
-rw-r--r--sci-biology/embassy-signature/Manifest34
-rw-r--r--sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch30
-rw-r--r--sci-biology/embassy-structure/ChangeLog6
-rw-r--r--sci-biology/embassy-structure/Manifest34
-rw-r--r--sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch30
-rw-r--r--sci-biology/embassy-topo/ChangeLog6
-rw-r--r--sci-biology/embassy-topo/Manifest34
-rw-r--r--sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch47
-rw-r--r--sci-biology/embassy-vienna/ChangeLog6
-rw-r--r--sci-biology/embassy-vienna/Manifest34
-rw-r--r--sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch32
30 files changed, 486 insertions, 328 deletions
diff --git a/sci-biology/embassy-esim4/ChangeLog b/sci-biology/embassy-esim4/ChangeLog
index bef564a95604..b3da1f887501 100644
--- a/sci-biology/embassy-esim4/ChangeLog
+++ b/sci-biology/embassy-esim4/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-esim4
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-esim4/ChangeLog,v 1.33 2015/03/28 18:01:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-esim4/ChangeLog,v 1.34 2015/06/21 09:01:36 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-esim4-1.0.0.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-esim4-1.0.0-r6.ebuild,
embassy-esim4-1.0.0.650.ebuild:
diff --git a/sci-biology/embassy-esim4/Manifest b/sci-biology/embassy-esim4/Manifest
index 6872b54f4b76..c3197621d835 100644
--- a/sci-biology/embassy-esim4/Manifest
+++ b/sci-biology/embassy-esim4/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-esim4-1.0.0.650_fix-build-system.patch 2568 SHA256 b19e115c5e2585349cea1a67e10d2928eb57ec65d2d55d305145d942cf7592b3 SHA512 2205c7b6ddcbbb17be6ae7242ddc54240c8087f04be5b7b9b245ce5d14c16ac196e227589b579d9c10ec433eaef7d69af9acb0ba16795130f630ef4b597997c2 WHIRLPOOL 8e52232753759142512035c86753214bf40b1e4433bf643b6866e8802aa53125ec61b5c3387a259aa81cadb3ddc1854eaaf7e8d15e3ec4d68d5fa6209bd3b49d
+AUX embassy-esim4-1.0.0.650_fix-build-system.patch 3167 SHA256 25d191cabc62f3651e7f0cd999573b788827a2f3fb75e5c7be7716797c511577 SHA512 c8f4468998b1e91122e4ee5f355c5db451fa889892c05125edcc2f734051410251de85a9d7aaf5566dc802240d2925c709cfd448c8f96351aaa91c124eb1396f WHIRLPOOL 1558f5aca98ef8e6742c5990e7bb604d99ff80d6994147e01e2b1a3afc1c50e5efb56b9649d228da90bd955c83e3e12b65cfdc45c3bd50667de0c4236229be6b
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-esim4-1.0.0.tar.gz 431898 SHA256 219b3541e2a67d31fd62140c2c9c2b41e2d3d814dec6aaf691f764e337917577
DIST embassy-esim4-1.0.0.650.tar.gz 473261 SHA256 ce2f8a4e802da7e11ac3cbaf24406d9b33d4aa488f1c68bbbc8e969ec7e0b671 SHA512 623b241915217ffb314e3fc4ca6aed5e1683b78b6c76f899b67c4e5d48ce83c9920d79b1c5a1508d61856c332e614020d0804b7252c535d9622f9623f29cd152 WHIRLPOOL ea34bd05cc41f8e1e4af8eebfca9f1c0888c96f0dbb11df79c2cd8966b27d72f019c8ec3043ca7c9e276e015232476165a77336590ace448766a45163f654d62
EBUILD embassy-esim4-1.0.0-r5.ebuild 519 SHA256 f8b35c9e3fd4c0b2b44501628a7daacb31a9ada8c58f029fa3dccd850928bdab SHA512 23b41eea8b3c0dd1f41887305afa18596cc82e6853e83355399a81545932c95c661760df2d926b1fd295bb04554e471f3926669808c0a625813216dc3e3750c3 WHIRLPOOL 47d8e921988c76e15d5a77adafe5df01b655be2a9d60201a139a098b2b45252b81befc23f6e5b8813bf71a64c6c843f676c99f194a7b2cb9b5e5902fd1388771
EBUILD embassy-esim4-1.0.0.650.ebuild 453 SHA256 c1e3ab42f2f99f749d15086762a1bcdbb36171eab6ebe273d8ddbd526b0c0feb SHA512 b05a644e027aad996a7c4ff56bf9ba656129a76390933976a034f2adb703c727e2cfee5aa71cc4a2a2f09b832b5a050d22a931528ee13dc60d5e6f71b6fdb40d WHIRLPOOL 780dbb382eb59e718f1f10321071b90668b04e4c81f2c1ea7e3c988f2cfec54d869cccd341dc91600dd00c49c5591d71f01aa7559551d3572a842486963716dc
-MISC ChangeLog 5018 SHA256 46a2f9032ecc0ff4e3c72e3819cb8ee3c2cca759380921e3a66d096473aa3395 SHA512 7867950cfa0cdcb2e4900e5e9673fabe969f596715896763560f0e629c2858d8e13c8ae030613d11354369f6d5ef526dbdffdb287ac2b5122c9ee48984da3e62 WHIRLPOOL 6e1032eacdab8e55a1cc0e8e1fc02da8bfba0f3c150078cae868acc73185a85d3340e860484b18508cbf60bc101d8bc7eee2b1776dc298fb933aeaba19285987
+MISC ChangeLog 5174 SHA256 97faf62dbc69f607804fe3204629293bd24a994c4ec0aa4fdcb437b5e427d180 SHA512 daa106d334327da2c13cbf74b4c4269e9fe2510ad1d1fcf67b7d9a90c51c972e608ad6434d531babe5af21cf18aa660d5cc779bcbcd6d9544b212e30846caae1 WHIRLPOOL 8a7780dfcf6a58321e586ba240eae5b0706d96244ba351e05be0a62ea87b2599758b68bd459264cb03e4d0502e555e93597ff0811e6b7420d52e8769be466e3c
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuxyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNVoP/Rs53nqa4sUP1ICA8IlyFMpa
-2To8AEY44gdZ1LRjBnB8iYdio+Nhe8qnH3b0lC+qd0P6bulPOMPWKSXLH76lBHC/
-LFceiaW8uRShZHOxx9ouNo74LcYHKUmrCgh+TeZ6n15chw4UajGeJl9GhSE5EpZD
-DG776ZU9HlPgqw9QIEcXDlTko2wkiiT1TjYVnU4R48xg2Dw7o8CvyBwIDthI1FYO
-k/28sHhj74hBFJfx2fNazA/oaMGN/xLCLr/xNt8FytITWGaylgt4IUNAkp6ez91y
-ohQ6EWh+HTHUsgWuoV99ZA7VCwHuBDao+FFpPgpESUDJxFSAYctk6ld4KNiXAMHr
-da6JFq6QpxUbuxYVTw36Coys8gMwRNrQ2B9bBB5wHCNJYh0UANGTNbinEqcjRrV/
-OtJzg929j9Dt1ZQSI6wai/nckzy1ev1PWuododh/O3xQlfbqgzvpZK7AxreFqQIS
-Q8Wz5qxDRTScOKxtoZIugf759iu/Kg55EPK2MWhhKA1xC9+3FPJe3wX8sacgDYDl
-NeLgOSSwXM5e7kppXQTNyrfibtHQ9UEVfyTRiBZnSWDMvxEpuPjJ9Rao/OVxL03m
-Ct+3TAaPgy5Grum4QbADv1MtimVDEtAdRYa42aXdRFwBTnCykCADXWBqVC1PkOy1
-iXT9fjlQVdLnFKptWB6b
-=pjqV
+iQJ8BAEBCgBmBQJVhn1xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDZUP/R9MJiqegCg1PQqi1KAWEni7
+cYCwDAVvEFOHuOb2/Qq8ZprJjdzJPClhnJse92xpFkKKN3RtM5y0R2jU92Go68WN
+VoaXsipFrC7OCIriLy2D3uy+U1Wpm3LZXnNqLPbksEran53RoXBb9QodL3JHiEOn
+kBVfCXfKAuSyvPv3DkkURIFz51DcNrGsiMomkl+SXdg8jbPnxW2lsKRCVJJsEPmQ
+6Pv753ENFaGU7szwL70X/VtNk517QAbwtH994OXBFRdMkJsbMi8R1TMWWzdnkwVN
+sNpbDKRFpqZqy8tSE9B6VqTEmwPIa5Up3DBKCSxzEygCwjCahL7UMTLFZqCaRKbx
+PA4Z4fwNWMOidXLb6mFO4Xl08hpi2X/CiMD9IIvAq5GcDB6FjefexL9PxzTr2nhi
+wnSapbA18l4/17RmpxeUuZND/RnIWIAzB8vNVDcodTnF8lNi7K45bTkvVSYxdGxr
+g+qCfo4/KLV+mnT2OJENF2LFDi+n81othQfn3JS1pdHP/qeb0loN9Ep3Yu0idum+
+6KtPmTNc7qpPAtx4tI6TNpjMh6nGOH4lkSUPIy96FRa/ZsNpo352IT3KaY0fP5s/
+kga0dXDDV+wfvbuOkj571g4pdFseEXCORJOTAuu4r/clnPVFNuuQYpaepC2fJPFk
+v7agsHrwjdkMLIH1sLBL
+=zdoV
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
index 8279071806c6..ead54c91b5f3 100644
--- a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch
@@ -1,6 +1,13 @@
---- ESIM4-1.0.0.650/configure.ac
-+++ ESIM4-1.0.0.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ emboss_acd/Makefile.am | 2 +-
+ src/Makefile.am | 6 ++----
+ 3 files changed, 10 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 924220a..2c45f46 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +41,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +63,34 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- ESIM4-1.0.0.650/src/Makefile.am
-+++ ESIM4-1.0.0.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
+index e1c1878..e253c95 100644
+--- a/emboss_acd/Makefile.am
++++ b/emboss_acd/Makefile.am
+@@ -1,3 +1,3 @@
+
+-pkgdata_DATA = *.acd
++pkgdata_DATA = $(srcdir)/*.acd
+ pkgdatadir=$(prefix)/share/EMBOSS/acd
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0620938..0304bb8 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,17 +101,10 @@
endif
if ISSHARED
-@@ -63,5 +61,5 @@
+@@ -63,5 +61,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
+ -lajax $(NLADD) $(XLIB)
endif
---- ESIM4-1.0.0.650/emboss_acd/Makefile.am
-+++ ESIM4-1.0.0.650/emboss_acd/Makefile.am
-@@ -1,3 +1,3 @@
-
--pkgdata_DATA = *.acd
-+pkgdata_DATA = $(srcdir)/*.acd
- pkgdatadir=$(prefix)/share/EMBOSS/acd
diff --git a/sci-biology/embassy-hmmer/ChangeLog b/sci-biology/embassy-hmmer/ChangeLog
index e13c9d1a94ee..174dac9fac61 100644
--- a/sci-biology/embassy-hmmer/ChangeLog
+++ b/sci-biology/embassy-hmmer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-hmmer
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-hmmer/ChangeLog,v 1.35 2015/03/28 18:02:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-hmmer/ChangeLog,v 1.36 2015/06/21 09:05:41 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-hmmer-2.3.2.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-hmmer-2.3.2-r3.ebuild,
embassy-hmmer-2.3.2.650.ebuild:
diff --git a/sci-biology/embassy-hmmer/Manifest b/sci-biology/embassy-hmmer/Manifest
index a274f84f59ec..784f138742ab 100644
--- a/sci-biology/embassy-hmmer/Manifest
+++ b/sci-biology/embassy-hmmer/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-hmmer-2.3.2.650_fix-build-system.patch 2371 SHA256 20427d58bfc422c6bed462720a5bc134d447afbab16f18971abd8f1cba514ebd SHA512 5dcae5146e86fe828bfd026ca95aecae1838b785d0b0b02f59193baa3966ebedb91cef4b7674353bc1935eb46f17aa9503f8c0a3cea69524f592a27d4de13b1e WHIRLPOOL 69ac46d89d397c4618aa753280a2606c5d5f8792e5d4366efc72e7c5032face31be1d7babcb1f6ed8a116050d6299538c01e4121f026d5233f7d7f733eec0c6c
+AUX embassy-hmmer-2.3.2.650_fix-build-system.patch 2860 SHA256 6d05b00b1fa6946594cb3e5dea4e3d1652decab49bcb5313801d8ed4a33e51ac SHA512 f215e5c338aa1f0bf791de223f3ee9a13622f70e142c5ad4812dfe171f7d602aab750e1dfe4233324752adc645abf289e63d8981b8497787c785c07de64c7944 WHIRLPOOL 19d3b640de27436d40b95c451c0d39458b1f4a69eed7cb536e7417606d792dea91c677e719cde5b82873060549f36794ec6f36ba71a7549d619fe7f645d8fa62
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-hmmer-2.3.2.tar.gz 565686 SHA256 9b27f2b7a9059b017e3bd3d31de08f6fbf7d49c3e025d73abd83ff0567732258
DIST embassy-hmmer-2.3.2.650.tar.gz 587775 SHA256 1464ff5e87c7c429f2fc78ac3554f8bd32cdaf49b8bed095fce6268b9afd4f6a SHA512 eb2c037fec70f4113b9ab59cc4eca9a608e8d0971a7bcc4612d60b1e28556444dd3ecdea4ff7b8f8b34711ad9f655334857e7510e89060459c81994a3abcc02a WHIRLPOOL 59027e96d3e629eb771fa966be95cd30138d6b97223056c95c1cc19d21ec0ffe555ff12f2cadc372ea303a0e06a9c1e673c4e32b2a50d8fd2ab2071d2c04cb83
EBUILD embassy-hmmer-2.3.2-r2.ebuild 650 SHA256 9d952f1c50419349979369829d3a1b64e3ac73778377c7f95862c8d7a7e728bb SHA512 638d2581dfe55337b5658e23cdc523f7645f3754b7b1168c0ccf157bfce20cafd78167eec12a66fbfb727b5af2f1111dcef296c402aa20a746770a59b79a38b5 WHIRLPOOL b261ea3ec91f3d527e8b6adf6c68b3fc0f952424428a804bfcee320ce26015dd917799928578bb9540519212af996fa1b24735d92cf1785baa83a74129cac027
EBUILD embassy-hmmer-2.3.2.650.ebuild 510 SHA256 2995f74e0ee21400b1e956771b507b148a279b928810624c20a72b3b6b32fc18 SHA512 f00503d4b101c17d2f90d5253c254af990cf98d75ffacce948042baa6f7bfa6c9d0999e5107563592df39690583720153ebbb0422c973b37bf5f220a08ccf77e WHIRLPOOL 1654973d5a95a03bacb88ecb484b0855dd4053ade3eb8fbcde89b14b3b4eb2bc054b3957e17da39644cb1cbf1b0b73dcf44b84a6303d42a9636d6c56f7d4a278
-MISC ChangeLog 5294 SHA256 d78bdd7d3010f86c3a1b082eb814befbf8ded5d3e2d2a4dce5fa8b28a1ee718c SHA512 5a912b1186bd616f8d91040c09885d88193530f32e086a90b7c04742a1ada8e0ec53e66443cc2df6637f5cc1ad210e00ba25063f07d672dc387d98f8ce5a8872 WHIRLPOOL 24b69548ddbf47ccfbacae973d0348856d1a6245c187dc9f3f7104a7d0ba636c8bbdc86d80459db7037300739555f93ade8a441f1e7a0333961554823613a42f
+MISC ChangeLog 5450 SHA256 f37958058bb7d3d532c9970a9aaa2f146fd9da610aa362e8e697b6aa4811150c SHA512 ff79da3b23f057604319a93af4e3b50b72d293abf6d4441aacac3e0074fc8fd4ce9027cfe26529c0555238bb5091fe75d2c4f24d7f1cf8ee8feea4438bf1eda9 WHIRLPOOL 2a9bfb84467181d90356468d17387a8fb21cabdf0c533239e1152ec61d34b3454d5097678e794303e479419282efc1bb005af03ef2dd4d59e70da7b751f025cc
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuzEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6LgP/j+kevTwzYdmPveOnPGEXRGq
-VKPcCRILby+30gIDs9jJAHoTlLRZyzc2tUUYCR2WL1RNUAc//TOjaGHqNHQ/XekF
-RultESlQkkCF3avT0msTyormg8S71mFDW5GnK2pKkseMoS51fDtY7+b4ab8hWpiq
-JqvaGcZtCsxczBZS3/Z+7T3Cxr/4DqoWYD+B+AUXEsDjDVGxYHP+jMITi7PYtCbw
-VJH+mz/jsMgAMOHxBB/YUoilw4obasnO3bSNUMILG6ycnRz0gzSMlI6a+8facxoX
-fWITEadycgJ/tf99H6F83xnGUfiuD8Wk6izgh1YyERLJ2OZfUFVaxgeXuAuJr/s2
-dSqI0OvcvriIqrCWHoj5ckARoSwbn/pAHSpTHc6/L4lriD3QV8M18acfHaqHgpGJ
-S3n9DLzJV00ATI2H4P47xYaXbzNGB7/+p3b/KxQwB3biCmVRlhvyH8J2uDSRlQ79
-N7F4jE9xf9qB8aOGyyR4JUrNMnJkuUnHtquZC85fGEg3fkFuUOaTooQ5gkxiDNvy
-y4wrOps1G0Ed73hZtEV9HfHzlsWoGGhgZk12115KP5x+ZCZ65ind45csMOk3LETd
-G2unPGLTTQUsFT/uFbQMkqgeivogohP2rpwpUWWT0eVk39iDep0UZCoW6FU1OP0T
-x/BtEQ/JiB+CX0TnJTnO
-=QwYH
+iQJ8BAEBCgBmBQJVhn5mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDjoP/0BFdctWp0gCsF71SKPYQueJ
+5RR6QIm8N1W67gZm47+pDM7goKHC5vYb8fv9hNh0AqLifm/NtfGayDOyTiX9f3aB
+gxT0tBAvIpNYrOtZ84kK5KitzfymQBd/Z7pjkakftgAXb+jQ4hlpeMWrPoygZR/1
+YPxOLbRhiDOz3rzbHoE9WSbnJRu/2+Qo18Fd3KMT0TXV4QrsobsUh/AQjOrCDf1O
+RPcqTKTDMF5JYIaW3UwqUdANu0PnQW8HqEUdWwhkRSUFz9tyEfWPL/UypNFhpPQA
+T5vpiiyN130ABaU7QpVPov8Zeulojy+ki7vCdF4uLnLlyFVALatkN6qJtJvjtrdr
+KP+6dajrqjNetoaxX3jBQexDjN+GvTX/YWomQhH279dU9JqljfkbcRq0TCShxXDi
+4RJVi9czrwiv139XP/TM974+RBeGlrwyngnMVlz+yomfp/+KDD6k/gk+xNOGytgF
+cMfZRfdWbmgjtodMvvc0sJCphYFzbHt6qL3/I0X09f5FgJ+DSdDElI8UpFPkOFpN
+n79/09BjbHwQST2h+2105bdBYylhokYVa/hzzS2AYzJGo6bEX+AQiTPxzTYg/13c
+CTdyNn7SG+WpvmVbFPfuN9bsOc9P1mpUMYo4SD6cpejkXqJUZQiSzs74gOSQxp5A
+QDetrf8qVsvk1qV8v2hm
+=ri/g
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch b/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch
index 78d0c254f25d..90c45632eada 100644
--- a/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch
+++ b/sci-biology/embassy-hmmer/files/embassy-hmmer-2.3.2.650_fix-build-system.patch
@@ -1,6 +1,12 @@
---- HMMER-2.3.2.650/configure.ac
-+++ HMMER-2.3.2.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 6 ++----
+ 2 files changed, 9 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 037ca00..f539ab6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +40,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- HMMER-2.3.2.650/src/Makefile.am
-+++ HMMER-2.3.2.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dc789bc..5a8c38e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -67,5 +65,5 @@
+@@ -67,5 +65,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
diff --git a/sci-biology/embassy-iprscan/ChangeLog b/sci-biology/embassy-iprscan/ChangeLog
index 2bf7f0584ea8..b9ccb62a85da 100644
--- a/sci-biology/embassy-iprscan/ChangeLog
+++ b/sci-biology/embassy-iprscan/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-iprscan
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-iprscan/ChangeLog,v 1.9 2015/03/28 18:01:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-iprscan/ChangeLog,v 1.10 2015/06/21 09:07:32 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-iprscan-4.3.1.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-iprscan-4.3.1-r1.ebuild,
embassy-iprscan-4.3.1.650.ebuild:
diff --git a/sci-biology/embassy-iprscan/Manifest b/sci-biology/embassy-iprscan/Manifest
index 91a255a7a273..0c5d01a5db88 100644
--- a/sci-biology/embassy-iprscan/Manifest
+++ b/sci-biology/embassy-iprscan/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-iprscan-4.3.1.650_fix-build-system.patch 2580 SHA256 8027ce9bd9b318fc6bce543770ab59fc8bd50237a68b959bc05274cdb3caa282 SHA512 de367b404d1f772276f4ca8f51c031ba148db6b80a480a4594f5e4151594eefae49ade820c145ae2b2feb5d7bd32bbb4196c82b3e809bc160ab88ce3a7b74913 WHIRLPOOL 71fb4928262df5669d828d945d47fa22f963c928e0dd0b24e1962191e63f803f354a15093c604caf7a1c8372a9b329c0183791c4577f456f634cdb5bdb6062bc
+AUX embassy-iprscan-4.3.1.650_fix-build-system.patch 3167 SHA256 4ee85226fda51d4232bbce8c8f1f3d9b6deedb794864bb16c13eee514ad49b09 SHA512 b2b28377e60790db744f32eb5cd4de5b7e15129b603e21013eeeebaea5c06e6867937b6441f3d8e788effdbb58c57b8841880aa7d4b4eae2b0b83dc72242f4d8 WHIRLPOOL f7e9084619cc6b0b1e8425753e5f44ab41b22d309afe10e3a01eab67eb76258cebe3b6ecad340d247f6ca51bff0a1fac4f2125a8f8be5e30466b50fdee3ee494
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-iprscan-4.3.1.tar.gz 339939 SHA256 df0bdd33ea6f279ed018f4a22e686cc14ff0e9f65342177b3b9dbb2951c3636a
DIST embassy-iprscan-4.3.1.650.tar.gz 406720 SHA256 9534de155a4efd765a588f567b9b502052360719278e492b1c0dd9e50aa78013 SHA512 eed75693557f141331dfb6bec6961a8f6eab93780cad3b629d547b8635be2df6ec85e5ae0e9646d174a562a0f6d31c3c487a4dacac9efdd393a7144cd5716878 WHIRLPOOL 25b3ac80d0f5e7bb3e4ffe21fcd2657894f23ca4f7e182d527d97b5b869e11206e2ab4f265fca027e419ef7fdd2752b3d11c8ef9518edb72b93dddff4d7dcfc8
EBUILD embassy-iprscan-4.3.1.650.ebuild 473 SHA256 d82f14ef0db4601c2f655f6c64cfcb07b699667eda0f2731b6765d825fa54d74 SHA512 381634dbb021015ba1ca33087ffda0c2006eac633437d0fab5890473beaf4231a1a3627d7f0475da0efd6f34dbe98130c25c97d3ea72de37f8aa0a78f6001206 WHIRLPOOL 7c25c22467d8f155b7abc2f41028e9fdad906c19f06113623506ff9e3bd64ff5f2c1ecb51f00687f9a5eb1a19deed9fc3a463cd17efd3663c6774e6b09e1a304
EBUILD embassy-iprscan-4.3.1.ebuild 505 SHA256 f64afda1a967a295c3468100fa61f6961695af1ff8c760356dc15c4ae137897d SHA512 0d48b41756575422adfa44c1303b35f41a7b36953b47997f4b7748471c4e95e8d31c16be9c6b21af0eecce643eb2f65f8a5a6dd140ae698cc70e03bb5f0b0696 WHIRLPOOL a1a54ad6ea1f29ac6b1482fb7f9ecbe0db24db6d08eedc310c8fbaad046eb6e7f40fd6cbe06e7c11a53dbd33fdad4f0ee7a03fb4de4161f4a2bf598f68f62551
-MISC ChangeLog 1622 SHA256 fe28f3841c4694c7621fe39fd64eb7d84c7d106245ec0d088590b1b9dc1e85a4 SHA512 29d2435a7ddee5300200ae2ed3ca994e060518f241867aa7f438d069761b99d4398971be98eb6be11e337eade9c665dac526b5153aae9cc01553acde11eda205 WHIRLPOOL 5f1c0068aabfff41c43f3a91f3f1b5f7683e39f00d10a59725d43c35c7dda95af5991aa2867ad6a6ec733316a8cdc711734a6be5104f83e8bbb3c0c8356d506a
+MISC ChangeLog 1781 SHA256 015954d5dfc1ad4daa5ba6b0f4492b754cae024770b6a03fd1d4c55ae280a24a SHA512 2022d1f98a55d9f57600c6a9f7fef6bfc8a15678bce2b3d6b3531be7c532ae31f27e0b7626b180b39e5eca29cb581973eab307666c7819fead2b3f8047ba45ce WHIRLPOOL 42f145f36c3be160be823dc14c7ccd4ea831c569000064306a73b5cd87b367520545e16c1d0954ea0a379a32b9cc968625d33fc510e49a30ff49321a07e2dd1f
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuyTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir59MP/2pjz+uZzyBOjL6c7hrSIDi4
-nrPham7cETKEJXA6dou/BpBqJoKIUSDf3Idzc5bgu+Q0NisNpYVTTQoolHgJI+MQ
-ww5SXwmKZRfwCd+Qfi6J+1CXvC5kOs9FRtBEqI+HovyRjaQ90vM4mieb7NQxJk5E
-FOQhIl9t/V2Nn2Zo/wS1NkLWkGzroCu0HEpQZy32tUIKLqiNt9bzf9VIc1aHDmvr
-n/JjqAIzCGtYwyug1Q3xwT3zojUOmMm95F8H1OJOhcI2o74Ny11eTM2C82PLsQJb
-fA3aVu66FrjCumVDgC1PCwn3NYCTh60MusECC67kTHPcnCiKaXVrYXlbLSUmnHqS
-RXxvhVgmOkPVjssCPth2I2WNFh9b2BI+KTx4qECHoAedxld9hc+Pm4DlPq7o/mym
-sCzEVYU1jVpR6xScFehkNYi8oCz4Vu9fEDy/2v1J1to1LFPAOkWwcYkxhCNVJX0M
-hV+11JAjOhKSp6VbMNU0JqlgSH2Bj8D8fx8XATkFP2WQIQjlJJ6VW8f6LjpD+hRV
-aebRXvgDOoJVe0cLcUwEc3USHVd0iNN0dLu/J+7roOlQKUwb2To2WSr7yeG4lAxI
-w8X1wqvasX57fCq/WgVqRbfuhOpWzINftj7xkEpEn2qfR6AOtEMVKJRgHVu0PcuX
-QviuYYd1PxWkGQuXVz2L
-=zeh6
+iQJ8BAEBCgBmBQJVhn7VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiaZoP/1AgKgRVfGWGp7RSrDppRk3q
+Qi7AAFKMaJ1JBHZsJXBBkMe2rG6kWhfvq84JiE2blfchRBJQUtJlVqr/lRXLzizg
+TlnBjStsd8iBwWAFum7qT+R+YB96KcyJiHwUOwrNlSNWMf/9Pot4J670kvpVfUEd
+BWtvDAGtnZMJT1Ex5nUhhpHej2ogL0YR5PdV9IN3E36gALJiFgxorLfHQYS0Ohc0
+HGAdpEZ4Cr8N8QVBLAP4Rh37ROxWlJfxRFY9TfmhmNIqGgUYwaTR11jqa3hDOj/C
+1omii8rGFB0lMB8rmzaRbU3DYorhsOBt6TMaFslL7jSa/bjBBiTjd48DQzeownwU
+tEi/OepGc5ZfYvFk+aiVoMHgEuZvhP3KfwAspp5MPWRKIFaHjUliICx7MnEYEywm
+iQTFXF7WZApV8I8wjR4nf9AZY+yhmIMV+Y6cGzLqNbjy41r9J4LqbRWeVBVShpfu
+VbNu0rvkdmfkI8sQKQyxAEecesqxBPhvjgmpMLPPGDxo6ExhlRphZ8UaJxIz7CfT
+mbz/aJ+kC+17u4XNhefBqCTrrTonNy6fJ4x2G2clqZ1lMu0jPnbUMKoKoBo9wGq+
+IaTgeoFEi6BG44yT0Fl0OurcuaWQROJGaOkJb6ROX8NJ9PX8nHqFCOg11nC8o3Hz
+0e3qJXSJU1GKRs58duS2
+=P2es
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch b/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch
index 955005d51211..8c8a1060e30f 100644
--- a/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-iprscan/files/embassy-iprscan-4.3.1.650_fix-build-system.patch
@@ -1,6 +1,13 @@
---- IPRSCAN-4.3.1.650/configure.ac
-+++ IPRSCAN-4.3.1.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ emboss_acd/Makefile.am | 2 +-
+ src/Makefile.am | 6 ++----
+ 3 files changed, 10 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9052ca5..c12c268 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +41,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +63,34 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- IPRSCAN-4.3.1.650/src/Makefile.am
-+++ IPRSCAN-4.3.1.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
+index e1c1878..e253c95 100644
+--- a/emboss_acd/Makefile.am
++++ b/emboss_acd/Makefile.am
+@@ -1,3 +1,3 @@
+
+-pkgdata_DATA = *.acd
++pkgdata_DATA = $(srcdir)/*.acd
+ pkgdatadir=$(prefix)/share/EMBOSS/acd
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0afc96a..904b41a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,17 +101,10 @@
endif
if ISSHARED
-@@ -58,5 +56,5 @@
+@@ -58,5 +56,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
+ -lajax $(NLADD) $(XLIB)
endif
---- IPRSCAN-4.3.1.650/emboss_acd/Makefile.am
-+++ IPRSCAN-4.3.1.650/emboss_acd/Makefile.am
-@@ -1,3 +1,3 @@
-
--pkgdata_DATA = *.acd
-+pkgdata_DATA = $(srcdir)/*.acd
- pkgdatadir=$(prefix)/share/EMBOSS/acd
diff --git a/sci-biology/embassy-meme/ChangeLog b/sci-biology/embassy-meme/ChangeLog
index 317e164226ef..c5ddb1ff5eab 100644
--- a/sci-biology/embassy-meme/ChangeLog
+++ b/sci-biology/embassy-meme/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-meme
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-meme/ChangeLog,v 1.23 2015/03/28 18:00:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-meme/ChangeLog,v 1.24 2015/06/21 09:09:22 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-meme-4.7.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> embassy-meme-4.7.650.ebuild:
Clean global scope
diff --git a/sci-biology/embassy-meme/Manifest b/sci-biology/embassy-meme/Manifest
index ce6970d62d64..2d79c474cd64 100644
--- a/sci-biology/embassy-meme/Manifest
+++ b/sci-biology/embassy-meme/Manifest
@@ -1,27 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-meme-4.7.650_fix-build-system.patch 2359 SHA256 d28fa6f227a8131d0f582c61c75679410712d696c81735903bae4f49e78ca897 SHA512 3669c1d9a19d531d63f45f0ca5ab81e50a714158d62304ef115bb3c3a19032856049eb16857f07ccec72150c5d6a50efdf8beafceb29b99fc96c2e3c554b7125 WHIRLPOOL b1f18556c06f4eede7ab731e34607b50348512153ac931626891fa02e4d8023d289817556491e33c36a333c446fbabfd8066dd670c13ad182f84e256cef0d5f7
+AUX embassy-meme-4.7.650_fix-build-system.patch 2860 SHA256 928eb90afbc7b70f69fd4bb7f1090bbd4ea2bd3d7a286b56c947dd481156b5b6 SHA512 c44b219c75e67d17fcfd56145ae3709053bda38b8690141d1e9b846e4e4a9cab135f0dc9c5399e4712cf030ad562dd075f45c393e78157a2c1b92d80903b3d1c WHIRLPOOL 4e93c672ee6026ee7b2e2ff6c8771a375049629f5e24e2e6cf9afa72cced5fc62d21f49c161fb5ffe55f0637ffe14baf78df15c1c95e0a42d3495a1619365141
DIST embassy-meme-4.7.650.tar.gz 622448 SHA256 a9ce0af5f8e05d82cf7678c9781041520bb9889a5706e38480940003ef2a9e8f SHA512 0536531b198aac09a9fe6c17cf1c60c766789c94a7f83f743a90aaa65061c95534bf398c53611a34549b7ec1a4928fdc45fe0d2553f25f85eeda41f90c2e8c6f WHIRLPOOL 041fec3789c86375edb64b34a0190484cda6a59aab564c5deee19930a8cec0455ed9689d726cb647cca30e7c3c59f728aff5546ab8ad491aed4f331e76497b51
EBUILD embassy-meme-4.7.650.ebuild 500 SHA256 d030da36a864645226fd35bf0048b6e46fb801355bc01025f8bc50d7a5ac1ffe SHA512 e66161feb869e80c5329d58da59430fd162cba4ac5b986512a9e681f382132f4ceda250c90270461aaddfac14fc2ee1d0e4cec87925e3ecfdc5fd2975f7f744e WHIRLPOOL 1a19ed237cac3bab4a1f07bfed6ec5eeeff2a4086a86724c1d21fda60fa850b609ddb115a702bd6bf39dbad0363c451d420b0919c0406688bdf4db56a9905a89
-MISC ChangeLog 597 SHA256 07aacca9f178d77c2a3b0104edd0be0ef67d56340789af828a7e2ff33bc2a4ef SHA512 be00d17e32f0cbef751036199ae82b0e04616f83c9d050ef3431dfad76342919aefcf7690ce8aa31e2cfd5296506cb3936c1f6bdccd44d23dd7b7cc4708efee2 WHIRLPOOL 2212a36dc27f76393f86857741958ee79207b9f83106deb47423f636f51e7610972490da7efa1c721a13621345a8b2b8692aba340d0eeb2dcc50616da4c80fd8
+MISC ChangeLog 750 SHA256 dd4f3a12304e509ea4abd9caa5a5e1b68b2bc1df56b9c3cd26233de0531fea4a SHA512 0b079723cd9c0a825cae54d654e4ccc7f051242ec7eb399de0265e2ce43960b57d7854825535a2300a0b96ac70d735b6d23fe086a13192108b14addd4f3605c0 WHIRLPOOL af77519eb83320b982ed520d1d2b7a81edf88d4971a731c8964bca1080c2c4a9b4202a1f16addd68bca4893699a08b4419bc504fb34a4e0552d809646f272bd9
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuxZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirJ3kP/RAsEWyisS3Va73rvFIoBow7
-zBCMUUvRE02kvCGSCCdyQb+AJUoa3FbL+vxCJnQg0ZNeYbDUmxGtTaTcKpQhPAp/
-EwlzlOcRbKMWE8KuF+7ejyvnfN6KFu4XSYzFLYc4gFEQE1wgcyouEgS9fkm6JCyP
-J1Q2ZnxPCUU+TBRJYnGvMnIazVjFeEzA8YWlBZVOrwFFE7F0/EJPzR00Tt6QtqyC
-HsZMun8NCgc4/mIc6cDWiqwgt6f/1uKEHzbZtqd9bjymjUPlyZNiaPtdiseOy7YL
-JSkp521DROG8q73o7uANDOQ8wC/garxfHzAK6vWEbHaBLlgcPUH4kSliES3Ln/k3
-PgqScZwsRvek2dwHWYuuvF+YRWxco5mPHlJ9JjtDl5e9Wkx+WsBwJhTHqSLRxrL6
-G0NBpWdlpsL4zV0zBbCxPVh62VZepGF1j+NOU/Idtqavl58Zzo+LX7qoDfCGSPvw
-3QZ8MYhTpP8tC+qPbfV3nics+03B4cJFnLzzkASUS2WWq2cgVgX8qpcOgiGuLiFz
-k3fR4nmnWPzxnKs7mBMI3v/JMztSRn+WH9YuVK7eWcn518OP9IeVuMLeAODVR11W
-R9Q/UT5npdim4bCCR0oY84eKjH6qc2mPmh5x7qA5wAAfh16zazjg0NG3SMEySGNG
-MLJEj4nncmnkhfH2fYuO
-=ugKF
+iQJ8BAEBCgBmBQJVhn9DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBpQQAL78viYcdlogoPDxmZnXlH+l
+N+QOG1cOm8+TehsM/cniz8tEjsJOeU4lbW271IF96Yd5csL+h5QJxbtj2cCk3vXM
+c7AbCPELgbKmrr2XDjBE2QFEboZzVXCTdxJxwX6J9MDw+K1qMyU0Bw55E8tH5wSN
+nOdzHB+/F8gbkzs+HSY9U6YdVU/iqrY5r8wOzJdMT4UBK9WPK/MEm7BECFiZMYu7
+M+s4p4SVPqFRaXBSMu4uV/kM7bt5vigXAGLok1DLtUEGI8kz12DUtL0oYxyqtC3t
+YT2+sXLjn+kZY0TwQ4Re5+ApaW+zkDiYuW2cMPai+INDiWvTKVtbx0NNAxjzesht
+z3cVpZsexlQEFF7uxR8ENhavmZrmAgt33q1n3AHIPsYHf2WbQbF5kEszZRG8s3/y
+vfT0hlzvYBkC8MoUM2dDxUtVJxkIm0FmvfJFoR+rqePKIEcsPZTYJylkppmn1lRa
+Yln8GA5fvzMsgLvT/ZoQnN02PbFeSp8ZY8j6sQBEp6oDMUbZBEWkDULK4Gq2Ujem
+gzp775gu2VrKVXt16lW3dFNblz3ZKxbbprvOj3hn7lohGgYzzXjF9Mtuc2+WGf3r
+Zgb9rKUBBg5kQ/QPpl4V3AfOcptovbrKnDpfXe36+Kj5459EikCHJSvxE6/R8MBU
+BvPLxk/N1EVB+yRGXyLO
+=eXU9
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch b/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
index 03c42460455e..56f5814e1efa 100644
--- a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
+++ b/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
@@ -1,6 +1,12 @@
---- MEME-4.7.650/configure.ac
-+++ MEME-4.7.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 6 ++----
+ 2 files changed, 9 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 391989f..d921f25 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +40,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- MEME-4.7.650/src/Makefile.am
-+++ MEME-4.7.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1600399..9f28162 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -60,5 +58,5 @@
+@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
diff --git a/sci-biology/embassy-mse/ChangeLog b/sci-biology/embassy-mse/ChangeLog
index 3e2233894889..ed526bcdb519 100644
--- a/sci-biology/embassy-mse/ChangeLog
+++ b/sci-biology/embassy-mse/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-mse
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-mse/ChangeLog,v 1.41 2015/03/28 17:59:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-mse/ChangeLog,v 1.42 2015/06/21 09:10:58 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-mse-3.0.0.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-mse-1.0.0-r7.ebuild,
embassy-mse-3.0.0.650.ebuild:
diff --git a/sci-biology/embassy-mse/Manifest b/sci-biology/embassy-mse/Manifest
index 6dc11a4a06f8..4e1060aa702d 100644
--- a/sci-biology/embassy-mse/Manifest
+++ b/sci-biology/embassy-mse/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-mse-3.0.0.650_fix-build-system.patch 3603 SHA256 929a1caf44f233ed5254e6df080370c2d876692508c523f0184373090024ac5b SHA512 a9448a5c0530abf9c596a5742e73e76d93a5aeca006b116b53b955f007983f0832fc7bf388e67a5c833c16fd9934dd9c17ba1870fe05f1062f0b9f2dc26191f3 WHIRLPOOL 63575045b844ebb8dadf9d772a9cdd46328e200f492ec0576fb275d2f5773784cd40544bdb05fe24b23f887ed35a6664d8c2bdfb5919c090bcb1cd96433da8ad
+AUX embassy-mse-3.0.0.650_fix-build-system.patch 4274 SHA256 599b095e98864d4268b5959517c1002b3b591a45d865e42f409eb0059af5168b SHA512 bfb4663a4b38928f765813cc9b5e773ca712c2333c1650d9c78f457307aa450684f77a20c0a087d3795d5b51f059c6f8113e74da35aa78753c1cc666ba583f4b WHIRLPOOL 418dc60bb9cf2023d499eec13b132f1aaab7bd9538ba2bc12f3f19926a25f7e7f0fb3b9b99e80acddfb57a4762aba5c90e413ffe5c8aa05d593d1309ecc28db8
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-mse-1.0.0.tar.gz 445562 SHA256 9e3688ff3514b7ea6cf104fbd2a2e611fe726fb7ac4bebab6f3c103f05c08d90
DIST embassy-mse-3.0.0.650.tar.gz 491747 SHA256 2744c2a447cc16d7ad4d9049c61793fc2803659b83b0666b3ca9c30648dac88c SHA512 4ae34de71566464e4352ff7b3bbd19b8bf0571013f34253495cf5cc57240bac9c75192c302eb0231763db1745a7e3e79ebcdcb006e36ea4621a886b213eb96d3 WHIRLPOOL 8d257e79161d5989ac2fe3fe5e55e073402b57795121693fd43ac0d2d348032abb7927d4e40faf2b4db182145f9bcdcc7ba5d7b0534df10dd844c256b8dacb9b
EBUILD embassy-mse-1.0.0-r6.ebuild 598 SHA256 40ae8e6cb04fd32fcaa7d93c4a9b247d555f76fff212fb5b0ce2228ec46e4465 SHA512 fc8c501160f9d93eee5e5f72b2a3421fc8a290b66da5802f973c12102334050c8afb9727fd1a1598a1d8cefc6a05db926c1cd63ea94c82f6108959fa552989eb WHIRLPOOL e8368ff3f0e0d5f768964d84cc3c4934ecf6f45060a52e161030a93c160c88b848b0fa659ef84d10e2767f15b35dda53c263524cb3169d6b94f3adcda1d6c304
EBUILD embassy-mse-3.0.0.650.ebuild 647 SHA256 75f68a79b08b7a2a8c5438e92544a3d63d0ea6db7f265d5790873a4f6fccb60d SHA512 e54e85a0e18871e44b0d5ae62e39cb6ebbf297d270ac1d0f71e99fce96eb865fae579feeb2250818b41481ac9781d0a266b81ca6b832d0ba1c69a157c4818ce3 WHIRLPOOL cf5a0ff2dbdf3ff67f90e9947cc578cd42b67b2e61931d4338349a044f5a7a68ae64cd78236ab804893deda33fbc4b51dee78a4b430aaf511ce52cfb5a54fab1
-MISC ChangeLog 6042 SHA256 96e2388d894e79db2a30754d1dc06c1f9074640708e7021fe04cbda6a6ba8ebf SHA512 5514a92a610404cf6db835c959a720cc701e481bf530714edcbc5a4ffe36bad935de7f988138d1a7f18f424eb4bdbd07447d997e9da847e6436a138bc93545e1 WHIRLPOOL 0968376ce3966acd0e3e07253a0688944240070f40940635b323cfb527918fba73a78793d660da7ae47749858626815164e2c212d7ee2cd0e39129b1fa53b869
+MISC ChangeLog 6196 SHA256 33d5a20ceaea1924c0fc21af8053c9e4fd1385a6b352c4224c9ec6de563041ba SHA512 29895c8f1db31e3fb946dfbf95ba737530fd9eeecca7cab5713075f06cc0a4c3e647df72369cefc3023a8ef36f2aeaa2677158431e44239d8517fa7257403281 WHIRLPOOL c520584027ef2ffef27609a3388c995c90160a90c9039f5d88414e9a5c46c85c24fb3bd9f4af24e694de1320d05d065fd2d08108344be05aa2c8de965cc38471
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuwWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircx0P/RtysikwN7rXYZ4MKcpU6Q2G
-yYKoltLwVGnnigo/gjCNLOkuFTaXG6Nz5e2mlvFq47CbjepLu1+g5QLeW0QEs8tM
-SdvhHX2I9IT3l6Evi4HdEowoij7SbJeMCXyrkNvrZQtb9fAL4aFP1uSaSWVj77FX
-X/MH+LYRKM8w15ARC4PrV7VYBx85PT7eVT4JeMSLYvWzsFckv/0wH75tnPJC9ddU
-hMMU6j8kU223jKPJgjAw18fjbJIpJ663ICsoqdJyMW2KSlN5SwJhJ1JQAMHECyzf
-rwUjcJu+7Y2UgklF9gWl49xqkVKJPniVSYt7g373UtNK76VNOVqozqj+WNgSM+99
-ZQCdTy8SJHoPIIUwYfUcesI+CYzq+1/L2tnvp6rrCWyY67awNL9bz1p5J+VP2XW2
-F6gOL/c616T0fXcfqTInrEcMCNiE+NtKhZ23ze7cv5KT3KeGE4dVtqrWgy9fPuke
-JKZUh7OtLt3Pgq5lILka1INgWV3OYz+mRprhQMvNqWXybsoEYCDudq5OSnjgNQWe
-p2paDzP3iXouocDKr8/swdFI1YB72lwQVnhq+Ft98SFwt4r/0HlQTBw+DN1QWttN
-teoZtxg07QudI1CO4UyX1wgkp/fVKx1/3vjFIL25pP62BqkZbSZdx+tPTEl6ZVcu
-YbljUxOWMl4+COz+V72L
-=byR3
+iQJ8BAEBCgBmBQJVhn+jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiv7kP/RV5BU1y3OgyWM2qsCtP77/c
+XcWxhUUvNFE0sABmrd1rHR6ICbcHEf9Pe4WFLSKH/naz8rXQFCX3hMqKDZZIbG1O
+9+sZmPkhO2jq3zI5IDz3/YZ9orhjlIes15rxOXO5zlqMeI4i5subOlDrILur/+09
+lzL8MU7G7RoZj3qrUzYXtHH8s+NHDjvGb7ch44VEgiFvIgDgnT98u8qwiDXlEl0s
+jyr7R1mUBom9KOc1O39GNR3HIokpfjWCcT3R12aCCXUFnwOevM8VehgL3gEB4v4Z
+dZ8yhpsckfeCUS7ZcacUzO+8BWoNHFiE5/H0Y8TtXF/KBICnTW23VNECIJUETFdd
+F7VmIt35WpFgQT0LqngLDpzYoIgNGblEpY6vScmYUeK4SeptppQtuvUzAPhv8aXI
+PVsBbfpwAQut9zI2f8Ro8OlcSBa8mBp8bluchcvBLk9jExETKLCUJL7Ih8uqgFIA
+POysBIfLSGu18h+6BajS1Df1Fy90/9RudVR8XTjXQYugyxFco/xvZDHiBK5B846+
+dBi+bTLa7t4Uw/YuRUnqVJ97Pb/z1R9+Irh2Hz1P4/DZs1ZiKhWCA/I3rq56Aj8T
+V3DIGNNCIM0fwSvEjfT3W7Ww4rhVYRPihyoWlKVR/2ujVLs7epxTCdIBOWWD234T
++fi/lPjqmhbp1S7ea3+7
+=Im6A
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch b/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
index 8b2f0574e3b0..c1095b266d60 100644
--- a/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
@@ -1,6 +1,27 @@
---- MSE-3.0.0.650/configure.ac
-+++ MSE-3.0.0.650/configure.ac
-@@ -635,33 +635,6 @@
+ ckit/Makefile.am | 2 +-
+ configure.ac | 67 +++++++++++---------------------------------------
+ emboss_acd/Makefile.am | 2 +-
+ src/Makefile.am | 6 ++---
+ 4 files changed, 18 insertions(+), 59 deletions(-)
+
+diff --git a/ckit/Makefile.am b/ckit/Makefile.am
+index f87b131..a670d2b 100644
+--- a/ckit/Makefile.am
++++ b/ckit/Makefile.am
+@@ -2,7 +2,7 @@
+
+ lib_LTLIBRARIES = libckit.la
+
+-AM_CPPFLAGS = -I../h
++AM_CPPFLAGS = -I$(top_srcdir)/h
+
+ CKITSRC = datafiles.c next.c seqentry.c strings.c gcg.c pir.c \
+ seqspec.c ttyinterface.c nextseqentry.c \
+diff --git a/configure.ac b/configure.ac
+index a20d488..eb208bf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +55,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,19 +77,21 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-@@ -1000,17 +963,13 @@
+@@ -1000,17 +965,13 @@ AS_IF([test "x${enable_savestats}" = "xyes"],
@@ -93,9 +116,20 @@
---- MSE-3.0.0.650/src/Makefile.am
-+++ MSE-3.0.0.650/src/Makefile.am
-@@ -18,9 +18,7 @@
+diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
+index e1c1878..e253c95 100644
+--- a/emboss_acd/Makefile.am
++++ b/emboss_acd/Makefile.am
+@@ -1,3 +1,3 @@
+
+-pkgdata_DATA = *.acd
++pkgdata_DATA = $(srcdir)/*.acd
+ pkgdatadir=$(prefix)/share/EMBOSS/acd
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b44632a..84e89b5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -18,9 +18,7 @@ AM_CPPFLAGS = -I../h \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -106,28 +140,10 @@
endif
if ISSHARED
-@@ -60,5 +58,5 @@
+@@ -60,5 +58,5 @@ LDADD = ../ckit/libckit.la \
$(XLIB)
else
LDADD = ../ckit/libckit.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
- -lensembl -lajaxg -lajax -lepcre $(NLADD) -leplplot $(XLIB)
+ -lensembl -lajaxg -lajax $(NLADD) $(NCURSES_LIBS) $(XLIB)
endif
---- MSE-3.0.0.650/ckit/Makefile.am
-+++ MSE-3.0.0.650/ckit/Makefile.am
-@@ -2,7 +2,7 @@
-
- lib_LTLIBRARIES = libckit.la
-
--AM_CPPFLAGS = -I../h
-+AM_CPPFLAGS = -I$(top_srcdir)/h
-
- CKITSRC = datafiles.c next.c seqentry.c strings.c gcg.c pir.c \
- seqspec.c ttyinterface.c nextseqentry.c \
---- MSE-3.0.0.650/emboss_acd/Makefile.am
-+++ MSE-3.0.0.650/emboss_acd/Makefile.am
-@@ -1,3 +1,3 @@
-
--pkgdata_DATA = *.acd
-+pkgdata_DATA = $(srcdir)/*.acd
- pkgdatadir=$(prefix)/share/EMBOSS/acd
diff --git a/sci-biology/embassy-phylipnew/ChangeLog b/sci-biology/embassy-phylipnew/ChangeLog
index 81bc2d6382c4..9550a755c8be 100644
--- a/sci-biology/embassy-phylipnew/ChangeLog
+++ b/sci-biology/embassy-phylipnew/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-phylipnew
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-phylipnew/ChangeLog,v 1.17 2015/03/28 17:58:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-phylipnew/ChangeLog,v 1.18 2015/06/21 09:12:29 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-phylipnew-3.69.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-phylipnew-3.68.ebuild,
embassy-phylipnew-3.69.650.ebuild:
diff --git a/sci-biology/embassy-phylipnew/Manifest b/sci-biology/embassy-phylipnew/Manifest
index 3e77749d83e3..037d0e570be2 100644
--- a/sci-biology/embassy-phylipnew/Manifest
+++ b/sci-biology/embassy-phylipnew/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-phylipnew-3.69.650_fix-build-system.patch 2660 SHA256 7a8701647c510d04a710d6cb52042dcc516124a5209662dd362f7e49c3f50e2f SHA512 ca2211e53077954a07d1a8997cff015f7a08e569d4c6d032703a9113ccb25ac2b191e866d35046ed02c0374cd3c177d90f0aeb4d182ec04cf6a39d1beda5c04a WHIRLPOOL 271ad6d7663f6aaac5a38750b00f262ebe37bf4c51b81238114c2bfe87e71fc897849781c2c052d792d17b5076e147db8a74e14f54278a82082fa92e73b268d0
+AUX embassy-phylipnew-3.69.650_fix-build-system.patch 3255 SHA256 26aad2bc72f89444dffdd301cfd4f50ba582b10082f21153e601c6812075ba86 SHA512 a0d4dcb3e7d4ce9b5cbd68168ebe7c8d248aa1166a6a52a0a77031291af8d2d32af0243571b669b9318426f753251d983ebb9b96eb1da81b594f4f4d20d7c249 WHIRLPOOL de7d91731115bca913a65a8f4a44d863433338ea4e5acb7f6a9fefca9a185325b18888d8339d180a49ecb7dfeb91f120a7c7188fe23f340dd21aeb8b3940458e
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-phylipnew-3.67.tar.gz 1624802 SHA256 efbfdbff0109c62823caf13f20cb6462f54371d55899fcbbe29240e503584945
DIST embassy-phylipnew-3.69.650.tar.gz 1741298 SHA256 af385d01826e67e05295955f05721728abbd4feb9e11a944189414da6590bfeb SHA512 b41a31285e05a418e4fbfae7241c3658fe458e3d5d84bff472d98b7c145340a55bee1d744b5c056d0e88407074947b5f37b2182c9cb800c8a8d43dfa76d026d5 WHIRLPOOL 94cbe384a1575c322c7e3cdba7ccdb79e3e24cec7bd24776872f3e7d425d85c64fdcdc1cae6c079b40ca943b84a039ba2c7c5c059c40ceaf95c5c2e11e4a3e58
EBUILD embassy-phylipnew-3.67.ebuild 542 SHA256 caaf16c790c0df32de03bb4b520cb123e9f544622b4fe8e0a75aff98f7d7f763 SHA512 b04ac52ba9068ae2ab2fe5e910ce6b3bb94e205a5c58bc8cba8a812992290299735bdb5138051287c3d98ee2db77f411e54a43da7259905e030b9dcfc4a8d400 WHIRLPOOL c7e7b02e801dfc48d692d6bd771684d4c66bed6dbdd7daa8761b359e5ea03a635ddd40d94c3b73af00e23bb928e668c123a7b5d148ec9741f17d57d9afa0955e
EBUILD embassy-phylipnew-3.69.650.ebuild 473 SHA256 2051857970250ae1d13bccf95ebcfed9313ecbd0dc811766fdd8feefb1adf414 SHA512 99b5cd71f7f3e1bde165774327c61fab8f9f76bb50bb314e0f91ff907761242b56ab0c1aaa9c0e8c41f94087084148c242d37ad6024073f4327485e25289c64a WHIRLPOOL 737ae13f6c929e309b15c34db6c75d828804009077976679058f8ef23be19bc51ee190c0f3bf0acf827fb232d1d42178e49614d558efaab8b33862760e65c9ba
-MISC ChangeLog 2647 SHA256 6004001e2c4c8270ea1f6eca152231d26ec0fff18da2c5498489b3d96b5ecdf4 SHA512 dbc485f786c0a79dc1ee94caeb97869b197996449744419d4be9118769fd6385bd5c03c0bec164fa0c997274992127648ed1be43a04f91b8c85f68a162514834 WHIRLPOOL a82201eb0ba8243dc819066f6e8c6e5ad2e7ed0000c3215f0b57373b81fc102e38a488d195fb83ac897ae86651d46f3ae487fa31cb8b8901c3b82cd04d97fe67
+MISC ChangeLog 2806 SHA256 142f97be3bcc2cfe360418a11835c21109505aa7085b705e93832b586ce957f9 SHA512 5d9859ac63566d082fb58bb3eb6ca81fce1bcdab06624e7795dcec6f28564c33c87f7b62a642e153c1a1f161cb995ad52b04cf2fed8029d3e5afdd28948135f6 WHIRLPOOL ad62b40aca5b1d875cb26944dcbcbc7f288024e298c3c0d1868e1a72074995bfa3b0ab40c8e7e6686bab57c11e85c013e4826d474a178803e65d6fe0172d0dd4
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuvNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir00UP/j/ETwzEdhU09J3QHavm5yOx
-BKMXGRjr1mULQq1lXbkv16E7lUf5pxYZVONn90SU9aypEIgkY3XC2Cp0iN86W78g
-xYc7lTIqVDC2PVtf8skVBw+iit9ACn/RBNi+jDx67SfL2i7fgao/RSs4ha0gA9bG
-+iKlYkhqkCFD990PM741IOVTeEOq2MNBqmCFpIdFgJuMOKlQZcWICBaqYaJtms8c
-gjgsLYSt/bebE2KYIfPAEhzLI+6J3bYLfdGuMTm9rRbfeZ3D0/yJwp57Zuih4eix
-RR+LnsNR+Amw9TOxDPwebMlPzLgGy416jH3CLkjrsq7pOp0pKPGcOK7q3ej3te3W
-Y79woC2Uu6m1ifvlSFFnvsELyVnRmgFsTP7juRSQrTglsCyrmUI0e86gdHDPWzms
-D7KZH65UNrlZfjW5lznub6YupKy+Bwf/GV66id7oBiQzgEmOzszl3iw0akhRvvFH
-+qcwpW5Yh9f5zXoDgzyl/VWSNAhiCpKuEMs68IT96jQzXK6F9s7G8XLowjw+6Yus
-Ui6g2lsan+QUr4NoNLJp7uRX+gEvUDB33zfdaGBohLvRQxm3zM9w+XfmNvrqz4bN
-jIlWELyp7qAAAKpdTpojxL1Kwjbdfl9HobNE4qwADmKuqDw4nH9pQ4BWG5PDJEqR
-cpBTC1zxfDW2wyiGoinU
-=y1cs
+iQJ8BAEBCgBmBQJVhn/+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7iQP/39T5EEwK62kZp7O6OyBl1a4
+jwaa7SCqn0NAcl8AKVyflTxp3zoK5ba2nj86O6HQUoX9UTdWy8P/Y2G7rjcZGruJ
+XhSo02k0Z0UzkiKh2oUan42HOqpjplNZGp7piHRiUEfreT2cOa7RMwMINrcHdPOg
+wJuh88Lu88dZHWhdOaxeG/84W84HTO62uW2U1VNtHyXoulcYJlSdKChwBPTScmy4
+xJjlt6xaHT0uYoow9FtbNYRCp7y90BiQnagoe2rsRk8Oh3ywH2RdZ4i8TK3TiEI4
+tJem+AoZHL6PQKHmP3IpQ6QuKt4T5pb/Gzpb0FJELD3ZQ2gK6PLFdRYNynrUSItH
+mBxJITSD+L+rYchQIQfNfnBysa+zSvQHtslBQ6B+L6KrokQi+4lbmALOLuitW2UN
+94iy7EDL3rUyO97+H8Sgs7cjGVjWQ+L/8HG3ZD+S6BBNROWg07Dl8D1yHRC2AWMp
+rBt68CZXvcT5LZHllZ2fVYka4Wo9o2e4UtPyjubtjdlo1l/oJgoID2Eq3zgaYKbw
+Ac9RzLxaMakl4liB2sI1fIXviGUlY0oXpsLI6xRZ4EdoEEEACuqPRM6xTo5YzD34
+aCuUBuRDqHvvRLf5o7WZaDYPg33YRtbkrxx+YETC8o83aVeEjIYF1obktXOLcgN4
+Lo9IaoqVFSb2y8xsLgCt
+=FksE
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
index e0efb74bd79e..1cba944094a2 100644
--- a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
+++ b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
@@ -1,6 +1,13 @@
---- PHYLIPNEW-3.69.650/configure.ac
-+++ PHYLIPNEW-3.69.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ emboss_acd/Makefile.am | 2 +-
+ src/Makefile.am | 7 ++-----
+ 3 files changed, 10 insertions(+), 48 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e5bfaf1..09ed517 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +41,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -781,21 +754,6 @@
+@@ -781,21 +754,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +63,34 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -918,6 +876,11 @@
+@@ -918,6 +876,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- PHYLIPNEW-3.69.650/src/Makefile.am
-+++ PHYLIPNEW-3.69.650/src/Makefile.am
-@@ -16,10 +16,7 @@
+diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
+index e1c1878..e253c95 100644
+--- a/emboss_acd/Makefile.am
++++ b/emboss_acd/Makefile.am
+@@ -1,3 +1,3 @@
+
+-pkgdata_DATA = *.acd
++pkgdata_DATA = $(srcdir)/*.acd
+ pkgdatadir=$(prefix)/share/EMBOSS/acd
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1883ce9..fb1787f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,10 +16,7 @@ AM_CPPFLAGS = -I../include -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -82,17 +102,10 @@
endif
if ISSHARED
-@@ -120,5 +117,5 @@
+@@ -120,5 +117,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
../../../plplot/libeplplot.la $(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
+ -lajax $(NLADD) $(XLIB)
endif
---- PHYLIPNEW-3.69.650/emboss_acd/Makefile.am
-+++ PHYLIPNEW-3.69.650/emboss_acd/Makefile.am
-@@ -1,3 +1,3 @@
-
--pkgdata_DATA = *.acd
-+pkgdata_DATA = $(srcdir)/*.acd
- pkgdatadir=$(prefix)/share/EMBOSS/acd
diff --git a/sci-biology/embassy-signature/ChangeLog b/sci-biology/embassy-signature/ChangeLog
index 595355846470..57c35be3208a 100644
--- a/sci-biology/embassy-signature/ChangeLog
+++ b/sci-biology/embassy-signature/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-signature
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-signature/ChangeLog,v 1.24 2015/03/29 08:44:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-signature/ChangeLog,v 1.25 2015/06/21 09:13:51 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-signature-0.1.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
29 Mar 2015; Justin Lecher <jlec@gentoo.org>
-embassy-signature-0.1.0-r4.ebuild:
diff --git a/sci-biology/embassy-signature/Manifest b/sci-biology/embassy-signature/Manifest
index 0d8bb05ee43d..d1033084f159 100644
--- a/sci-biology/embassy-signature/Manifest
+++ b/sci-biology/embassy-signature/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-signature-0.1.650_fix-build-system.patch 2379 SHA256 1ab4c73668ea4c3dc9c4cc8b0e3a1c02f083073aad1df82a03389f54d5903722 SHA512 ffe62fad569f71b6851e3aa3ae0435722261f484cdd4636e87f59c21f645c4aa9c714a0b9a1d2144b399a9db34bbfe7488e84b0e5e5f7b240b7ab1dc779f1db3 WHIRLPOOL 4ea315e7de17b4741178f79c7322c243b71f55beebd6a8d0727a4399046b548426a876e2f8556eee0318dd1c284555d043421db3a472503baedd6fdae05557d8
+AUX embassy-signature-0.1.650_fix-build-system.patch 2860 SHA256 768fe1c2740827007d475f31451195090032b907e0ed5b36b9201504d6eb4df2 SHA512 54a6027b2fb1d17eff98b7c1e9adc61578a2845b30be3b7c40551b4291950ce11900798dbf7d54e1fc9421743a8d313fc42a14cfa39976735ac8cfae5a297954 WHIRLPOOL a272e7679d14c883fb76d83e78e429582c776364c590738f4bb6b3e793f54c95bd0bb42b263fc6ca5569a34a9be2e84a2dc62cb67efe05ad451ac0513102c2d8
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-signature-0.1.0.tar.gz 574940 SHA256 0966e165516448e214275e3cafcca91b9bb83d96264d2bf205aace1380138d2f
DIST embassy-signature-0.1.650.tar.gz 622294 SHA256 2ab34cc76caaaefe7914e9b00dd12ee81a32d7a7ccca20ba901d67f1e2c2f27e SHA512 4989693b17c29ece16f94934e1b2f5e62f31c345bc8cbac938450db0d8f5d56ae37be6090c46e96725e63621c5951f8a65461cd36d4aafb1b509f3f554b4e952 WHIRLPOOL 1a943266ee9092f13fb3ad0779cdfe70e3cb5c1ed7d31164a93da90aaea2df95150970e0ef22df89c3cc97dfe7564092f2cab8aad7fb720e2f456cb363666de3
EBUILD embassy-signature-0.1.0-r3.ebuild 501 SHA256 31eb32c8b40c3c84d0c3c8f072560c309e714d6dcbd9bb4982816f3bda6ba97b SHA512 b4b71971a32b8f90b933feb83e6e7a9d65f4119179ce4981a94a54fd15c137e784335779642d70c7d53fafa715332b40f354533ed0cf9b79a28cca18f64c1d92 WHIRLPOOL f3871dc066609327acc6597c9c2287949f6205b93f52407317c62bd7729a8b75ae6aaecd0786492cace9a2a899714857837acba3f46da84a6c6b2e3b84a03fb1
EBUILD embassy-signature-0.1.650.ebuild 449 SHA256 807bd99b7b6e241d102b041dd5faac7aa5b90201623d420908839fe5316c9528 SHA512 b0a0a2de39934b3124eba2ab0ebd1eab5a1a3e95a9b3b67dc26353b1114698ebdbff1bf19f2adce25b4d92529eebf29b528ed35a2725ebb18fb20c7d1b8d8c5e WHIRLPOOL 504c4d0de25c37634e8616697a6da7087e0127a2698dbbb73aeae7ca5205eba0bf78527417884f655676f3c81ac47b17a66c3de0cb2f9e0a56430d76254093a6
-MISC ChangeLog 3706 SHA256 c8d7167ae1857e77a0f2c99542fece0a1cc77a8b74d5d403ca191126d3f96fa0 SHA512 038d62c16a4faa6aeb1d5522d065f1f1bcca1d595824cf08ec2bd26bd1f72da92ed310df95d316d4285cd14cce3f15604d7c428f852834851c051bcfddfa5b4b WHIRLPOOL dcd0efe01740579526794fa8312c6ac6a588eff2e5da60becf1382b8d1bfc62ca252cc34dfd96a7fb27d77ad469f2326a4b4a722f17955da99f2289004c2e9cb
+MISC ChangeLog 3864 SHA256 27b743af18ee8d2fc1420f1dcb7aba01c65211fb4c7ac965a2926f141fa8428a SHA512 220fd9e7da3a4c4a306631d4460b39431de1e5d29af32257071e0cb35c680541eea139825c5bfe1760e7313df2b4695b2cbe7850fe2fc916f3cb50c66cfd50e3 WHIRLPOOL a1596d167902201f0fc6f735186372d6c0f5de529106f524af11bfb8de08e9d1dc518a0984936c4873f03d062a43b6e5a168ea2eba10a16edcaf83cced3fdfd1
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVF7ttXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirh1YP/3SS1+gC4jYMfNifaaNk0dCO
-q/sX5IRCIQqjDgyOSDYdUUJNMyth8vSzGj5GkTL/cUVZ8QjEb3WOrmtX4pWTfqif
-JodiQumCz5fAPhuoZpC/IW/RWYjaobZklG4gIpl4hjKJRpSGxQG1jj1JlWs1Z+9c
-iI+52G/Z+Xhiq7+7D9lmiDJyTgPm9A2JuDoJW9dm4dwkBMEY/slGw7rr1Fglv8kX
-Vib7grYqmhAp7VNJqscK3HKKY3fttqW81rz7tgCi1u1fDth382XmCVfBhUoGaznG
-mT1Qrv/CffnvOSspWl8BOfxIyy/ZncSOUV5bJOh78K+Q4YaQjvG+mZldoPxEqFnv
-v7tiv3dkvxjtdjiPL7gMHdnB0Td4gr4Zffwl+gLbrOJb3JNU+3NonE6uR8bmeDiD
-0yCp88h+6+vwJ6WySKDErffMoKEA63YQ0THWKQt11QaNTqd//D53XlWApjiZR1i9
-8P9uOfcvZ3yHcPs/Qc/t/AAoh6o1x98iy3mZQnTJBku+QKjG9xOCBNBN0u4u9Qf4
-dCEADDZknNNAYR7jjfxt2ONiRnnLQfVtzfRwhTuSwcUmuo113/3Yx1jeyc/xqP79
-2nP2T1rj7Ox2101jrK2gMUqkl5lXkwD2wys/LqFaLHZ+p6zVsCV7PGwRDbeugCtj
-WYFRPJHsPw/HoZKcTUlI
-=lUmF
+iQJ8BAEBCgBmBQJVhoBRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6voP/1aooouDvgaPdvFir9eee5pD
+ZRSYcHvROrRbOh8DD7OVEj9vSgc+P1spzXK3JyfGEqXiHH2yRJzCIO1pmSqaDgnU
+WnyeBUaIEA/5ZXMiYchiENXcpfEcEWQq0CVdKXgshr/c+25wwlyqPvxahmO6O40G
+m8ZGNHEwvn2KitnaMcv/TFvhV7UhVtufQLulfEy1+tFdFdeUHayR9JRbxFzATBof
+Ov5FkObCObqHc8fJuT1RdtlXXGtYIy9QAm5VbUvxhMxilAEI0pk5gJyh4Pm/g2z3
+39VhU2y8gXKNZxh+ymkAdgPFUuNvTmtPvpJEHT955OSqHJzkV5emgVjXTEDJQt5M
+saCm3pXjoC/V3VKvyvWA9XvYhzZ+UQEMAx+n6sN+bY2dVJyO/644QO62336uvRQU
+HjgHpYUXvq9LrxVG/vq4vwWcWWbnucYzh66cfp3K9B5gymNNyIkD+ZE3cpXRIGrn
+KGtf11ykqcWVV/AGLR4cgrUo+eekXyz9i+0d2Fx/TPVv08scHU93CkxlLcrM94Ru
+2QBNBfWl8watxQVbXYU2b4woFwLB8cpCJ4cqxYwX1OfS/FXug7BMOwhul3HKvK8p
+zfmsuo6oyxJD9vzoKjv2lMVabj3ymQ4BBgAPIUESWOgnyKBms/fVJKHU5UeUBbXp
+ispFvFrBTSJP6OuzL0Oq
+=JDP0
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch b/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch
index 5197c6422f5a..32e4d684cbb3 100644
--- a/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-signature/files/embassy-signature-0.1.650_fix-build-system.patch
@@ -1,6 +1,12 @@
---- SIGNATURE-0.1.650/configure.ac
-+++ SIGNATURE-0.1.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 6 ++----
+ 2 files changed, 9 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f5ddd0..827543f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +40,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- SIGNATURE-0.1.650/src/Makefile.am
-+++ SIGNATURE-0.1.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d77e43c..849f17a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -68,5 +66,5 @@
+@@ -68,5 +66,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
diff --git a/sci-biology/embassy-structure/ChangeLog b/sci-biology/embassy-structure/ChangeLog
index d19f8e6ffdc2..c7e3b80ce5ff 100644
--- a/sci-biology/embassy-structure/ChangeLog
+++ b/sci-biology/embassy-structure/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-structure
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-structure/ChangeLog,v 1.24 2015/03/28 17:57:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-structure/ChangeLog,v 1.25 2015/06/21 09:15:24 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-structure-0.1.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org>
-embassy-structure-0.1.0-r4.ebuild, embassy-structure-0.1.650.ebuild:
diff --git a/sci-biology/embassy-structure/Manifest b/sci-biology/embassy-structure/Manifest
index 7d78d9fa4c1d..89f404195bbb 100644
--- a/sci-biology/embassy-structure/Manifest
+++ b/sci-biology/embassy-structure/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-structure-0.1.650_fix-build-system.patch 2379 SHA256 167ed0cef4f275351dbdc52c7f0fb587527e62049edc987497e79c9d5c486ff0 SHA512 2ae3080fe28cd6ad03dfe02112e16a302ac2d2d65efd70b98676a137221d9897662930a6beb4eeae87cdbf66d29cacca4b4647314eedfe2aefdcb000c762af69 WHIRLPOOL 49d523d564afcb72db32eb475e4738706b7d60e2505bb309642cdb5b9b121d29370dcdf7571e9a02c9e699f79439b04a494cc22274aee7173ae73d03da03fcfe
+AUX embassy-structure-0.1.650_fix-build-system.patch 2860 SHA256 e8d2923a0cc2eeeb97ed731afb6922fca203887e1b3570d0e46910065db86ca6 SHA512 8929ee9e2eff5636e4d40ec5d1860d866e90c17cc23f4e75f44fd829409591b869cd5feb13a6c02bb5d80a9a7ed55c06f7be45f61268a768ddfdafe84188237c WHIRLPOOL 80f9e14144f20bbf64863804b28fe6fca2a7856d868d5d43ac612e0ab9d3d655a979734ae77c97c3ac4903bf577a3384bc0041d0b4c69faa03bd41edb3fa8e44
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-structure-0.1.0.tar.gz 532035 SHA256 cd8b17947fe764e830bd14887deb85a5f196f490d25b9c6408aaca0c1baecd23
DIST embassy-structure-0.1.650.tar.gz 588118 SHA256 06c3d07f495247d1427e91887fa00df053486e2b59f0ec722735bb0b957502f1 SHA512 56fb0ed975bfd95b1fbbccaf694e0617ec23971d53bdc230eeb6ca177907e784805697193e7630e4a513f1b4ee7a1a7974136520963557c452185be4ed22b641 WHIRLPOOL db988aab3f6d2165f44039385fd0a7ab2d6a7dce12906714d5932b411e3dfeac7e06a219af048ef120ea22acab3c1e958fefe68e6e1f19eec56de82c5c1b8c03
EBUILD embassy-structure-0.1.0-r3.ebuild 501 SHA256 0b292a276467ae04180ca9c25c5a75c72ef5938848322f1f08cff49aa0d72d30 SHA512 ac9e82e81e88a2d9a065366ac7ff1327e43e00e9a06591475f7faf30b87a16b194b921bf40a5e1a469a889998cd93cd19cde9e2ddda5c8b247c19c76193ce6ff WHIRLPOOL 3b998631a045721c65b84f9dd442251920618b90acbcb2c535cf4d22f6b3a7a51ea3db01fee272aa23dd90af81a85ae77edb904a31a485510e673bf8eabca852
EBUILD embassy-structure-0.1.650.ebuild 451 SHA256 0d17d107a9e288885c1dc2fb8b754d044f83bcb77369126f81665a0ac1be0af4 SHA512 6ac9d280377d52562e7e1ee8ba1b80297169459b73c9f08ddbdbf29aec57e2f2e057acb7a6beda2e0a977f0c3f6d9aca1251d548d8556335ff2cd1e21188ca6a WHIRLPOOL 6cc98e08740d9852dc6ac3b763209e4e654375d896c60c8051ecdf02ea155da2aeb55cea3f3da400bc3c72cad7bcac3ce47209eaf76453a80ac4a1e3f92915d8
-MISC ChangeLog 3740 SHA256 56a56b2d78fc347abe7733f29f7c0d3a486f9bbc46841649523bdd63ba3d8096 SHA512 289887b35fa19f89a9314d946aa0edeb691213c7a1764bef05dbbfbd37c2b47db29595a8d6940b10f362a8350e4975ec62882649847d25face6ce84ed4f3e0c4 WHIRLPOOL cb0672e11e7f63b49584b4a43961901a4d45f794c2a9b2631ce94a133fa33ba04d7c765897d3b257cc969fee14efd1907ddd663dc40da6f5fb0829b7155898e4
+MISC ChangeLog 3898 SHA256 5fe31e03f1c5d75ff9606b6d89fe311de8692e7c97ae3ad7cc9924e46cba5f7d SHA512 6a3f1667263fae6eca976b85eacba15d71121087e6d9803c0bd995c2cb3986c6c33e02f274c10a1c88ed3fd206dde4456b49be0f663866c07dd256a0de8469be WHIRLPOOL c9706fc2e9d630616f3a4e90873bc7b8b8a59a9077fa69140aa5e04011418a49732003d2240e486f7a6b629ce35b19a4a1eeb31d28fbc28dab4e98ca50e15fb0
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFuuVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirI9YQAJdhyRtYCTCNtLYHF1rI4HMN
-rAa7U0qyA8Mky8w7GlUT+Qnij9YiuQlpznhMnTsYdotsjxeGjRN9MK68uEUdHqwq
-z4Htft6IacBNcWkCDUg2OHA348XC3PMO6N2iIX579CNP/HH93oKt+UT2pcf+VYuC
-JOhjHfQp8kcWzMFHWr+E6OkmW6lmjoYs14PVJTPXVUegGTfq7q+VIA5yByqtakTa
-iT+h9RBRItn+Gl96AOYSkdfZX+dTazyRQDvNSJpCEkwWAZt5M46u5K6J4MtnkMRP
-gg4R18R3oqCQT44aQzyi+Kih42O4a+fE5ao9vl360izBGv91ZshksDr0c3eV6RUg
-ala85TR9fKkMXNKTjnKNOPlNhKDx2fZWOM+0krF49nwovW/YJgyA0X9YM6svnuWU
-c/P3mBV1TA4DlP3EUAanhMM13bq/rNx0ReSg73Hcs6iZQzaI/4Yec8UvaWVzhwFx
-nrwHJ/AYk9PuHR/zNPS7XAWZJVUIpy1cH9AALfMXN9rIlK8kMhOqtkU9tpcWRi8/
-WKM15B7TuiHjWT5vIlFV8uWnCUu6KP7V/z9RHiHQNkVaGBx5kia0Lh4JyXhE5FW2
-XKQNfnHJy7AY0MHlrToW0cKjGEXb7xpiXUViCTgwyNwxmk+tVcoBUq6kuCcEmny3
-8O8CZ6knvv9woCEOY8W1
-=xHhK
+iQJ8BAEBCgBmBQJVhoCtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijQMP/2rJjzchovzEOr+w9iiJJXLV
+WRidS6CyMJ9aDW3NnNH8YeSizJOwWyrCyU4fx3Aynj1r61F93khZbjVZV/1gSo0L
+HF6OACNd7U/kHSxcBe53QLQIoIuB+Flegusbzr7rGP5ulllzUBAQzMgLicNeU6XC
+k2qYK/b84DXIbO/PiGEWA66Gjaet+l4+gv6xceNky8aUf166d5RhavBVZZGLNjkd
+LFIKlZ+9q0UlBDwnkRlAIhkTTQRGZ9+uBFC4HRgfncepO/BHKLa0GyGeRojqNiQC
+TvBueIdCyG1OtA+7ytb/R60atuOw2V92D1Ob/3zoY3fsnjTvr2LpNaj+RFp0JBVH
+w1/5VB54e9h+FaTfgFapPq4AzNv9jUzdtpquK7j2oI1KoIwB14tC3JRPFGRLL+uL
+EadjQzrzZx2EyDgtzi3qzj/JBPdh7vTyK3butqRnA85jJFFJtBVljwV9oUigkXfS
+vg7/WUp3K70ZJOx2/gohlRkSAN239YoHAvipDYDyJ8Uz00frf3OgNZMKMJTm0mER
+9PMaMh8J6kyoFxj92Vy+fvjk27SXPg6bQxn02ShViupX2eWtY2AzszZN2RMquGUA
+cfLaSfJLQvUR3EDQuxp3H/e2IjcPT1Kky5ekhOduqbrpeU+qVusMGOAi63+02rsG
+YIjxfDnafO3oJMCER9Ow
+=nHzv
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch b/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch
index c87eefde11ce..bdd9e37714e4 100644
--- a/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-structure/files/embassy-structure-0.1.650_fix-build-system.patch
@@ -1,6 +1,12 @@
---- STRUCTURE-0.1.650/configure.ac
-+++ STRUCTURE-0.1.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 6 ++----
+ 2 files changed, 9 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ee482ef..e4af4b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +40,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- STRUCTURE-0.1.650/src/Makefile.am
-+++ STRUCTURE-0.1.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 81ade5d..2ed0d14 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -66,5 +64,5 @@
+@@ -66,5 +64,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
diff --git a/sci-biology/embassy-topo/ChangeLog b/sci-biology/embassy-topo/ChangeLog
index 4f7b2d168b75..a4bb74826f1c 100644
--- a/sci-biology/embassy-topo/ChangeLog
+++ b/sci-biology/embassy-topo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-topo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-topo/ChangeLog,v 1.34 2015/03/28 17:56:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-topo/ChangeLog,v 1.35 2015/06/21 09:16:49 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-topo-2.0.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-topo-1.0.0-r6.ebuild,
embassy-topo-2.0.650.ebuild:
diff --git a/sci-biology/embassy-topo/Manifest b/sci-biology/embassy-topo/Manifest
index da7ef761df6b..97a041b11d87 100644
--- a/sci-biology/embassy-topo/Manifest
+++ b/sci-biology/embassy-topo/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-topo-2.0.650_fix-build-system.patch 2550 SHA256 9ae3b09bd98c5d19e692bd5fdeeb6629b2ab74b5727a3d8e310d8db3c505a8ed SHA512 4ee1edb48108cdcf664038662a7da3f1708cb44a0986914f707756dba86c7882740e103d47e683d4df489c3e16e46ecc393bd1d394081fb24f025400aba64ffa WHIRLPOOL 81019a812bb2d693598c3732a1b77fba91a4509d5bf93b2493663c697cdebd849b1737bf6ff16f8a6296b62fc2f8a163dc325e37444058605c1843df950b9cf1
+AUX embassy-topo-2.0.650_fix-build-system.patch 3167 SHA256 d78bcacee455ab12fdb482fa760eb89716da3bac9dbf5ace0f9bba37f2585dbf SHA512 bacff621e9d80d39a4e415736e1524cf69dd86b0253f65fb52ad2dda200cafe8e14af296897c3f695bbe360f2a56862a40dec6b8b0d0e597310f065e191ae770 WHIRLPOOL 09ffc786288a0b428f349cf74973729a9dea8d8ed2078897538b97b59ef41cd48053e0763c6665310a770c6410b28726fe9c09b0ada9543d6fd8054b1e99b24f
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-topo-1.0.0.tar.gz 379929 SHA256 a7fd297c5e27becedd4aafd272123a176581c68b90de872fb3cb46356333cc16
DIST embassy-topo-2.0.650.tar.gz 443510 SHA256 a8b8b7c1e04be44b5d6982614a9af44b84d0282bb917ed29e23a0a710241ad6f SHA512 8ef157a61ac47680734bed3d07cfe2bcd86730998453daa704b74aad667944ad6b0cc6f7fce36be4566cb19a626f1648d5f6793ce227cf57939fcfd0d10690a8 WHIRLPOOL fbe0edadeafe14b4b24be6fd65ed51dc9572f89e12e6f038017e9dd208a867138219350ccde6ca3eeab94ccedf34e5ec672a65cbf30c3819387407e778caeb55
EBUILD embassy-topo-1.0.0-r5.ebuild 513 SHA256 d8afb0a82783055fff4e55759dca0fa32ecf17d612731d4102b19828cc98a448 SHA512 39ef1c5e28cfe0b36c7e6298f3e8b4aa70e40a70338f1aa6d2ae60d9071ddde07ac4516e89871fad571cc8e8ee5f5a5597f2ef78b23f93d25fb8e978674f48e0 WHIRLPOOL 32553faaaf32ce7bd08a07c6441dd9d7dda153e8cb94d12bb12643e046cb20ccbf93552a01e7516cb1d4b37bd0146721922b710606a0a12663b98d53c6490d61
EBUILD embassy-topo-2.0.650.ebuild 451 SHA256 522b9f842a6cf5e2368c251aad8bbe3c13067c2a274ab3a87837629f261e9bad SHA512 398a70bbfd23d8c78af9e2d9491440863895533681d8f3834bc70b6d2c323bdef0cc54b0a6e73a75f71eb0ed739b7e4133d0822ccb557834df23c890684b5803 WHIRLPOOL ae94974f262a3dcccaae7178185cefdb18379aaddf78cf7497f80f17e280410347eb417f4bcaa91edd5e72e31748248c1846400bf8dc19d8edf0b4e04006dd76
-MISC ChangeLog 5059 SHA256 f0589f3be9955b3ec067002a51b1b9363143080b52445f93d1bcc8045635423d SHA512 839da505cf583ee9f3b98148d028d0f117ce84b0315d6ff26fd7ae707bfaa986c09b93f9b960304c27a6154b281c0420bbf4b8af84fcd0c93220c7e2d5369c36 WHIRLPOOL 2b1981508c86ba488402817a4293ac88dac88c1ed565306fc5a3c1b955dfe21fb45f351c5d76c56ae08a0dbfe7200500f2a70a0256fa4ac5244f4972246c3820
+MISC ChangeLog 5212 SHA256 9bf176f777b2a7325026c20377fe46465c1f29f96a1af3e78ac3721a511bb30f SHA512 c7c527494cba100183d37b40b97913f3b4d401de0d990ccc1bda92288deb994e25f8daac07ea14b18287435a3409ec81a489bdf2be333d21ace00db07f1835f7 WHIRLPOOL 05b8f8040075da4b7e2277547af92019562d3a744b7370c2e9dc98df7d43d36a3972e88ef96295831c95f23d0b2c4027ba3f6ceda25304699c4be490c2c06f3f
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFutZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViryo0P/1adhzKbXfeDuRP33/kaxY87
-CzG+hotPCrYul5MLmScTLNhzO2Rfnt+e5qFbWbrqOfoV+fwccNFt36WBbeUc5pau
-RlsH7MDsiS4aw/VSFKIwumtIHA/WLVjOn/Dtcr8kirpf6FykRdllsJs6PzGdmGvP
-mPHVzaX03CFIqL2bB/jPUFxlYGD+Ck6i9hOdpiS7QYz6ugqWp2MUnsBQGu0wt2+L
-4Q5V/ZrrL+ffonggpiyz+5vHK7EKJh48f7y32u4/foZ9P8SGFBmDEUDlO+bB4wBE
-BpIqyAGQDPlP+n7T/EbictbzeUFcM3JzH/wpwN081ihKipYCoqbf3eyVNk9fXPsX
-X8r7E2z2sWyyC29vi8xr/B5Gk4EaqlLA1mFmbMRYfP1jt7sJXvls3EfDJos8jGX5
-CFjNn/iCQmaNHtY05HIIPWxZjE5lBP1NdZAtAL31WLHdO0oGX4i4djABYIoyHw6Z
-ee4io3sXF+w79XU8v4+rUCEjYGwZp1QkDh+exVj+BW8XalBn9xQf5Z7S3XHDxhIV
-pbdFMtuxquGxAdYfjS8X+0ODBzzkzlUaeQQrCpHGC1RLOhSuUUJWCZP6tGPmnnHT
-8U6utXAKtXFLN2i8FspGea2yqlnL4/i/HY2U7Nki3Io0rvy+nZzxLv8ziu+Gf9Gb
-DroUVPvcKKm71ME3mJFB
-=YBY/
+iQJ8BAEBCgBmBQJVhoEJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9MgP/0jXbL4WiHXaNXgXmAIhreUu
+sfUXoaTdDvleM0huz6baXT7R9kz6kImbpft02RvJf2t5w+aVGjhL94yg4h7+OQuM
+nZ9sckQkU5EmvebGJ3KVJeISJhtcHpcaJOVTs1KtBKQQgCEP3uvgymtjUfQdEErC
+gSZ7WGwymxACj2602iJNfE4APnu+wkuzrsdcXECcRbQHk4XWIzZ5XZ0qRH1c66CZ
+iJs2H2DaroX+ri54u31+kviC1N84Xt7fI58qXcxCMDyZAQ3wj4uO0hB6t9PLinvX
+z5jQ9NQe6c1IFwGHkRdYyEXS+otHMa2tL7IK1sTtsCUpe2z8VLXx4vZCyWarUYON
+y0pDJsUbYM8HLU8YBHvJjTdXFdoKoexbezKk/uO1H9X0P2sPcP7rIEKwpm9kSQGl
+mW10n7UifAPCm7TxPIaaCjEffWhWV3GGXaC27gF0AFkrseQyL5MmZ1gLvxMeycAJ
+GZs1/yKnrfU8gqd02nLR2B0HPCN9xSFWfRQ4EfnF6aaykxuIY1rntgAnqtnY5Esx
+RLhJK7TRN6gNp9VfN8ipen94eRWduGppgigkDpoRW4hSHZQqaQWzvawTcAZMu+NK
+X1IPQ2inKAsFv2KEqlI+uuKBaUfz+lxCpSIUdHfFrQqeRv6HTvgJGvbRweaeT1Kx
+gAuwE6r1NkXznWuRXti3
+=xAdb
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch b/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
index 7ddda05cb62d..3c37879de8c8 100644
--- a/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
@@ -1,6 +1,13 @@
---- TOPO-2.0.650/configure.ac
-+++ TOPO-2.0.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ emboss_acd/Makefile.am | 2 +-
+ src/Makefile.am | 6 ++----
+ 3 files changed, 10 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8eeb8ca..4fd28ac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
@@ -34,7 +41,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -737,21 +710,6 @@
+@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +63,34 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -874,6 +832,11 @@
+@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- TOPO-2.0.650/src/Makefile.am
-+++ TOPO-2.0.650/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/emboss_acd/Makefile.am b/emboss_acd/Makefile.am
+index e1c1878..e253c95 100644
+--- a/emboss_acd/Makefile.am
++++ b/emboss_acd/Makefile.am
+@@ -1,3 +1,3 @@
+
+-pkgdata_DATA = *.acd
++pkgdata_DATA = $(srcdir)/*.acd
+ pkgdatadir=$(prefix)/share/EMBOSS/acd
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1cdb0b1..0e86a4b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,17 +101,10 @@
endif
if ISSHARED
-@@ -60,5 +58,5 @@
+@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
$(XLIB)
else
LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
+ -lajax $(NLADD) $(XLIB)
endif
---- TOPO-2.0.650/emboss_acd/Makefile.am
-+++ TOPO-2.0.650/emboss_acd/Makefile.am
-@@ -1,3 +1,3 @@
-
--pkgdata_DATA = *.acd
-+pkgdata_DATA = $(srcdir)/*.acd
- pkgdatadir=$(prefix)/share/EMBOSS/acd
diff --git a/sci-biology/embassy-vienna/ChangeLog b/sci-biology/embassy-vienna/ChangeLog
index 2133af5a45c0..ec10ac284092 100644
--- a/sci-biology/embassy-vienna/ChangeLog
+++ b/sci-biology/embassy-vienna/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/embassy-vienna
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-vienna/ChangeLog,v 1.12 2015/03/28 17:55:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-vienna/ChangeLog,v 1.13 2015/06/21 09:18:26 jlec Exp $
+
+ 21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ files/embassy-vienna-1.7.2.650_fix-build-system.patch:
+ Update buildsystem for latest plplot, bug #552492
28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-vienna-1.7.2-r1.ebuild,
embassy-vienna-1.7.2.650.ebuild:
diff --git a/sci-biology/embassy-vienna/Manifest b/sci-biology/embassy-vienna/Manifest
index 359e45c5ce2b..b7f29a635256 100644
--- a/sci-biology/embassy-vienna/Manifest
+++ b/sci-biology/embassy-vienna/Manifest
@@ -1,30 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX embassy-vienna-1.7.2.650_fix-build-system.patch 2607 SHA256 4710a3477526134952cbaac58e373537ce5bed852052ee9d67ab8dffce9c86d2 SHA512 fcd14f06b2eebed9426a0ef8e47a7cf286529d5ae12a2cc145e8d755bf132ee0d157bedff9c81373c19f637449681de8977c9dce3725611fdbc27909dd437a10 WHIRLPOOL 1a7189d68244b7f3a436be3a12ba26fe855eacd3bfa67b54733e4bc92e8cfa18fa3d66f84dfef39f02d17bcd923d42dd18120b10faa1c322a63c9eff8cb63798
+AUX embassy-vienna-1.7.2.650_fix-build-system.patch 3083 SHA256 0831ff5582301bb74750a5c4b7006b5ccfb7dfeeaa4c5772c051ed628715a390 SHA512 b09ea9adcc9da002a83e431ff4f3f48075bd885bd35b5690a21ed7d120835a5fa9eaf566fecfd916897e18d539ccc7ea1c8640759996e4979865556eaf8dccb2 WHIRLPOOL 1ca51a2336916b491eb26b846f0810d8ecd722ed9552c1faa83d360a94e8724cb50be3873788e67c05ef10368c43985fde61a61ecb765261195a4eab90289e8c
DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
DIST embassy-6.0.1-vienna-1.7.2.tar.gz 682200 SHA256 7bed50f9992aec250f974f5c5fd9a42d49c24f05e0e9fac88bb94b2d76be25db
DIST embassy-vienna-1.7.2.650.tar.gz 873165 SHA256 d3c9f64394a5c59151a345c3a2d8e2b3fcab3b59918584776316c204f0bb6c6d SHA512 1484ca419ebcb7776d8f92dd633d4fda1a752a73ccb5189b58f7417a5611e015e9b42cbb37b51f4d5c7a27df0d5cab2cdf1e95ebd70a8359ffc8fa1633d28103 WHIRLPOOL 78679a7aca7db9b67774c9a07e11ecb081b0297c3e9c23e0f98d08ee96f62bef7b861ae223f2962ff79f67b0d9582168e21d869ae0ef6c9c23beb53102a351d2
EBUILD embassy-vienna-1.7.2.650.ebuild 460 SHA256 6a1556248f2e1c91077c1c5315e76a5102f7388c1192d3f633ed9df4c9d37849 SHA512 afb7548754ee6f112835e7ec712c25e73c0dd5e86b4cff9d49618abc51be4c9b86a359c742586fa3259343eaadb0e4731d88dd6e56a6aaf7cfc982b055315edf WHIRLPOOL b8eeedc3ddb69d6f84eb3fcc9eb785dc5c8808aa36995cf3d34669f0bb73c210e69a9642e3cbdd4d8680aad80674ca442402d9096730467cd60acb43e5f3691a
EBUILD embassy-vienna-1.7.2.ebuild 514 SHA256 e09942caa6fe430a484e16e6573b627564e1b94c914ad2a86c249d8a82124e17 SHA512 38408183679edfd551ce2a3c8604138775ff1ff7dbc91d531861e807bc2863a91837640f3405a756f96f998807fb04b17b14f286405382689d7405c2753f563f WHIRLPOOL 759b9816ea2ed28a8018302ad42907c7fbe15a13abc716e97e5e86beaf8197b8efb8f74f28c071be7144eed069b63b9f3cb432cc04d657a6a0400ddbf385ad7a
-MISC ChangeLog 1977 SHA256 4078bb2fc9503252cefcc7f8d4c638970b467d6d549d3a5dae12838919d6f561 SHA512 909d71584456abb04cddf45eb08a15c3559c9c0c2c5bccbd7ed9ed7496471a4fce8aafe7f0a0d9b4b605ac011f434ded41161df680e423c15e2badb586191aa9 WHIRLPOOL 9381bbd1eb4def04b2d2638c32686e2daf3cc7addb33bf751720b41d28d666b697b4f6d5aa0ad4a96628819d6acdbf26d0a82d752ecee4dab553e08c062bb4d0
+MISC ChangeLog 2134 SHA256 4ce8df30009ff6337fa540ba1ad4ae9478c67968b46048a3dcb3ab2a1c2eb0b2 SHA512 55156fd3adf143e66a1f93578657c70ecd3e54134d238e07e094e2344b842bb8df0f5346eb8e7f92257e751f50b06e643c282551b8eed4a3eca661eb11dce810 WHIRLPOOL f24c077f90166fbec7400263a1b4016fb69576bf2c188238d4d60efdcf682a5b7da9c8237eef639ab90ec210a3f146edcc4297ab9065901c3a3646f84fdf2db1
MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVFusEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirChAP/01/NMxW7MbCZrwfU28F5KUi
-mlrApL85XNl8TInR0WS2ik/LWLl0MdLVMJo31Ay9CthNTyFiGnltdqlQr+HXI5Jo
-c489u0+oqCXnu9rxetpXnnIeRsf6IHQffFSceDSQM1cbH8dgMJ1fKrz8SYUYhkaf
-qM82UPBwv36w723nIQsF26lUsOSqKkHrLxE5zw1TTpGioAAVM/ZdY7qecLOrRV58
-vF+8XIHq8GBJIhzYyd6Y18T0Cufy1FSdFrOTDS4ncuMn3yaqArhIHdwJI1QQMhqZ
-oTrmZN/aJ/EN+iXvq7c89Ow91yui/Db7RzOpck7bT0wueQDZSq3L31v1Fqg93+Yy
-LFPSLxuyhvr9ghpLvtvd4kZLL0X8T1v/4qrUX0pYEOIgMgCsYXMaxpbepQzbI8iH
-7KLCWQoXVVKsG0Vn3as/2Qb4yjWPYfy3Ya9erl/TqGh4/Yylk/G0E1oZoLljb1dx
-qIZzqxj3NvrFzavBV2w3vIkyOlCIiWhyJCWzuUinYVgGT5KaRt17LKx3hKi9O74s
-y9WTrOfpUORnKqDvqqIqdRQdAGa9BY9CdQ8gQMLcvquljy0RDDZUI2viYHUrvIG5
-6fPDMg+atp7zsh9a08a2nuwIV5rFVW6Yfca5aXeVsEtK6afLCTTtHhvhRxIR6/R2
-qkyKMj3AXV+5SgxctCaZ
-=m+VI
+iQJ8BAEBCgBmBQJVhoFjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCjUQAJUm1pcA1upYk5HcOzGl3WfH
+/ord3zczDf1qmK8WEuU54YuxobXY60RIbXPNqj0YR4nw2H2M1u+fdgE0JIrkD0rK
+h+Up4j7IU6Erp23abO07E55DetIqf84aGfNE69xjvrwkWvnanhLeLHygd0IotgzG
+ZQC2DzHMBZU+p8JVbvHZcyQcPtXf0KoxTZIGNoVNy8+mwfBJSv1xj0LpmK+m4lKK
+6A1WvJYeYKWi4ApUTggpadW5yM3mK3247r5dP1FVyda/ipqnlHu4a9vlXWsL3FXC
+kaKz1GooPMd7WsXJLlDgmDOtmiSvPcv1EvW52l9wNbt00hcCrXWQo/VOFKCJkbcc
+VwDn1ouBdIHjyr/2Ms7dxRoHrwdfD1vR9OKd+YCQ+jIMjzGFgTtCFXCGQuRpLx0D
+/B5fGa8TF0gS2wG8XKMx3DlSzcfZZSiLnqYozP/jLZtGRrND6vIoTiTf/+R99IFE
+dvdrV5kjvhmn5CsHSqEtj7mXPa09FbSTKDqOZKz7Ui5qltI1/CvOoO5NJbB5Yclr
+s6ibchCuK+RULEam/dAluvzkmuWDkh8OHMptH0DNnXZnQqFqsCm3XbsRcbj7AWgh
+xDKPY3EV1KY2723fsir9Iawoj9NmggS55OrxrNfoXTGbE9Dm7ZJ7akw1sW8znJyq
+qjNTpWTeSsDAVxeTwZmq
+=E3tJ
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
index c9ece691229c..5ce365ed5497 100644
--- a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
+++ b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
@@ -1,6 +1,12 @@
---- VIENNA-1.7.2.650/configure.ac
-+++ VIENNA-1.7.2.650/configure.ac
-@@ -649,33 +649,6 @@
+ configure.ac | 49 +++++++------------------------------------------
+ src/Makefile.am | 7 +++----
+ 2 files changed, 10 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f5a4ecf..bbe0743 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -649,33 +649,6 @@ AS_CASE([${host_os}],
@@ -34,7 +40,7 @@
dnl FIXME: This does no longer seem required with Autoconf 2.67?
dnl Intel MacOSX 10.6 puts X11 in a non-standard place
dnl AS_IF([test "x${with_x}" != "xno"],
-@@ -751,21 +724,6 @@
+@@ -751,21 +724,6 @@ AX_LIB_POSTGRESQL
@@ -56,21 +62,25 @@
dnl Test if --enable-localforce given
locallink="no"
embprefix="/usr/local"
-@@ -888,6 +846,11 @@
+@@ -888,6 +846,13 @@ AC_ARG_ENABLE([systemlibs],
AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+AS_IF([test "x${enable_systemlibs}" = "xyes"],
+[
+dnl using system libraries
-+ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([PLPLOT], [plplotd],
++ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
++ )
+])
# Enable the purify tool: --enable-purify, sets CC and LIBTOOL
---- VIENNA-1.7.2.650/src/Makefile.am
-+++ VIENNA-1.7.2.650/src/Makefile.am
-@@ -32,9 +32,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1f5b756..e178914 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,9 +32,7 @@ AM_CPPFLAGS = -I../H -I../../../nucleus -I../../../ajax/pcre \
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
-I../../../ajax/acd -I../../../plplot
else
@@ -81,7 +91,7 @@
endif
if ISSHARED
-@@ -87,6 +85,7 @@
+@@ -87,6 +85,7 @@ LINKFLAGS = $(VERS_INF)
endif
liboviennarna_la_LDFLAGS = $(LINKFLAGS)
@@ -89,7 +99,7 @@
ovrnaalifold_SOURCES = vrnaalifold.c
ovrnaalifoldpf_SOURCES = vrnaalifoldpf.c
-@@ -119,5 +118,5 @@
+@@ -119,5 +118,5 @@ LDADD = liboviennarna.la \
$(XLIB)
else
LDADD = liboviennarna.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \