Bug #439154: Copy latest ebuild back to 9999 revision.

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

3 files changed, 96 insertions, 22 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index c38e3d3fe7ac..938139acf15c 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.162 2012/11/09 18:06:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.163 2012/11/18 10:26:20 robbat2 Exp $
+
+  18 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+  Bug #439154: Copy latest ebuild back to 9999 revision.
 
   09 Nov 2012; Fabian Groffen <grobian@gentoo.org> git-1.8.0-r1.ebuild,
   git-9999.ebuild:
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index e4d59b0f0577..44bc64a02a9c 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642
 AUX git-1.6.6.1-interix6.patch 457 SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849 SHA512 58e63d78d665f9122214ec1b7a8d730f7c9d8938283db98580334e293f46a984b86c8d72fbe48f891eda6d48fc76982857539761c6dcf881b1bb5817c275d263 WHIRLPOOL 803ec2121a7abe018c591c249c2b835aadd114a65b0cf6be4fd6440c77f9282d13b4225e1d63a5b22bb46f058bcd073dc97e801476278a91ff9f82634104f3d8
 AUX git-1.7.1-interix.patch 2192 SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495 SHA512 bd02d6c2b83827eb3d286ef37b358c2eb25d453655bebf1d2d074b47e7aab1c3b3f07da21eca33f01ac457d2878b674b2c857f9915ac71438a02bca112c89c41 WHIRLPOOL 7a314149acaa54199a258c1ebd9ee34356fa0393d3d49c994b25a66a593d4214391495d5dd67db01e6b1e396cb6c96b0ddcb7c3d78316bec7fb10af0e7e38af4
@@ -51,13 +48,6 @@ EBUILD git-1.7.3.4-r1.ebuild 14028 SHA256 61d5e1bcdf37f4d5cb93e32780642a25352cee
 EBUILD git-1.7.8.6.ebuild 14683 SHA256 38f21df5f6abefb90ce93129adacf4b307decd48417d6830eced6ec0b595cbd0 SHA512 7ef0bc6125d06100636bfc15fef7d0cacef08f2c9a75beaa7331f1e5c5e06a7cd96f84b0ec975be8fd290efccaf0b9e40edb524063a2a9bfe69870bd2b2c9185 WHIRLPOOL 06ed98a81369963955aafa2186b30fa64ec544f8f1b268c7bb228d83c0e371e70223a69f7ed69da7df47ddc1a10459c40f36e3b2659d9c85c57e0dc036870d9c
 EBUILD git-1.8.0-r1.ebuild 17164 SHA256 276f681b0c8569e162d5f26f9a1c702a75519445d7a5a355667893dde73d3172 SHA512 7169dcb619096877069b6ca503578f333075c01d77fe5a0d80d89898faa34bdee5bac965e484f7a2ae83b428ea05914051e06f130f862702b976c525ada9a9db WHIRLPOOL 31640abe272caa1460ac95a8da1754a4acc27ac119c854dfcf60272bff5334258e7b95f9d228fbe400fadb959a1acc194b48319abfa6f375be56f689aeb149b2
 EBUILD git-1.8.0.ebuild 15358 SHA256 d14583eae36328c2c0cb910e371ef2a1041c12b42be58c778e21b6096edbd880 SHA512 258b3c503c2e605689753447f59770e5d3baaf2d781affb8723a30707b901f39c6a42bcb49253251e686d60fc2ab63cf9eb53194d6c6fdab20f23726726ebc90 WHIRLPOOL 7b1414b53c20faa05086e7af84a92dc0e622cd27d56edb80e4d02b07c23c12a69449d079762543399ae9fc2d625ffd1b0cf1ff6d2078392d4bb862fd4a3a51db
