Update buildsystem for latest plplot, bug #552492

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

3 files changed, 52 insertions, 35 deletions

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