Update buildsystem for latest plplot, bug #552492

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

2 files changed, 35 insertions, 18 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/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