-EBUILD git-9999.ebuild 14915 SHA256 ff499106ade0509c9d2a2f2a7dfb8d44b6f3bba5aa756e69b0e272ae7a9cb854 SHA512 8075131b35de77ee1f01ee3bdfd76e786c2a916201da88f83501d5aee05a32e8aa7a30200f4493ff067452c68ec30b0e0ec5b04e9694e4d2867a93fde8a493b0 WHIRLPOOL 21ea9f45d6371cda9d8f68bdc6595a3d05074dc484e3b07155b3aa44d57f8ca2ccc8afd6fb52276ece1e2e4f756ffc28c14c80e3f1fcab4dcedd641462cd9260
-MISC ChangeLog 94248 SHA256 5ec42b4ec3a17fe40fc9f8fb1ad0fa55c898d6731bca047cfccbaf651e8b7f75 SHA512 809e272e4b9d1c97057a8134231ada260b860effbb319c93011ff74670bb28da80bfc04c73543a510f274a76669819ce037417a003694aef2412fc2bd17e7b7f WHIRLPOOL 0360d59e6eec0382b5b473d0d9c1dc1f885bfc53f184ac6a9ce29913fa7cf528ca2620727269dc89437f8ca5791524587ced08e43dfac0d4f7d7fe65032bcd14
+EBUILD git-9999.ebuild 17161 SHA256 e3c9f77f8e448d4665af486e678e58ca096a1782d5c44c5e7ec5e2b6f327a060 SHA512 d2fd59a4fc89859aea5347f88e3b700090e93e24a558202116a3ed650746ca27bc2a717e889d3d63d1d978fe79e8689e513b8f187d9e22fa09415c30e10abb45 WHIRLPOOL b64dfbf723c0960b3d6fdbf02e49165f7012bd700b9a0a419263b2870e24e96301cf4582a508777cb3ba3c641f5fbf13cf4290798c82176096bec5740dd834ab
+MISC ChangeLog 94376 SHA256 3205e82e8436f5c7e441f2fac359e199a08aeb9958e4d13a75e67769ddc4dd52 SHA512 e63435a380be8ef95881450cfafacf6f4b1397c1672ed702a778c50e3317796ae37782ff941b6d93b42982016c53ad8990c31db8acbb931a1355e2c357937e60 WHIRLPOOL a2a0ea90bd4207e81a2ecce3ae2474c70d8b2dd2370266aa8c728b86a79c80b6380e532f4c74ab9b8575b4384c1f2fca94217678fb760fb8b2acaec4aa57a970
 MISC metadata.xml 1821 SHA256 3f0864988fd1d6ca97db612f9157275bf00336143969acb9d82ca6e6523127f5 SHA512 9f2d7adaf973837028f0c7cb305ac9917a88f07490ee172e570fc70860385de5c2b00edd6c22a37c9448d9260f51554e87b32b24e3bbbcc521f9ce5bbcb1fce0 WHIRLPOOL 7c135c44361168708252533d60a05f2c7d4b202c96c212e75d3057fa5ad80928c7d7452359b7e068c7a1f41dd4276c5917ac47ae010ec93821b2a9a3518f7aa9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
-
-iEYEAREIAAYFAlCdRi4ACgkQX3X2B8XHTokiqQCdG1gwOjY70evKFqIR3dS15s0h
-uf0AoJkc2Fhjnmm90Q6omg0vnmqBNJBh
-=WlxC
------END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index d6bd8b121168..b59efe5aff57 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.38 2012/11/09 18:06:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.39 2012/11/18 10:26:20 robbat2 Exp $
 
 EAPI=4
 
@@ -40,11 +40,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	!blksha1? ( dev-libs/openssl )
+	dev-libs/openssl
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl[-build] )
@@ -53,7 +53,8 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs?  ( virtual/emacs )"
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/gnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@@ -211,8 +212,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.
-	epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+	# 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
@@ -234,6 +235,12 @@ src_prepare() {
 	# Fix docbook2texi command
 	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
 }
 
 git_emake() {
@@ -264,8 +271,10 @@ src_configure() {
 }
 
 src_compile() {
+	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
 	git_emake || die "emake failed"
 
 	if use emacs ; then
@@ -279,6 +288,11 @@ src_compile() {
 			|| die "emake gitweb/gitweb.cgi failed"
 	fi
 
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
@@ -293,6 +307,24 @@ src_compile() {
 				|| die "emake info html failed"
 		fi
 	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		git_emake || 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
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
 }
 
 src_install() {
@@ -300,6 +332,10 @@ src_install() {
 		install || \
 		die "make install failed"
 
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
 	# 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]
@@ -317,6 +353,7 @@ src_install() {
 	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
+	newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
 
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
@@ -339,20 +376,62 @@ src_install() {
 	newbin contrib/fast-import/import-tars.perl import-tars
 	newbin contrib/git-resurrect.sh git-resurrect
 
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	# git-diffall
+	dobin contrib/diffall/git-diffall
+	newdoc contrib/diffall/README git-diffall.txt
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	dobin contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# diffall - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
 	# 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 \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats vim workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
@@ -499,7 +578,9 @@ 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 completion"
+	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"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"