New maintenance version for 1.5.2 series

Package-Manager: portage-2.1.2.11

4 files changed, 195 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 29dad510f1b5..a4655bd63374 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.212 2007/08/15 23:20:15 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.213 2007/08/15 23:46:01 ferdy Exp $
+
+*git-1.5.2.5 (15 Aug 2007)
+
+  15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.5.ebuild:
+  New maintenance version for 1.5.2 series
 
 *git-1.5.3_rc5-r1 (15 Aug 2007)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index efa8835d0544..1443df59524c 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -35,14 +35,17 @@ 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.4.tar.bz2 1192216 RMD160 564556465cd6ccc70d4357d5349afed042d0c4ca SHA1 54842b00bf66de555ce82b3abfd2eb5f0aeb0bea SHA256 169ef9e884ff2408cd59a9dd3114616051e7aaeffb88b37a78b26dabcc967499
+DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 SHA1 5c145b98dbd7b8695e8dcc18ca661454775c869b SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9
 DIST git-1.5.3.rc4.tar.bz2 1317298 RMD160 87343dbd330ee58ecf3c81baa9a7c07d12967ff7 SHA1 71bdaaa6532965e2808d3e77e0e0839caa4083bd SHA256 7cc7c4c236e1768ee4ad39c7bb2db203a8c00a70586c52ad9d36d2ab2c740e23
 DIST git-1.5.3.rc5.tar.bz2 1333359 RMD160 3677a265f8242db0f2baecb088e68b15bfc61b93 SHA1 d31ea29470ee9872f110f1759f1134403964886e SHA256 0eff4c012911d779b96a816ca904ff8aa56e027fdb8c7d77e1e8a82908d9df7c
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.4.tar.bz2 505852 RMD160 731bd5d5f5000d186f97e16b26fbef39058b893e SHA1 14bf076457a7cd94ffb5c46f50c923d38d77fc17 SHA256 28e2e1a107abd593fae371bcc7e7d8905671d54bac927c1f19d113091040b07b
+DIST git-htmldocs-1.5.2.5.tar.bz2 505906 RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a SHA1 974a1317078dc5159ef1eafb3937d3c651b4efbc SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532
 DIST git-htmldocs-1.5.3.rc4.tar.bz2 532797 RMD160 aac89ed4a91487c0ddd9d3ba262ed45fa86b72de SHA1 528a3573dcf095eba10e30d4a9f22a1dae93f4be SHA256 d8e5eb15891f22f6a10f236fb07e390caa3383fdfbedd287160391518b397d00
 DIST git-htmldocs-1.5.3.rc5.tar.bz2 535904 RMD160 b4cb74c54b658b2cb6039b31c5aff89b71e9c74d SHA1 705468fbe9e7de24e261477bb2294822e533ac31 SHA256 ee2b490b9d265aae3911cf44a3caa22c97709977762b34def10458e32b5f2a5f
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.4.tar.bz2 139830 RMD160 2d7c822cbbbc970a22734524847b8f8c00eb370c SHA1 cc52c3dd5550f357d42d23fd3240335254d2a245 SHA256 8934c88c7db58e57c1d403f6b21bd02fd955ef49ce236afe29288a0acd2575ec
+DIST git-manpages-1.5.2.5.tar.bz2 139885 RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 SHA1 47a2f330581c9e4dcb5e8c25d7508c5e8d7d7997 SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4
 DIST git-manpages-1.5.3.rc4.tar.bz2 149495 RMD160 64e03735f14196bc7e3208f22167eca8e61f79c8 SHA1 ff7bf6901a99b7ef05d7283e3bed9b14c540527f SHA256 834bda2c8c9868f99244676bd9742797ded79afa2b61469107be4e36dad99e79
 DIST git-manpages-1.5.3.rc5.tar.bz2 150206 RMD160 c84867d4adb21ad7147501a4875fd491f62b5906 SHA1 3b5dddc07b096b0923b9ffd0a67f792342b062d0 SHA256 ed3aac966068519e2370b5cc0dcc1046f1b6f31a11797a787f4a15ffaf08a2d3
 EBUILD git-1.5.1.6.ebuild 4415 RMD160 7c5e1759aa8f269a2a6c3ae8503cfa47c79ee66a SHA1 fcf556d35c0162eb74cbf28cca088ff6d8d642f7 SHA256 7970963a050b0a407375c8943408489ef51f995561d34c6d67596ba435b4eff3
@@ -53,6 +56,10 @@ EBUILD git-1.5.2.4.ebuild 4417 RMD160 012b44c0152047285efa9d2b56e87bba098737fa S
 MD5 5377c12857bf8376d358a0412fc34840 git-1.5.2.4.ebuild 4417
 RMD160 012b44c0152047285efa9d2b56e87bba098737fa git-1.5.2.4.ebuild 4417
 SHA256 7662d2eea8a472408d3187cf494638c9abf6d7ddad6b6f5819d210b3cebe6825 git-1.5.2.4.ebuild 4417
+EBUILD git-1.5.2.5.ebuild 4416 RMD160 1c20bee02c6062629da40e4329c1aa49ffb90e0b SHA1 f7cec285d941dbca7dfecf2b10d6620f2c63b3ac SHA256 681878396976a5b624c60d93faa8c08a6868a96bcf04374cdd5c088e3ea424f8
+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_rc4.ebuild 4418 RMD160 096d3719804bd5655058494694cf1f29e975f1d4 SHA1 22c8f1af96904c8b64fa3c8ca8575a9418512399 SHA256 e9fb65ae85cde58dbaba3ed7327f92af10e937835c9bb7ae9877aebb1336d4a7
 MD5 f1c15ea68acb4ee3ec1d7eadf9ce81e9 git-1.5.3_rc4.ebuild 4418
 RMD160 096d3719804bd5655058494694cf1f29e975f1d4 git-1.5.3_rc4.ebuild 4418
