gentoo resync : 15.12.2019

3 files changed, 72 insertions, 11 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 89dd1b9e1828..6a6238ad681f 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -8,9 +8,11 @@ AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
 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
 EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 4fff8a2b6512a1e272be9b67952c936afebb588c4cd3d4d7d6c6dea3be573551fb4fd8c67cf3f6f0987123a48cd7523ece78fd9155b1bbc148ffbb5fad6458d1 SHA512 90f5b3a2b8081b9cbff7d6df8cf5a87bd169a8f02a64ca1de5ee90fc06e897eb076cb394a009a09b70318bf0d58511708ee689fee7dbcfae44f687a06bc57bb9
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 64b82342a9302cd8cb6f72ae71e641c19100fe1983fbeb60f001a13ab1eebd4917d0de76ca7f99f9e5e19dd69f5d55f12055c4410797e6adfafb83c2e8dceff0 SHA512 a66032c3bc48daf9d763700abedbdedf90e90d05bdadc2e357decfa1ca87f9b291a561197a7f85731b71ebb1de656ff1af55af38e7651432884660d1764f5526
 EBUILD autoconf-2.69-r4.ebuild 1333 BLAKE2B 339f336d60a2131094463909dff0700f5f7097633e5b890c2a1d3a7b72119875c9605f362cebc1ee868e420ad5000784f84a3e253b238f651ba08da0c2fab0d6 SHA512 127ae0772b786b31d708f703e21aedd405a435b80c2a5e4108d4f5ca28c0e92b2632ded6835968314121966c8dc60ca112d98ab57a14e454476c3f0d0d71078e
-EBUILD autoconf-9999.ebuild 1161 BLAKE2B ded76045a2b945c56bcb4ab3bc094ee06dc0eec6de760420b239b15598c454c5c3c92bbcb389323a4cc241bcaa67250ecab2c859aa3a8873b6db7c8007be1363 SHA512 e2f16eb169acd4ce1ee0ee46bf96ca12a44190e50a300ca45509e0483f50c65a4f73035532c9942ad9fa6119d2859b9262a7970a7fa4947c38b29c622dda5432
+EBUILD autoconf-2.69-r5.ebuild 1811 BLAKE2B c4be0697c6e208fd37c0daf3ca413c8a4c1e0e5e0c847c9ebf2d04af18b2823bb9693d18d406d4869ce718a32f1d15bf834eb22ab6de0bac95f18750adba3e4f SHA512 1ea3a8605e565211a6c01e8e8bb362f81c92cbbfccab0892285d5cc66f3bd3ebefa33369aa83103b4de54ff923e287a0b31fd60b988a13841d2c655f573dc2a2
+EBUILD autoconf-9999.ebuild 1205 BLAKE2B a7c12326d20aa0b7f874b8a7e7da3d23288c0dc80f4333761538a4117839a4159747b20f18ce28a0fb0be48b81cbd85b9d7ee18f81769613c92a1655b090cfae SHA512 d63fbac3e7642caa702d3e3201a004fa39291b6ca9237cea58f62f4c4e45686f4f5553f73c3fa44a6cb6c4f5b60a7ae39a0366337ba3423ecf73fa3cdb718157
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
new file mode 100644
index 000000000000..a51dccb3f741
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 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
+	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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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/${P}:2.5
+	>=sys-devel/autoconf-wrapper-13"
+[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
+	"${FILESDIR}"/${P}-fix-libtool-test.patch
+	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+
+	"${WORKDIR}"/patches/${P}-runstatedir.patch
+	"${WORKDIR}"/patches/${P}-texinfo.patch
+	"${WORKDIR}"/patches/${P}-runstatedir_info.patch
+)
+
+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
+
+	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
+}
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index f728a1a9f570..22cc7e63dcdb 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
@@ -21,21 +21,23 @@ LICENSE="GPL-3"
 SLOT="${PV}"
 IUSE="emacs"
 
-DEPEND=">=sys-devel/m4-1.4.16
+BDEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
+RDEPEND="${BDEPEND}
 	!~sys-devel/${P}:2.5
 	>=sys-devel/autoconf-wrapper-13"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3"
+[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 src_prepare() {
-	# Avoid the "dirty" suffix in the git version by generating it
-	# before we run later stages which might modify source files.
-	local ver=$(./build-aux/git-version-gen .tarball-version)
-	echo "${ver}" > .tarball-version || die
-
-	autoreconf -f -i || die
+	if [[ ${PV} == *9999 ]] ; then
+		# Avoid the "dirty" suffix in the git version by generating it
+		# before we run later stages which might modify source files.
+		local ver=$(./build-aux/git-version-gen .tarball-version)
+		echo "${ver}" > .tarball-version || die
+
+		autoreconf -f -i || die
+	fi
 
 	toolchain-autoconf_src_prepare
 }