New upstream version

Package-Manager: portage-2.1.3.9

4 files changed, 196 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 48f8a7a97b98..048b5ed0b8ef 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # 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.216 2007/09/02 11:50:00 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.217 2007/09/19 19:49:39 ferdy Exp $
+
+*git-1.5.3.2 (19 Sep 2007)
+
+  19 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.2.ebuild:
+  New upstream version
 
 *git-1.5.3 (02 Sep 2007)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index c6b1237e1a23..04e07616fc49 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -31,12 +31,15 @@ RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 SHA1 5c145b98dbd7b8695e8dcc18ca661454775c869b SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9
+DIST git-1.5.3.2.tar.bz2 1344171 RMD160 ef5436d8e95080415dc968c45b2e8f480a1d66c7 SHA1 7e28fd6b0cc2c9c4e6afc9b2dc79c4f804db86f3 SHA256 e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45
 DIST git-1.5.3.tar.bz2 1345645 RMD160 7182cadbd5d323749117340ad0abd8194aadf9e7 SHA1 a5a7b3d14f182d3d50223661289e9b5b953f5b59 SHA256 aeef281072cf3e045b73e7047bd9830a71128b828920b3d389a5b7b7cbd0beff
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.5.tar.bz2 505906 RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a SHA1 974a1317078dc5159ef1eafb3937d3c651b4efbc SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532
+DIST git-htmldocs-1.5.3.2.tar.bz2 537124 RMD160 e2d0423ab2eaa11fbb61365445ace3d1427c76dc SHA1 f60ff1733938ae110a01bee0fd8daccfd2cf897c SHA256 c424e7b43d753b50e07e836d569233a545eacae5485b7dc562b492676db516c6
 DIST git-htmldocs-1.5.3.tar.bz2 540702 RMD160 8326c941534bebf28002f8434684b24b90c87113 SHA1 7c85bb15db1827317491174cb823c56f1191aea6 SHA256 79fad33cd79f8e942f876f4fb6aaa065537884ee4b9cfe4dff0a324415fc249c
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.5.tar.bz2 139885 RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 SHA1 47a2f330581c9e4dcb5e8c25d7508c5e8d7d7997 SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4
+DIST git-manpages-1.5.3.2.tar.bz2 147283 RMD160 9d8d9ae79f50b838f22a82ed71ee831ebc83ce98 SHA1 26fd2eedd5803afdf7ccc5bedd31306eea05d95e SHA256 b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f
 DIST git-manpages-1.5.3.tar.bz2 152541 RMD160 d84451df213ea6f8671e7a181392f56988019e35 SHA1 02f5f41977522b9b14718e0ace5b98a9710133e9 SHA256 538956f0bf92e7f1e8c893b8d589d5d9db49b1921ff1547685ab6ba6ab2918ff
 EBUILD git-1.5.1.6.ebuild 4415 RMD160 7c5e1759aa8f269a2a6c3ae8503cfa47c79ee66a SHA1 fcf556d35c0162eb74cbf28cca088ff6d8d642f7 SHA256 7970963a050b0a407375c8943408489ef51f995561d34c6d67596ba435b4eff3
 MD5 4c6ba2ac3142c57509ae3405ab1784d4 git-1.5.1.6.ebuild 4415
@@ -46,14 +49,18 @@ EBUILD git-1.5.2.5.ebuild 4416 RMD160 1c20bee02c6062629da40e4329c1aa49ffb90e0b S
 MD5 a68490eb1c91867d3963f3f9ee8d4f9a git-1.5.2.5.ebuild 4416
 RMD160 1c20bee02c6062629da40e4329c1aa49ffb90e0b git-1.5.2.5.ebuild 4416
 SHA256 681878396976a5b624c60d93faa8c08a6868a96bcf04374cdd5c088e3ea424f8 git-1.5.2.5.ebuild 4416
+EBUILD git-1.5.3.2.ebuild 4428 RMD160 6924c121dfdaf58dc6c56742b6ebb9603228019e SHA1 f0d4632fa0ed75916d3db3e261f5cb9c572dbe25 SHA256 7cfa610ddfb07d3e1f9930c318d31f7a53733c33c06c46a3a35bc3a5237c637b
+MD5 9dbd1204a0dcf1445493dd666ae0cde5 git-1.5.3.2.ebuild 4428
+RMD160 6924c121dfdaf58dc6c56742b6ebb9603228019e git-1.5.3.2.ebuild 4428
+SHA256 7cfa610ddfb07d3e1f9930c318d31f7a53733c33c06c46a3a35bc3a5237c637b git-1.5.3.2.ebuild 4428
 EBUILD git-1.5.3.ebuild 4419 RMD160 93606faa1a83b8ff8bf812bd9a791a0b5ef924dc SHA1 5ed4e8d02af65713c9e3e0143296812022079cd6 SHA256 63200a4f13455278d203f7129c2e40c78294592c5d9d771f343c994abc7f62aa
 MD5 8b3fe233b919d9f176626d9f595b75bb git-1.5.3.ebuild 4419
 RMD160 93606faa1a83b8ff8bf812bd9a791a0b5ef924dc git-1.5.3.ebuild 4419
 SHA256 63200a4f13455278d203f7129c2e40c78294592c5d9d771f343c994abc7f62aa git-1.5.3.ebuild 4419
