gentoo resync : 20.03.2021

3 files changed, 21 insertions, 21 deletions

diff --git a/sci-biology/embassy-topo/Manifest b/sci-biology/embassy-topo/Manifest
index 97983069ff2e..e1c6e4c988fd 100644
--- a/sci-biology/embassy-topo/Manifest
+++ b/sci-biology/embassy-topo/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-topo-2.0.650_fix-build-system.patch 3167 BLAKE2B 84dc4a55e13387263400d03904c14069baf93746ce32878349cbaab3c1d39aad30c448b8bf01fb2cec0a057403a8c8d7befd3869c5c28299e6001f25738a16c6 SHA512 bacff621e9d80d39a4e415736e1524cf69dd86b0253f65fb52ad2dda200cafe8e14af296897c3f695bbe360f2a56862a40dec6b8b0d0e597310f065e191ae770
+AUX embassy-topo-2.0.650_fix-build-system.patch 2944 BLAKE2B c9535f630899346a43a993c3563e202792610c751940a2aed3d41fc633fcffb53c372c702c19104fd709dda6b6093c4897d19336028312757135ccacec3cd8af SHA512 981326c4b27a0db091494da5a2d6215dbdac31544b33601765329c7b4e817ccdcc39e795cdc14719211a8726cb7761d070e83e234e878ac7f82bd226851ad1be
 DIST embassy-topo-2.0.660.tar.gz 443510 BLAKE2B ba49debdfb9f13051bd32d0d14de3b446a8fde83923e6927df52fd989460c60b5d3023aeaa84d3ab920533c40607f7ba274f64827cefa611a1513f203e08316c SHA512 8ef157a61ac47680734bed3d07cfe2bcd86730998453daa704b74aad667944ad6b0cc6f7fce36be4566cb19a626f1648d5f6793ce227cf57939fcfd0d10690a8
-EBUILD embassy-topo-2.0.660.ebuild 342 BLAKE2B 268ee1b91524560d28c58cfacfae4f249fdb9efc3b34aae381e6779005fc7a7022b56c74f61e8cd541dbb9bd112cbb7a9c0a569272e0962252104eba435615be SHA512 c2a0822f7d20ae5c2bb78aa2f3705517fa7371b154a16395d7b13b5835980a11dce9364cb6d0a90f47a39cc729692b4567ceb5085022b3c0ed41535a3a8ab067
+EBUILD embassy-topo-2.0.660.ebuild 339 BLAKE2B 97a0643d61e7dd61025ee0ea1b2b0429bc843737dbed7e53ac955c60c2540a0372b1ad15f8a00d884943e7b791c4e98eb5c04a4fcb1992f031c9a40d1011860c SHA512 50f5b9a761e053206a6a3d1021e5cdbf9f1d557c300185e3d42353f593c2e653263f4a640c536fee938c74ac4924ef54eae9a9df233b32900f544f3512ce46e5
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild b/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild
index 009adfe73914..3c16f7bf4fa4 100644
--- a/sci-biology/embassy-topo/embassy-topo-2.0.660.ebuild
+++ b/sci-biology/embassy-topo/embassy-topo-2.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="Transmembrane protein display"
 
diff --git a/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch b/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
index 3c37879de8c8..600e38928aff 100644
--- a/sci-biology/embassy-topo/files/embassy-topo-2.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-topo/files/embassy-topo-2.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 8eeb8ca..4fd28ac 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -41,7 +34,7 @@ index 8eeb8ca..4fd28ac 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 8eeb8ca..4fd28ac 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 8eeb8ca..4fd28ac 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 1cdb0b1..0e86a4b 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,9 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -101,10 +90,21 @@ index 1cdb0b1..0e86a4b 100644
  endif
  
  if ISSHARED
-@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -34,7 +32,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
+@@ -59,6 +57,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