New upstream version. Remove RCs for 1.5.4

Package-Manager: portage-2.1.3.19

5 files changed, 14 insertions, 471 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 61e4e228627f..2654e00c2066 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # 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.253 2008/02/01 10:46:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.254 2008/02/03 18:22:58 ferdy Exp $
+
+*git-1.5.4 (03 Feb 2008)
+
+  03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.4_rc2.ebuild,
+  -git-1.5.4_rc3.ebuild, -git-1.5.4_rc4.ebuild, +git-1.5.4.ebuild:
+  New upstream version. Remove RCs for 1.5.4
 
   01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.2.5.ebuild,
   git-1.5.3.7-r1.ebuild, git-1.5.3.8.ebuild, git-1.5.4_rc2.ebuild,
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index b2ea231b872e..d7f4de55b88f 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -12,29 +12,21 @@ DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1
 DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 SHA1 5c145b98dbd7b8695e8dcc18ca661454775c869b SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9
 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-1.5.4.rc4.tar.bz2 1579434 RMD160 38fd4c2b745ae3e54bc15d3ff76fc4e2fbbf0c79 SHA1 6a2a337e3663bc3e7fd589cd15cce6ed314ba575 SHA256 65c6dfc83901dba3ee4f26318b40ab1bdba520d76a636b1597fea6900ee7b9ea
+DIST git-1.5.4.tar.bz2 1583166 RMD160 7d49a13b19a15f6acd57aa3e8d9e7ac82b105ffd SHA1 0bde73f3093fcd54ff62f34be9c59a48ceee01af SHA256 c6f1cc44a3960ffa787d1e5902be0f1f928e7ff882f206d9ba554753d1bd8e5c
 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-htmldocs-1.5.4.rc4.tar.bz2 608931 RMD160 f3b70e0d1db60e4918620f93393932fd12a13e37 SHA1 bca483c23863582ba33b179ac730cf85c64e50ed SHA256 b78848913ccb432d4510cfd8a57c5d22d704a7e99993638ce9dc67738baa39db
+DIST git-htmldocs-1.5.4.tar.bz2 609896 RMD160 f55380837e99cd70a5a266f9e44bc5cf62809129 SHA1 14943152482d5ed454002c879460cd9ccdcf258c SHA256 4d3b633aab0de30da6126537b84ab1bd06dd45e963aaeb5590cc6e6414ec4c96
 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
-DIST git-manpages-1.5.4.rc4.tar.bz2 155937 RMD160 97f43cdfb356048589ba527ca1ae2402f4b86c85 SHA1 4bc08af8f3b9dcc02ff7eae515cddb38927639af SHA256 612317e4acda3e068c19014785ba03f95feabd10de325566f2cbf0e1886ee8ed
+DIST git-manpages-1.5.4.tar.bz2 156304 RMD160 be7e3158924a254ebac7b161af7d27bacfe1079e SHA1 a34a846092ae9b3d23f0015ba86ecc4d52e096c8 SHA256 e86e4909b56cd56f79bb12c088c95f32df80e836c1fac7be800ddb6fbcb2aa8f
 EBUILD git-1.5.1.6.ebuild 4399 RMD160 6ffd38687bfca4241034a3047d24c1794829b34d SHA1 7561cdb0a648991103fc6cc89c4583c0218caa18 SHA256 3dd2ba27e7e85fb08e5f81a6752c83a30b1624fcaa2070bd93d8feae027bfe4e
 EBUILD git-1.5.2.5.ebuild 4437 RMD160 0d6241aa454380876b2fd2fd95a4fbf679742e42 SHA1 e7eff8a303a3609432ece65581601fee853ae34d SHA256 04a7bbf40e9ffdaf234063af961fa4c3c71958c556ddfc2cdbba33f3b153d094
 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
 EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84
-EBUILD git-1.5.4_rc2.ebuild 6570 RMD160 d6655bc515a4ffa8c32cf211682eb86c808a5414 SHA1 67bced69478051fb72ed44545ce8e230d8af094c SHA256 6791f63c64f2a71b7fc1a1113a80ef0b5656686161bbe72d8c4fa22caf173119
-EBUILD git-1.5.4_rc3.ebuild 6570 RMD160 90081086dc13a1f61826b614cab8699d11bcdf0e SHA1 ca0427f17997e1ecafd145cc201b91e3155b37e6 SHA256 76004c1132cf17722f15b5384338414cfa7cdb79717024a0642edd95ae9e9ca6
-EBUILD git-1.5.4_rc4.ebuild 6570 RMD160 a02ad3e15cdecf0f551e6e0b3909b90878457290 SHA1 9324d903ae845ddd95863f983ff0718d24de835a SHA256 becea484d4ab60bef685486bad2cdfed541cb37539f295e0f6bdc086e9eb38bf
-MISC ChangeLog 37022 RMD160 921b5ca137861fff59d2c17b7c510fbf8161442c SHA1 ebd8408e0a6a935dedaa91b491ac3f8ba64b5956 SHA256 92a8c927c510a16d31611a09aa75fe2f1646b162226101f8285f71b3fb451cdd
+EBUILD git-1.5.4.ebuild 6486 RMD160 3e0dd803ac54088eae79793c560a509744b58ef7 SHA1 d4b747081d551fed1533bc1bad26169b27b76760 SHA256 7d92f25f7b47ad836c6d5611240631bcae7bcd7b6dcaa1c89a60f126bdc9ae64
+MISC ChangeLog 37235 RMD160 9a72a444bb5175d5b0a12398ef9a04b7597f183c SHA1 2922c34bedcedbf24187e56d747f88c2c0b565be SHA256 3cf89404f73c4b5d59d16a7b92cd111522ee6036b9a9b93f8cd3d67ffbbb25c7
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
diff --git a/dev-util/git/git-1.5.4_rc2.ebuild b/dev-util/git/git-1.5.4.ebuild
index 87268b003d0e..a9114b39b3e6 100644
--- a/dev-util/git/git-1.5.4_rc2.ebuild
+++ b/dev-util/git/git-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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_rc2.ebuild,v 1.3 2008/02/01 10:46:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.ebuild,v 1.1 2008/02/03 18:22:58 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -143,6 +143,7 @@ src_install() {
 
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
+	# svnimport - use git-svn
 	# 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
@@ -203,10 +204,6 @@ pkg_postinst() {
 	echo
 	showpkgdeps git-archimport "dev-util/tla"
 	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
-	showpkgdeps git-svnimport \
-		"USE=perl" \
-		"dev-util/subversion(USE=perl)" \
-		"dev-perl/libwww-perl"
 	showpkgdeps git-svn \
 		"USE=perl" \
 		"dev-util/subversion(USE=perl)" \
diff --git a/dev-util/git/git-1.5.4_rc3.ebuild b/dev-util/git/git-1.5.4_rc3.ebuild
deleted file mode 100644
index cbb1dd219079..000000000000
--- a/dev-util/git/git-1.5.4_rc3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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.2 2008/02/01 10:46:40 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 \
-		"USE=perl" \
-		"dev-util/subversion(USE=perl)" \
-		"dev-perl/libwww-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
-}
diff --git a/dev-util/git/git-1.5.4_rc4.ebuild b/dev-util/git/git-1.5.4_rc4.ebuild
deleted file mode 100644
index 9963bfdc7eb6..000000000000
--- a/dev-util/git/git-1.5.4_rc4.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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_rc4.ebuild,v 1.2 2008/02/01 10:46:40 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 \
-		"USE=perl" \
-		"dev-util/subversion(USE=perl)" \
-		"dev-perl/libwww-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
-}