gentoo resync : 20.03.2021

2 files changed, 19 insertions, 22 deletions

diff --git a/sci-biology/embassy-mse/Manifest b/sci-biology/embassy-mse/Manifest
index 2ed7653d9601..b41ff2714e8c 100644
--- a/sci-biology/embassy-mse/Manifest
+++ b/sci-biology/embassy-mse/Manifest
@@ -1,4 +1,4 @@
-AUX embassy-mse-3.0.0.650_fix-build-system.patch 4274 BLAKE2B 20674fb79ff55fe7e73f0dc5c62bbe6acec81cb314260a6b879b0881b9f0848204d82301675c5829ef236050af3e4f5d2c31e6cd3a0c2f9554da1408951deb4c SHA512 bfb4663a4b38928f765813cc9b5e773ca712c2333c1650d9c78f457307aa450684f77a20c0a087d3795d5b51f059c6f8113e74da35aa78753c1cc666ba583f4b
+AUX embassy-mse-3.0.0.650_fix-build-system.patch 3968 BLAKE2B 97999702bc800bb02c0c77969e17f4ab36e6491d494ff09c3fbb20624f75db7392a5c1dbe91d977e3596855a89ccb70525c01cf7952364fb4bac4a8f403ea5d0 SHA512 8abaabce2566d42209e6863c30c6cbb392afc900d52f819e975662699651b7114257a372a50657419355d0af69f1dea80501fe2b3cf57ce1c8ca731d1b7557e4
 DIST embassy-mse-3.0.0.660.tar.gz 491747 BLAKE2B 7d072458577a90fc367c5b6ed72d1d36592e42b83b3a4e31126b925ddc76f1946fba14e22b7410f66eb837f686f848bdb1033f3b62084f1423543d7605c4f6b9 SHA512 4ae34de71566464e4352ff7b3bbd19b8bf0571013f34253495cf5cc57240bac9c75192c302eb0231763db1745a7e3e79ebcdcb006e36ea4621a886b213eb96d3
 EBUILD embassy-mse-3.0.0.660.ebuild 560 BLAKE2B 9eab17caab14b9c89b455239cbf5006ccb4454be3d54c9233cbda6bf107e44f0b8e88e514d60eae529892d80afd59e53e2d0dadaa113d4de50eecd6a693d7bd7 SHA512 a6b0a375dc3fe6035df488732848ac6dde8209a641c7f201ab2d6b6e463be87b505d486d207c64f2b690fe437772f78196ba223678788b879d2b21b2e3e1cedc
 MISC metadata.xml 347 BLAKE2B 2368d452e759747738601ae0e5e5e7181167badeaa28ed89aa8e07b55ebc9d2f1dbcd351cd5569a4548c307cfaa23b26756d88778c078685848db72dd9b094e7 SHA512 d6ddcfb5e3234d23f3c500a7234b0bc77ecdb0cf52f35f041ffdd444b8b3fefe7d0b3e89e5f7fb86da375647b7436ab1766b5bff186206e189045e38ade2056e
diff --git a/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch b/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
index c1095b266d60..23e656dc0a86 100644
--- a/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
+++ b/sci-biology/embassy-mse/files/embassy-mse-3.0.0.650_fix-build-system.patch
@@ -1,11 +1,3 @@
- ckit/Makefile.am       |  2 +-
- configure.ac           | 67 +++++++++++---------------------------------------
- emboss_acd/Makefile.am |  2 +-
- src/Makefile.am        |  6 ++---
- 4 files changed, 18 insertions(+), 59 deletions(-)
-
-diff --git a/ckit/Makefile.am b/ckit/Makefile.am
-index f87b131..a670d2b 100644
 --- a/ckit/Makefile.am
 +++ b/ckit/Makefile.am
 @@ -2,7 +2,7 @@
@@ -17,11 +9,9 @@ index f87b131..a670d2b 100644
  
  CKITSRC = datafiles.c next.c seqentry.c strings.c gcg.c pir.c \
  seqspec.c ttyinterface.c nextseqentry.c \
-diff --git a/configure.ac b/configure.ac
-index a20d488..eb208bf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
+@@ -635,33 +635,6 @@
  
  
  
@@ -55,7 +45,7 @@ index a20d488..eb208bf 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 @@
  
  
  
@@ -77,7 +67,7 @@ index a20d488..eb208bf 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"])
  
  
@@ -91,7 +81,7 @@ index a20d488..eb208bf 100644
  
  
  # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-@@ -1000,17 +965,13 @@ AS_IF([test "x${enable_savestats}" = "xyes"],
+@@ -1000,17 +965,13 @@
  
  
  
@@ -116,8 +106,6 @@ index a20d488..eb208bf 100644
  
  
  
-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 @@
@@ -125,11 +113,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 b44632a..84e89b5 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -18,9 +18,7 @@ AM_CPPFLAGS = -I../h \
+@@ -18,9 +18,7 @@
  	-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
  	-I../../../ajax/acd -I../../../plplot
  else
@@ -140,10 +126,21 @@ index b44632a..84e89b5 100644
  endif
  
  if ISSHARED
-@@ -60,5 +58,5 @@ LDADD = ../ckit/libckit.la \
+@@ -35,7 +33,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 = ../ckit/libckit.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
+-LDADD = ../ckit/libckit.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
 -	-lensembl -lajaxg -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = ../ckit/libckit.la -lnucleus -lacd -lajaxdb \
 +	-lensembl -lajaxg -lajax $(NLADD) $(NCURSES_LIBS) $(XLIB)
  endif