Fix missing argument in call to python_convert_shebangs, and drop accidently added .orig file.

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

6 files changed, 16 insertions, 514 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index cecb86583589..d5c731fe070c 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2011/01/07 23:06:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.78 2011/01/08 01:23:25 robbat2 Exp $
+
+  08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.5-r2.ebuild,
+  -git-1.7.3.5-r2.ebuild.orig, git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
+  Fix missing argument in call to python_convert_shebangs, and drop accidently
+  added .orig file.
 
   07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
   Also import python improvements to 9999 ebuild.
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 1cf875c31a51..3cf757b73e2e 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -60,13 +60,11 @@ EBUILD git-1.7.3.3.ebuild 13532 RMD160 6a01b8f3f230121e511aaf3acd3530de855a48bb
 EBUILD git-1.7.3.4-r1.ebuild 14136 RMD160 c9bde051761319337f6ce8a6ca7aa5b8182be8e1 SHA1 5dfd34736df1eb4795a1acbf2a1d2dcabdf35563 SHA256 6081f6a499a2f5adf2b30bade29889f4985daae2ee9b0248b14b4ca2f4a08b2c
 EBUILD git-1.7.3.4.ebuild 13532 RMD160 b379ddde309f7100100918e35ba2c3d01ca6ee91 SHA1 07e6b99f28385aba1af0fed2fc8b9f520431995a SHA256 db389597432ac36a5b7040df99cc3db11e1c3d267e4c2e7e8da0c9658105fdd6
 EBUILD git-1.7.3.5-r1.ebuild 14534 RMD160 830e9397783317f88a6d53a8f178e8bebf9ead31 SHA1 a78dd360518b95a43a9d43a12ccf1b068f66851f SHA256 09bd4d06eca685dfa2378e25f84264bf19f655e6c7881b7260bb8dff42fc3074
-EBUILD git-1.7.3.5-r2.ebuild 14756 RMD160 3050347e75127451168634aba937bdce5517903e SHA1 2af32b6488326329c5ad232a2f6b29c3bfeaac86 SHA256 6ac93bb85c6df016506497107f3a598205f34f0a8119d5688d680a53d2761d2e
+EBUILD git-1.7.3.5-r2.ebuild 14770 RMD160 5ee68a69dceff478d5090d67701cc621f9c0915c SHA1 4705808e0ed840f462d8700b28be0dcb668bf6b4 SHA256 62a30a728a3000872a930efbd3923cf13631496aa1e18dd9046318adead29c5c
 EBUILD git-1.7.3.5.ebuild 14182 RMD160 8dcb114ed8fb7c69cab8fb6263017f1ee46beedd SHA1 9fc7f6836d795377040addf54d2a00135d9d1417 SHA256 fd834346ba9cd9def74cc77376143601610915bb82c686621bbba28b9e5867b7
 EBUILD git-1.7.4_rc1-r1.ebuild 14556 RMD160 d5beb088508abb9e7d61c9198a484078b71806a6 SHA1 c0648f35a92dfcf833b7e8383122c88b200abd93 SHA256 5f409709c3678a39d1e66229672d8d7790813c943c1b828e93c07da4162bd32b
-EBUILD git-1.7.4_rc1-r2.ebuild 14778 RMD160 f2b743937251cde17e302fd458a99f206801d14d SHA1 922f707f9824ca16231dde3e808ca178c4bbbe2f SHA256 9162dfa83f9388c9a76937cc74a343f0f1d9448b6e68c19a140ffdaeec37bb81
+EBUILD git-1.7.4_rc1-r2.ebuild 14792 RMD160 7fe80fc536de74f89d10c6d31f9ea5e32c0d7430 SHA1 b4db654466076268debc5722a5d1e0003a0b7d9e SHA256 7e0242be5d0c5e07d31bc524fe34ba4d72192c9e5bf6d38a92e8e7e41386e841
 EBUILD git-1.7.4_rc1.ebuild 14204 RMD160 90440a8dcb3c67814a58a150c05bfe28dc0aa2e7 SHA1 97cc1c2263e78c791a4a097a9b7c540efb67adc8 SHA256 3793d812083128b32cfc3a2c18628c5f4414690ddb6146eab6411459b15a8cd0
-EBUILD git-9999.ebuild 14771 RMD160 6fb223eea066b39074babf036e9936be6ea35fcc SHA1 27e46eafacf625640742c49358231379209187dd SHA256 d29609bc9a34816418ec76b7564f3874f94c4239ba9604a5645b0f0aca51cf08
-MISC ChangeLog 77672 RMD160 5c9cf251e01b0758e200fde1033a16aa6c4f4715 SHA1 1adff72e8e620def09c85191a0e3d756d92d3bc9 SHA256 30da07acadf23d6e9532db230f7235e028829f2a611af7ca493415b55e81b75f
-MISC git-1.7.3.5-r2.ebuild.orig 14539 RMD160 43653dada1723b2a8f2003d38127cb05288b11d7 SHA1 b01c3ca8538d0f72c8fc617db79f6d5cff6904cf SHA256 eb73561d2dbd978565e003e926d72f99e35500d9c5f704b7e2f0f1131b8d8165
-MISC git-9999.ebuild.orig 14549 RMD160 c7e37742de905fce1d69aa26cd507afc5a20feda SHA1 4c6bae8e1c63f852b46b03c4d4776bd56af64e8e SHA256 3c77bb9543ab7431e433dbf4195ddabbfd2824da033f0be4801276f197a3993c
+EBUILD git-9999.ebuild 14785 RMD160 893930629ce14ccd17a3bc436f7386e56f99f90e SHA1 2742f319f1a5faf031bf190e731d80e4a616379b SHA256 b20c1344ab1d4bee786cada8cbe1c185e5a46866db0e8ba212b45a369023ba8a
+MISC ChangeLog 77921 RMD160 ea695fa873d9f52459399cb0deef2397c722b2d2 SHA1 65106b4b87ba403aba8a81e48241f9461b35e25f SHA256 ba24aa4f553af2ea4170a4ce6a58433faf739fb750d80dad371acb43d65d48a3
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/git-1.7.3.5-r2.ebuild b/dev-vcs/git/git-1.7.3.5-r2.ebuild
index a4a3dd3aaebd..3ce57a05152d 100644
--- a/dev-vcs/git/git-1.7.3.5-r2.ebuild
+++ b/dev-vcs/git/git-1.7.3.5-r2.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-1.7.3.5-r2.ebuild,v 1.1 2011/01/07 23:03:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5-r2.ebuild,v 1.2 2011/01/08 01:23:25 robbat2 Exp $
 
 EAPI=3
 
