non-maintainer commit: sync live ebuild with git-1.8.3.2.

Package-Manager: portage-2.2.0_alpha189/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

3 files changed, 56 insertions, 52 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index e400da837baa..e618cbe00f81 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.204 2013/07/15 05:58:50 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.205 2013/07/26 23:04:25 williamh Exp $
+
+  26 Jul 2013; William Hubbs <williamh@gentoo.org> git-9999.ebuild:
+  non-maintainer commit: sync live ebuild with git-1.8.3.2.
 
   15 Jul 2013; Jonathan Callen <abcd@gentoo.org> git-1.8.3.2.ebuild:
   Non-maintainer update: make ${PYTHON_REQUIRED_USE} conditional on USE=python;
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 1f22b970281c..ccb462c2da6b 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -55,24 +55,14 @@ EBUILD git-1.8.0.2.ebuild 17163 SHA256 931df741e5eeccee8c67048dd07074777228a6cb4
 EBUILD git-1.8.1.5.ebuild 17189 SHA256 bec81381b6dc3763d99fa20f6828c844a6b801aa5df41b6b99e07c87ff7c4a3d SHA512 22ee72cb4efff7ab5ff7ae53db9292b4a7e72ea75566e2664b001a8c8a761e7bfa3a4e28d4a7fa4ec777db497a0b56964ca2efdedd11fc2f34c9d9ab37ea335e WHIRLPOOL a5c025332de62d0a1e3832ec8ed1b873e5a44c16b4be41c05292553a4375b41ed996263e4c5ad1dedb800601790084d6ed6e0e010f35cd0ace41fc04b8360439
 EBUILD git-1.8.2.1.ebuild 17612 SHA256 4d80e7d5e92b44281d640770dcc104021494633a6fa945550b5cd8963dd2d733 SHA512 d7de530d0a4cc714c7c11d02af8941912eaefe2e80cc054193e880943ded85a6391e92f38437aadbbaba2623ca789078a776e99ca26e5c98c28a1928e9d1bdc8 WHIRLPOOL 63373a2b5515a02b924c0c811d5dfe67db84b0fc93982d9f5ec4dca81f9d80d15ec4f13fb35d66389cf6234427d736e26b9df85fa8160995cab61c675482e8f8
 EBUILD git-1.8.3.2.ebuild 17381 SHA256 6b1369b22acbe0e69f16007639047280ba60211359a69eb952d18b4d6d8ea8cd SHA512 b21e2ff89691aa47baf941fb38166d53a191aadfba48be2e1bb04cc31d4c71bcb144d1a0a1228e6c6cd0b43fc6d86c9293fc34a4eb16ea62a740deff8252f441 WHIRLPOOL 1e196f71f461da05a07226a75eb3e8ee5f0ec6877d74d3d44196ec300c7f0a8c3e5e1be17b8c925a755f4b57fa75a97ddaaa8023283fa4e3122bbcf1a218527e
-EBUILD git-9999.ebuild 17301 SHA256 38772b0f96d81aaf7b6e31092b677f3c50234b4f7b2cb6eaced06900e32ce350 SHA512 50e9fe76af6195f52dbcd6c787c2943e1ced23f6036f405e17648361ba7da0fbf2026a75f999ba10831ec250c668778b7ee863ca8284e3470d2856548f44e383 WHIRLPOOL 24e52c2af1d6a62f281b253ef88db7b84216ac8a7ee3e79171081f36b18f2ba13c339bca191fed890156766be7cbf575ac203599d9e381c8c1dd85fe15cb8846
-MISC ChangeLog 5645 SHA256 6a7d2662ab66471d9d585d71eff75c23a32372ad010093eeda87c2c10b39d01b SHA512 a61ca762424d888bdf82b4276cd6b3085b25817786b8d8f871384d51190a70abdf883f0e416bd02cf8c9de5a30c7007ebc0f21cf41a7836a5c52df371ab915c8 WHIRLPOOL 6db06041e179b26675706fd5c037c770807eaf2076e5d789f35995da8a4a4e9c54a7079d48e7a188442b403cf964349f4fe814ea700a5bcc4b8d601d2e7a32a3
+EBUILD git-9999.ebuild 17383 SHA256 12a37082cf61d8e5fd6699e3d44dc612255ed900bb314b918115ccf88c827392 SHA512 a19208ea1208955b7b6b0ee545d2d5f222e4e6485c8fb7f386cdb85178e6c9841ab49a3a1d4ab39daaa9dae1d51445ddf49934f65022141c438ab97d87fddea8 WHIRLPOOL a930998eb2252425fe8461e75bf4fbe3ebe954284e0b9ddd1f994a4cd7f32fa5fe85dc316e88939dae84a8d41c9f3afd41546b2353dd446a2291fde73fd37d6c
+MISC ChangeLog 5778 SHA256 d880843af9f274128f2da28600dd88053d666ca1203038a74cd27b67302fae04 SHA512 4766c039450242cd0d6e4e84ff7ef7bfd73491f32593054ec04689c1546e369fea271e8cfbd47a3e4d61698d2d43411498325ce35a9650904beb7db5e54b3cce WHIRLPOOL bed154ff105eff91458225752f93a5d7b7f6c4b6ff1ffdb0bdfe43ca18c8503d4d3897bc52b567bf25fbbad4159525cf0b30fb73bf9a9d7bed9bfa8684843ae2
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1821 SHA256 3f0864988fd1d6ca97db612f9157275bf00336143969acb9d82ca6e6523127f5 SHA512 9f2d7adaf973837028f0c7cb305ac9917a88f07490ee172e570fc70860385de5c2b00edd6c22a37c9448d9260f51554e87b32b24e3bbbcc521f9ce5bbcb1fce0 WHIRLPOOL 7c135c44361168708252533d60a05f2c7d4b202c96c212e75d3057fa5ad80928c7d7452359b7e068c7a1f41dd4276c5917ac47ae010ec93821b2a9a3518f7aa9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR44+gAAoJELHSF2kinlg4D9wQAJQUzZwn9UV1laqwpYIldlTg
-iQcD79mH+Mv2ft7oFQKXoY/P0fBIT80Kp4IqX7V58bIqYhfQVBqRM4Cf2M+M0ZXn
-sUUaUC3i30B1h90jzgAW6YAfkIX1zrq8v6Y6v7yYe7s6Khb35aa+3SMOj1OhiBc9
-Bu5zVbZxHfZ7JJgha3PrmH+KlEUeG0mvxeDsivVq/zwrsItHXXXlz+BduRgNz3oR
-Q07hOwJ1gHtv1G2GqHVtNmqHfsMYFiEXbD/Yn1mjEcZWJM5TEfGHJL7pYqcvekzG
-XsVl5jk6+3AJgbxpwZLZ5gPNpbKv+qrSmyQ9qPphmf3SG8stLSBRngfV9dvIq0aQ
-vZAFOXCHXzmmDwD3XWTF/btp/iJzdsWZMPm11uwxNxkQYybksOdFZToRKHipV7yV
-iIWcc1G50zuyybAVvAomFpY3bn4TvmzCNKAjBq/MLS5vJeGRDJrgHgC01fukIm3V
-iuBmNtBavNwJggpJzhaFxqPpA4o81Bw454HCI6YTU9xsXO5Udghbzl+5LSgJhnte
-dxjMWKcNmQ9bJT4b+DPT/OTXcUsuTlO8OF0/j1yhLE02grUdsvwomwvqsNkA/i/3
-lfyAXwvDkMRRhJDriBgK1wYSBTsIy55LjtjM6ZxGyC7Lkn8mAFgtKr/coLbRclDr
-ZA2XmSx9l2CVb7C0aZEz
-=wpmz
+iEYEAREIAAYFAlHzAI0ACgkQblQW9DDEZTg94ACfTne3Y0sY/xyR9K5S5TMYvQIF
+tl0AoKnUXRUgjsXdTZlK9tCOHBZ6A2kW
+=v2Mu
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 5ff1e04b0965..6926dbaace7f 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2013 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.42 2013/05/18 13:48:38 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.43 2013/07/26 23:04:25 williamh Exp $
 
-EAPI=4
+EAPI=5
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_DEPEND="python? 2"
+PYTHON_COMPAT=( python2_{6,7} )
 [[ ${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-r1 python systemd ${SCM}
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
@@ -67,9 +67,10 @@ RDEPEND="${CDEPEND}
 			)
 	python? ( gtk?
 	(
-		>=dev-python/pygtk-2.8
-		dev-python/pygtksourceview:2
-	) )"
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
 
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@@ -101,17 +102,18 @@ REQUIRED_USE="
 	cvs? ( perl )
 	subversion? ( perl )
 	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 pkg_setup() {
-	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+	if use subversion && has_version "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
 	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
+		python-single-r1_pkg_setup
 	fi
 }
 
@@ -140,6 +142,9 @@ exportmakeopts() {
 	myopts="${myopts} OLD_ICONV="
 	myopts="${myopts} NO_EXTERNAL_GREP="
 
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
@@ -150,7 +155,8 @@ exportmakeopts() {
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
-		&& myopts="${myopts} USE_LIBPCRE=yes"
+		&& myopts="${myopts} USE_LIBPCRE=yes" \
+		&& extlibs="${extlibs} -lpcre"
 	use perl \
 		&& myopts="${myopts} INSTALLDIRS=vendor" \
 		|| myopts="${myopts} NO_PERL=YesPlease"
@@ -191,6 +197,7 @@ exportmakeopts() {
 		myopts="${myopts} NO_NSEC=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
 }
 
 src_unpack() {
@@ -211,12 +218,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	# bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
-	# funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
-	#epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
-
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+	epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -225,7 +228,7 @@ src_prepare() {
 		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die "sed failed"
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
 
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
@@ -247,7 +250,7 @@ git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
-	use python && PYTHON_PATH="$(PYTHON -a)"
+	use python && PYTHON_PATH="$(python_get_PYTHON)"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
@@ -260,6 +263,7 @@ git_emake() {
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
+		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
@@ -278,8 +282,7 @@ src_compile() {
 	git_emake || die "emake failed"
 
 	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el \
-			|| die "emacs modules failed"
+		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 
 	if use perl && use cgi ; then
@@ -310,7 +313,7 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake || die "emake svn-fe failed"
+		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
@@ -356,18 +359,17 @@ src_install() {
 	newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
 
 	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
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# 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
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
 	if use python && use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 
@@ -411,6 +413,12 @@ src_install() {
 		cd "${S}"
 	fi
 
+	# remote-helpers
+	if use python ; then
+		python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+		python_optimize
+	fi
+
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
@@ -468,10 +476,12 @@ src_install() {
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-	systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-	systemd_dounit "${FILESDIR}/git-daemon.socket"
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
 
 	fixlocalpod
 }
@@ -485,9 +495,12 @@ src_test() {
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh"
-	local tests_perl="t5502-quickfetch.sh \
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
-					t5520-pull.sh"
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.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
@@ -521,7 +534,7 @@ src_test() {
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-vcs/cvs server && \
+			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
@@ -579,7 +592,6 @@ showpkgdeps() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
-	use python && python_mod_optimize git_remote_helpers
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
 	einfo "Note that the prompt bash code is now in the seperate script"
@@ -593,5 +605,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use python && python_mod_cleanup git_remote_helpers
 }