@@ -61,10 +68,10 @@ EBUILD git-1.5.3_rc5-r1.ebuild 4464 RMD160 eb67962f19aa5bdb30ff69b8d01edeedd9c8c
 MD5 332c00e8302cd7b6ea985db14401cf9e git-1.5.3_rc5-r1.ebuild 4464
 RMD160 eb67962f19aa5bdb30ff69b8d01edeedd9c8c7b0 git-1.5.3_rc5-r1.ebuild 4464
 SHA256 0fb0f21088369c881c0c27f5680d8c15722f9d8c407b17dcad9f99793eca3f5f git-1.5.3_rc5-r1.ebuild 4464
-MISC ChangeLog 30420 RMD160 f776e7bd4a3a8fc7defb8773b17bae4471943b29 SHA1 3920db322fe758c17ced3e818969b54eaf499ea0 SHA256 d7ccb07a8f6f0c2bfcea7369244fbee9bcd95f6e1a52c417c9e9093eeb67dead
-MD5 938593a6fe67ba6fc7b8f898f1cd28a5 ChangeLog 30420
-RMD160 f776e7bd4a3a8fc7defb8773b17bae4471943b29 ChangeLog 30420
-SHA256 d7ccb07a8f6f0c2bfcea7369244fbee9bcd95f6e1a52c417c9e9093eeb67dead ChangeLog 30420
+MISC ChangeLog 30566 RMD160 ad46c4235b403c905e6199ca4ccee8dd7c3566f6 SHA1 c0159d9fa477569631c49b201af6bef085348e38 SHA256 8b8fb39a3cc933bb5d6bfa8c64d1d335e3001eb18b63114167b43f81ccd5a62b
+MD5 78fefe223a75485623cfb27ade5c00fe ChangeLog 30566
+RMD160 ad46c4235b403c905e6199ca4ccee8dd7c3566f6 ChangeLog 30566
+SHA256 8b8fb39a3cc933bb5d6bfa8c64d1d335e3001eb18b63114167b43f81ccd5a62b ChangeLog 30566
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -75,6 +82,9 @@ SHA256 301643b4303f5c172513408004ef342288e1faa91aaef68d4ccdbae7ab8ff919 files/di
 MD5 5dbf9bb14e13c828216446ab27f4f80c files/digest-git-1.5.2.4 771
 RMD160 cf5a399c1d358a4ad19e7712d92789f763bb5878 files/digest-git-1.5.2.4 771
 SHA256 12d14f59eee40805d572f35bee3fa0037d4e9775bfb7c99a7dd3eaaee4914e60 files/digest-git-1.5.2.4 771
+MD5 64276a745b68cfa7123ecba383657cde files/digest-git-1.5.2.5 771
+RMD160 554d48bbc7c2e10ee8c64f31046cfe8a8251c708 files/digest-git-1.5.2.5 771
+SHA256 90cff61fb313217b7cc600adb70c46789882d898f1ddd8e378e54ae7dc3bdae7 files/digest-git-1.5.2.5 771
 MD5 133e61e681aab87c6c86056dcc450130 files/digest-git-1.5.3_rc4 789
 RMD160 a8c57511feeee359c771517ce683b3d228150147 files/digest-git-1.5.3_rc4 789
 SHA256 06fce77d2701ea1576c2203dc4ffdabbb3007f698e4288ea10dcfa6d04cfa5dc files/digest-git-1.5.3_rc4 789
@@ -84,7 +94,7 @@ SHA256 deff53bec38dfe248e642ad3b7d1cfd5d7c2db3d09b129d6ea95b004d7b99926 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGw4o7ViELBEf1JB0RAhcJAJ4i5XJE+i15XHjrBJTIUWytD62QzACeOGky
-6d1hQGdDC1IsYToqXNjJEP0=
-=0v0P
+iD8DBQFGw5BNViELBEf1JB0RArtmAJ9/3kB+ptM8vPaKypF48SuhLJjFzgCfYYGO
+batchELb1Dl60HjGGq3RedA=
+=+dZC
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.2.5 b/dev-util/git/files/digest-git-1.5.2.5
new file mode 100644
index 000000000000..e811bf3a64c5
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.2.5
@@ -0,0 +1,9 @@
+MD5 34b37c1c51ffbfc54069a5b2487f3c29 git-1.5.2.5.tar.bz2 1192416
+RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 git-1.5.2.5.tar.bz2 1192416
+SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9 git-1.5.2.5.tar.bz2 1192416
+MD5 a7d19493caf24cb2e418d566475772ee git-htmldocs-1.5.2.5.tar.bz2 505906
+RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a git-htmldocs-1.5.2.5.tar.bz2 505906
+SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532 git-htmldocs-1.5.2.5.tar.bz2 505906
+MD5 5d825f9f0dd0d66c852445fa4794f4be git-manpages-1.5.2.5.tar.bz2 139885
+RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 git-manpages-1.5.2.5.tar.bz2 139885
+SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4 git-manpages-1.5.2.5.tar.bz2 139885
diff --git a/dev-util/git/git-1.5.2.5.ebuild b/dev-util/git/git-1.5.2.5.ebuild
new file mode 100644
index 000000000000..aaa95b4e7150
--- /dev/null
+++ b/dev-util/git/git-1.5.2.5.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.5.ebuild,v 1.1 2007/08/15 23:46:01 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="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 www-servers/apache(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}