Update buildsystem for latest plplot, bug #552492

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

3 files changed, 57 insertions, 41 deletions

diff --git a/sci-biology/embassy-emnu/ChangeLog b/sci-biology/embassy-emnu/ChangeLog
index b53b1c3f5986..e90ae7691fce 100644
--- a/sci-biology/embassy-emnu/ChangeLog
+++ b/sci-biology/embassy-emnu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/embassy-emnu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-emnu/ChangeLog,v 1.34 2015/03/28 18:00:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-emnu/ChangeLog,v 1.35 2015/06/21 08:56:06 jlec Exp $
+
+  21 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  files/embassy-emnu-1.05.650_fix-build-system.patch:
+  Update buildsystem for latest plplot, bug #552492
 
   28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-emnu-1.05-r6.ebuild,
   embassy-emnu-1.05.650.ebuild:
diff --git a/sci-biology/embassy-emnu/Manifest b/sci-biology/embassy-emnu/Manifest
index 5d8bf73faf7d..f49aaf3330d5 100644
--- a/sci-biology/embassy-emnu/Manifest
+++ b/sci-biology/embassy-emnu/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX embassy-emnu-1.05.650_fix-build-system.patch 3455 SHA256 6f165662eb1e8d57eed8f51fa6c836b949f6be83327732bb7a7fa1b93373c763 SHA512 fd0a51d12009d3ccd25a0a60b0fd2133b22988594667b2c68498c987b9a41ac0ac75421996940d7480864912a2316f0d7a0ca4bd2bb777f16706d0a4907d6896 WHIRLPOOL ef04417248b83999c8c83769c7576acb4da71387904a83d7876d0a2a8be59032140aaf624b22b1c8c85ffb4e2ec63eb2d9ea6bca079a541f330a8f37842f9e15
+AUX embassy-emnu-1.05.650_fix-build-system.patch 4072 SHA256 fe36162b0925c6b2746d6663c91853cbdf964c42ab950fb5613506518d1cac15 SHA512 644c4f0930a157ae9121354b49ddeb756b25d823d25733405fcc500d2080067f013443ba43a1512c6940fc4fd19cfe38c336dd0c58237354bad580cf9ba68b2e WHIRLPOOL 36dd5eab9ad368e471fbf799443a4a0d8132b89e31f670b030735f768684d4afe21577962c3ae0476f949c116a514425a16345edfb8172548df156b61b0cd1ff
 DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
 DIST embassy-6.0.1-emnu-1.05.tar.gz 390229 SHA256 2f58621cc7151f813ce608dcd5b3505fc84af882c778fe28167508d6851dc333
 DIST embassy-emnu-1.05.650.tar.gz 425595 SHA256 0a5ae3a1fbaf7952ba5e28cf89bf9cbf521cea9fe4703170b532c50542c8ea0e SHA512 0cb0dafd53c4fd410409430dc12353989d2c226191acace26e81b457602b6b6c60f8eb1d0d9b36ea90b2420010c1a3e887a2458e8487008a36775961e378d0dd WHIRLPOOL ab62608ab9a1f433a0781c672c80daf6447f81e98159adc506e4a6fd22c7c6376fd6b5ae14f91aba5bdad76f66c3e0a9a89638cf2288f90aa70c36402c41cc6a
 EBUILD embassy-emnu-1.05-r5.ebuild 585 SHA256 107017fa4db5806261142fca90ab67f8b37ad27d844676ebc868f5ab648d0c2d SHA512 5007d4bb4f96210d0602ff489533d8a5deee8c6eed55fa6c745d85a9304a9b6f8dea18f4ba22519ab0f39c9d6c2d44c2bc30d30fa900255abe3ca36066c99153 WHIRLPOOL 4ff71bd1ba6025f335a4d1970ca0d5acfd0d2c545def98f8becc971deddb67e880ed379d3c6ec2a9250ccd3aa6b0e4ab3fcbff7ada7fd7bf890e51be0c04b4ed
 EBUILD embassy-emnu-1.05.650.ebuild 551 SHA256 85dc84cde0522dc33bacc08032bfe813327c3d9ff8029617bcdb3032b7a60042 SHA512 2f17de2daf7e7283974169e1c002442127f88536792fe5c5126f9275f739e3eac6a536ba6215da2a083e0892346c3bd637fcc8335a38f9d1218775ce38493064 WHIRLPOOL 773ae5a387783ccb0e720867bd1c9bb5db37869282ac8c2c467aa88e7e1bd2162c102c4764b7460d19add844149b087c6f7051613f4afdd60149f6a266d2a534
-MISC ChangeLog 5067 SHA256 6fcc96a86896d3b6a66e3e903911febac57e4a63e014ccfbf2c1a5fd559404bc SHA512 61662b2295315f90812d2e5c58b3b8a1f4f15790ea3dbbdb23142692e2058c3bb7369a4b6f93f63ee824bbb12ea53f925471741f81cb04038fe8271da0ea3df5 WHIRLPOOL ce02f542fb58c7fa876a3e4723171e8e0eeec0ffffe82735c09604b3942db6a19c23391093dae3dd690f1287d8cc08869174c49ab73035a0a6dfd53e8f9ab145
+MISC ChangeLog 5221 SHA256 c23b8feae038f5de8eb63d9f0f6c569b0acc03e25cebd2c9b5bfd4c7e45d0967 SHA512 34da4783348408202dbc240d9fdcbc370ac0385c1b41be4a73e9c565e25f84633b808525980edbdd47ec1a2f0f31cc03369d9208d340e4653de86cc8a90ab4c3 WHIRLPOOL 0047620191be27d41e3f7ed9d86b1e733b136379b8e263701b5fcc03f35fdd47bc511d26ca60b7e8b7b73aacd9b2bd0242875202cbc712a049189a87a9f8e8fb
 MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVFuw3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtOkP/2MGKODcUw13t+0K5Kg551F4
-DeZvAlMM/Dm6InNDbd+FuahU7V8wxcWnoCdKRymcaLR/Z649uY5jqeY/s8CEjMHb
-3LOkWXr0n/5DDaNHBuvjsRRD+JTMVrOlmQhqqOGeZ3WfDhb4YCOC4F/yjCA80fOS
-bLLIKF25lR1b4LKBlrCVGguHZgMvSaVHjCtLCGsqv/bO3PIBbFnbt7+m63OMayEg
-XnGMI6aiDPUczJPwoq0Xf6L+VsGVipeFYReHTxDVYmXuWzKxiJ/uRkJK3YILuuiL
-BFZ2cxdUGhWQDMvq2XnxSciLa8v/CePwuEthNyJ9PuWbujVUPlljOLsmRaWBxvut
-WEb/JxxBa2X8W27xOiNZhAPV5wkjASDE15pw6+bMUhdCrmyBxjHXk24rLq9Xgrdb
-bvdKWB8BH/mlHWwOMcWtX5En1rvqGvCFTLzR6oRsRM2adEAvylJS/xpZLq6oDxND
-dD199R5RW5fUMYOEIxXX+3FlcHHQJBBw754S0QBKA7rVNKRPDc39IMbwhbTR4uqA
-wlZa4UvBRG82Yct5eLYjJdeJbC9ICNNnKQGio3ZcLvUjEJGKPr+aQBhhe6rIB7up
-axF4G1ELsP/m+WSO4KMyTHyqthEXi2sRH7KnfbQOZft4JrRBKghCVeVGTFGh8+sk
-xycmcLCsJzxrOcK6X6wM
-=ol3B
+iQJ8BAEBCgBmBQJVhnwnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7X0P/0EQR2G7PwNhhpPE2zP1b2c6
+FuYi5k0/Ew5pnHDOyrkIi/QsZrjkMbNDoyky0fcF+kliQlnFEN3H+B/4dEpjTtS/
+JOy3xi5vb2Zw+LXdf1AcAXCcr6jh8rSnriCOCqRCEkLrU3vCNjOoVm5x7tbdSkUB
+jCvKZctDc0n4ICvV8ipkdaqNOJseMGG6Cc1WMidK3cf1lgXBmdmYVN3/61TwtMbA
+F2wWH43xE/25wiP4zKT2NOEoc6+BpZCKqhXeWk6LONOyvJfC4HJ/JV81HjgIYbYK
+lZuzigZ26FK/jy0zPUxyq/ZzzHZqmrMul7JSSQHIb9um+GYv02Ob0cS7AZ2T206+
+6nQXB2b9+Fp/zodotlpr9CcAsQMGztu8qgMfuR1AhAtWR2iWu5EYpVku/Bz9U4os
+UmRwDNgHs47XpYgPMPrc1YHpLJCIjag1Ns0gwMQhbBfFNehKzIWMVxyiR5bg66Cv
+tBdVsN8s/QwTRw87gWKcIQ0of7bwNmTSsUF/Aol4EaHQn7VkZTydAVh+tBnseaKf
+ZAgucAZuhKxe71F7uPTNl14Vv/gqny+3KjdgVzCFbdOt6ctyXh5uMKBMmU93IYe/
+Mql+DsMuci3KX1mCraD7sfHwZdsrLhsOco9ly+MKU1txsELqC66+yOPPtB1Rttgo
+jwsP80DpYhp4JVekVxdJ
+=BllD
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch b/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch
index e73eb7b170ce..4e14bac1704a 100644
--- a/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch
+++ b/sci-biology/embassy-emnu/files/embassy-emnu-1.05.650_fix-build-system.patch
@@ -1,6 +1,13 @@
---- EMNU-1.05.650/configure.ac
-+++ EMNU-1.05.650/configure.ac
-@@ -635,33 +635,6 @@
+ configure.ac           | 67 +++++++++++---------------------------------------
+ emboss_acd/Makefile.am |  2 +-
+ src/Makefile.am        |  7 +++---
+ 3 files changed, 18 insertions(+), 58 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7482ade..b815bdb 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,36 +63,37 @@
  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
-@@ -899,20 +862,16 @@
+@@ -899,20 +864,16 @@ dnl fi
  
  
  dnl emnu and mse only: uses curses
 -dnl Test if --with-curses is given
 -AC_ARG_WITH([curses],
 -[AS_HELP_STRING([--with-curses], [curses (or ncurses)])])
--
++dnl Test if --enable-curses is given
++AC_ARG_ENABLE([curses],
++[AS_HELP_STRING([--enable-curses], [curses])])
+ 
 -AC_MSG_CHECKING([for curses])
 -
 -AS_IF([test "${with_curses}"],
 -[
 -  CPPFLAGS="$CPPFLAGS -I${with_curses}/include -I${with_curses}/include/ncurses"
 -  LDFLAGS="$LDFLAGS -L${with_curses}/lib"
-+dnl Test if --enable-curses is given
-+AC_ARG_ENABLE([curses],
-+[AS_HELP_STRING([--enable-curses], [curses])])
-+
 +AS_IF([test "x$enable_curses" = "xyes"], [
 +  PKG_CHECK_MODULES([NCURSES], [ncurses])
 +  PKG_CHECK_MODULES([FORM], [form])
@@ -97,9 +105,20 @@
  
  
  
---- EMNU-1.05.650/src/Makefile.am
-+++ EMNU-1.05.650/src/Makefile.am
-@@ -17,9 +17,8 @@
+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 b295079..330c76f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,8 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -111,17 +130,10 @@
  endif
  
  if ISSHARED
-@@ -57,5 +56,5 @@
+@@ -57,5 +56,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
  	../../../plplot/libeplplot.la -lmenu -lform $(XLIB)
  else
  LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
 -        -lajax -lepcre $(NLADD) -leplplot -lmenu -lform $(XLIB)
 +        -lajax $(NLADD) $(NCURSES_LIBS) $(FORM_LIBS) $(MENU_LIBS) $(XLIB)
  endif
---- EMNU-1.05.650/emboss_acd/Makefile.am
-+++ EMNU-1.05.650/emboss_acd/Makefile.am
-@@ -1,3 +1,3 @@
- 
--pkgdata_DATA = *.acd
-+pkgdata_DATA = $(srcdir)/*.acd
- pkgdatadir=$(prefix)/share/EMBOSS/acd