Add latest rc from upstream.

Package-Manager: portage-2.1.4_rc10

4 files changed, 255 insertions, 5 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 05a7f210ee4c..93d7078a8ee7 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.239 2007/12/25 08:39:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.240 2007/12/25 08:47:17 robbat2 Exp $
+
+*git-1.5.4_rc1 (25 Dec 2007)
+
+  25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc1.ebuild:
+  Add latest rc from upstream.
 
   25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
   git-1.5.4_rc0.ebuild:
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 24c4d332dc56..f8e39c28529e 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -39,6 +39,7 @@ DIST git-1.5.3.5.tar.bz2 1351433 RMD160 188cdbf40fe841cd5a59f8f11a621a135a61f406
 DIST git-1.5.3.6.tar.bz2 1356739 RMD160 dbda09ada993a9835f9f403d7fa5c54ed3598b46 SHA1 35f2df92046996a3b72a708e9408eb4d6d4d0e6f SHA256 95a5f9d8a9174277b539296901561fff6dbbba20dbdd4cfe5595c22a5a4d2221
 DIST git-1.5.3.7.tar.bz2 1361540 RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 SHA1 95c3b64d34f28db8122e30f28dc5758ebbc8469b SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec
 DIST git-1.5.4.rc0.tar.bz2 1539299 RMD160 5bd261e7b1bd312e6e7b55674c5cb9e22678c127 SHA1 daea8267ffd6cd1f4003809949d327d6fc1a4100 SHA256 d1d952e06f8112c0b217cde3a9bbb9352b116d2002fec1b71e9c61e30a2ea7c8
+DIST git-1.5.4.rc1.tar.bz2 1548134 RMD160 a0d64bd1f8981922be35ecc0350879af587ffe3b SHA1 bd41a8d1af5d9667501e558cabccea3ca4c99713 SHA256 4f1c45574a16bd66fcfa370c5f7acc0e2fd20217fd200ad55371071c3c8038a8
 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
@@ -48,6 +49,7 @@ DIST git-htmldocs-1.5.3.5.tar.bz2 542940 RMD160 3597521cee89eb538db7ead2c4910852
 DIST git-htmldocs-1.5.3.6.tar.bz2 545021 RMD160 4174428f3d37d3c32776137390bb46d3667a47a9 SHA1 6539d9481e5e53400d8c9f8ad89ccde5f0deb340 SHA256 893b72beed877cca84de11f941807441685666016994bf83cbd28cf07b8144c9
 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
 DIST git-htmldocs-1.5.4.rc0.tar.bz2 571372 RMD160 7da3cdce5aeccf8e423ac9141c025409944f151f SHA1 f2c0a2fcaca63da298d06551349f975ef534aa2b SHA256 2248d40a2acdb85fed5355ab135a98a6ab658c4f73511fc347aa0a6a1656614f
+DIST git-htmldocs-1.5.4.rc1.tar.bz2 600054 RMD160 6c0570d9a4d81a61445c795247758d84d451b947 SHA1 c309024457cfd22530f7b63d727da902ddc787f3 SHA256 66aad13fc1768a2b57dd76100535d997d58f3731159d6cb568d7bd4b6887b107
 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
@@ -57,6 +59,7 @@ DIST git-manpages-1.5.3.5.tar.bz2 147502 RMD160 9ee059e372c7dc6660de5c77d27b5e55
 DIST git-manpages-1.5.3.6.tar.bz2 147732 RMD160 4080488cd65b82b2459b373c3d8eb6d3024b24e9 SHA1 0db0722b5da956db18c2639fd710c72bf5916fd9 SHA256 ec03a96deb343267d34801bb20f18d296c693da19280910cf3e68f5acc89de07
 DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
 DIST git-manpages-1.5.4.rc0.tar.bz2 153501 RMD160 746e9e0d09ad462ab6c3684032bfb09629ed10dd SHA1 fbc771fa552746d337fe71084b30dcb3c1833f18 SHA256 ad184fdf2e430610cb60562bc9b302cf2c9cc6c2edfcfa2a4dfcaed5df98c376
+DIST git-manpages-1.5.4.rc1.tar.bz2 153363 RMD160 b754f0c74bf0059e0811eea2b41d6a88f73a279f SHA1 486d17465451c54b730f875c89408d8045840e76 SHA256 2121a9c28214f4285e4004c321fa6b2a50a13e3a281def775eda978b192f58cd
 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
@@ -105,10 +108,14 @@ EBUILD git-1.5.4_rc0.ebuild 6572 RMD160 43843dc24bc1cd78f74f7dd8b03e4e2d0dfed2ec
 MD5 dcfbc5fb35c054e04d202464568d346b git-1.5.4_rc0.ebuild 6572
 RMD160 43843dc24bc1cd78f74f7dd8b03e4e2d0dfed2ec git-1.5.4_rc0.ebuild 6572
 SHA256 44864a1e092c384267a370a497559cb36abb9169b925da184a5c590b57bb2935 git-1.5.4_rc0.ebuild 6572
-MISC ChangeLog 34722 RMD160 059ad886b8646efa752e81736041b8e5add016e5 SHA1 889f4a1a5dcb353f592b7c60f2cc8115d94c31ac SHA256 8785f3c004279b61f977e668f07aff5b5630c32508849386ff1ee739617489ff
-MD5 5bb28cf9be4ca4f06673f27e307e6786 ChangeLog 34722
-RMD160 059ad886b8646efa752e81736041b8e5add016e5 ChangeLog 34722
-SHA256 8785f3c004279b61f977e668f07aff5b5630c32508849386ff1ee739617489ff ChangeLog 34722
+EBUILD git-1.5.4_rc1.ebuild 6572 RMD160 0dda8c41529b254fb9bcd7aba3d6c0d5a9687266 SHA1 f8d920341c212457b3620547cf635017cc2dc18a SHA256 c992e77b8e892380e7b1f6053fc5128031696729a7fb1a147c3133fcea2bcdf2
+MD5 8aa9898d26a7e3b2f07f58d6d57c84c5 git-1.5.4_rc1.ebuild 6572
+RMD160 0dda8c41529b254fb9bcd7aba3d6c0d5a9687266 git-1.5.4_rc1.ebuild 6572
+SHA256 c992e77b8e892380e7b1f6053fc5128031696729a7fb1a147c3133fcea2bcdf2 git-1.5.4_rc1.ebuild 6572
+MISC ChangeLog 34860 RMD160 a689fbd9805470fd2530ede932fcf6a59e58a949 SHA1 8066bd1a8221a486ba3e4cdfe52eb35fdd74acc5 SHA256 555069aa6072441082bc3116bef9d44c5d5b2de27626bd2f2c227bc67bc3abe9
+MD5 f0744f22e4e639287b9d829d6406674d ChangeLog 34860
+RMD160 a689fbd9805470fd2530ede932fcf6a59e58a949 ChangeLog 34860
+SHA256 555069aa6072441082bc3116bef9d44c5d5b2de27626bd2f2c227bc67bc3abe9 ChangeLog 34860
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -149,3 +156,6 @@ SHA256 58c658fd0f1660c20f6c637ff6c1aad20489ade95b1c2b4a0abaabd9d2feb858 files/di
 MD5 cd1d61fd309be4341ba9d31b19f4cb03 files/digest-git-1.5.4_rc0 789
 RMD160 b3fafa7e21ef5f603ce9fd7af2aff8474c91b514 files/digest-git-1.5.4_rc0 789
 SHA256 ae81fa0f6650efd1ad1081ac655bfcf803d459088f25402caf165f9dfe4d26fb files/digest-git-1.5.4_rc0 789
+MD5 c91c14718766b5d4c612571bd48d19f1 files/digest-git-1.5.4_rc1 789
+RMD160 4fc1bbe780a5457aff6facc63b51107b896afb28 files/digest-git-1.5.4_rc1 789
+SHA256 f6f0eba281cfb9eb9f00a4f0895014bba7838205fb51134059c9168a5a8e3e72 files/digest-git-1.5.4_rc1 789
diff --git a/dev-util/git/files/digest-git-1.5.4_rc1 b/dev-util/git/files/digest-git-1.5.4_rc1
new file mode 100644
index 000000000000..b3ab18152208
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.4_rc1
@@ -0,0 +1,9 @@
+MD5 37b44a578fc2b32ef2669d8e177e5d1d git-1.5.4.rc1.tar.bz2 1548134
+RMD160 a0d64bd1f8981922be35ecc0350879af587ffe3b git-1.5.4.rc1.tar.bz2 1548134
+SHA256 4f1c45574a16bd66fcfa370c5f7acc0e2fd20217fd200ad55371071c3c8038a8 git-1.5.4.rc1.tar.bz2 1548134
+MD5 4c8d7d6cc723beece3d1992f8f27edcc git-htmldocs-1.5.4.rc1.tar.bz2 600054
+RMD160 6c0570d9a4d81a61445c795247758d84d451b947 git-htmldocs-1.5.4.rc1.tar.bz2 600054
+SHA256 66aad13fc1768a2b57dd76100535d997d58f3731159d6cb568d7bd4b6887b107 git-htmldocs-1.5.4.rc1.tar.bz2 600054
+MD5 16c95f31b4ff74229bdcc9742a263c6f git-manpages-1.5.4.rc1.tar.bz2 153363
+RMD160 b754f0c74bf0059e0811eea2b41d6a88f73a279f git-manpages-1.5.4.rc1.tar.bz2 153363
+SHA256 2121a9c28214f4285e4004c321fa6b2a50a13e3a281def775eda978b192f58cd git-manpages-1.5.4.rc1.tar.bz2 153363
diff --git a/dev-util/git/git-1.5.4_rc1.ebuild b/dev-util/git/git-1.5.4_rc1.ebuild
new file mode 100644
index 000000000000..bd4ba075bad5
--- /dev/null
+++ b/dev-util/git/git-1.5.4_rc1.ebuild
@@ -0,0 +1,226 @@
+# 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.4_rc1.ebuild,v 1.1 2007/12/25 08:47:17 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 ~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"
+
+	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"
+
+	use tk || rm "${D}"/usr/bin/git{k,-gui}
+
+	doman man?/*
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		einfo "Doing Documentation${d}"
+		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
+	# Stupid CVS won't let some people commit as root
+	if has userpriv "${FEATURES}"; then
+		einfo "Enabling CVS tests as we have FEATURES=userpriv"
+	else
+		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
+	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 \
+		"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
+}