diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /sci-biology/embassy-cbstools | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'sci-biology/embassy-cbstools')
3 files changed, 21 insertions, 21 deletions
diff --git a/sci-biology/embassy-cbstools/Manifest b/sci-biology/embassy-cbstools/Manifest index 667d2a881591..a15852d6da70 100644 --- a/sci-biology/embassy-cbstools/Manifest +++ b/sci-biology/embassy-cbstools/Manifest @@ -1,4 +1,4 @@ -AUX embassy-cbstools-1.0.0.650_fix-build-system.patch 3167 BLAKE2B f34ccb14802128cf315cb767d519a8440b9fc9bb8fe3bbcb02a310f25304cdf5109dc4625ad62aed2323c1b3d438a99549e625b8440b42bce0477689d6d3fc24 SHA512 0ec7317d719da5466f02813105184d44c18f5ec668e0cdc1e120324216070009da4e38ce34dffb320b438665926f4506437e60757c3103fb03a526c46ca042d8 +AUX embassy-cbstools-1.0.0.650_fix-build-system.patch 2944 BLAKE2B f33ea2bc9579a7a233064e562ae76ede11fa81d9c6c972338e944028192390e797deb13514b1d02a32b1b6b55925a8eeef15f8ed11598ab487e9deb3e7a6a14d SHA512 913542383cf0dcacdf7c18ee258b6bf37fcde77b41a548089e239c9e20e2087cbec0e5244eb946b511bb76ec5930a6a44142ea172d894061bfca5e1228e29047 DIST embassy-cbstools-1.0.0.660.tar.gz 452594 BLAKE2B 68d13e14b4805af7ba1742537e6ebd621553ba6c895cd4bb13a5c1e93e72e03916ba62833f31ec35e69fa9a4ab15d9348dbfe19eb55a82f3ecd86141726e6c01 SHA512 8f16f726220a36f998d8a0f1d8aec9ec6b2db8160b15bed7bafc5a65d57a937bd91ee831ecabe2e9aaa8cecaa18d050f16439a276a882730fde3fa4937bec384 -EBUILD embassy-cbstools-1.0.0.660.ebuild 352 BLAKE2B e384b07b74042cefb1d5e2e3c646a4006850b6846997daa136a652b569efa8db98092cbf8a2b965a1add167306fcf4b10fe50b1772b75d50d893a95ba900056e SHA512 f85c1ecdd7c16e13c8e1a08441b73a76f66ff770a3ca75eeb745f31b46aa5e2b74172f20de4b520e64e0ed167cf50b55d01ab78b760c9fbfde8ecee689f2703a +EBUILD embassy-cbstools-1.0.0.660.ebuild 349 BLAKE2B 3930b547938c8e72d8e058684c8808385c7dff42b3d6796e854da4f2401be95d652eba027c7c17e715e3a670eb4d8b31837a65d0d0dd285374ef169a8b87852f SHA512 c3354cf9907079e2870e1acf7c8ccfed1225da5c1eff6f97f144373b80ebdfdbb6d4b0fd95632e341e51edd42b15bce88bf7a10ed78a328a4907f86ba24a843d MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e diff --git a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild index 6104a470f3f7..873b9cb64520 100644 --- a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild +++ b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 EBO_DESCRIPTION="Applications from the CBS group" diff --git a/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch b/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch index d29310efcb47..bdaaaf98f23c 100644 --- a/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch +++ b/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch @@ -1,13 +1,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 a70d4d2..b8f5e79 100644 --- a/configure.ac +++ b/configure.ac -@@ -635,33 +635,6 @@ AS_CASE([${host_os}], +@@ -635,33 +635,6 @@ @@ -41,7 +34,7 @@ index a70d4d2..b8f5e79 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 a70d4d2..b8f5e79 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,8 +70,6 @@ index a70d4d2..b8f5e79 100644 # Enable the purify tool: --enable-purify, sets CC and LIBTOOL -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 @@ @@ -86,11 +77,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 824a03c..9db171d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -19,9 +19,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \ +@@ -19,9 +19,7 @@ -I../../../ajax/ensembl -I../../../ajax/ajaxdb \ -I../../../ajax/acd -I../../../plplot else @@ -101,10 +90,21 @@ index 824a03c..9db171d 100644 endif if ISSHARED -@@ -65,5 +63,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ +@@ -36,7 +34,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 +@@ -64,6 +62,6 @@ + ../../../plplot/libeplplot.la \ $(XLIB) else - LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ +-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ - -lajax -lepcre $(NLADD) -leplplot $(XLIB) ++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ + -lajax $(NLADD) $(XLIB) endif |