[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sergei Trofimovich]

commit:     1358450322c7cfadb35d2d369a909ab5c7dccf20
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sat Jun  2 23:37:15 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 20:54:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13584503

toolchain-binutils.eclass: drop git-2

git-2.eclass is deprecated and the git logic is handled in the live
ebuild itself.

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

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0e532a8f201..552bba37c31 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
 }