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, 40 insertions, 24 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/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