-MISC ChangeLog 31070 RMD160 33578f615392456eebbceb3bbfa82267c43ea39e SHA1 a5d2ab88ff2ad053a5a82ab653ab9d1676b9919e SHA256 b29f77020b78bc8cd7c9fe9bde4c12cdb2a4231e4570d6ba1dfbf820679025ed
-MD5 917a669bbddc9ed283e30a7a61fd72c8 ChangeLog 31070
-RMD160 33578f615392456eebbceb3bbfa82267c43ea39e ChangeLog 31070
-SHA256 b29f77020b78bc8cd7c9fe9bde4c12cdb2a4231e4570d6ba1dfbf820679025ed ChangeLog 31070
+MISC ChangeLog 31196 RMD160 80de9981d01c495e43a6d913e1aae8d903f0b744 SHA1 e6a726f0702b3a3f73f4470d9bf26c8b9036e081 SHA256 b6040d4729ceabd909e3b6a637080d2bc95105807ee8d649b2b70369950ccd0e
+MD5 4aad7dc498674eaeeb5c959f0c3f104e ChangeLog 31196
+RMD160 80de9981d01c495e43a6d913e1aae8d903f0b744 ChangeLog 31196
+SHA256 b6040d4729ceabd909e3b6a637080d2bc95105807ee8d649b2b70369950ccd0e ChangeLog 31196
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -67,10 +74,13 @@ SHA256 90cff61fb313217b7cc600adb70c46789882d898f1ddd8e378e54ae7dc3bdae7 files/di
 MD5 efc4d5f8444ed86be18ca395817cf3f8 files/digest-git-1.5.3 753
 RMD160 de84a1304adeaa05bbbe398f23999adb42a3aa23 files/digest-git-1.5.3 753
 SHA256 7e50d57067d71b45fddb8fcab772d4c5b15a7c23c5c485d7ed893ec41bccf5bd files/digest-git-1.5.3 753
+MD5 dc55082a57dd68127735b0bbad6e10ec files/digest-git-1.5.3.2 771
+RMD160 eadd468c29b62ee34683b7feaff9056988d556a1 files/digest-git-1.5.3.2 771
+SHA256 6fc2d60518112a009528d040478ab64a2441c52dd2412b3dd308185f5ac8501b files/digest-git-1.5.3.2 771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFG2qN8ViELBEf1JB0RAmYRAJ407x7rVniuekufB45ViWKDfTSXYwCfWSts
-iUZCm4yv1IxXUv+shHMOi+k=
-=vvx4
+iD8DBQFG8X1jViELBEf1JB0RAhzZAJ97CgtPuPfQg7r6/m13nnajSU6ENwCfeSkA
+SQPuZ10AQ+gKg9NTn8aQYzQ=
+=z99s
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.3.2 b/dev-util/git/files/digest-git-1.5.3.2
new file mode 100644
index 000000000000..af179b362f7e
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.3.2
@@ -0,0 +1,9 @@
+MD5 2113337dd27141a6890ff84f25164901 git-1.5.3.2.tar.bz2 1344171
+RMD160 ef5436d8e95080415dc968c45b2e8f480a1d66c7 git-1.5.3.2.tar.bz2 1344171
+SHA256 e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45 git-1.5.3.2.tar.bz2 1344171
+MD5 8f04afcd5c6d5b8a245bfb213ce1a35d git-htmldocs-1.5.3.2.tar.bz2 537124
+RMD160 e2d0423ab2eaa11fbb61365445ace3d1427c76dc git-htmldocs-1.5.3.2.tar.bz2 537124
+SHA256 c424e7b43d753b50e07e836d569233a545eacae5485b7dc562b492676db516c6 git-htmldocs-1.5.3.2.tar.bz2 537124
+MD5 375183e7370877f752674063e4336dfa git-manpages-1.5.3.2.tar.bz2 147283
+RMD160 9d8d9ae79f50b838f22a82ed71ee831ebc83ce98 git-manpages-1.5.3.2.tar.bz2 147283
+SHA256 b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f git-manpages-1.5.3.2.tar.bz2 147283
diff --git a/dev-util/git/git-1.5.3.2.ebuild b/dev-util/git/git-1.5.3.2.ebuild
new file mode 100644
index 000000000000..aadb1bfe4397
--- /dev/null
+++ b/dev-util/git/git-1.5.3.2.ebuild
@@ -0,0 +1,164 @@
+# 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.3.2.ebuild,v 1.1 2007/09/19 19:49:39 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, the revision control system heavily used by the Linux kernel team"
+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="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	dev-lang/perl
+	tk?     ( dev-lang/tk )
+	curl?   ( net-misc/curl )
+	webdav? ( dev-libs/expat )
+	emacs?  ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	perl?   ( dev-perl/Error )
+	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.3-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/git{k,-gui}
+
+	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 www-servers/apache(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}