gentoo resync : 19.01.2018

8 files changed, 21 insertions, 107 deletions

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 0601543657b8..c52cab6d050b 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,16 +1,13 @@
-AUX autoconf-2.13-destdir.patch 677 BLAKE2B f30eb8fba21a14537324f3785bbec04d972412a54a5db3e160f809a721ec0a683701fc3a8d6b23d529bb72992ca937f52a8fbc46f7505b199b9d576c020fb962 SHA512 eeb9619bdc365fb3877b816e30192fb235b8c7fed9e810da0382363141abd9b5df217cda31a7dd1eb51d6310714412709fc830fdaac55a6ccfcfd8335f752c54
-AUX autoconf-2.13-gentoo.patch 898 BLAKE2B 069e7e281fe0efe180423a77a5876d5301460e9ae1b8612d6679bde71cf4739be9c27cdfa76274fb15d13eaf2893053ec1311d92f1095511b8dbfd7030a7e7ae SHA512 8195ea24bd1fbcba20cd09de12dc90879a3d6e2877179d43830abdca6c68148c2bd611b1d3919777304945a08e0d939aa868bb689558515af6b0b10524f16e5c
+AUX autoconf-2.13-destdir.patch 604 BLAKE2B 4c3607a31a7e99820b49dea142e9b2445a70508cedf7407f7822f86fb4d1595ced6ab202bf6e42e422f41e44c256e62ee2a617f5ea01d1319c66f811333d5c1e SHA512 c69c7681b028f82735e0187dc9ea0d73906b74e32a6d51754e2c973a559895590fb5a1701d153445b772bcf0536a4688292895242910f20e6d4cf1a02f1a877f
+AUX autoconf-2.13-gentoo.patch 799 BLAKE2B e9d403d2e7e6ca2efafcf9b2e7108f8b383b107bc78290242f0ed2662ec8e05c5a178f8014e6317f260695cbaa0e4c6a2cce3221d1990b1fd2a96fa3db5ce611 SHA512 5712ad0d67cb5661c949700d5bc0d8c582b27562229400e7b8b1c0249020d13077af5ef3602adef7135cc8dfe529556d5a23f2ce494e3554322262510c2a9fb7
 AUX autoconf-2.13-test-fixes.patch 547 BLAKE2B aa7509f3098da8e2723f835133e375d63896ea65b3030037d625361fa01a02e7e982920cedcbfdf1679783fd7a6a8f0b8476e583749419fd8d103735c0b98d2d SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592
 AUX autoconf-2.61-darwin.patch 450 BLAKE2B bf5bf1f9561c0a1880c9e3f97383a8c91450cf727587f267848d7acad8d805e7a0bdb4d64ea8605fa44851d8841d5ce3557afc890bc1a4365844fcaa223e1439 SHA512 b698bb51a1264ce92cced79906926a473d37eaf7dcf5d6d599c6c6012910391933e19a7a436cd0c93f817f56f6749006777bb914648eab8da96ecca0c1e2cfd1
 AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71cab644328c850c77214dd15c99c2b1ae2ee040ef3d75d4dbe3301992bdb9ad2f2b48f4a6363b14e9f6765863e57f0047b83f86 SHA512 38506631fdde1f80a3467673e6fb48d4751323462c1657c85e2b5289e1219ef236ed9af3a66906c8851a62c244c1ffed70537a5f1421539429a9aa04e929d727
 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
 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.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-2.13.ebuild 1521 BLAKE2B 745ce1ba4d39b75cf89ed701bbf102092854922f1dc0be421326c0f3a95f2a32aa69dae8ca4ac0e7b0e738f0e4c0553126636674571376df8870d77afa5e1998 SHA512 493ba0d22c90ed02e77e2406f76bc6e2cc6c9c56e824ca8c7ce73a2e3e265868de5824ed9b0261f457903ca12068e24ea55c77e2709f9d28366fc25c9ac13091
-EBUILD autoconf-2.64.ebuild 566 BLAKE2B a0488603af961a72257e96959d28ff6fb552de3b19a9773a8af845f8a0c5e0f54ee5f93c40192d3c3409b7d16489cd4ae5aaad8925404962fc0c4d9fe0357bed SHA512 9449a2616671cac6a34f632c965a0bb59f38d0c0694b4412e547769d5f957b7ab82cef995c77641814c7c6e0682df3f3b754cd48252f44e38ba71e7d72fc448f
-EBUILD autoconf-2.69-r4.ebuild 1552 BLAKE2B a08275b31c04915ee5700e62fb0edd31f192e5a8e70e00e2343d248ce29e5ebbccb67f65e2bf96e44c16737c1f132bbcc3232386768f432e7d5bb5df94cd3ed1 SHA512 807fe30809f095873e535c9b0e385550f59432e9c0f65fd66642700d25417362dfdcebca1ef4d0ce71a54a343546b79cd308df039af5e1f4f89ee40df4e7ed45
-EBUILD autoconf-2.69.ebuild 1517 BLAKE2B 0ffa84941b0f394404b767506cc3a0efedbc19e6b50e8cd3386ebbb75ae657e3c828791f72c01e95982670ab1783c4be301f7562884b93c1eca6c8d5065b912c SHA512 9ac5e366d81466493aa7e8202bc688670e219071b8bcf0801dec14df0c2977bd3520a95cd343b9658ae7327a4e09b5b9fe4e5c5f9faa4982260b83c1e4368cd4
-EBUILD autoconf-9999.ebuild 1361 BLAKE2B 70f04f869ac9481058e94197b617498fc5551ba3358a7f418d4fe2dd87a2263f47eeb431a2422e872a2e4d7fed903933a8914bfc19ba2e372e6a7b2285854a1b SHA512 cbd6d7f64866419b258c7f711eff2dff2f1dbb11847d80d2d7dfa3cadc11c37ec457e9e351ca56dadbeb73b0466e81d24efae4121a02751abdbf63c7595cbce2
+EBUILD autoconf-2.13.ebuild 1527 BLAKE2B dec4a25a2d19aea170999fa5fe507cbb65a6fcb29e0691aa88a5d6d37b49516dffb4a193087055e6d9e49349c3c4995f783f3997851ce207bc190d304e7b5e54 SHA512 3f8e4bb7abbfce90cd9fdd8c0b434422614a68ed91dde4ca1aa757566913797b971e45f4611bfc4c61d630dd7403b3c5d1e332ee77a715cd0e738ff08d7e582a
+EBUILD autoconf-2.69-r4.ebuild 1374 BLAKE2B 19b63c9ff6691714eda0581c97264dcfd1dca90b8add8625af9591f8bf89f3b2ea595de3a103d48c3bc6dae85b326b4665e4506e33308680dd38060eaf8e0403 SHA512 085ef894de4d986e0015d3e0358394e8a7c8e7469bbbed41321e5c2da344b272baec571f9c934b50c6071fadf10a29d98894a899fa64289c2c67f724151a7cf2
+EBUILD autoconf-9999.ebuild 1202 BLAKE2B fae085e5067ebd954f846668b3b1f1df312270caf880206d3c3b6c55e4bf27e219b717f53f8115b1ebcbea0c3695b82bb1918e345c716d108ae02e62ca6a4bd6 SHA512 40ffec2e0437c2519dee11ee092866e667aec59d3b5137a6286552b9f8c6cc3d595051b1652141eb31506fedc89dbb71300129d1c99ec14325a5e9b4ddddef8a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index 4a48b2723e23..8f10539884d6 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit toolchain-autoconf
 
@@ -27,7 +27,8 @@ PATCHES=(
 )
 
 src_configure() {
-	touch configure # make sure configure is newer than configure.in
+	# make sure configure is newer than configure.in
+	touch configure || die
 
 	# need to include --exec-prefix and --bindir or our
 	# DESTDIR patch will trigger sandbox hate :(
diff --git a/sys-devel/autoconf/autoconf-2.64.ebuild b/sys-devel/autoconf/autoconf-2.64.ebuild
deleted file mode 100644
index 572f9e3322af..000000000000
--- a/sys-devel/autoconf/autoconf-2.64.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-devel/m4-1.4.6
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	!~sys-devel/${P}:2.5
-	>=sys-devel/autoconf-wrapper-13"
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index 98a89a19379c..17b047107a63 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -4,10 +4,7 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	# We need all the tags in order to figure out the right version.
-	# The git-r3 eclass doesn't support that, so have to stick to 2.
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
@@ -42,5 +39,4 @@ src_prepare()   {
 		"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
 	)
 	toolchain-autoconf_src_prepare
-	eapply_user
 }
diff --git a/sys-devel/autoconf/autoconf-2.69.ebuild b/sys-devel/autoconf/autoconf-2.69.ebuild
deleted file mode 100644
index 90d1e296b1b5..000000000000
--- a/sys-devel/autoconf/autoconf-2.69.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-2
-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 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-3"
-SLOT="2.5"
-IUSE="emacs"
-
-DEPEND=">=sys-devel/m4-1.4.16
-	>=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
-	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autoreconf -f -i || die
-	fi
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-}
-
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}" || die
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index 9495cddbedd9..82ed3494918b 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	# We need all the tags in order to figure out the right version.
-	# The git-r3 eclass doesn't support that, so have to stick to 2.
-	inherit git-2
+	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"
@@ -36,7 +33,7 @@ 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
+	echo "${ver}" > .tarball-version || die
 
 	autoreconf -f -i || die
 
diff --git a/sys-devel/autoconf/files/autoconf-2.13-destdir.patch b/sys-devel/autoconf/files/autoconf-2.13-destdir.patch
index 858b8bcc1f71..47605af5f59c 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-destdir.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-destdir.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2004-10-20 16:44:54.949117496 -0400
-+++ Makefile.in	2004-10-20 16:45:39.999268832 -0400
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -41,18 +41,18 @@
  
  transform=@program_transform_name@
diff --git a/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch b/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch
index 8e40d0cae049..44f09cba92f0 100644
--- a/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch
+++ b/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.orig	Wed Feb 28 20:51:53 2001
-+++ configure	Wed Feb 28 20:52:03 2001
+--- a/configure
++++ b/configure
 @@ -654,12 +654,10 @@
    echo "$ac_t""no" 1>&6
  fi
@@ -16,8 +16,8 @@
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
---- configure.orig	Wed Feb 28 20:53:24 2001
-+++ configure.in	Wed Feb 28 20:53:28 2001
+--- a/configure.in
++++ b/configure.in
 @@ -14,12 +14,10 @@
  AC_PATH_PROG(PERL, perl, no)
  AC_SUBST(PERL)dnl