gentoo resync : 20.03.2021

3 files changed, 21 insertions, 18 deletions

diff --git a/sci-biology/embassy-domsearch/Manifest b/sci-biology/embassy-domsearch/Manifest
index b75a5a676260..a2b6ac07a746 100644
--- a/sci-biology/embassy-domsearch/Manifest
+++ b/sci-biology/embassy-domsearch/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-domsearch-0.1.650_fix-build-system.patch 2890 BLAKE2B dfc956c10857a15a99ac57ca6d4986f43bd659903b71fb6e07b3a57fc0ed82f8303f33dcdc2584f4b5756a756a71b68d65cd4b24a984af3a76ec47789a95f673 SHA512 3f012a5646751b43ec66d006df04cbe8fa880d0acd62723962dbb0e1817c5f5db2bd4879c25cf932114aa43291bc70816afef6664088532222e11135f0ab5603
+AUX embassy-domsearch-0.1.650_fix-build-system.patch 2806 BLAKE2B 44cfc67f34b7d4112cf0247231eb82db7433a1aecfffaf1723b4fcd5e186c0d7dd683db52bbc006027b305c2551b760c98116e5fab3eb874bd1a843f38ef2e71 SHA512 73bc497c5e7974d50a1ecd1ea537b923e5670ac1abafe9877b8fb98e4e94688fe7c77d233e4df45952da6f39013f0fa87d80791cdc79d3ed005e3f8070484144
 DIST embassy-domsearch-0.1.660.tar.gz 504183 BLAKE2B 598ba359558519967d0e8d895bca453aaeffef3d8a62c3d77b6b2f321118e890ec70c3baa3dd3acc03fc9a19cc380909cf3f14e5569c4ae90d3d5e88817d6e6d SHA512 a242100dc7b4b1f4a838dbf65dffb0475b6b890c7d68efae6a74beb3d4784d031f92365a50a41c0d7ea7d1b4be5e65a298626a798970c74df0d5f85427a51589
-EBUILD embassy-domsearch-0.1.660.ebuild 341 BLAKE2B ad203f06d1de9154b8c9603d1ad5e83ebc95f56c07f9a079b0edf38637b8dbae935efaef91aabdf411121cc5956f44a0027d2b8d9fc7784f3f2781bac339a88d SHA512 b7719faa5c0b7fd20379351f41930926cdea99e5c1b26e23aec3f7aceae12e1db885997782b2c4ca89e0bc5d92e17261e990d644ba04da36d9c219c0e5732afa
+EBUILD embassy-domsearch-0.1.660.ebuild 338 BLAKE2B 90d616ea192ce84a7cd8806425ecddbb8cb1c475900616c0aeb7f629ceb9294a05620a23df512a694c606af4e90f4968ddf0643a9800c13adde6556d6382a268 SHA512 64cb26ac31b6dee716132a3ec575e8c19d703e8ba023db382e1ade34ecda2227d2663fc18aa7ef5b5de9bedbb6ff103d2f6ac1a33c1c50e60e18523d54132351
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild
index a47adcfb8457..e4c37b996653 100644
--- a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild
+++ b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.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="Protein domain search add-on package"
 
diff --git a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch
index d24857c8386d..ecc702edcb66 100644
--- a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  6 ++----
- 2 files changed, 9 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f0f97fa..d419d7d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index f0f97fa..d419d7d 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 @@
  
  
  
@@ -62,7 +56,7 @@ index f0f97fa..d419d7d 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"])
  
  
@@ -76,11 +70,9 @@ index f0f97fa..d419d7d 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9829ebd..433a5c5 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
@@ -91,10 +83,21 @@ index 9829ebd..433a5c5 100644
  endif
  
  if ISSHARED
-@@ -62,5 +60,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
+@@ -61,6 +59,6 @@
+ 	../../../ajax/pcre/libepcre.la \
  	../../../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