Migrate to git-2 eclass. Update live/stable logic conditionals.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 25 insertions, 14 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index add1cf456e4e..eacfe23e9db3 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.89 2011/04/06 23:07:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.90 2011/04/20 11:53:08 scarabeus Exp $
+
+  20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> git-9999.ebuild:
+  Migrate to git-2 eclass. Update live/stable logic conditionals.
 
 *git-1.7.5_rc1 (06 Apr 2011)
 *git-1.7.4.4 (06 Apr 2011)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 9462aecd5c8a..b955bae9269d 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2
 AUX git-1.6.6.1-interix6.patch 457 RMD160 27bdfe9ab248791f628420cc45751fae2643b3d5 SHA1 6c80a5cb63cbcf89b61b8f5e2c16736cb0be09bc SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849
 AUX git-1.7.1-interix.patch 2192 RMD160 725c43e056bbaa82e4af1f2aef9dd152214f9d65 SHA1 de6062aaa8bd177c77c124696d4253c299bba1fb SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495
@@ -43,6 +46,13 @@ EBUILD git-1.7.4.1.ebuild 14904 RMD160 6b0c81ecda446902564c35b7d984aab9dbf6adc2
 EBUILD git-1.7.4.4.ebuild 14906 RMD160 3993a4daed1f3bb0957ef152588ce11837b0bb99 SHA1 80d453a91fb8fa9bc386ab4153efa1a39f978ca5 SHA256 ae7060451622765ac0a9b508d56e7a7a45e92513471f1829d0208a4c3f2f5e24
 EBUILD git-1.7.4.ebuild 14902 RMD160 4957dc78057f58bffab9307f9997f43a56356bd4 SHA1 76f728548fe8d45c33174728ea76d34538803d0e SHA256 a661883ac1a6498b741166d679fbb81badd61b2f9b132ae6690811ba91d2d81e
 EBUILD git-1.7.5_rc1.ebuild 14908 RMD160 dad3da7bd083409b9c67cfe702fe660324a1f5c7 SHA1 71652f339314fcd3695e0e938a8cc6e4f45c75c9 SHA256 aa25cee30e32a207da21387bc6e10aac707798a81ad5e71fcc56cfda38dbe599
-EBUILD git-9999.ebuild 14902 RMD160 0b841e382f668039cd509472ad4edeb615cc3138 SHA1 a18e060a009a703470c7f90ef750c3d365535f36 SHA256 06bfcac681e8e2bbb012abbdfa3c22f2bd47cd510bd649e060704c0481a07980
-MISC ChangeLog 80354 RMD160 bc52688cc43fcb50cb12503483dad683e875fddc SHA1 7921cd58f6e740ac28ae88caaf4fc77364a2127d SHA256 765b81b8d55a6395d68ae674f4f55ab535cfb872e97d67eff6e1f1d4f09c13e2
+EBUILD git-9999.ebuild 14832 RMD160 716761553547dfb90b5b248dd08c005f98fd42d1 SHA1 e3e38f0612b15d0fa722d6556fda3a1c4092b41f SHA256 aa31dfb6b63f15a8f0e18678a679cc34079e0846ab95046f45ebfac63c14c6dd
+MISC ChangeLog 80495 RMD160 e7f2533b7d74e8475b22f14080d2cc700a773b97 SHA1 2b42c63ddea7f282886f69ab6f2f3d39bddbe01b SHA256 9312304f811afa2e030e60ebe224cd4f23c9d958e5d16f29aacd8a78bb19e8f5
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2uySoACgkQHB6c3gNBRYd0PACgsPldKxO1XN5Yz/AJ9Chf9pEz
+SPYAoJs8L12021XWlFQv+RmUpjW72dL9
+=MLKv
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 41db5a8dd999..1e64de608985 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.18 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.19 2011/04/20 11:53:08 scarabeus Exp $
 
 EAPI=3
 
@@ -8,9 +8,10 @@ GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion python
-[ "$PV" == "9999" ] && inherit git
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM}
 
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
@@ -19,16 +20,13 @@ DOC_VER=${MY_PV}
 
 DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
 HOMEPAGE="http://www.git-scm.com/"
-if [ "$PV" != "9999" ]; then
+if [[ ${PV} != *9999 ]]; then
 	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
 			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
 			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
 	KEYWORDS=""
 fi
 
@@ -75,7 +73,7 @@ DEPEND="${CDEPEND}
 	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
-if [ "$PV" == "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc
 		app-text/xmlto"
@@ -180,7 +178,7 @@ exportmakeopts() {
 }
 
 src_unpack() {
-	if [ "${PV}" != "9999" ]; then
+	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.bz2
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
@@ -189,7 +187,7 @@ src_unpack() {
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
 		cd "${S}"
 	else
-		git_src_unpack
+		git-2_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
@@ -286,7 +284,7 @@ src_compile() {
 	fi
 
 	cd "${S}"/Documentation
-	if [[ "$PV" == "9999" ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then