From cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 9 Jun 2018 09:27:03 +0100
Subject: gentoo resync : 09.06.2018

---
 eclass/toolchain-binutils.eclass | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'eclass/toolchain-binutils.eclass')

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0e532a8f201e..552bba37c312 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -15,7 +15,6 @@ if [[ -n ${BINUTILS_TYPE} ]] ; then
 	BTYPE=${BINUTILS_TYPE}
 else
 	case ${PV} in
-	9999)      BTYPE="git";;
 	9999_pre*) BTYPE="snap";;
 	*.*.90)    BTYPE="snap";;
 	*.*.*.*.*) BTYPE="hjlu";;
@@ -24,11 +23,6 @@ else
 fi
 
 case ${BTYPE} in
-git)
-	BVER="git"
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
-	;;
 snap)
 	BVER=${PV/9999_pre}
 	;;
@@ -58,7 +52,6 @@ DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 
 case ${BTYPE} in
-	git) SRC_URI="" ;;
 	snap)
 		SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2
 			ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;;
@@ -112,11 +105,7 @@ if is_cross ; then
 	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
 fi
 
-S=${WORKDIR}/binutils
-case ${BVER} in
-git) ;;
-*) S=${S}-${BVER} ;;
-esac
+S=${WORKDIR}/binutils-${BVER}
 
 LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
 INCPATH=${LIBPATH}/include
@@ -129,10 +118,7 @@ else
 fi
 
 tc-binutils_unpack() {
-	case ${BTYPE} in
-	git) git-2_src_unpack ;;
-	*)   unpacker ${A} ;;
-	esac
+	unpacker ${A}
 	mkdir -p "${MY_BUILDDIR}"
 	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
 }
-- 
cgit v1.2.3