New upstream version. Fix for bug #181718

Package-Manager: portage-2.1.2.7

5 files changed, 214 insertions, 5 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index e81728a7b1bb..c04c54bbe5b0 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.203 2007/06/14 15:26:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.204 2007/06/16 18:06:48 ferdy Exp $
+
+*git-1.5.2.2 (16 Jun 2007)
+
+  16 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/71git-gentoo.el,
+  +git-1.5.2.2.ebuild:
+  New upstream version. Fix for bug #181718
 
   14 Jun 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
   Stable for HPPA (bug #179245).
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 451227426e76..dce8395f3665 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 MD5 626503da08b9af48199596c83d6f49b3 files/70git-gentoo.el 88
 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd files/70git-gentoo.el 88
 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a files/70git-gentoo.el 88
+AUX 71git-gentoo.el 265 RMD160 c7284b9b210e631c91c4d5a6849e7e43be16d3c9 SHA1 da4a1ea75804fff4d54d34f072478e5ad1a49088 SHA256 930a56df44a3fc9ceb16304b7b53d87bc736708c1a34f4b46f21a128314b5066
+MD5 093ae397d3588b5e14e9bafcf0d7f840 files/71git-gentoo.el 265
+RMD160 c7284b9b210e631c91c4d5a6849e7e43be16d3c9 files/71git-gentoo.el 265
+SHA256 930a56df44a3fc9ceb16304b7b53d87bc736708c1a34f4b46f21a128314b5066 files/71git-gentoo.el 265
 AUX git-1.5.0-symlinks.patch 652 RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b SHA1 0a19157c0c577e3560443a9a636684b0477eadf8 SHA256 52f7e1394f41b0138682b196fd12a5acd0a04e524317a815dd464e67d9e0bd09
 MD5 532e02bd8bfc22e803d4295b0890e5cd files/git-1.5.0-symlinks.patch 652
 RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b files/git-1.5.0-symlinks.patch 652
@@ -25,14 +32,17 @@ SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/gi
 DIST git-1.5.0.7.tar.bz2 1053367 RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 SHA1 1e0d09f27cd8eb3ac96590ed4c1baba459d5359e SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada
 DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.2.1.tar.bz2 1184392 RMD160 1d5917ebab541ac65530d353a6f5260ee2ac1c0a SHA1 3905cb325520fc8a52a8c77ee95dd0de8e13a5d5 SHA256 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37
+DIST git-1.5.2.2.tar.bz2 1190255 RMD160 ab4e7c30fa13470b3fe16edb1d6681600438483e SHA1 7dbb601265e601293f8918290258088f9ae2918f SHA256 9c569ab1096c37e1b7ba3633fda5b36b9ad4305454ce2748bb1da557a3817041
 DIST git-1.5.2.tar.bz2 1180424 RMD160 5e9064bdceadcac779112e8c677a6236de75ed7d SHA1 f60d8dbf0926a3c12a1658bac177b383939d8e54 SHA256 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
 DIST git-htmldocs-1.5.0.7.tar.bz2 450009 RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 SHA1 4767bc6c617d1b5906acc3cc869b870c9743d294 SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.1.tar.bz2 504298 RMD160 3c819ea838fd5f3706616c1efd3b6b813267707c SHA1 cf17c960451dc4378e1e35e9504f17d4eb57cd31 SHA256 e2f2edbbc03b9eed78d5b24a1c9565ab3f2b5131c2c743c4b651b41bfab0b56d
+DIST git-htmldocs-1.5.2.2.tar.bz2 505023 RMD160 28d4a886e411b8d9068f28f19fa6be71716d4241 SHA1 cbac536bb2c2bd81487ee0f021ea4d7eabef13be SHA256 8c078916fb43b88de9a0626bee32f217452bed6dd2798643c3cec020b389205f
 DIST git-htmldocs-1.5.2.tar.bz2 499796 RMD160 bef6b3b51896019430039475662a046e69075917 SHA1 e2c22fc9c5c0325b4c658a6034177b2ebfeed991 SHA256 8ba238a066a4ffde51dd1aaa04b8d9757d0b7ad3793a20289d9ddcf1d54368e2
 DIST git-manpages-1.5.0.7.tar.bz2 126927 RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 SHA1 66de3c514b1942920b66f434350f55e2ff70f90e SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.1.tar.bz2 139651 RMD160 9b48b9aba586a59ef7759f95934003299ff1fd03 SHA1 6e9d153df8d51dd943faff0eda33e18c974210c4 SHA256 f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f
+DIST git-manpages-1.5.2.2.tar.bz2 139718 RMD160 c1597fedd5e60f89356fd6d3a49d62c0b797a935 SHA1 4bd6c99b8b30fa1af05408b86621eb3f0d47d69e SHA256 4b1c681c5be4cda05e98f74269b9e9d3334d05340bec224c32f97c3044653fc6
 DIST git-manpages-1.5.2.tar.bz2 138905 RMD160 90520407c8338eda4e9ab2ad573490b06acc01df SHA1 025a4a65e6a1c9aa1abfd64007ba3559655bb629 SHA256 5822714d1847a1d44f3d93286a60e45c375f521c07ce06794636afe187d0680b
 EBUILD git-1.5.0.7.ebuild 4344 RMD160 773db02bbcab8cba9b903e7ddd4dfabdb757e454 SHA1 98c145b5d1e8a4b38b002e6040d146d4c5621980 SHA256 2fdd37d31b701843d2a941a6610939c94de2431c4d4c4088ef83b8719a105681
 MD5 4514af684d0a13883a77a9baadb47724 git-1.5.0.7.ebuild 4344
@@ -46,14 +56,18 @@ EBUILD git-1.5.2.1.ebuild 4389 RMD160 e14442d8b777448d5b5ea4ca7d100877fee006d4 S
 MD5 ed2e08cd3693c447a8304eb49b78cca9 git-1.5.2.1.ebuild 4389
 RMD160 e14442d8b777448d5b5ea4ca7d100877fee006d4 git-1.5.2.1.ebuild 4389
 SHA256 2cccbb062bc7c9956e3dc71a8c2f04d95c63cf91901d19eb265d359ea0cd1958 git-1.5.2.1.ebuild 4389
+EBUILD git-1.5.2.2.ebuild 4345 RMD160 7023cc8340987241a3f2536e6ab1c8f8c2b3537c SHA1 46a98be50f0e70da171c69352d8b13c10d58522c SHA256 065d59f5515398b67ec884720794c25e5ea9255f3282bade49201954e8fce5cc
+MD5 1892892ec3f3d57b3a8aab859dae5c62 git-1.5.2.2.ebuild 4345
+RMD160 7023cc8340987241a3f2536e6ab1c8f8c2b3537c git-1.5.2.2.ebuild 4345
+SHA256 065d59f5515398b67ec884720794c25e5ea9255f3282bade49201954e8fce5cc git-1.5.2.2.ebuild 4345
 EBUILD git-1.5.2.ebuild 4429 RMD160 b9a7d2e89619ec4dfc06277c4235cfca65f5e4e4 SHA1 6c9d94cf0d2a34f6f56b17559d52e23631691819 SHA256 e8bb13c5d7f82564de0b904121d38470554604636ce0b49d4177f545df6734b2
 MD5 364720747558c0372e68deb5b5f63118 git-1.5.2.ebuild 4429
 RMD160 b9a7d2e89619ec4dfc06277c4235cfca65f5e4e4 git-1.5.2.ebuild 4429
 SHA256 e8bb13c5d7f82564de0b904121d38470554604636ce0b49d4177f545df6734b2 git-1.5.2.ebuild 4429
-MISC ChangeLog 28684 RMD160 1b86e33425040514dab36392fc754a28b446d003 SHA1 3d4868723fffa10f7c6c45b779437663e57d6f14 SHA256 a680343041fd2365d1d0a01a5e5e9543a74d77c5e8c8433d04310e874241f0e5
-MD5 74adab22ee448df3583ccf87ee853a6c ChangeLog 28684
-RMD160 1b86e33425040514dab36392fc754a28b446d003 ChangeLog 28684
-SHA256 a680343041fd2365d1d0a01a5e5e9543a74d77c5e8c8433d04310e874241f0e5 ChangeLog 28684
+MISC ChangeLog 28859 RMD160 036a0eaf8604c974a54e54ab2d99d73b0421aaa6 SHA1 f4ea2232513b66e17a23e8f46441a83e8461d2e1 SHA256 82e5e17a020a1d65596ad4b8068aa91ea82b05247f1625165fa1da1cdf195570
+MD5 cf120b0da379e54ed22f109b905a5168 ChangeLog 28859
+RMD160 036a0eaf8604c974a54e54ab2d99d73b0421aaa6 ChangeLog 28859
+SHA256 82e5e17a020a1d65596ad4b8068aa91ea82b05247f1625165fa1da1cdf195570 ChangeLog 28859
 MISC metadata.xml 392 RMD160 da59e9305bc7e87b945795cdd7725b8c4130dc84 SHA1 d00357fdc17b861721ae37474801fba87d1dc6a7 SHA256 790671f0af52b6c259869673a58dcaac9dee62dc57e4afd9807f61c0790f1dc5
 MD5 0aa7e069436908b95b80ded3a3178a4b metadata.xml 392
 RMD160 da59e9305bc7e87b945795cdd7725b8c4130dc84 metadata.xml 392
@@ -70,3 +84,13 @@ SHA256 b23f701b5266db2abd4d519994c42e71f196b62b82c1be8baced52e96557bccf files/di
 MD5 0d47f6cd024c409e8031c12428ba4fbc files/digest-git-1.5.2.1 771
 RMD160 cb092bd4d3cc84d8d4dd00bcbe858e6d141a5617 files/digest-git-1.5.2.1 771
 SHA256 d0989060d042b928a6a979690eb88fca8ba8f2404db10c69ba8a9f8641355c31 files/digest-git-1.5.2.1 771
+MD5 41ee0e92579e9bb6d8dbefc2f8b7b9cd files/digest-git-1.5.2.2 771
+RMD160 7e945a9845fc8d65a709e9e9f0dd97dc836d5953 files/digest-git-1.5.2.2 771
+SHA256 fad39484b480f8a2fa50817ae366c46f87a750b791886f245bc688c90421e0c1 files/digest-git-1.5.2.2 771
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGdCbFViELBEf1JB0RAoLyAJ9HmfS5jXkhHOU1oLXMkKZclFNgHwCeMoUT
+OL16Y0Etl3v8d5SYEcg1vJI=
+=6Zgg
+-----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/71git-gentoo.el b/dev-util/git/files/71git-gentoo.el
new file mode 100644
index 000000000000..ded21c29e3dc
--- /dev/null
+++ b/dev-util/git/files/71git-gentoo.el
@@ -0,0 +1,7 @@
+;;; git site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'vc-handled-backends 'GIT)
+(autoload 'git-status "git" "Entry point into git-status mode." t)
+(autoload 'git-blame-mode "git-blame"
+  "Minor mode for incremental blame for Git." t)
diff --git a/dev-util/git/files/digest-git-1.5.2.2 b/dev-util/git/files/digest-git-1.5.2.2
new file mode 100644
index 000000000000..5eb891b477f2
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.2.2
@@ -0,0 +1,9 @@
+MD5 846940654b703ec5c8de4ee388cb4d08 git-1.5.2.2.tar.bz2 1190255
+RMD160 ab4e7c30fa13470b3fe16edb1d6681600438483e git-1.5.2.2.tar.bz2 1190255
+SHA256 9c569ab1096c37e1b7ba3633fda5b36b9ad4305454ce2748bb1da557a3817041 git-1.5.2.2.tar.bz2 1190255
+MD5 6b17a1b9daac6413a8998c75ec41079e git-htmldocs-1.5.2.2.tar.bz2 505023
+RMD160 28d4a886e411b8d9068f28f19fa6be71716d4241 git-htmldocs-1.5.2.2.tar.bz2 505023
+SHA256 8c078916fb43b88de9a0626bee32f217452bed6dd2798643c3cec020b389205f git-htmldocs-1.5.2.2.tar.bz2 505023
+MD5 892e8506874d537038d67c51f9c76ec9 git-manpages-1.5.2.2.tar.bz2 139718
+RMD160 c1597fedd5e60f89356fd6d3a49d62c0b797a935 git-manpages-1.5.2.2.tar.bz2 139718
+SHA256 4b1c681c5be4cda05e98f74269b9e9d3334d05340bec224c32f97c3044653fc6 git-manpages-1.5.2.2.tar.bz2 139718
diff --git a/dev-util/git/git-1.5.2.2.ebuild b/dev-util/git/git-1.5.2.2.ebuild
new file mode 100644
index 000000000000..e28a3daab52e
--- /dev/null
+++ b/dev-util/git/git-1.5.2.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.2.2.ebuild,v 1.1 2007/06/16 18:06:48 ferdy Exp $
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker"
+HOMEPAGE="http://git.or.cz/"
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
+
+DEPEND="dev-libs/openssl
+		sys-libs/zlib
+		!app-misc/git
+		curl? ( net-misc/curl )
+		webdav? ( dev-libs/expat )
+		emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		perl? ( dev-perl/Error )
+		tk? ( dev-lang/tk )
+		gtk? ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=71${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+# 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 mozsha1 ; then
+		myopts="${myopts} MOZILLA_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"
+		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
+	fi
+
+	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
+
+	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
+
+	sed -i \
+		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
+		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
+		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
+		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
+		-e 's:ln :ln -s :g' \
+		Makefile || die "sed failed"
+
+	exportmakeopts
+}
+
+src_compile() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
+		die "make install failed"
+
+	use tk || rm "${D}"/usr/bin/gitk
+
+	doman "${WORKDIR}"/man?/*
+
+	dodoc README COPYING Documentation/SubmittingPatches
+	if use doc ; then
+		dodoc Documentation/technical/*
+		dodir /usr/share/doc/${PF}/html
+		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
+			die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use gtk ; then
+		dobin contrib/gitview/gitview
+		use doc && dodoc contrib/gitview/gitview.txt
+	fi
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	cd "${S}"
+	has_version dev-util/subversion || \
+		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+	has_version app-arch/unzip || \
+		rm "${S}"/t/t5000-tar-tree.sh
+	# Stupid CVS won't let some people commit as root
+	rm "${S}"/t/t9200-git-cvsexportcommit.sh
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-archimport "dev-util/tla"
+	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
+	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
+	showpkgdeps git-svn \
+		"dev-util/subversion(USE=perl)" \
+		"dev-perl/libwww-perl" \
+		"dev-perl/TermReadKey"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}