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-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