Remove old and unused stuff

(Portage version: 2.1.2.11)

10 files changed, 6 insertions, 715 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index cf26a03a78e0..f40dc9c6a8ed 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.209 2007/08/08 11:04:16 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.210 2007/08/13 22:30:06 ferdy Exp $
+
+  13 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/git-1.5.2-tempfile.patch, -git-1.5.0.7.ebuild, -git-1.5.2.ebuild,
+  -git-1.5.2.1.ebuild, -git-1.5.2.2.ebuild:
+  Remove old and unused stuff
 
 *git-1.5.3_rc4 (08 Aug 2007)
 
diff --git a/dev-util/git/files/digest-git-1.5.0.7 b/dev-util/git/files/digest-git-1.5.0.7
deleted file mode 100644
index f4d7cb06c147..000000000000
--- a/dev-util/git/files/digest-git-1.5.0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 f3144aef04e479d54fbf47072ea58dc1 git-1.5.0.7.tar.bz2 1053367
-RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 git-1.5.0.7.tar.bz2 1053367
-SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada git-1.5.0.7.tar.bz2 1053367
-MD5 3fcc9d2118a50fe20b721289260816a5 git-htmldocs-1.5.0.7.tar.bz2 450009
-RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 git-htmldocs-1.5.0.7.tar.bz2 450009
-SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823 git-htmldocs-1.5.0.7.tar.bz2 450009
-MD5 74f8792f0ceae63e8ec74fb14598b20d git-manpages-1.5.0.7.tar.bz2 126927
-RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 git-manpages-1.5.0.7.tar.bz2 126927
-SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba git-manpages-1.5.0.7.tar.bz2 126927
diff --git a/dev-util/git/files/digest-git-1.5.2 b/dev-util/git/files/digest-git-1.5.2
deleted file mode 100644
index 1d404824d0a9..000000000000
--- a/dev-util/git/files/digest-git-1.5.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 79c749b720c29c024d948163fdc47dac git-1.5.2.tar.bz2 1180424
-RMD160 5e9064bdceadcac779112e8c677a6236de75ed7d git-1.5.2.tar.bz2 1180424
-SHA256 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5 git-1.5.2.tar.bz2 1180424
-MD5 b2f0bab66212c61761c250b03f8e7222 git-htmldocs-1.5.2.tar.bz2 499796
-RMD160 bef6b3b51896019430039475662a046e69075917 git-htmldocs-1.5.2.tar.bz2 499796
-SHA256 8ba238a066a4ffde51dd1aaa04b8d9757d0b7ad3793a20289d9ddcf1d54368e2 git-htmldocs-1.5.2.tar.bz2 499796
-MD5 4ff6dc447e6336189a94add85e156aec git-manpages-1.5.2.tar.bz2 138905
-RMD160 90520407c8338eda4e9ab2ad573490b06acc01df git-manpages-1.5.2.tar.bz2 138905
-SHA256 5822714d1847a1d44f3d93286a60e45c375f521c07ce06794636afe187d0680b git-manpages-1.5.2.tar.bz2 138905
diff --git a/dev-util/git/files/digest-git-1.5.2.1 b/dev-util/git/files/digest-git-1.5.2.1
deleted file mode 100644
index 6ee89fdaafae..000000000000
--- a/dev-util/git/files/digest-git-1.5.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0a39e786a12974cbe7b14f2fe92dc163 git-1.5.2.1.tar.bz2 1184392
-RMD160 1d5917ebab541ac65530d353a6f5260ee2ac1c0a git-1.5.2.1.tar.bz2 1184392
-SHA256 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37 git-1.5.2.1.tar.bz2 1184392
-MD5 3778795756775c73f44dd643e6ca6e3f git-htmldocs-1.5.2.1.tar.bz2 504298
-RMD160 3c819ea838fd5f3706616c1efd3b6b813267707c git-htmldocs-1.5.2.1.tar.bz2 504298
-SHA256 e2f2edbbc03b9eed78d5b24a1c9565ab3f2b5131c2c743c4b651b41bfab0b56d git-htmldocs-1.5.2.1.tar.bz2 504298
-MD5 e9da37e899167a4f36a71c8fee46e6a0 git-manpages-1.5.2.1.tar.bz2 139651
-RMD160 9b48b9aba586a59ef7759f95934003299ff1fd03 git-manpages-1.5.2.1.tar.bz2 139651
-SHA256 f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f git-manpages-1.5.2.1.tar.bz2 139651
diff --git a/dev-util/git/files/digest-git-1.5.2.2 b/dev-util/git/files/digest-git-1.5.2.2
deleted file mode 100644
index 5eb891b477f2..000000000000
--- a/dev-util/git/files/digest-git-1.5.2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 846940654b703ec5c8de4ee388cb4d08 git-1.5.2.2.tar.bz2 1190255
-RMD160 ab4e7c30fa13470b3fe16edb1d6681600438483e git-1.5.2.2.tar.bz2 1190255
-SHA256 9c569ab1096c37e1b7ba3633fda5b36b9ad4305454ce2748bb1da557a3817041 git-1.5.2.2.tar.bz2 1190255
-MD5 6b17a1b9daac6413a8998c75ec41079e git-htmldocs-1.5.2.2.tar.bz2 505023
-RMD160 28d4a886e411b8d9068f28f19fa6be71716d4241 git-htmldocs-1.5.2.2.tar.bz2 505023
-SHA256 8c078916fb43b88de9a0626bee32f217452bed6dd2798643c3cec020b389205f git-htmldocs-1.5.2.2.tar.bz2 505023
-MD5 892e8506874d537038d67c51f9c76ec9 git-manpages-1.5.2.2.tar.bz2 139718
-RMD160 c1597fedd5e60f89356fd6d3a49d62c0b797a935 git-manpages-1.5.2.2.tar.bz2 139718
-SHA256 4b1c681c5be4cda05e98f74269b9e9d3334d05340bec224c32f97c3044653fc6 git-manpages-1.5.2.2.tar.bz2 139718
diff --git a/dev-util/git/files/git-1.5.2-tempfile.patch b/dev-util/git/files/git-1.5.2-tempfile.patch
deleted file mode 100644
index bd8ad085cbcf..000000000000
--- a/dev-util/git/files/git-1.5.2-tempfile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/diff.c b/diff.c
-index 33297aa..b23e190 100644
---- a/diff.c
-+++ b/diff.c
-@@ -186,13 +186,11 @@ static const char *external_diff(void)
- 	return external_diff_cmd;
- }
- 
--#define TEMPFILE_PATH_LEN		50
--
- static struct diff_tempfile {
- 	const char *name; /* filename external diff should read from */
- 	char hex[41];
- 	char mode[10];
--	char tmp_path[TEMPFILE_PATH_LEN];
-+	char tmp_path[PATH_MAX];
- } diff_temp[2];
- 
- static int count_lines(const char *data, int size)
-@@ -1561,7 +1559,7 @@ static void prep_temp_blob(struct diff_tempfile *temp,
- {
- 	int fd;
- 
--	fd = git_mkstemp(temp->tmp_path, TEMPFILE_PATH_LEN, ".diff_XXXXXX");
-+	fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
- 	if (fd < 0)
- 		die("unable to create temp-file");
- 	if (write_in_full(fd, blob, size) != size)
diff --git a/dev-util/git/git-1.5.0.7.ebuild b/dev-util/git/git-1.5.0.7.ebuild
deleted file mode 100644
index 447291165a2c..000000000000
--- a/dev-util/git/git-1.5.0.7.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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.0.7.ebuild,v 1.13 2007/07/29 16:56:54 phreak 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.6 )"
-
-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
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	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"
-	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() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.2.1.ebuild b/dev-util/git/git-1.5.2.1.ebuild
deleted file mode 100644
index 2009b229af01..000000000000
--- a/dev-util/git/git-1.5.2.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.1.ebuild,v 1.3 2007/07/29 16:56:54 phreak 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 )"
-
-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
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	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() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.2.2.ebuild b/dev-util/git/git-1.5.2.2.ebuild
deleted file mode 100644
index 01ebb512d74c..000000000000
--- a/dev-util/git/git-1.5.2.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.2.ebuild,v 1.3 2007/07/29 16:56:54 phreak 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
-}
diff --git a/dev-util/git/git-1.5.2.ebuild b/dev-util/git/git-1.5.2.ebuild
deleted file mode 100644
index 2e0f2be8e5a6..000000000000
--- a/dev-util/git/git-1.5.2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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.ebuild,v 1.4 2007/07/29 16:56:54 phreak 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 )"
-
-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
-	epatch "${FILESDIR}"/${P}-tempfile.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
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	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() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}