@@ -333,7 +333,7 @@ src_install() {
 
 	if use python && use gtk ; then
 		dobin "${S}"/contrib/gitview/gitview
-		python_convert_shebangs "${D}"/usr/bin/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${D}"/usr/bin/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 
diff --git a/dev-vcs/git/git-1.7.3.5-r2.ebuild.orig b/dev-vcs/git/git-1.7.3.5-r2.ebuild.orig
deleted file mode 100644
index d432050bd411..000000000000
--- a/dev-vcs/git/git-1.7.3.5-r2.ebuild.orig
+++ /dev/null
@@ -1,501 +0,0 @@
-# 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-1.7.3.5-r2.ebuild.orig,v 1.1 2011/01/07 23:03:56 robbat2 Exp $
-
-EAPI=3
-
-GENTOO_DEPEND_ON_PERL=no
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-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
-	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
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-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
-		webdav? ( dev-libs/expat )
-	)
-	emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-	) )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc?    (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc
-		app-text/xmlto"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use perl ; then
-		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-		use subversion && ewarn "git-svn needs USE=perl, it won't work"
-	fi
-	if use webdav && ! use curl ; then
-		ewarn "USE=webdav needs USE=curl. Ignoring"
-	fi
-	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts="${myopts} BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts="${myopts} INSTALL=install TAR=tar"
-	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts="${myopts} SANE_TOOL_PATH="
-	myopts="${myopts} OLD_ICONV="
-	myopts="${myopts} NO_EXTERNAL_GREP="
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
-	use tk \
-		|| myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl \
-		&& myopts="${myopts} INSTALLDIRS=vendor" \
-		|| myopts="${myopts} NO_PERL=YesPlease"
-	use python \
-		|| myopts="${myopts} NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use cvs \
-		|| myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts="${myopts} NO_MMAP=YesPlease"
-#		myopts="${myopts} NO_IPV6=YesPlease"
-#		myopts="${myopts} NO_STRLCPY=YesPlease"
-#		myopts="${myopts} NO_MEMMEM=YesPlease"
-#		myopts="${myopts} NO_MKDTEMP=YesPlease"
-#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts="${myopts} NO_NSEC=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts="${myopts} ASCIIDOC8=YesPlease"
-	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${myopts} NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [ "${PV}" != "9999" ]; then
-		unpack ${MY_P}.tar.bz2
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-		cd "${S}"
-	else
-		git_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# Noperl is being merged to upstream as of 2009/04/05
-	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-	# GetOpt-Long v2.38 is strict
-	# Merged in 1.6.3 final 2009/05/07
-	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-	# JS install fixup
-	epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
-	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
-	# user.
-	# Merged upstream
-	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
-	# bug #350075: t9001: fix missing prereq on some tests
-	# Merged upstream
-	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
-
-	sed -i \
-		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
-		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# bug #318289
-	epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${EPREFIX}/usr/bin/python"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el \
-			|| die "emacs modules failed"
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ "$PV" == "9999" ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-
-	if use python && use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	dobin contrib/fast-import/git-p4
-	dodoc contrib/fast-import/git-p4.txt
-	newbin contrib/fast-import/import-tars.perl import-tars
-	newbin contrib/git-resurrect.sh git-resurrect
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		blameview buildsystems ciabot continuous convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
-		stats svn-fe vim workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-	fixlocalpod
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh"
-	local tests_perl="t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-vcs/cvs server && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first
-	cd "${S}/t"
-	git_emake clean
-
-	# Now run the tests
-	cd "${S}"
-	einfo "Start test run"
-	git_emake test
-	rc=$?
-
-	# Display nice results
-	cd "${S}/t"
-	git_emake aggregate-results
-
-	# And exit
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
-		ewarn "You must build dev-vcs/subversion with USE=perl"
-		ewarn "to get the full functionality of git-svn!"
-	fi
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-1.7.4_rc1-r2.ebuild b/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
index 32f44809c0ba..44d5eb5570c3 100644
--- a/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc1-r2.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-1.7.4_rc1-r2.ebuild,v 1.1 2011/01/07 23:03:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r2.ebuild,v 1.2 2011/01/08 01:23:25 robbat2 Exp $
 
 EAPI=3
 
@@ -334,7 +334,7 @@ src_install() {
 
 	if use python && use gtk ; then
 		dobin "${S}"/contrib/gitview/gitview
-		python_convert_shebangs "${D}"/usr/bin/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${D}"/usr/bin/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 2089657966f8..6e21675e62f4 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.12 2011/01/07 23:06:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.13 2011/01/08 01:23:25 robbat2 Exp $
 
 EAPI=3
 
@@ -334,7 +334,7 @@ src_install() {
 
 	if use python && use gtk ; then
 		dobin "${S}"/contrib/gitview/gitview
-		python_convert_shebangs "${D}"/usr/bin/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${D}"/usr/bin/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi