Update buildsystem for latest plplot, bug #552492

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

3 files changed, 42 insertions, 28 deletions

diff --git a/sci-biology/embassy-clustalomega/ChangeLog b/sci-biology/embassy-clustalomega/ChangeLog
index 05a053fd0998..d95b39436521 100644
--- a/sci-biology/embassy-clustalomega/ChangeLog
+++ b/sci-biology/embassy-clustalomega/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/embassy-clustalomega
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-clustalomega/ChangeLog,v 1.2 2015/03/28 17:56:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-clustalomega/ChangeLog,v 1.3 2015/06/21 08:41:14 jlec Exp $
+
+  21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  files/embassy-clustalomega-1.1.0_fix-build-system.patch:
+  Update buildsystem for latest plplot, bug #552492
 
   28 Mar 2015; Justin Lecher <jlec@gentoo.org>
   embassy-clustalomega-1.1.0.ebuild:
diff --git a/sci-biology/embassy-clustalomega/Manifest b/sci-biology/embassy-clustalomega/Manifest
index 592b49c3c9df..018894e356fe 100644
--- a/sci-biology/embassy-clustalomega/Manifest
+++ b/sci-biology/embassy-clustalomega/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX embassy-clustalomega-1.1.0_fix-build-system.patch 2383 SHA256 42b1e713f2e987226ec6a9ce4177755139e573a752d7b16ed8dddfe6732a7230 SHA512 e0b517d5e6a5969d7428b8dfb72f71e9dd871383827db36a0bc9149c3fc4aa90638e7e9b0752927b1a081eae3ac62d2d8d0feb9aaa5c5434a1d09dc42f4104ef WHIRLPOOL d62e8e6888e09fcc592a0d5fc7383a76611f6ca09113726d4e744452ffe66c5359e843a5b4009969d59cc543b9a3e9d9003f1b7a6fe8a67091570dd9c597f769
+AUX embassy-clustalomega-1.1.0_fix-build-system.patch 2860 SHA256 21b6a87a19f37745f76fe9c45837d9a5bab6420dafcb9f50aa3899b88b3cd322 SHA512 6b1c8a2915c9c48ec203bc131461b9acecc3948da79f36941e2fd97a22bf044a35ee717e0be0b13f46d8a6f81148c29faa1e048ed4066cf768dbc705141a772d WHIRLPOOL 00b3a809502d22dfe01a3f5b12db5a62914753b81aaa4d4450c9506a1afcef65c9fa58706da6ca367de077395226aeb5ecb341cc5cb448aa0373a00569c9a778
 DIST embassy-clustalomega-1.1.0.tar.gz 618177 SHA256 98bcb7e561a6f0373ddf96c5d98c0f043da1cddb75dc94a1dca439c54b5a27b5 SHA512 fc16f9505e0300ae184e292fb1d96ce6b90eaf80298f847769466a84726d10ea58e3f4c14ed21a9e2c36d7fa533c7ad248b4995bf41c8abbd0fed1faf1fd4801 WHIRLPOOL f06e66144845b85cdc253571f126bdc9074d3efaad45c92c83bfc8abfc8a0a70b75435e2917f76519a53e94f8649805e99c88137bd04e59cc5c15dc6dabc6b54
 EBUILD embassy-clustalomega-1.1.0.ebuild 518 SHA256 f8d612a5a3490915786e36804e93640fb21214f38bd5e0ce1c3def9fb7fc4f59 SHA512 484b5654baa74d2ea233ef8fd054b6fa31a03e2df16a1f05f34b07ab7509aab49b28ecbb1c7f9f4a1e2eca98be16e36c636f743c36c3d3046a14bfb318daa0a2 WHIRLPOOL 3ecd0dce41dbaa72746523d5ae2c3f59849e8edf6a696aa5d5cb2331799d54170a0ff70f6256238cf07aea5bdc9deff9465b35a5ed80c8b76b18cb04922316e8
-MISC ChangeLog 640 SHA256 e27ead252a1396ab92761f5f17e656c8dc5ba4cb6682e7955f9cd4c794091768 SHA512 f00e7b8b2da325c1518af2d5bf2de0ed99ab095d801bf4a64f9484e437850b0129ff804f9652df2d5c443bbc0cbbd79e92a6153e637e92202ca7cf3c996c3d75 WHIRLPOOL 5a9bf7bc16c8fff5eaae4e0f4f0cbd2539a2514729524c730fbb7062bfe784ca6f8344d3a65100e9748970f702b633c9db839a2d5abcb357abc9b1d489a8099b
+MISC ChangeLog 799 SHA256 b9f70f99fb963c9ccf78c43e36ac262753b16438a4b1fb7589d83c5796c010fc SHA512 2bbe112471e0e8042f170d73ac947b0d202cbbc86cefb596c97046bd1fd0319d15f24c17b99a6f69f8e1c346d44fa71ce039e0aee5e6829a8dc9b5c66e767ca4 WHIRLPOOL 99fe0031d3a5b19e5dfc757bb06764a705f063d0a71461cd735b04e95680b40ea9bc8a85f24b48fce2feb0228b96e3980a6119c3831ccf02c1f28a9942d17871
 MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVFus0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirb24P/iC4Tq7OR69IZAMtYJ5Jajze
