From ff28e498c2c2e784bff5d0a2fc9e7b1fc198784e Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Fri, 7 Jan 2011 23:06:38 +0000
Subject: Also import python improvements to 9999 ebuild.

(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)
---
 dev-vcs/git/ChangeLog       |  5 ++++-
 dev-vcs/git/git-9999.ebuild | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'dev-vcs/git')

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 34c7388aa0df..cecb86583589 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.76 2011/01/07 23:03:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.77 2011/01/07 23:06:38 robbat2 Exp $
+
+  07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+  Also import python improvements to 9999 ebuild.
 
 *git-1.7.4_rc1-r2 (07 Jan 2011)
 *git-1.7.3.5-r2 (07 Jan 2011)
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 72a37efaa28b..2089657966f8 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,11 +1,15 @@
 # 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.11 2011/01/07 21:51:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.12 2011/01/07 23:06:38 robbat2 Exp $
 
 EAPI=3
 
 GENTOO_DEPEND_ON_PERL=no
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion python
 [ "$PV" == "9999" ] && inherit git
 
 MY_PV="${PV/_rc/.rc}"
@@ -37,7 +41,6 @@ CDEPEND="
 	!blksha1? ( dev-libs/openssl )
 	sys-libs/zlib
 	perl?   ( dev-lang/perl[-build] )
-	python? ( dev-lang/python )
 	tk?     ( dev-lang/tk )
 	curl?   (
 		net-misc/curl
@@ -95,6 +98,10 @@ pkg_setup() {
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 # This is needed because for some obscure reasons future calls to make don't
@@ -239,8 +246,9 @@ src_prepare() {
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
+	# bug #329479: EPYTHON
 	PYTHON_PATH=""
-	use python && PYTHON_PATH="${EPREFIX}/usr/bin/python"
+	use python && PYTHON_PATH="${EPREFIX}/usr/bin/${EPYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
@@ -326,6 +334,7 @@ src_install() {
 
 	if use python && use gtk ; then
 		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs "${D}"/usr/bin/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 
-- 
cgit v1.2.3-65-gdbad