[gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses

[gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses

[Marty E. Plummer]

In the live ebuilds using this eclass, the git logic is handled in the
ebuild itself and not the eclass. Drop the git logic as it uses git-2
which has been deprecated for quite some time.

Marty E. Plummer (2):
  toolchain-binutils.eclass: drop git-2
  toolchain-glibc.eclass: remove git logic

 eclass/toolchain-binutils.eclass | 16 +---------------
 eclass/toolchain-glibc.eclass    | 11 +----------
 2 files changed, 2 insertions(+), 25 deletions(-)

-- 
2.17.1

[gentoo-dev] [PATCH 1/2] toolchain-binutils.eclass: drop git-2

[Marty E. Plummer]

git-2.eclass is deprecated and the git logic is handled in the live
ebuild itself.
---
 eclass/toolchain-binutils.eclass | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0e532a8f201..a504a0f9a4e 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" ;;
@@ -113,10 +106,6 @@ if is_cross ; then
 fi
 
 S=${WORKDIR}/binutils
-case ${BVER} in
-git) ;;
-*) S=${S}-${BVER} ;;
-esac
 
 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
 }
-- 
2.17.1

[gentoo-dev] [PATCH 2/2] toolchain-glibc.eclass: remove git logic

[Marty E. Plummer]

The git logic is handled in the live ebuild directly, and the only use
of this eclass is in non-live ebuilds. In fact, the two newest non-live
ebuilds do not make use of this eclass at all, and as far as I can see
nowhere in the history of this file does it inherit git-2 at all.
---
 eclass/toolchain-glibc.eclass | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index d75ca2eefdf..5f0e0cfd5cd 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -667,16 +667,7 @@ toolchain-glibc_do_src_unpack() {
 	# Check NPTL support _before_ we unpack things to save some time
 	want_nptl && check_nptl_support
 
-	if [[ -n ${EGIT_REPO_URIS} ]] ; then
-		local i d
-		for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do
-			EGIT_REPO_URI=${EGIT_REPO_URIS[$i]}
-			EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]}
-			git-2_src_unpack
-		done
-	else
-		unpack_pkg
-	fi
+	unpack_pkg
 
 	cd "${S}"
 	touch locale/C-translit.h #185476 #218003
-- 
2.17.1

Re: [gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses

[Andreas K. Huettel]

[-- Attachment #1: Type: text/plain, Size: 847 bytes --]

Am Sonntag, 3. Juni 2018, 03:47:14 CEST schrieb Marty E. Plummer:
> In the live ebuilds using this eclass, the git logic is handled in the
> ebuild itself and not the eclass. Drop the git logic as it uses git-2
> which has been deprecated for quite some time.
> 
> Marty E. Plummer (2):
>   toolchain-binutils.eclass: drop git-2
>   toolchain-glibc.eclass: remove git logic
> 
>  eclass/toolchain-binutils.eclass | 16 +---------------
>  eclass/toolchain-glibc.eclass    | 11 +----------
>  2 files changed, 2 insertions(+), 25 deletions(-)

As already discussed in private, this doesnt really make sense... 

Both eclasses are only used in old, stable ebuilds that are being phased out, 
and are in freeze.


-- 
Andreas K. Hüttel
dilfridge@gentoo.org
Gentoo Linux developer 
(council, toolchain, perl, libreoffice, comrel)

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses

[Marty E. Plummer]

On Tue, Jun 05, 2018 at 11:24:49PM +0200, Andreas K. Huettel wrote:
> Am Sonntag, 3. Juni 2018, 03:47:14 CEST schrieb Marty E. Plummer:
> > In the live ebuilds using this eclass, the git logic is handled in the
> > ebuild itself and not the eclass. Drop the git logic as it uses git-2
> > which has been deprecated for quite some time.
> > 
> > Marty E. Plummer (2):
> >   toolchain-binutils.eclass: drop git-2
> >   toolchain-glibc.eclass: remove git logic
> > 
> >  eclass/toolchain-binutils.eclass | 16 +---------------
> >  eclass/toolchain-glibc.eclass    | 11 +----------
> >  2 files changed, 2 insertions(+), 25 deletions(-)
> 
> As already discussed in private, this doesnt really make sense... 
> 
> Both eclasses are only used in old, stable ebuilds that are being phased out, 
> and are in freeze.
> 
> 
Reason I sent these patches is git-2 is deprecated in favor of git-r3,
and I assume (perhaps wrongly) git-2.eclass won't be removed from the
tree untill all its consumers are ported.

And in both eclasses the ebuilds which use them never enter the git
logic path, so its effectively dead code and even with the 'freeze' this
change will not change their behavior.
> -- 
> Andreas K. H?ttel
> dilfridge@gentoo.org
> Gentoo Linux developer 
> (council, toolchain, perl, libreoffice, comrel)