gentoo resync : 15.12.2019

5 files changed, 15 insertions, 151 deletions

diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index f596174779d6..9055a61df65f 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,10 +1,6 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
 AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1318 BLAKE2B 1844a1c52406e4142d2b966f485de914a63dd1553e1dfb6f07dfc5860884df13228ef33ca782870a90f5f04de67f21f35028855f6da1bcfaf279fff417b603e9 SHA512 9561f39564bcba61495665e984e0e4539459ec1a342461364849f74cb86adfe6e71867913f0aa98540a4c9a54d0932f133b5541ea41e59f9b32d0278d22db17f
-DIST gnuconfig-20170101.tar.bz2 50152 BLAKE2B be36ec32461444e489c591aa5dff8540f6191cc21c69590bb48632e79b4ce41b1ca30b17d034c068cf79762a520447c0edc1b3a300b4225b25f8ed19fbf249e5 SHA512 a4d72b50f0c6ebae702b4d51aaeb459ac2b325f9f79ff6c464c1b92ecd7eb961b47b4fa0eb03894e80646846cff39a3e3b2d8ada6279e288e94846a12578b440
-DIST gnuconfig-20180101.tar.bz2 51438 BLAKE2B c09ceb107bc446b04feb6fda500a1d869c8e0841bb72b7116c7bdadaa737cc25db2715ab3ce20429a9a7d4e0a5c0b054b63b21fc49da2f65e277169c34b5e2ed SHA512 3af359088e8e93c81ec49bfae90839266596c2566a663839b0e91c4d4319d2bfb91738af9d5fa19b9d53703979fbddd81294bcc032b46c33b94f1961ff9f2178
-DIST gnuconfig-20190804.tar.bz2 58538 BLAKE2B ec2ef7990e94eebca655db3f7e84a0294ca59f4753e33f69bdbd4d214240e33472abbfdd99735ec71d38a3d542501603a54e979e2aad4776c5faf6646d016956 SHA512 c24e0a49046d2a7fa3a77a22f06be8b97adb05541a95225c65c1cea47f7977230db1954666795019d28c02a4676acb93cc8b5c53f1b838e28fb50746630af82f
-EBUILD gnuconfig-20170101.ebuild 1530 BLAKE2B 05981235db138b6b8f87114bbe36ef300eee9818eead70a7d036d799e7b05079701dd56d1b782f7e8022af5ba86ebb5ba740cc5a57cafc0e7367c399826884ae SHA512 c3c31d225ce0711f01b9a321a815f3898190d85f242d90248af6d227bff3e8f1748bbd72f90eef68d20bb0301556a6a1369654cc632af1f2be9f70e7b0a799dc
-EBUILD gnuconfig-20180101.ebuild 1545 BLAKE2B 8dd458bf69af25e4818c8ee9b34e03af96dfd697c7b0aa1813396b8af52aecfc0525ae53a69a55e90e036c273901dcb29170a374821de1fd891c6d0eaa5fca59 SHA512 4e61eaaf674ab08d28567c4d17cfa98606cb740ae56e529b064d2c1542098c1d24d538bc5ed2bb7e41bf563376d0801a684180a4af6d76f5234c9d1fd1586bf4
-EBUILD gnuconfig-20190804.ebuild 1571 BLAKE2B e113178cbdf1d1951ff7faf044b1798be6e101017b4f68788d9834033afbc0d45460c2317d34a4435a05059101b84d3e1c21962f64da500bc08d04b9d42a8933 SHA512 3c0fa6f1a3efb7a92fef78ad6e9422b9942ca3d581f1086e2d2d670e911b35f94acc7a2cd6228d54d1ac05b2ac4d489a0070a03abe77745b44b66519dbef5744
-EBUILD gnuconfig-99999999.ebuild 1571 BLAKE2B e113178cbdf1d1951ff7faf044b1798be6e101017b4f68788d9834033afbc0d45460c2317d34a4435a05059101b84d3e1c21962f64da500bc08d04b9d42a8933 SHA512 3c0fa6f1a3efb7a92fef78ad6e9422b9942ca3d581f1086e2d2d670e911b35f94acc7a2cd6228d54d1ac05b2ac4d489a0070a03abe77745b44b66519dbef5744
+DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
+EBUILD gnuconfig-20190912.ebuild 1523 BLAKE2B e4ce27911b3ca92c3e579e009f3e48cb73886f2b2a95743dc2274f05ed8a9e9e9da9bf4c9aed98ba55c1dbb6ea8b3fc86f8990a870e908f3a4844d79497afae2 SHA512 bea0f4cbdc83165f78879e69b566408b246c4acb197282e12d0a10afbd64075cc36cb3daa45adbeb5f6a09ec7e68c9dc558adbd1e1b8c3149b6e517b9e0169bb
+EBUILD gnuconfig-99999999.ebuild 1536 BLAKE2B 0e7fc3cd1f4e700e12018cb16ad17492d5f4b8b1c61b02591bb3d6ce7be14899bf451d9c46a01d1c88c4819d9bfd4818b9c387ada8477950e8d1639653f02e38 SHA512 b27df0d8f71192ab3fc5f33cbb254700e122f0244426d2bca526d065e5fe1266abe9efcb116417e2a86dbb5e1175a9e84d570e86de79824c64d5bd7dd2ca4f91
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
deleted file mode 100644
index f132f3374af3..000000000000
--- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
-		http://git.savannah.gnu.org/r/config.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Updated config.sub and config.guess file from GNU"
-HOMEPAGE="https://savannah.gnu.org/projects/config"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-maint_pkg_create() {
-	cd "${S}"
-
-	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
-	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
-
-	cp "${FILESDIR}"/${PV}/*.patch . || die
-
-	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf ${tar} ./* || die "creating tar failed"
-	einfo "Packaged tar now available:"
-	einfo "$(du -b ${tar})"
-}
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		maint_pkg_create
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	epatch "${S}"/*.patch
-	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
-}
-
-src_compile() { :;}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins config.{sub,guess} || die
-	fperms +x /usr/share/${PN}/config.{sub,guess}
-	dodoc ChangeLog
-}
diff --git a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
deleted file mode 100644
index 0ba18b2c2bdc..000000000000
--- a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
-		http://git.savannah.gnu.org/r/config.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	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 ~x86-winnt"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Updated config.sub and config.guess file from GNU"
-HOMEPAGE="https://savannah.gnu.org/projects/config"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-maint_pkg_create() {
-	cd "${S}"
-
-	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
-	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
-
-	cp "${FILESDIR}"/${PV}/*.patch . || die
-
-	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf "${tar}" ./* || die "creating tar failed"
-	einfo "Packaged tar now available:"
-	einfo "$(du -b "${tar}")"
-}
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		maint_pkg_create
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${S}"/*.patch
-	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
-}
-
-src_compile() { :;}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins config.{sub,guess} || die
-	fperms +x /usr/share/${PN}/config.{sub,guess}
-	dodoc ChangeLog
-}
diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
index 2a59bb6ec8f4..ee23a02cd86c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit eutils
 if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
-		http://git.savannah.gnu.org/r/config.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
 
 	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
 	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 ~x86-winnt"
 	S="${WORKDIR}"
 fi
@@ -31,9 +29,9 @@ maint_pkg_create() {
 	cp "${FILESDIR}"/${PV}/*.patch . || die
 
 	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf ${tar} ./* || die "creating tar failed"
+	tar -jcf "${tar}" ./* || die "creating tar failed"
 	einfo "Packaged tar now available:"
-	einfo "$(du -b ${tar})"
+	einfo "$(du -b "${tar}")"
 }
 
 src_unpack() {
@@ -46,7 +44,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${S}"/*.patch
+	default
+	eapply "${S}"/*.patch
 	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 
@@ -58,7 +57,7 @@ src_test() {
 
 src_install() {
 	insinto /usr/share/${PN}
-	doins config.{sub,guess} || die
+	doins config.{sub,guess}
 	fperms +x /usr/share/${PN}/config.{sub,guess}
 	dodoc ChangeLog
 }
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 0ba18b2c2bdc..5d49b8940d9d 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eutils
 if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
-		http://git.savannah.gnu.org/r/config.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
 
 	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
 	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 ~x86-winnt"
 	S="${WORKDIR}"
 fi
@@ -59,7 +57,7 @@ src_test() {
 
 src_install() {
 	insinto /usr/share/${PN}
-	doins config.{sub,guess} || die
+	doins config.{sub,guess}
 	fperms +x /usr/share/${PN}/config.{sub,guess}
 	dodoc ChangeLog
 }