gentoo resync : 29.01.2021

3 files changed, 16 insertions, 24 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index ca8822fb69b0..1de8a455d17d 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -7,18 +7,18 @@ AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71
 AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
-AUX autoconf-2.70-fix_c99_check.patch 834 BLAKE2B 387ae38c3a6966efc802f0a9b0f12c5cedb09696b8dde08a78ca7c07736032b6815f8dcf6ceef9e9596973f78e48e4464865e68eea8d694f169f64ade92ada78 SHA512 fdb7cd4b6e87ecd63c99306cd5360aede9b7ec9e4b8c17ae43d8b821ea716ca15966243f091743e90444868eb54b5f5e29407d8bb844c1ef812c7a02d8caa6a4
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 DIST autoconf-2.70-patches-01.tar.xz 27284 BLAKE2B fa4ef923d487f600de98d765d3db23c73cd546f777c19986f9179cbe0e9eb254e3bb4c8107b6ce9f2c1f008b4c72033565711f0d8b63e6538b83ec56a2d75875 SHA512 648604ec24decbc48d281049eca94e7e7146d013c006297d9d9c71b749bd856684b8ab8550ac8961ce506b036ad25b7236dfb5e53114c10edfefbd58ecc55020
 DIST autoconf-2.70.tar.xz 1346528 BLAKE2B 7a14f966f1fb89a250aedb03d483ab1f92d73a7085bc289094b62984620563922d041e717274270af0afaf52f058b4c6402c1af14cce58d70d5d884414797c80 SHA512 af4af6b8811baa424c00990b368a6cbfb1d598dde9ee08dce2a5fc32cb9517e6e683a59d6852507f6a72d499fc298c4171b6f06962cf3ba40cf1557cfb6069fe
+DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
 EBUILD autoconf-2.13-r1.ebuild 1519 BLAKE2B 58fd708a0ad5b5fecb1c27035f6283a02d4b49fac552a6c59da077a52d79beed9d28fb8fd8594d7cb6b652e0270ae7068060d97b5d6c4d6c228f7acfdf7f5e36 SHA512 ce5bd09f8a242fe91e3d5633f88ed33569a82264b881ea74a68d29b6175cf2d532377a1c80f1e7b220c0582ff4241fc7946897bbe32ad9a521a470fdfdec616e
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
 EBUILD autoconf-2.69-r4.ebuild 1300 BLAKE2B a7611ebc260e49b8893af7d1179820abad58dd294e8d160f13a8a3eba1fa7f91235851ee8a5116a4d8d91a045409235c4310bd012affbaa2084515618e32f923 SHA512 2b8b1f5c7db44cef4bbcb674909f6008c201e00ce1ffd7e3dc8d347185a4b7171e06db7a2f5e0c3b3486625aec95be374830fba486bc0942cf014126e2f4ce9a
 EBUILD autoconf-2.69-r5.ebuild 1819 BLAKE2B 5cdb2367829da34d55780dc42b5773a10b92610a33268a1dbab205c4296e754f11daebfcd635a99b2dd39b0c466371b5020464faa94793805bdfea37d0a86bcf SHA512 b591922b1f2e8aede0ca2f4bc5a27d86dbe7d43c3121109ac9b1a499c9d01da8888aeb02cb9d252d5931c886e53a54b61878f8ab6c66f4e8063a0cbd5bdd2313
-EBUILD autoconf-2.70-r1.ebuild 1846 BLAKE2B 86c980472a4f9dd4fa3c7a1b64a3da44e43b7358d7ea46863a2134222841eb052c3ba1246e75acb8e6edd0efa1f05d58518bf6bb64ec234bfcbb2ba20dbcc72d SHA512 3a6339ba3f3859641bcb16e3ddbca5af1f0a7276a661926dc44a79df284fb4245a90c64c1b442fcfc4edb820dd61a7a20e72d76b1c10d3a5540506d7e3ab70b2
 EBUILD autoconf-2.70-r2.ebuild 2040 BLAKE2B 9a149ce87967e1e58abb170f2f2febf01788988827e46067e898892b18c3686a999625073c68b618e3c517007600e1340e12c17fdae5797b0832c8bcac5b9b79 SHA512 dd266d75b0942f82737930263aec6f6838f0041ce5c99782451e1bae95442027bab56fed4a4ea2180aa25bc5e719926288159901adde0fd3456188e6e7d642bc
