gentoo resync : 29.06.2020

3 files changed, 65 insertions, 45 deletions

diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index ed69bbf46c03..75fb985fdff6 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,6 +1,7 @@
 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-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
+DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
 EBUILD gnuconfig-20190912.ebuild 1523 BLAKE2B 9c554949eeb12824973093297ef62487a86b01dc221d758885a26d7d1d27b5d7e1f0f67bd98f870bd37fae2ec2a9edae408a689d0068da1edd5d0b11e202c8bf SHA512 1dfe87e69b584f5747732c4915e5c620b9082ba492bc0b306ba3ccc21ae603ce29ccb9e45192da015bb1f419ee247391ddb11b7025b590192010014956ced37c
+EBUILD gnuconfig-20200621.ebuild 1532 BLAKE2B 6f8a2082af26b31813412daf18e78edcc64aa185f2b9deb19a5906bf256d33a1df8a92d478da45a7129423e09b9023fe18171aa048beb20b876b5c9fd974f9e2 SHA512 d6e48365fad60eb251a84c799edb780160e5257ec74b59d3ac6893ce3469f65ad9934d2618f9f59f017d2ba2345531e95f8d6bcc60e974e1de627828eca1414a
 EBUILD gnuconfig-99999999.ebuild 1532 BLAKE2B 6f8a2082af26b31813412daf18e78edcc64aa185f2b9deb19a5906bf256d33a1df8a92d478da45a7129423e09b9023fe18171aa048beb20b876b5c9fd974f9e2 SHA512 d6e48365fad60eb251a84c799edb780160e5257ec74b59d3ac6893ce3469f65ad9934d2618f9f59f017d2ba2345531e95f8d6bcc60e974e1de627828eca1414a
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
deleted file mode 100644
index 5a696d1c4b4e..000000000000
--- a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 42ebd93d96cd060141e37d9d6601ca1e7d21040d Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hongjiu.lu@intel.com>
-Date: Fri, 20 Dec 2013 14:36:01 -0500
-Subject: [PATCH] Add x32 support to config.guess
-
-GCC on Linux/x86-64 may be configured for x32:
-
-https://sites.google.com/site/x32abi/
-
-by default and the Linux/x32 target should be x86_64-VENDOR-linux-gnux32.
-This patch adds x32 support to config.guess.  OK to install?
-
-URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html
----
- config.guess | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/config.guess b/config.guess
-index 97ad0733304d..92f16126465f 100755
---- a/config.guess
-+++ b/config.guess
-@@ -1090,7 +1090,18 @@ EOF
- 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-+	set_cc_for_build
-+	X86_64_ABI=
-+	# If there is a compiler, see if it is configured for 32-bit objects.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_X32 >/dev/null
-+	    then
-+		X86_64_ABI=x32
-+	    fi
-+	fi
-+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC$X86_64_ABI"
- 	exit ;;
-     xtensa*:Linux:*:*)
- 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
--- 
-2.19.1
-
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
new file mode 100644
index 000000000000..7eb2a8392c5e
--- /dev/null
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
+
+	inherit git-r3
+else
+	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 ~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}
+	fperms +x /usr/share/${PN}/config.{sub,guess}
+	dodoc ChangeLog
+}