gentoo resync : 20.03.2022

3 files changed, 12 insertions, 9 deletions

diff --git a/sci-biology/embassy-phylipnew/Manifest b/sci-biology/embassy-phylipnew/Manifest
index f750851e5b3e..04367b5bf202 100644
--- a/sci-biology/embassy-phylipnew/Manifest
+++ b/sci-biology/embassy-phylipnew/Manifest
@@ -1,5 +1,5 @@
 AUX embassy-phylipnew-3.69.650-fno-common.patch 16289 BLAKE2B 346f5d704be918503a80ab224e1892953a2d1d6ef642e6ced95fcb1476954e09d983bd0eef1d6afe71d2c4e043a05a99dd92748151e337ac5d3646d91008c2e9 SHA512 0ea1f10865832a44647f0888eabef1df6e5baadace9fda782f171d52eef70fc7d8ef80317d46eaeb029896b8b0b4ca0d845561ae761daf406f7c26e18ebd1341
-AUX embassy-phylipnew-3.69.650_fix-build-system.patch 3019 BLAKE2B 39c2d7843ffac8c0a04c70d307d5651f2e53cc386c3a9b1f312d4fd53a9b9ba235a02931c4812a750da8711988e262b1c9a51a7152da20f61cd56c0d21607a89 SHA512 7d46280ffadcbc07e01d09a49a7896539a5c0c271979fcb3e1ffdf385051812adeaabec186c73e2105a710eee2fd340d89bbcbd4ecfa112879fb00cbc58c2dfe
+AUX embassy-phylipnew-3.69.650_fix-build-system.patch 3019 BLAKE2B 94bdca3ee696570f1f6c82cdc3e948d8e48621ed3537c98f681e953a0ce88fe790b2a8ef60cc836cd2d9c303348cf13b2bc27ccb411714880da98af9ff0d42c8 SHA512 3ce374ac3d2537fd307e310357c6efa8b66330475c6fd383dd83a7507fe179796cbfb4c25036b3254731467a0dd5798b9024e9b6009c905df3990a168a528a6b
 DIST embassy-phylipnew-3.69.660.tar.gz 1741298 BLAKE2B 58a2c66ffb9c447fa17462bf54d7b8e65702701d74c1f16ec6906a3acaf076ebcab30982befe6334101bc483901132069a71ffa0e2334aaee0da02a30276b7f2 SHA512 b41a31285e05a418e4fbfae7241c3658fe458e3d5d84bff472d98b7c145340a55bee1d744b5c056d0e88407074947b5f37b2182c9cb800c8a8d43dfa76d026d5
-EBUILD embassy-phylipnew-3.69.660.ebuild 409 BLAKE2B 52d2e35042acda08f96cab28de1d0dd2c31c6824df7541b195644f67a8325b35b4ce34d8eab9710f0239466feeaa4c0f5f20017891812e702671710797fd0315 SHA512 7511f44570ab985948b8daf6b9267235a930d0c70fc17cff754393e3c2d9028db5360dc60642398a5fd951ae412a70d6d5610a0008137ef646040ccd1904ba27
+EBUILD embassy-phylipnew-3.69.660-r1.ebuild 441 BLAKE2B 773748fdfc603bd1134d4324f3e24ff49bfd2f4cf4f6a033aaa708aea2c3475f20a1467becbb3a965b07b2b77ec6dd2a1e6ae0d3f3ad1c4fe0e8ee6512b588fd SHA512 b075fe9ae13b226dba97252706cec3d5da279cf9be3225a29c7d673a21dcff4fb05d860d75a59f2b7a611c2c640df9d8c34272f72ae25f2b8be475255ff8a034
 MISC metadata.xml 348 BLAKE2B d71aba38f248b80e63e5805f1c0f710815220774a8a514f69a708666c647f061a3f295196da119cec9b5681648a54a1915073039302586d17540296855a255df SHA512 4f8c9238704b81e38abad62bc92e67ad08fe30907277794ee5a4265f4dd8e69fb1b4cabead1fc45c48888c3dbe30496b2c7df3b1c8fa2662f87a4deef32661cd
diff --git a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.ebuild b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660-r1.ebuild
index 129b42870a79..d7dc57a64fc8 100644
--- a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660.ebuild
+++ b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EBO_DESCRIPTION="The Phylogeny Inference Package"
 
-EBO_EAUTORECONF=1
-
-inherit emboss-r2
+inherit autotools emboss-r3
 
 LICENSE+=" free-noncomm"
 
@@ -18,3 +16,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.69.650_fix-build-system.patch
 	"${FILESDIR}"/${PN}-3.69.650-fno-common.patch
 )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
index 95951e632188..589408ed4a9e 100644
--- a/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
+++ b/sci-biology/embassy-phylipnew/files/embassy-phylipnew-3.69.650_fix-build-system.patch
@@ -1,5 +1,5 @@
---- a/configure.ac
-+++ b/configure.ac
+--- a/configure.in
++++ b/configure.in
 @@ -635,33 +635,6 @@