gentoo resync : 08.01.2021

6 files changed, 85 insertions, 12 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 9be1f6798649..ca8822fb69b0 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -12,11 +12,13 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 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
-EBUILD autoconf-2.13-r1.ebuild 1530 BLAKE2B f4daa60dc1598eae9e05788f1f869db80c9e548f2ad391ce5469b6911484192f63cfb3d5d22c7c4bce46355c674b43c94c3c45b8aff78717d9971736ed37e91d SHA512 d77d846fdb6c22a20f447b6bc9efbaa33b3e69ed8c7a41f33b1cffd171af6594d6f06db05e643ee847012eb6e60b68e0aaa125f46695aedbf46806d21feca8da
+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 1311 BLAKE2B a9f50189aace861513fe04aebb63b8f6e1e478e4632f9ae5d7681b6c9073291ed9e94794886098c785c831113e8b765a13e6ba23f149fbda7ca2adc77c0b3493 SHA512 fe2b5a4cfbf4a2fb65b7fbfe4cabf6500e404d9ea681f6920e840a4f3dc8cda915e07cb295969a07d938ef0ac1d690bbf5043ebdd409d7ce9d5f7c818540b5dc
-EBUILD autoconf-2.69-r5.ebuild 1830 BLAKE2B 0f0cfbf6ace5140536b6a3c3016e0f7c8336fad564d93177ee8e3ddb44156f8464373bafe6f4ab2109362cbfb21d56c5ae9f2bf85b898765a163b11f79b1f5c5 SHA512 9ddbf0f2acd89320049cfdea14e426204281a35c0fb559394dfc593d6e6e3de332a4c5d3832cfc58da54263a201a83cbdc9776b94727190c166965eb42bd62e0
-EBUILD autoconf-2.70-r1.ebuild 1857 BLAKE2B 47d5dfec7bf0edb08660f1a63b169559d9c238c62ddd00ef46e77b9efde99c4492dbc618005fc4a61a2a6b5f9e619d49c9c4840fd0d347dff3395bd4725decff SHA512 c377d440cb1b9d59e9b5d4f3ea720146f196a639bce726e811343971feebc3ee848bd715cb92c6e42549a620af4ba981bede08e1e4c35665409498a9d429c435
+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-9999.ebuild 1386 BLAKE2B de6bb3a1c210e63b358e6db1fa72c77bd5067fe22e629ea76620d8c31657b8c29bd58cdb69b39f87c7445bcc0d0da77e93c5d35d33783cc31df9a4ddf14cad03 SHA512 5dc7271984bb48e29325dae31d193bdf838cef778d7d391145787c4b1e1a31a4720f8827bcef2acf8d4edbd8885ebf70392d3dfddb7a64e63d30dc7208565164
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 9a3e4927330d..fddff76d6a75 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index e2f9e6cee1a2..88dc5a32355f 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 3000e01e360d..856f5d6b85fb 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.70-r1.ebuild b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
index ce4adc5321b0..5ed982219210 100644
--- a/sys-devel/autoconf/autoconf-2.70-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ else
 	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"
 	[[ "${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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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}"
 fi
 
diff --git a/sys-devel/autoconf/autoconf-2.70-r2.ebuild b/sys-devel/autoconf/autoconf-2.70-r2.ebuild
new file mode 100644
index 000000000000..169fd49165ff
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.70-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+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}"
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+BDEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6"
+RDEPEND="${BDEPEND}
+	>=sys-devel/autoconf-wrapper-14
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5"
+[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+	fi
+
+	# 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
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_install() {
+	default
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}