+EBUILD autoconf-2.71-r1.ebuild 2157 BLAKE2B e97dc881118f122653dc7d9c64628706ad3ad2e723a2066552ee1112c1f9e2cb595c3f7488593ebe5268eb6c195142f27fa462488915f79001a3f5190f6591e3 SHA512 a425cc8e2870315d1d4ea31745164482dd187384af82a0494e8722cac9b000e42034c535964cc4196bda798d7aed21050816146b3780eaae3145538ec1a74b5d
 EBUILD autoconf-9999.ebuild 1386 BLAKE2B de6bb3a1c210e63b358e6db1fa72c77bd5067fe22e629ea76620d8c31657b8c29bd58cdb69b39f87c7445bcc0d0da77e93c5d35d33783cc31df9a4ddf14cad03 SHA512 5dc7271984bb48e29325dae31d193bdf838cef778d7d391145787c4b1e1a31a4720f8827bcef2acf8d4edbd8885ebf70392d3dfddb7a64e63d30dc7208565164
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.70-r1.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
index 5ed982219210..034454ba9f77 100644
--- a/sys-devel/autoconf/autoconf-2.70-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
@@ -10,8 +10,10 @@ else
 	# For _beta handling replace with real version number
 	MY_PV="${PV}"
 	MY_P="${PN}-${MY_PV}"
+	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
+	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
 	[[ "${PV}" == *_beta* ]] || \
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
@@ -23,22 +25,20 @@ DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
 
 LICENSE="GPL-3"
-SLOT="${PV/_*}"
+#SLOT="${PV/_*}"
+# autoconf-2.71 is a bugfix release of autoconf-2.70. Let's keep the same slot
+SLOT="2.70"
 IUSE="emacs"
 
 BDEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6"
 RDEPEND="${BDEPEND}
-	>=sys-devel/autoconf-wrapper-14
+	>=sys-devel/autoconf-wrapper-15
 	sys-devel/gnuconfig
 	!~sys-devel/${P}:2.5"
 [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix_c99_check.patch"
-)
-
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -48,6 +48,13 @@ src_prepare() {
 	# Save timestamp to avoid later makeinfo call
 	touch -r doc/{,old_}autoconf.texi || die
 
+	local pdir
+	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+		if [[ -d "${pdir}" ]] ; then
+			eapply ${pdir}
+		fi
+	done
+
 	toolchain-autoconf_src_prepare
 
 	# Restore timestamp to avoid makeinfo call
@@ -56,7 +63,7 @@ src_prepare() {
 }
 
 src_install() {
-	default
+	toolchain-autoconf_src_install
 
 	local f
 	for f in config.{guess,sub} ; do
diff --git a/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch b/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
deleted file mode 100644
index 2174e75afebd..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.70-fix_c99_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff_plain;f=lib%2Fautoconf%2Fc.m4;h=601c2df41bd4ee602065ce041a1173aca8a0f52e;hp=fe217cad679f2f4506c3e20dee64e7e3e3b83a24;hb=efc940dc82763b7b2d6e65f04d15d5972d829c0a;hpb=b693e208691c54fbe07cdf49b9a98358baadcfe2
-
-diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
-index fe217ca..601c2df 100644
---- a/lib/autoconf/c.m4
-+++ b/lib/autoconf/c.m4
-@@ -1559,7 +1559,7 @@ dnl SVR4			-Xc -D__EXTENSIONS__
- # option to output variable CC to make it so.
- AC_DEFUN([_AC_PROG_CC_C99],
- [AC_REQUIRE([_AC_C_C99_TEST_PROGRAM])]dnl
--[_AC_C_STD_TRY([c99], [ac_c_conftest_c89_program],
-+[_AC_C_STD_TRY([c99], [ac_c_conftest_c99_program],
- dnl Try
- dnl GCC		-std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999)
- dnl IBM XL C	-qlanglvl=extc1x (V12.1; does not pass C11 test)