-sQkyBe8Hfc1BMXHxaM6Dr7k2uqwllE1iYc7ywzIlOZJvHYmz5BvihBkxSciUNM4L
-MTrzDBFIksxb8KZX/hTNOddymDZtcOFYiwXeXDvHSjC4HgbNXNK5dQRMd35Yfmdg
-5w/uAhwA7EJAcnLR8bVn7wy4kxFHVC/oVYaupyBJuQs5clmCS4gNrTNyual9vEnt
-eOZt68uJ8qvumwAYBPdlrTE0+r+mCMTDXhhmRBQImhCAVI3+YFXBg5GJpgH3DCmx
-3BiV9+ckPukE/d0TrGJV8W6i16XVy1rCHmUu23+55yG3oCmduPxnNM+lfGf7tKHl
-ab3HTmJ/+7jQ7LLXIj3b2R62wS7Setq9ypc89Kxsty8zp14YQIjdw2LHJlY6cbK7
-XzPLEDkuv/ib4SVaUxJc0eNzKTjnDx9i3C7O8Dmkt/6PprgykR0KLmkbp4psHmoD
-7tTrMI3SBwiOxb6pdA4IU+i9G6Z4nDG+HLrn1MwXWV7WvEXg0JvHwhyhsrPKlEBM
-Ss2N7/9VqDorbVzE+5+tQKbAiC5zYV5K/sAaU2HmF94OfzMAzoEjH+MYpDFb/K/L
-sO71qR5mmDymOtMYKXofFnTl2iL2ytCpokHytW/edqEXT5FMgX1mOIrWM441PR1+
-sevSviD4ap/5pTSOA48O
-=xOcy
+iQJ8BAEBCgBmBQJVhnirXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyc4QAMBPQ2u/2XD9dBGCP1E/xJpl
+jDzN/wG/RohUrfQxvc+PM6lm7FiQ1wS/fYbwCcxmUtfw9t5StcfbHRS/p3UQXf4Q
+2Rb3gLxdQpUFPqc1LO4dKuLYTcVJ34cowaU5apCf0tpdZO9sCllnCTxvNLgG7eAr
+3GGqqWk2K8n6IEtN+vwzbliVB0Pl4DIWDmoMZyH6E+d2MnDRIm7rxnSrSpRHxOmU
+JcoZ0SWFmrSfj84GWnpiuqTKspgf8HMC7anJwWN2sjQ7YmeuapdpT7U2Q/9cqf0J
+B9ia/XxOg7WuNZqGTqkgjw8JnUrNd40U1MeFzYr++ps3frvVBvdPpJkf2HuIy3eV
+CqTyC2asR3biHkDhYcx9GlwWzQ1jb8hdhUd5lQz2/RPnUOPkEjqbGAAprLGsBJPI
+M9fvx271FpXB3bxM30zk0I/fbQnqooOkrwe3b2BR6Dk94jMuOZYdLllXxxpQDCbs
+gdq5iivHGb7kKxg6kUdH2G2fwj9UfGX4Qnf/pzLvotHEkhA3+4U6Q7V3AlpaNpUM
+x3vF0l0AYgQqDqYKS1Tbz+mv8juygVlH3uF04fBTMQol/P5XTIz9vPKk+qdlxGxb
+PrF/JJm17Gyj744sS+Z/1OQOKx2KWbfxhJ1UjkOyFCq6U+/xGGimIJuZB2A3262Q
+8Ky5X851k9lBoh/Lh70p
+=XUoB
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
index 7847da78ac4a..5525d79b525f 100644
--- a/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
+++ b/sci-biology/embassy-clustalomega/files/embassy-clustalomega-1.1.0_fix-build-system.patch
@@ -1,6 +1,12 @@
---- CLUSTALOMEGA-1.1.0/configure.ac
-+++ CLUSTALOMEGA-1.1.0/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 f12ed19..b143922 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
---- CLUSTALOMEGA-1.1.0/src/Makefile.am
-+++ CLUSTALOMEGA-1.1.0/src/Makefile.am
-@@ -17,9 +17,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9135679..c201149 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
-@@ -62,5 +60,5 @@
+@@ -62,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
  	$(XLIB)
  else
  LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \