gentoo resync : 16.06.2018

4 files changed, 39 insertions, 46 deletions

diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index eea4e50afe34..8c1290f51547 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,6 +1,6 @@
 DIST uClibc-0.9.33.2-patches-17.tar.bz2 32437 BLAKE2B c051e8acf4f7d8da219918a5cd7b465865da7e64307b2a1c64b6b86f8381340edf03745301f0b3b358403d56712964c3d57f330b88a3e8ff2da22d898a35c909 SHA512 6a6ad8aef862f742e60965c447e5abee2349886f01bf5e44111b2a6c21e59e4644195cf36e85b8ce0dabbf7b92dc2c36ae27f0b7a02b0f9f4278e46ec5fb5a76
 DIST uClibc-0.9.33.2.tar.bz2 2834029 BLAKE2B a23e7b3a1a8142ef08349179e27f2d47765757829c2a88d4937d02314bc7c07bd36a21d815213f1478b24075bb029112738161bb1be383df08cec5e786aae260 SHA512 1cf18fe5418e12ae12ce995d7455d465bc4737f225afc49512ec69858771e099bead7b18408b01c7e6f845dcc80c3b4f875332eeffdcc04ae4b48474fb29a8dd
-EBUILD uclibc-0.9.33.2-r15.ebuild 9391 BLAKE2B 9c4001c6496f450a0870b08d9fdf7e841ae292a71cc7f1d71b696c6fb6f35717ea5922355a07105ad54e4dfd0c1cec1c9c988a37dc27057e8ec68b69539bbafb SHA512 39d7e5a916c8e8b96eb944d52d9bf9b01ff866d19207da63b59101970e025506c2efbb87aea74da862ff0209dc80657f7f0c941fb745be0fd9e175baa181611f
-EBUILD uclibc-0.9.33.9999.ebuild 9334 BLAKE2B dc74b67228433668095b432c366a0be69ff7b43701ff13b23fff9569dbd33d774693ee3f368f0a03e9ebc0cc5aeb5b4f69c851da815c3c65c2abb4bb221d2cb0 SHA512 2d38cdffa1285fa62f9df0092a5df6c9136a29036f14c3e04712cc481bb3b7ec04b58fdcee7d0de13505120ef55ac2284e18d2011151e2cd721762184e98bf44
-EBUILD uclibc-9999.ebuild 9312 BLAKE2B a4edb33fb50e77ec8c1f4411498b62ee4a63f2d62e3c0e0a022e161e5dd39c4ca28439c49f34370c83799b1005cc98f5103941c079c1dc20489497a65e5cfec3 SHA512 57f7fd506b86a650941b174fb96eba4721c15cf2fd7cae1794abbbfe4237897ad3060cfd39f2b1665fc0a198379548f4372a90b3b4d550a2d2a1db60cde984ce
+EBUILD uclibc-0.9.33.2-r15.ebuild 9386 BLAKE2B ac8aa826c8b51d9bc6d3a54b35105af17fa3d735cbeeca5283ef1a6312aad80e405100af6078658b51037bbeba3a873846d6244753dcd8c08027eab2f56af19a SHA512 7bdf5a54c1fe8a781c655ec44a8b4f50f7f758b4b7547de0d2a44a2c321291282c427e6d140de581ebb471a377009eec77d8c27f432617b91863bb780ad37d1d
+EBUILD uclibc-0.9.33.9999.ebuild 9348 BLAKE2B 0889fa7e2bc7c86f5a461ad43bfde8b7968e3ab7624ee881da04b11000164f6586683095fcd0773eb6e47d195b48b041450999da67f226939c1ecef6a724fbf5 SHA512 f9f97e41563be062974547c6945c45716edf16433c308bee9593ee051e6fb0d5ce786348d76acc8318db7d48ed27e451eba16a121538ed658218503492938e34
+EBUILD uclibc-9999.ebuild 9329 BLAKE2B c833b8f34dd30ef29c0d843731ded7b8778b9a60c675b5e8c009ed82bd827a9ed3355b7fd613e99b7fa2655f49cefe04147b5b3075e4691a2c74231fb75b7ac7 SHA512 ea49b5e167e624328efa4a145183e500ac916a979216d38e7d642ee3aaad704da70cb0b957bb0161242ce3709d123d701664a43717e38cb172c5b09ff5ef41d8
 MISC metadata.xml 1388 BLAKE2B 2c031c5d87aefe90b83a2d0de01ee836b978bf1e89a8b16cbbf71acbc5366a57c3d15423a4beb6a6c51ad6adecc45731b949591fdf6faa5de7a6516ea04d5ce9 SHA512 59111cac2b1c0e2df5ed96d01e6913307915281c8d24019f5a12213dabd0621adfb52e87d344e1de484e1b6dd19014ce695f00b96f27ce26d7632e825863beeb
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 4c712c8a69a8..32bb54180854 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,20 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.busybox.net/uClibc"
-	EGIT_BRANCH="0.9.33"
-	inherit git-r3
-else
-	PATCH_VER="17"
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.busybox.net/uClibc"
+	inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER="17"
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -235,8 +232,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index d55f0afff6da..fbc8a60a1fc9 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,20 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.busybox.net/uClibc"
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_BRANCH="0.9.33"
-	inherit git-r3
-else
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+	EGIT_REPO_URI="git://git.busybox.net/uClibc"
+	inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +16,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != *9999 ]] ; then
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -233,8 +231,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
+	if [[ ${PV} == *9999 ]] ; then
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 3e096317babc..f5cec3749e75 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,19 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.busybox.net/uClibc"
-	inherit git-r3
-else
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.busybox.net/uClibc"
+	inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -24,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -232,8 +230,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi