From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- sci-biology/embassy-emnu/Manifest | 2 +- .../embassy-emnu-1.05.650_fix-build-system.patch | 45 +++++++++++----------- 2 files changed, 24 insertions(+), 23 deletions(-) (limited to 'sci-biology/embassy-emnu') diff --git a/sci-biology/embassy-emnu/Manifest b/sci-biology/embassy-emnu/Manifest index fd37224607b6..abf651b02922 100644 --- a/sci-biology/embassy-emnu/Manifest +++ b/sci-biology/embassy-emnu/Manifest @@ -1,4 +1,4 @@ -AUX embassy-emnu-1.05.650_fix-build-system.patch 4072 BLAKE2B d256a82e214b8900eaab252e6695c4120eabb8379a59cfffe6a8b70e5decaf681af42ed9de3f9f74215a1a7f21e11367763aa705d7495eca41ab3fea1483e056 SHA512 644c4f0930a157ae9121354b49ddeb756b25d823d25733405fcc500d2080067f013443ba43a1512c6940fc4fd19cfe38c336dd0c58237354bad580cf9ba68b2e +AUX embassy-emnu-1.05.650_fix-build-system.patch 3844 BLAKE2B b77be3d3917db4cdfcfce201089595a80b970575f77dffbc366c77ae27010b9a78582b035728008b20ae11b0c7c18b7b20a5fdfcd59b840f85f54a1db2fc5496 SHA512 1836ba79762f62f9e27a770a35b89ae5f2821c4d23dc93b1ab3505404105280256f1c43287471385a5be71659fbe614f5f7f97d78a4743b3b1b90b303a25f674 DIST embassy-emnu-1.05.660.tar.gz 425595 BLAKE2B ed6ab4a0572ac4b57cf0f0b75a3894b1f950f7f373a7c6797ea0c34ba1b0d0e044f2c6951aec7c084340c6b207aa4c8b386055e92ceb9fc83c920fc70e83e665 SHA512 0cb0dafd53c4fd410409430dc12353989d2c226191acace26e81b457602b6b6c60f8eb1d0d9b36ea90b2420010c1a3e887a2458e8487008a36775961e378d0dd EBUILD embassy-emnu-1.05.660.ebuild 470 BLAKE2B 4a5fb352f30c729ded48ba438d978ff7ba85ee419eb1dbe94df07f34dd2b6fa50527615678c166cd627090bb2b15bd88d6d8ffd3d66e16006714d9a175444dec SHA512 ec9df242ed5a421fdbc45b59c1a9a9a3cfe540bde2ea010a29ac56e758d26fa0f1a1c850de644e82486a574850b0702d7d87adebfd851cd40076e17596c88f05 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e 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 4e14bac1704a..ecd7f928da3a 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,13 +1,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}], +@@ -635,33 +635,6 @@ @@ -41,7 +34,7 @@ index 7482ade..b815bdb 100644 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 @@ AX_LIB_POSTGRESQL +@@ -737,21 +710,6 @@ @@ -63,7 +56,7 @@ index 7482ade..b815bdb 100644 dnl Test if --enable-localforce given locallink="no" embprefix="/usr/local" -@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs], +@@ -874,6 +832,13 @@ AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"]) @@ -77,23 +70,24 @@ index 7482ade..b815bdb 100644 # Enable the purify tool: --enable-purify, sets CC and LIBTOOL -@@ -899,20 +864,16 @@ dnl fi +@@ -899,20 +864,16 @@ 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]) @@ -105,8 +99,6 @@ index 7482ade..b815bdb 100644 -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 @@ @@ -114,11 +106,9 @@ index e1c1878..e253c95 100644 -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 \ +@@ -17,9 +17,8 @@ -I../../../ajax/ensembl -I../../../ajax/ajaxdb \ -I../../../ajax/acd -I../../../plplot else @@ -130,10 +120,21 @@ index b295079..330c76f 100644 endif if ISSHARED -@@ -57,5 +56,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ +@@ -34,7 +33,7 @@ + -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \ + $(NLAIXLIBS) -leplplot + else +-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \ ++AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \ + -lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot + endif + endif +@@ -56,6 +55,6 @@ + ../../../ajax/pcre/libepcre.la \ ../../../plplot/libeplplot.la -lmenu -lform $(XLIB) else - LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ +-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ - -lajax -lepcre $(NLADD) -leplplot -lmenu -lform $(XLIB) ++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ + -lajax $(NLADD) $(NCURSES_LIBS) $(FORM_LIBS) $(MENU_LIBS) $(XLIB) endif -- cgit v1.2.3