gentoo resync : 20.03.2021

3 files changed, 31 insertions, 19 deletions

diff --git a/sci-biology/embassy-vienna/Manifest b/sci-biology/embassy-vienna/Manifest
index 6218b012ba4a..dcf9c44204c2 100644
--- a/sci-biology/embassy-vienna/Manifest
+++ b/sci-biology/embassy-vienna/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-vienna-1.7.2.650_fix-build-system.patch 3083 BLAKE2B 294e9896615c7d01a804097249673f86d8bf6bf6757763bdbd2cecf9e328a2b324b6918818f8e33917c2000d5a2dad5a66aa6c0e764619d35048d3c5ca032351 SHA512 b09ea9adcc9da002a83e431ff4f3f48075bd885bd35b5690a21ed7d120835a5fa9eaf566fecfd916897e18d539ccc7ea1c8640759996e4979865556eaf8dccb2
+AUX embassy-vienna-1.7.2.650_fix-build-system.patch 3349 BLAKE2B c6d12bee84b5bc5bb987929a1d606c28cab1d5bb318fdf294f01569d90ae4736c818ddf3d5d2fd506fe3d012c35d320c74c0b3185540e19a03b0e7dbcac9e0d6 SHA512 4da6e09711974bf10259558f78208d207f3e07b0156488acfce788d83f05a6872246d6acf3c318195285e1d84b3788aec65d82f989c682b56129c4dfb6df8eae
 DIST embassy-vienna-1.7.2.660.tar.gz 873165 BLAKE2B 46e976e52ad65490237563af09e483c212a6170c8c79fac8a2f2609040ee6a4cf60c04b00159c4c33d8c2a10f6e457e412287409fc0ea5724c5687dbd65ff06c SHA512 1484ca419ebcb7776d8f92dd633d4fda1a752a73ccb5189b58f7417a5611e015e9b42cbb37b51f4d5c7a27df0d5cab2cdf1e95ebd70a8359ffc8fa1633d28103
-EBUILD embassy-vienna-1.7.2.660.ebuild 436 BLAKE2B e61cd8a676a547d75b80035ffaf6e54d8d02e9ae81713f0baf010394231c2e963b2d61926923f7873d7edb726343088b288b9562df4d8957cf18257f20281ae0 SHA512 009ad16069bd0a8134a705a82a2d1ee5a3b5de28d434870e9b7298e64885a8c76f1c604432b2d0808d6f4653906e211b6c848496bbefd0c4324d698fb8285ec3
+EBUILD embassy-vienna-1.7.2.660.ebuild 433 BLAKE2B 2feaec37d75ccd9bb4798f56ed58a06944e06488d4ce8bb2ba924dda2cbce5abf54e6ef1e15cca61620db06b51132143cc001e0ef84f5eeeb4f3e7b95bc23bfc SHA512 0481fac0f109b153119e6e12907cea9083a52b3a85e1c26985b14e45cf9a68e36b188bc16c10f528eb19df73fad511afc13742eaa8cd653e5fdd6559497c7184
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild
index d82532a4f623..6d63add1eea0 100644
--- a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660.ebuild
+++ b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.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="Vienna RNA package - RNA folding"
 
diff --git a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
index 5ce365ed5497..8bd816b0e672 100644
--- a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
+++ b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650_fix-build-system.patch
@@ -1,12 +1,6 @@
- configure.ac    | 49 +++++++------------------------------------------
- src/Makefile.am |  7 +++----
- 2 files changed, 10 insertions(+), 46 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f5a4ecf..bbe0743 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -649,33 +649,6 @@ AS_CASE([${host_os}],
+@@ -649,33 +649,6 @@
  
  
  
@@ -40,7 +34,7 @@ index f5a4ecf..bbe0743 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"],
-@@ -751,21 +724,6 @@ AX_LIB_POSTGRESQL
+@@ -751,21 +724,6 @@
  
  
  
@@ -62,7 +56,7 @@ index f5a4ecf..bbe0743 100644
  dnl Test if --enable-localforce given
  locallink="no"
  embprefix="/usr/local"
-@@ -888,6 +846,13 @@ AC_ARG_ENABLE([systemlibs],
+@@ -888,6 +846,13 @@
  AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
  
  
@@ -76,11 +70,18 @@ index f5a4ecf..bbe0743 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1f5b756..e178914 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -32,9 +32,7 @@ AM_CPPFLAGS = -I../H -I../../../nucleus -I../../../ajax/pcre \
+@@ -10,7 +10,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -leplplot -leexpat \
+ -lezlib -lepcre
+ else
+-CYGWIN_LDVIENNA = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl \
++CYGWIN_LDVIENNA = -lnucleus -lacd -lajaxdb -lensembl \
+                 -lajaxg -lajax -leplplot -leexpat -lezlib -lepcre
+ endif
+ endif
+@@ -32,9 +32,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -91,7 +92,16 @@ index 1f5b756..e178914 100644
  endif
  
  if ISSHARED
-@@ -87,6 +85,7 @@ LINKFLAGS = $(VERS_INF)
+@@ -49,7 +47,7 @@
+ -lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -leexpat -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 -leexpat -lepcre $(NLAIXLIBS) -leplplot
+ endif
+ endif
+@@ -87,6 +85,7 @@
  endif
  
  liboviennarna_la_LDFLAGS = $(LINKFLAGS)
@@ -99,10 +109,12 @@ index 1f5b756..e178914 100644
  
  ovrnaalifold_SOURCES = vrnaalifold.c
  ovrnaalifoldpf_SOURCES = vrnaalifoldpf.c
-@@ -119,5 +118,5 @@ LDADD = liboviennarna.la \
+@@ -118,6 +117,6 @@
+ 	../../../plplot/libeplplot.la \
  	$(XLIB)
  else
- LDADD = liboviennarna.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
+-LDADD = liboviennarna.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
 -	-lensembl -lajaxg -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = liboviennarna.la -lnucleus -lacd -lajaxdb \
 +	-lensembl -lajaxg -lajax $(NLADD) $(XLIB)
  endif