Bump the release candidate for more testing.

Package-Manager: portage-2.1.4

4 files changed, 252 insertions, 15 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index c1f7e66cdc2e..86af3b73b4b1 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.249 2008/01/13 22:02:28 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.250 2008/01/14 13:54:00 robbat2 Exp $
+
+*git-1.5.4_rc3 (14 Jan 2008)
+
+  14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc3.ebuild:
+  Bump the release candidate for more testing.
 
   13 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org>
   +files/git-1.5.3.8-t9101.patch, git-1.5.3.8.ebuild:
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index a9db6ea318d2..f2c56426071a 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,6 +1,3 @@
------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
@@ -46,16 +43,19 @@ DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5
 DIST git-1.5.3.7.tar.bz2 1361540 RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 SHA1 95c3b64d34f28db8122e30f28dc5758ebbc8469b SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec
 DIST git-1.5.3.8.tar.bz2 1363259 RMD160 8e35e67cc94152c681849e14cb4aec86f1b316cf SHA1 acca91988e674c5976e15a290be65f2775296162 SHA256 f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77
 DIST git-1.5.4.rc2.tar.bz2 1550103 RMD160 96b857d72d10287366a634a63294caa336850c6d SHA1 7ccae071e31aa43a0ae3ed562664f2ef69312d93 SHA256 48f86c8be2f5315b7a178f74a0d01a120be5119eeeee465fd7ef60c1740d6014
+DIST git-1.5.4.rc3.tar.bz2 1565463 RMD160 b77c052cd08496c771325e5235972e0eb476ad49 SHA1 c72798b860aca4b07411dd6fbeb1d0a3ca16868a SHA256 15a834fd7818b71600e2dd3855a9e9924198c699daaf6db4e3e6ab514f7ae0c4
 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.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
 DIST git-htmldocs-1.5.3.8.tar.bz2 549444 RMD160 f4df777094158beea16bd2f0783ef846198e2c36 SHA1 d822887c45437daebf08c7cfe6e93a4ce5136fd3 SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874
 DIST git-htmldocs-1.5.4.rc2.tar.bz2 603097 RMD160 b530069db8852d78a373c5eb1874ac189f624502 SHA1 ff76bc79172ef3bc2d4ade7f16389ca132f0e36c SHA256 03516a441af5f0881a1064e44acf3638a083a23c650b13ba24036facd5b8b712
+DIST git-htmldocs-1.5.4.rc3.tar.bz2 604712 RMD160 37f12f0972538088e050bd5d115e7fedcc5e65a1 SHA1 96014c1b972442ef4f9f8887014c084595f0ba86 SHA256 e3c1c62e2c27d0c25743f87e07ae8c022539e637323c666d96c5f6df23e37c7d
 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.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
 DIST git-manpages-1.5.3.8.tar.bz2 147875 RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b SHA1 15b9ece73c28897affb5da187835d19ff20e9962 SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
 DIST git-manpages-1.5.4.rc2.tar.bz2 154985 RMD160 4c3d8eb5e907a56c6a3f6f8eafc247ab3201bd6e SHA1 42634edd7dbb66b060a10be7e2e51541575216d2 SHA256 6e4bcdb992c710ac2b6b698a68cca2ada050db85979fb31e59015c0718686c39
+DIST git-manpages-1.5.4.rc3.tar.bz2 155119 RMD160 f4df340f36e85f9144bc6a18f94692d07ed5c0a5 SHA1 adf52f9466f4cea604b68880d21d652800009377 SHA256 98e020ba2285c03403731548e15e31a08a91684de24a1a5058a97a17078e370c
 EBUILD git-1.5.1.6.ebuild 4399 RMD160 6ffd38687bfca4241034a3047d24c1794829b34d SHA1 7561cdb0a648991103fc6cc89c4583c0218caa18 SHA256 3dd2ba27e7e85fb08e5f81a6752c83a30b1624fcaa2070bd93d8feae027bfe4e
 MD5 1e901aac703feaa5c47587dbbe31d717 git-1.5.1.6.ebuild 4399
 RMD160 6ffd38687bfca4241034a3047d24c1794829b34d git-1.5.1.6.ebuild 4399
