diff options
| -rw-r--r-- | sci-biology/embassy-esim4/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch | 47 |
2 files changed, 35 insertions, 18 deletions
diff --git a/sci-biology/embassy-esim4/ChangeLog b/sci-biology/embassy-esim4/ChangeLog index bef564a95604..b3da1f887501 100644 --- a/sci-biology/embassy-esim4/ChangeLog +++ b/sci-biology/embassy-esim4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/embassy-esim4 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-esim4/ChangeLog,v 1.33 2015/03/28 18:01:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-esim4/ChangeLog,v 1.34 2015/06/21 09:01:36 jlec Exp $ + + 21 Jun 2015; Justin Lecher <jlec@gentoo.org> + files/embassy-esim4-1.0.0.650_fix-build-system.patch: + Update buildsystem for latest plplot, bug #552492 28 Mar 2015; Justin Lecher <jlec@gentoo.org> -embassy-esim4-1.0.0-r6.ebuild, embassy-esim4-1.0.0.650.ebuild: diff --git a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch index 8279071806c6..ead54c91b5f3 100644 --- a/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch +++ b/sci-biology/embassy-esim4/files/embassy-esim4-1.0.0.650_fix-build-system.patch @@ -1,6 +1,13 @@ ---- ESIM4-1.0.0.650/configure.ac -+++ ESIM4-1.0.0.650/configure.ac -@@ -635,33 +635,6 @@ + configure.ac | 49 +++++++------------------------------------------ + emboss_acd/Makefile.am | 2 +- + src/Makefile.am | 6 ++---- + 3 files changed, 10 insertions(+), 47 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 924220a..2c45f46 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,21 +63,34 @@ 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 ---- ESIM4-1.0.0.650/src/Makefile.am -+++ ESIM4-1.0.0.650/src/Makefile.am -@@ -17,9 +17,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 0620938..0304bb8 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,17 +101,10 @@ endif if ISSHARED -@@ -63,5 +61,5 @@ +@@ -63,5 +61,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ $(XLIB) else LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ - -lajax -lepcre $(NLADD) -leplplot $(XLIB) + -lajax $(NLADD) $(XLIB) endif ---- ESIM4-1.0.0.650/emboss_acd/Makefile.am -+++ ESIM4-1.0.0.650/emboss_acd/Makefile.am -@@ -1,3 +1,3 @@ - --pkgdata_DATA = *.acd -+pkgdata_DATA = $(srcdir)/*.acd - pkgdatadir=$(prefix)/share/EMBOSS/acd |