Remove the experimental git-r3 testing support. It is not needed anymore, git-r3 has been proven to work and we can happily use it instead.

2 files changed, 18 insertions, 67 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7451c36f3ec1..f87ab47a7c9a 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1432 2014/11/20 02:44:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1433 2014/11/20 15:25:52 mgorny Exp $
+
+  20 Nov 2014; Michał Górny <mgorny@gentoo.org> git-2.eclass:
+  Remove the experimental git-r3 testing support. It is not needed anymore,
+  git-r3 has been proven to work and we can happily use it instead.
 
   20 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
   Add RDEPEND on dev-qt/qtchooser.
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index b560cddaac69..674ab562d770 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.33 2013/10/08 11:19:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.34 2014/11/20 15:25:52 mgorny Exp $
 
 # @ECLASS: git-2.eclass
 # @MAINTAINER:
@@ -11,16 +11,6 @@
 # Eclass for easing maitenance of live ebuilds using git as remote repository.
 # Eclass support working with git submodules and branching.
 
-# @ECLASS-VARIABLE: EGIT_USE_GIT_R3
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Use git-r3 backend instead of classic git-2 behavior. This is intended
-# for early testing of git-r3 and is to be set in make.conf.
-
-# (since we override src_unpack this doesn't hurt)
-_INHERITED_BY_GIT_2=1 \
-inherit git-r3
-
 # This eclass support all EAPIs
 EXPORT_FUNCTIONS src_unpack
 
@@ -582,66 +572,23 @@ git-2_cleanup() {
 	unset EGIT_LOCAL_NONBARE
 }
 
-git-2_r3_wrapper() {
-	ewarn "Using git-r3 backend in git-2. Not everything is supported."
-	ewarn "Expect random failures and have fun testing."
-
-	if [[ ${EGIT_SOURCEDIR} ]]; then
-		EGIT_CHECKOUT_DIR=${EGIT_SOURCEDIR}
-		unset EGIT_SOURCEDIR
-	fi
-
-	if [[ ${EGIT_MASTER} ]]; then
-		: ${EGIT_BRANCH:=${EGIT_MASTER}}
-		unset EGIT_MASTER
-	fi
-
-	if [[ ${EGIT_HAS_SUBMODULES} ]]; then
-		unset EGIT_HAS_SUBMODULES
-	fi
-
-	if [[ ${EGIT_PROJECT} ]]; then
-		unset EGIT_PROJECT
-	fi
-
-	local boots unp
-	if [[ ${EGIT_NOUNPACK} ]]; then
-		unp=1
-		unset EGIT_NOUNPACK
-	fi
-
-	if [[ ${EGIT_BOOTSTRAP} ]]; then
-		boots=1
-		unset EGIT_BOOTSTRAP
-	fi
-
-	git-r3_src_unpack
-
-	[[ ${boots} ]] && EGIT_BOOTSTRAP=${boots} git-2_bootstrap
-	[[ ${unp} ]] && EGIT_NOUNPACK=1
-}
-
 # @FUNCTION: git-2_src_unpack
 # @DESCRIPTION:
 # Default git src_unpack function.
 git-2_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ${EGIT_USE_GIT_R3} ]]; then
-		git-2_r3_wrapper
-	else
-		git-2_init_variables
-		git-2_prepare_storedir
-		git-2_migrate_repository
-		git-2_fetch "$@"
-		git-2_gc
-		git-2_submodules
-		git-2_move_source
-		git-2_branch
-		git-2_bootstrap
-		git-2_cleanup
-		echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
-	fi
+	git-2_init_variables
+	git-2_prepare_storedir
+	git-2_migrate_repository
+	git-2_fetch "$@"
+	git-2_gc
+	git-2_submodules
+	git-2_move_source
+	git-2_branch
+	git-2_bootstrap
+	git-2_cleanup
+	echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
 
 	# Users can specify some SRC_URI and we should
 	# unpack the files too.