Merge branch 'next'

7 files changed, 94 insertions, 87 deletions

diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 5e12777b92de..0840103bee14 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,10 +1,10 @@
-AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1315 BLAKE2B a0d88c06dcd6aacc93bc54b67cc7b6197ab3e58186a47cc6825a36eb898e4c0bfa50b38c3d8ca233583981ec2e7b9ab7a66d48507bd487d725ddd88182eb5a30 SHA512 e35aa9b56acc50bad8f560fb4def75c79bf8090e6595d5a66ec10f2a12ac1037dac9c0e5c1c4b66946dac26b97f845011952d1472625753294c295e82f67cb6a
-AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1690 BLAKE2B 53d43da59ed0bcd390408333efcd07de1f1aabb9b4dfde8335949897535885cbbde3e623990737b833c47f6e948a64decfb6060395eaa935e8e5e0ac681605f4 SHA512 cb53feeaa937a72b3d64a45120890fdbb5c8eb93124da6528fcbbf03fff0d4f08d252fed1331d40de5cd34f09dc9e05d175e24fe097f274b141b73366f8cb0ad
-DIST gnuconfig-20161104.tar.bz2 49977 BLAKE2B 4d7d838c153abf2624bf53ceaefa43cee3f7321a36fc4bc64bfe8a22f93430faa43c28cb5c56a30d4818f7dc84fdcca7b866adc0cb557d8a67e7ca3e3a2f1daf SHA512 976b29363aaeaddf4d0520e1458b7fd3f91adf4e4f54c732acba984b9fd59a67c72488a439cc848deae32de8e6884b372ff5e5bb2972ea1e8eb9ddb222816f56
+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
-EBUILD gnuconfig-20161104.ebuild 1540 BLAKE2B 4b82791d056a3a03ea6977d0849dfdd14db635fa51179b4dbf5b8cebdcad1424d9c3b17fb8122e98bada6b6ead518b23a3d6a7eeda9b412c263202ecd17a7e0f SHA512 b2bf31e1c4dbf327c8153e9a76ae15e842aced572f454896707d41b085b730f9ed72570ecb107b061f444d336ff7f8e7bd7cfab039bda1423042e3b1cbe733e4
+DIST gnuconfig-20190804.tar.bz2 58538 BLAKE2B ec2ef7990e94eebca655db3f7e84a0294ca59f4753e33f69bdbd4d214240e33472abbfdd99735ec71d38a3d542501603a54e979e2aad4776c5faf6646d016956 SHA512 c24e0a49046d2a7fa3a77a22f06be8b97adb05541a95225c65c1cea47f7977230db1954666795019d28c02a4676acb93cc8b5c53f1b838e28fb50746630af82f
 EBUILD gnuconfig-20170101.ebuild 1552 BLAKE2B af79dc52309ea125f1e424d60ed04141fd94e36da24a9cd8f7d99582f67a588ed12b9c8f80f116c6b225af86fd0f39b41bec75802c144f72c26c1ba5115c63f8 SHA512 59d0cc38277e881eeb75dca77fa497a247edafee7488dd6cf08aec0e1839fbe3d651f38e79a905e59ab37e1a3650fb360f58d23fa01b6765a46265cd4015eedb
-EBUILD gnuconfig-20180101.ebuild 1580 BLAKE2B 9a042eda40df4b580a3ef2883eac15208a4f1f2bfd17527185853404a33cbea81acd6e99435a3bb2d9ad35251d3c7ba78b88d1b21070a9b2b0db0ce7837833c3 SHA512 7c877857bca6620a4932d4939050388dbd0beca60ec7a0729b635f8f3b915478036909c0f8534d027b9818fe66caa3c7a66146f3cda938ba614c9930668e5a58
-EBUILD gnuconfig-99999999.ebuild 1576 BLAKE2B 00e0809f7cb0f30a60ec4fa3a1fc734a4a667223cc9e1001df7e1ed9e4f9b1bfc7e86cbc10cddb71ad33a9e4b647f27e2f307d766b3827722e93b09a163c96db SHA512 aae8750105eedbf5bb86cb5a958c21e1dc4c65e16bb4f2dfd8aefe1c0320adbab73ff4f3af4b6d3244cdb1c812b72c71a6d23dc4b31651dd4bbb9e94b92da75a
+EBUILD gnuconfig-20180101.ebuild 1567 BLAKE2B c085296eb227b05e021048e2f3a5ce1b36cbeb783e5ac829d90a18acf71f74f60e7c1dd8a4ccdf5cf7a823e6ff43707555ae19d7a67057e1d13723da12bd94c3 SHA512 e3d10d89dfdfd42554197057cda6724a8725c93cb235812d578281c2af16f8ee30826db9c30380b4d40eea65a05ad88fb0df7e66ba8749b068829c22792699b8
+EBUILD gnuconfig-20190804.ebuild 1593 BLAKE2B 3da2f6df66246162f251389fde500c0d447f090b8499127d88f968fe9ce8b893c3d2de27eb073f8208df63e43ea5681702f15b10258a8c1c0f5f0d8e882c5b4e SHA512 c9b3595a3a16605410424b006f989396910cadb24a8ddd29db9e9f3704aada6899aa516246c8d25a0e06cb24fd5bd2ad57d8c6ced081c96f3d48e7c24719aee1
+EBUILD gnuconfig-99999999.ebuild 1593 BLAKE2B 3da2f6df66246162f251389fde500c0d447f090b8499127d88f968fe9ce8b893c3d2de27eb073f8208df63e43ea5681702f15b10258a8c1c0f5f0d8e882c5b4e SHA512 c9b3595a3a16605410424b006f989396910cadb24a8ddd29db9e9f3704aada6899aa516246c8d25a0e06cb24fd5bd2ad57d8c6ced081c96f3d48e7c24719aee1
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
new file mode 100644
index 000000000000..83c259b2b1ef
--- /dev/null
+++ b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
@@ -0,0 +1,64 @@
+From d5899b457d3215db991761e57aa4e091e4b24f28 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 9 Oct 2008 15:51:35 -0400
+Subject: [PATCH] add ps2 targets to config.sub
+
+We no longer carry the "ps2" target as that conflicts with the long
+standing shortcut for the i386-ibm-aix target.
+---
+ config.sub | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/config.sub b/config.sub
+index a318a4686850..837d23369163 100755
+--- a/config.sub
++++ b/config.sub
+@@ -810,6 +810,27 @@ case $basic_machine in
+ 		vendor=atari
+ 		os=mint
+ 		;;
++	mipsEE* | ee)
++		cpu=mips64r5900el
++		vendor=scei
++		case $os in
++		    linux*)
++			;;
++		    *)
++			os=elf
++			;;
++		esac
++		;;
++	iop)
++		cpu=mipsel
++		vendor=scei
++		os=irx
++		;;
++	dvp)
++		cpu=dvp
++		vendor=scei
++		os=elf
++		;;
+ 	news-3600 | risc-news)
+ 		cpu=mips
+ 		vendor=sony
+@@ -1172,7 +1193,7 @@ case $cpu-$vendor in
+ 			| bfin | bpf | bs2000 \
+ 			| c[123]* | c30 | [cjt]90 | c4x \
+ 			| c8051 | clipper | craynv | csky | cydra \
+-			| d10v | d30v | dlx | dsp16xx \
++			| d10v | d30v | dlx | dsp16xx | dvp \
+ 			| e2k | elxsi | epiphany \
+ 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+ 			| h8300 | h8500 \
+@@ -1359,7 +1380,7 @@ case $os in
+ 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+ 	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
++	     | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \
+ 	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+ 	     | morphos* | superux* | rtmk* | windiss* \
+ 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+-- 
+2.19.1
+
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
index 2c69f57878eb..5a696d1c4b4e 100644
--- 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
@@ -1,4 +1,4 @@
-From 8474d78c459f4ec8f8930094faeaacb2b77bf68f Mon Sep 17 00:00:00 2001
+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
@@ -16,15 +16,15 @@ URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/config.guess b/config.guess
-index fddac42..17a4f70 100755
+index 97ad0733304d..92f16126465f 100755
 --- a/config.guess
 +++ b/config.guess
-@@ -1038,7 +1038,18 @@ EOF
- 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+@@ -1090,7 +1090,18 @@ EOF
+ 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
  	exit ;;
      x86_64:Linux:*:*)
--	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-+	eval $set_cc_for_build
+-	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
@@ -35,10 +35,10 @@ index fddac42..17a4f70 100755
 +		X86_64_ABI=x32
 +	    fi
 +	fi
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI}
++	echo "$UNAME_MACHINE"-pc-linux-"$LIBC$X86_64_ABI"
  	exit ;;
      xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 -- 
-2.4.4
+2.19.1
 
diff --git a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
deleted file mode 100644
index 88e43cd8ac2b..000000000000
--- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582f9caf95b3ccf36e6248be3b5b414546b0a03e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 9 Oct 2008 15:51:35 -0400
-Subject: [PATCH] add ps2 targets to config.sub
-
----
- config.sub | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/config.sub b/config.sub
-index 88307c1..7ee2b4c 100755
---- a/config.sub
-+++ b/config.sub
-@@ -258,7 +258,7 @@ case $basic_machine in
- 	| be32 | be64 \
- 	| bfin \
- 	| c4x | c8051 | clipper \
--	| d10v | d30v | dlx | dsp16xx \
-+	| d10v | d30v | dlx | dsp16xx | dvp \
- 	| e2k | epiphany \
- 	| fido | fr30 | frv | ft32 \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-@@ -823,6 +823,24 @@ case $basic_machine in
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
-+	mipsEE* | ee | ps2)
-+		basic_machine=mips64r5900el-scei
-+		case $os in
-+		    -linux*)
-+			;;
-+		    *)
-+			os=-elf
-+			;;
-+		esac
-+		;;
-+	iop)
-+		basic_machine=mipsel-scei
-+		os=-irx
-+		;;
-+	dvp)
-+		basic_machine=dvp-scei
-+		os=-elf
-+		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
-@@ -1389,7 +1407,7 @@ case $os in
- 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--- 
-2.3.1
-
diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index 387ba6cac9aa..97da37cf54f6 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
index bd734c724372..c7e0faa0146d 100644
--- a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils
 if [[ ${PV} == "99999999" ]] ; then
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 +31,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 +46,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
 }
 
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index c4ccaeecd38c..c7e0faa0146d 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils
 if [[ ${PV} == "99999999" ]] ; then
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 +31,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 +46,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
 }