@@ -76,10 +76,14 @@ EBUILD git-1.5.4_rc2.ebuild 6522 RMD160 6b303428d7caeece9a6fffabb5d9e445f5ac90e9
 MD5 4305be9cc311ad946b72dc341d29c886 git-1.5.4_rc2.ebuild 6522
 RMD160 6b303428d7caeece9a6fffabb5d9e445f5ac90e9 git-1.5.4_rc2.ebuild 6522
 SHA256 d2b2eeb6ec2241a65af8329e944ac582f978bac3f812efe13164dc90bd9dc8f9 git-1.5.4_rc2.ebuild 6522
-MISC ChangeLog 36416 RMD160 492c9774e0aaf8483a3d6b31b69417613454ed3c SHA1 08ea68b846b86c2937db4045211948f86037b811 SHA256 4e7a421543080f25e82c3b663955f723f4ed943dfd115edee27904a791ebe04e
-MD5 ec174a272cc29c541fa978aabb708521 ChangeLog 36416
-RMD160 492c9774e0aaf8483a3d6b31b69417613454ed3c ChangeLog 36416
-SHA256 4e7a421543080f25e82c3b663955f723f4ed943dfd115edee27904a791ebe04e ChangeLog 36416
+EBUILD git-1.5.4_rc3.ebuild 6524 RMD160 f2b136ead0289c6c81c4574a399f7402aa8feb85 SHA1 8b35f4c2569288e0977c6b662c10f20bc05cc603 SHA256 6705e94596d7c2f87c645c1c6d89141549b9f282d48e7d5b914c0dc1324e019b
+MD5 56694edfd6d30cc9cd2ebb531efd588c git-1.5.4_rc3.ebuild 6524
+RMD160 f2b136ead0289c6c81c4574a399f7402aa8feb85 git-1.5.4_rc3.ebuild 6524
+SHA256 6705e94596d7c2f87c645c1c6d89141549b9f282d48e7d5b914c0dc1324e019b git-1.5.4_rc3.ebuild 6524
+MISC ChangeLog 36572 RMD160 d65a595fe0e7d0dc36b5625f2910b4fb30761edb SHA1 83d3d9148733d588def891ba8663d8944d08f835 SHA256 107009b4e28ec0784a0bd3214f9a5d6a5a0611b122db338c5052c2f4212b1a2e
+MD5 8bbe9c4ac060d98396dd46811a57bfdc ChangeLog 36572
+RMD160 d65a595fe0e7d0dc36b5625f2910b4fb30761edb ChangeLog 36572
+SHA256 107009b4e28ec0784a0bd3214f9a5d6a5a0611b122db338c5052c2f4212b1a2e ChangeLog 36572
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -99,10 +103,6 @@ SHA256 219c46860726039d89eac7c09ee4b01492db88eb27d6c4cf4bddd81f88b4bcbf files/di
 MD5 12d31c3934484779438ae3032978629c files/digest-git-1.5.4_rc2 789
 RMD160 5130d6992e7341a156d4cb753d86ca4f1c3f60e3 files/digest-git-1.5.4_rc2 789
 SHA256 09317a222dc430ff24f128ac881d5b0a38101f9094ff612aab59c9d36d7d3922 files/digest-git-1.5.4_rc2 789
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFHioqAViELBEf1JB0RAs9cAKCEQP30/lo+JLrHENtnk9GyvazEKQCffcMM
-cFu+OME364jM25fBGq1jbig=
-=4I5z
------END PGP SIGNATURE-----
+MD5 64de31e8c19369c85866cd447f5aedd4 files/digest-git-1.5.4_rc3 789
+RMD160 567d6747b50e88fc7de5e480c7e2de288c82b5cc files/digest-git-1.5.4_rc3 789
+SHA256 e5d9f167f0e63bb5803abc1b693f47d61c14e9f5db7b0c93a7c6852606b56def files/digest-git-1.5.4_rc3 789
diff --git a/dev-util/git/files/digest-git-1.5.4_rc3 b/dev-util/git/files/digest-git-1.5.4_rc3
new file mode 100644
index 000000000000..9f823a3ecfb5
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.4_rc3
@@ -0,0 +1,9 @@
+MD5 d7bfc8c9a9427257455b0df0ef01dcdc git-1.5.4.rc3.tar.bz2 1565463
+RMD160 b77c052cd08496c771325e5235972e0eb476ad49 git-1.5.4.rc3.tar.bz2 1565463
+SHA256 15a834fd7818b71600e2dd3855a9e9924198c699daaf6db4e3e6ab514f7ae0c4 git-1.5.4.rc3.tar.bz2 1565463
+MD5 4e1cc24871024d7a67e7aad6a2a7e470 git-htmldocs-1.5.4.rc3.tar.bz2 604712
+RMD160 37f12f0972538088e050bd5d115e7fedcc5e65a1 git-htmldocs-1.5.4.rc3.tar.bz2 604712
+SHA256 e3c1c62e2c27d0c25743f87e07ae8c022539e637323c666d96c5f6df23e37c7d git-htmldocs-1.5.4.rc3.tar.bz2 604712
+MD5 fff9abe0d1c362919d237239b099efa3 git-manpages-1.5.4.rc3.tar.bz2 155119
+RMD160 f4df340f36e85f9144bc6a18f94692d07ed5c0a5 git-manpages-1.5.4.rc3.tar.bz2 155119
+SHA256 98e020ba2285c03403731548e15e31a08a91684de24a1a5058a97a17078e370c git-manpages-1.5.4.rc3.tar.bz2 155119
diff --git a/dev-util/git/git-1.5.4_rc3.ebuild b/dev-util/git/git-1.5.4_rc3.ebuild
new file mode 100644
index 000000000000..aff99871382d
--- /dev/null
+++ b/dev-util/git/git-1.5.4_rc3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc3.ebuild,v 1.1 2008/01/14 13:54:00 robbat2 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
+
+DEPEND="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	dev-lang/perl
+	app-arch/cpio
+	tk?     ( dev-lang/tk )
+	curl?   ( net-misc/curl )
+	webdav? ( dev-libs/expat )
+	emacs?  ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	cgi?    ( virtual/perl-CGI )
+	perl?   ( dev-perl/Error )
+	gtk?    ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=72${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 iconv || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+	use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+	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
+	if use cgi ; then
+		emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
+		die "make install failed"
+
+	doman man?/*
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+
+	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}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+		newbin "${S}"/contrib/blameview/blameview.perl blameview
+		newdoc "${S}"/contrib/blameview/README README.blameview
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# p4import - excluded because fast-import has a better one
+	# examples - these are stuff that is not used in Git anymore actually
+	# patches - stuff the Git guys made to go upstream to other places
+	for i in continuous fast-import hg-to-git \
+		hooks remotes2config.sh vim stats \
+		workdir convert-objects ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${D}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use cgi ; then
+		dodir /usr/share/${PN}/gitweb
+		insinto /usr/share/${PN}/gitweb
+		doins "${S}"/gitweb/gitweb.{cgi,css}
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+		docinto /
+		# INSTALL discusses configuration issues, not just installation
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+	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() {
+	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
+	if ! has userpriv "${FEATURES}"; then
+		ewarn "Skipping CVS tests because CVS does not work as root!"
+		ewarn "You should retest with FEATURES=userpriv!"
+		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
+			rm "${S}"/t/${i} || die "Failed to remove ${i}"
+		done
+	fi
+	built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elisp-site-regen
+		elog "GNU Emacs has built-in Git support in versions greater 22.1."
+		elog "You can disable the emacs USE flag for dev-util/git"
+		elog "if you are using such a version."
+	fi
+	elog "These additional scripts need some dependencies:"
+	elog "(These are also needed for FEATURES=test)"
+	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 \
+		"USE=perl" \
+		"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 )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}