[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/

[Andreas Hüttel]

commit:     84eab008261ffb440c5bdab3c5a29428dcbe1c38
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 19:05:39 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 19:06:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84eab008

sys-devel/binutils: Add stable branch live ebuild

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...{binutils-9999.ebuild => binutils-2.31.9999.ebuild} | 18 ++++++++++++++----
 sys-devel/binutils/binutils-9999.ebuild                | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-2.31.9999.ebuild
similarity index 97%
copy from sys-devel/binutils/binutils-9999.ebuild
copy to sys-devel/binutils/binutils-2.31.9999.ebuild
index c7972aa0b70..5a79c08c6b9 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-2.31.9999.ebuild
@@ -20,6 +20,7 @@ IUSE="+cxx doc multitarget +nls static-libs test"
 #                      Default: dilfridge :)
 
 PATCH_VER=1
+PATCH_BINUTILS_VER=9999
 
 case ${PV} in
 	9999)
@@ -27,12 +28,22 @@ case ${PV} in
 		inherit git-r3
 		S=${WORKDIR}/binutils
 		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=${PV%.9999}
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=${PV%.9999}
 		;;
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=${PV}
 		;;
 esac
-SLOT="${PV}"
 
 #
 # The Gentoo patchset
@@ -79,14 +90,13 @@ MY_BUILDDIR=${WORKDIR}/build
 
 src_unpack() {
 	case ${PV} in
-		9999)
+		*9999)
 			git-r3_src_unpack
-			default
 			;;
 		*)
-			default
 			;;
 	esac
+	default
 	mkdir -p "${MY_BUILDDIR}"
 }
 

diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index c7972aa0b70..a2e72661a56 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -27,12 +27,22 @@ case ${PV} in
 		inherit git-r3
 		S=${WORKDIR}/binutils
 		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=${PV%.9999}
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=${PV%.9999}
 		;;
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=${PV}
 		;;
 esac
-SLOT="${PV}"
 
 #
 # The Gentoo patchset
@@ -79,14 +89,13 @@ MY_BUILDDIR=${WORKDIR}/build
 
 src_unpack() {
 	case ${PV} in
-		9999)
+		*9999)
 			git-r3_src_unpack
-			default
 			;;
 		*)
-			default
 			;;
 	esac
+	default
 	mkdir -p "${MY_BUILDDIR}"
 }