gentoo resync : 19.05.2018

5 files changed, 20 insertions, 24 deletions

diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index fed2ee23e5ff..24041f923d9e 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -3,8 +3,8 @@ AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1690 BLAKE2B 53d43da59ed0b
 DIST gnuconfig-20161104.tar.bz2 49977 BLAKE2B 4d7d838c153abf2624bf53ceaefa43cee3f7321a36fc4bc64bfe8a22f93430faa43c28cb5c56a30d4818f7dc84fdcca7b866adc0cb557d8a67e7ca3e3a2f1daf SHA512 976b29363aaeaddf4d0520e1458b7fd3f91adf4e4f54c732acba984b9fd59a67c72488a439cc848deae32de8e6884b372ff5e5bb2972ea1e8eb9ddb222816f56
 DIST gnuconfig-20170101.tar.bz2 50152 BLAKE2B be36ec32461444e489c591aa5dff8540f6191cc21c69590bb48632e79b4ce41b1ca30b17d034c068cf79762a520447c0edc1b3a300b4225b25f8ed19fbf249e5 SHA512 a4d72b50f0c6ebae702b4d51aaeb459ac2b325f9f79ff6c464c1b92ecd7eb961b47b4fa0eb03894e80646846cff39a3e3b2d8ada6279e288e94846a12578b440
 DIST gnuconfig-20180101.tar.bz2 51438 BLAKE2B c09ceb107bc446b04feb6fda500a1d869c8e0841bb72b7116c7bdadaa737cc25db2715ab3ce20429a9a7d4e0a5c0b054b63b21fc49da2f65e277169c34b5e2ed SHA512 3af359088e8e93c81ec49bfae90839266596c2566a663839b0e91c4d4319d2bfb91738af9d5fa19b9d53703979fbddd81294bcc032b46c33b94f1961ff9f2178
-EBUILD gnuconfig-20161104.ebuild 1542 BLAKE2B fceb2bb00e44023d5d70ef589b93595e2fd7b191920373762bcbb431208b99c20009fb33da41a69d9d828e4903cf04fe38bebf408bad28b677670dcb744c653f SHA512 f9ab7bc629530ff6db87488d3e8d1c847843d9f9120029ace48187542b73eef3d3b85af7072b7fae8dc6d46e63ae77b3db4f71503c49ae92548ca8b34501400e
-EBUILD gnuconfig-20170101.ebuild 1554 BLAKE2B 8fa35b982436951e323773dbe70f86802238f07522f9d4d1178de03f026dfd091a825b78edcc52dcdc919aa21e4a845505a3f4e7a5e9c39c41936a12ea07fc0d SHA512 0b38335d9bf9782144647b9cb7c28e87b4769acbe67f812ea102134567d40814f411a676bf4f7cda5b7b939dda87f234b78ef83aaf094b8dc4d85d718aeb0892
-EBUILD gnuconfig-20180101.ebuild 1578 BLAKE2B 24eea49a9e182a4264b5479f4ce09358414cec16aea4bf48fb486d0aa19b16b6f5b23f20791d33a40aec50181d99dc3ea01ae3d70471f0d7c43d0192162a2015 SHA512 540fc032dda79504d8031753256cabe4351a3e4ecdbf1f6d8ac193b4f68a9455b18c383248041a915c538e7045ddea2adb5f4911b6ee2f5d6d90351868e801bf
-EBUILD gnuconfig-99999999.ebuild 1578 BLAKE2B 24eea49a9e182a4264b5479f4ce09358414cec16aea4bf48fb486d0aa19b16b6f5b23f20791d33a40aec50181d99dc3ea01ae3d70471f0d7c43d0192162a2015 SHA512 540fc032dda79504d8031753256cabe4351a3e4ecdbf1f6d8ac193b4f68a9455b18c383248041a915c538e7045ddea2adb5f4911b6ee2f5d6d90351868e801bf
+EBUILD gnuconfig-20161104.ebuild 1540 BLAKE2B 4b82791d056a3a03ea6977d0849dfdd14db635fa51179b4dbf5b8cebdcad1424d9c3b17fb8122e98bada6b6ead518b23a3d6a7eeda9b412c263202ecd17a7e0f SHA512 b2bf31e1c4dbf327c8153e9a76ae15e842aced572f454896707d41b085b730f9ed72570ecb107b061f444d336ff7f8e7bd7cfab039bda1423042e3b1cbe733e4
+EBUILD gnuconfig-20170101.ebuild 1552 BLAKE2B af79dc52309ea125f1e424d60ed04141fd94e36da24a9cd8f7d99582f67a588ed12b9c8f80f116c6b225af86fd0f39b41bec75802c144f72c26c1ba5115c63f8 SHA512 59d0cc38277e881eeb75dca77fa497a247edafee7488dd6cf08aec0e1839fbe3d651f38e79a905e59ab37e1a3650fb360f58d23fa01b6765a46265cd4015eedb
+EBUILD gnuconfig-20180101.ebuild 1576 BLAKE2B 00e0809f7cb0f30a60ec4fa3a1fc734a4a667223cc9e1001df7e1ed9e4f9b1bfc7e86cbc10cddb71ad33a9e4b647f27e2f307d766b3827722e93b09a163c96db SHA512 aae8750105eedbf5bb86cb5a958c21e1dc4c65e16bb4f2dfd8aefe1c0320adbab73ff4f3af4b6d3244cdb1c812b72c71a6d23dc4b31651dd4bbb9e94b92da75a
+EBUILD gnuconfig-99999999.ebuild 1576 BLAKE2B 00e0809f7cb0f30a60ec4fa3a1fc734a4a667223cc9e1001df7e1ed9e4f9b1bfc7e86cbc10cddb71ad33a9e4b647f27e2f307d766b3827722e93b09a163c96db SHA512 aae8750105eedbf5bb86cb5a958c21e1dc4c65e16bb4f2dfd8aefe1c0320adbab73ff4f3af4b6d3244cdb1c812b72c71a6d23dc4b31651dd4bbb9e94b92da75a
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild b/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
index 60b5697dc481..bd734c724372 100644
--- a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
 		http://git.savannah.gnu.org/r/config.git"
 
-	inherit git-2
+	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"
+	S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
 	cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
-		git-2_src_unpack
+		git-r3_src_unpack
 		maint_pkg_create
 	else
 		unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/*.patch
+	epatch "${S}"/*.patch
 	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
index 92d06ef82ca8..0b3c4010d8f4 100644
--- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
 		http://git.savannah.gnu.org/r/config.git"
 
-	inherit git-2
+	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"
+	S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
 	cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
-		git-2_src_unpack
+		git-r3_src_unpack
 		maint_pkg_create
 	else
 		unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/*.patch
+	epatch "${S}"/*.patch
 	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index 2629a1d763f8..c4ccaeecd38c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
 		http://git.savannah.gnu.org/r/config.git"
 
-	inherit git-2
+	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"
+	S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
 	cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
-		git-2_src_unpack
+		git-r3_src_unpack
 		maint_pkg_create
 	else
 		unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/*.patch
+	epatch "${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 2629a1d763f8..c4ccaeecd38c 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -8,10 +8,11 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
 		http://git.savannah.gnu.org/r/config.git"
 
-	inherit git-2
+	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"
+	S="${WORKDIR}"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
@@ -21,8 +22,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
-
 maint_pkg_create() {
 	cd "${S}"
 
@@ -39,7 +38,7 @@ maint_pkg_create() {
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
-		git-2_src_unpack
+		git-r3_src_unpack
 		maint_pkg_create
 	else
 		unpack ${A}
@@ -47,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/*.patch
+	epatch "${S}"/*.patch
 	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }