gentoo resync : 20.03.2021

3 files changed, 21 insertions, 18 deletions

diff --git a/sci-biology/embassy-domalign/Manifest b/sci-biology/embassy-domalign/Manifest
index 5afe28fedab4..deb0216a9f19 100644
--- a/sci-biology/embassy-domalign/Manifest
+++ b/sci-biology/embassy-domalign/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-domalign-0.1.650_fix-build-system.patch 2908 BLAKE2B eb0b7288b25a96d6b60ee75e8d022efbd5a3a72ac69c93e32a823316799215d8ea2db923620a0e32924e6961df20cfc939e4fa332d255208175d70977cdc0d14 SHA512 5cd02b39812adc44d9b877cca8902b6a66e79c90975b50233a4f8f84392026ffad25d57665e68e5db533f28935f444b4dc75b7120bafd910e415b75737686ad2
+AUX embassy-domalign-0.1.650_fix-build-system.patch 2809 BLAKE2B 01ae7488b764f3d3853d8f6e4fc2f2115d381decbac3d20922d26c079d0242622f553359dab2401481be3cdf28f25495c567682c1b9d2140f3686f312cbc20f5 SHA512 09444e7ee2b263b56177275c4fe9452344720e641acb721e1630696941a3f077c9790357f9d8b775bff4f5df595973f59d1e9f4c3f66b54fa31f53db4e32ce58
 DIST embassy-domalign-0.1.660.tar.gz 498669 BLAKE2B d21352b28ca046c1bfe8600a7eba641d670e232571f95f9c75b47486a63f2a2b02516191706c0688e81bc33cda90ebf88a9ce800535dce9a955ccc15e25dd20a SHA512 14e86664e9038acc60fbec92fa218e218921fb1e51cc2e482fb1760ccd9ea16041dc8a2a9f5f320fca3340b7efdc48ea9d753b048a43966fc3431acdaddc7846
-EBUILD embassy-domalign-0.1.660.ebuild 343 BLAKE2B eb2e7187c98b12fc74b1efdaf70d14d64c867db49aba11f4f07617bc727dd5223b011ef7b78981b638010e541f8c534d8886b7d7c4fcb9e40ba3b148a0e17441 SHA512 bdc0f0bf6a006d2091f98c3a3258e402b522a743866db74324333c5ec9d14df181561b0beb75baa6aaec130636e1e866184e5c4ed414ceb4e8365e13801df84c
+EBUILD embassy-domalign-0.1.660.ebuild 340 BLAKE2B 8e42cd3a864fe7b85628901b37eba3e72b2d7efcf48ac3b7b48c65735b0983a68d47dd525ed7972e2be9c9b15723c6409de10017718e5945cd7c231153be022a SHA512 236b004af2c4a2e84eebc72f8363af05c757e0251417c8f2971ec4902a067669754980cc65f358a3295a05ea0e3c4a43a9e2b2a7e9e6010632c73ac06c281ed6
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild b/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild
index a897dba4b060..331bd7e05a71 100644
--- a/sci-biology/embassy-domalign/embassy-domalign-0.1.660.ebuild
+++ b/sci-biology/embassy-domalign/embassy-domalign-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 alignment add-on package"
 
diff --git a/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch b/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
index 033ddf7b6535..079850c2bcc3 100644
--- a/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
+++ b/sci-biology/embassy-domalign/files/embassy-domalign-0.1.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  7 ++-----
- 2 files changed, 9 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 693eb4d..dc0fda9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -40,7 +34,7 @@ index 693eb4d..dc0fda9 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 693eb4d..dc0fda9 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 693eb4d..dc0fda9 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8785446..fe85f11 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -17,10 +17,7 @@ AM_CPPFLAGS = -I../include -I../../../nucleus -I../../../ajax/pcre \
+@@ -17,10 +17,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -92,10 +84,21 @@ index 8785446..fe85f11 100644
  endif
  
  if ISSHARED
-@@ -63,5 +60,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+@@ -35,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
+@@ -62,6 +59,6 @@
+ 	../../../ajax/zlib/libezlib.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