New upstream version, remove a buggy one.

Package-Manager: portage-2.1.1

3 files changed, 18 insertions, 180 deletions

diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 0dbc4b13d256..6f61f26020ca 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -19,13 +19,13 @@ RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 SHA1 376a96ecf68cf90fa0b29fde700e5e947967531a SHA256 e4a9ef8403c3716f7494d4865ee6c3e862b93012df41522237ace91f68a6d6ce
 DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632
-DIST git-1.4.3.tar.bz2 858845 RMD160 c22d51f70469df10d56869a72695e68b39a1f87f SHA1 e191fa0c392c557b51adee230a029c2f149005af SHA256 2110d13f93a11ba7416d2c77d23a397a7d996a4894a7aa4497512bb38582ee5b
+DIST git-1.4.3.1.tar.bz2 859292 RMD160 0256ba4df5f1ac654ee782b11cf168dcb0308a27 SHA1 7cae162939cba1a27af460b43eb32adca7a4fec8 SHA256 47e49261f0d4e8733de3f90d6be8b445fae0634b125a433c8110039bf485349a
 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d
 DIST git-htmldocs-1.4.2.4.tar.bz2 283907 RMD160 6aaa9e601cc16d4e45176e58fbbc87a332afb243 SHA1 e05b2ef0a5354b8c6ff4d043d620e0b229cda7a9 SHA256 90f3ad4bced74bbadfc6f02a1c3d222a6bcf13d940b9aef368b7cbae083c1f86
-DIST git-htmldocs-1.4.3.tar.bz2 301187 RMD160 6b486e8b4974ce63a6d9cbca84449c52b0c1373c SHA1 78373c54f75ee1ada1d4a6d464b9370a1900c3f5 SHA256 1290b5f17788ef07e246925a3d32b7e6caa47ca6ac1cfbc4191f2baef5c8125d
+DIST git-htmldocs-1.4.3.1.tar.bz2 301586 RMD160 d2e8a93c593f25b73c2bab173163e7364361d8e1 SHA1 4b39ca12840a3ee320cb78bbfc5873e89ac64f77 SHA256 f9376688169ee331913b2130134de39972d7aaa47135017112b9abff72304cb3
 DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4
 DIST git-manpages-1.4.2.4.tar.bz2 90375 RMD160 0b3d486d04a5a64aab273c75823c603f307fcd02 SHA1 961b3981f074663ec64bbbc5b82fdab0c45b7919 SHA256 6e0520fd779225e79957871d981ddfc9e93f157374de88f654d4f20958557518
-DIST git-manpages-1.4.3.tar.bz2 96534 RMD160 0bfb5209ae9b7654ae79d6bc6d9e2434de3fe30d SHA1 93c8bd72c03da53ebd3c46610c43a7ceb545f068 SHA256 521913205de68801ad7262495231691b8c2727014a036963fdb3b2bbac43626a
+DIST git-manpages-1.4.3.1.tar.bz2 96649 RMD160 b1eba204ea72c2a673678ec453ca1eb46f5d5e2e SHA1 b3978a75fae3ca198903dc4ccd2dd9857a4f6c9e SHA256 378a698fab917e3bccb1b1f842a11dead60e9201dee7f0cca9b80e19754a9ed2
 EBUILD git-1.4.1.1.ebuild 4360 RMD160 8e8e54c393253adde1589c94208702a373a81259 SHA1 413652cd5c1c901778fdf3dc6dc1d10d64d31c83 SHA256 7e3ded56b642fc7dcf52b54a768cbf3f7adcb5527044cb44a99ac9c04844c997
 MD5 2c27b231d4e7f5dda4eb4a9ed1f6bb32 git-1.4.1.1.ebuild 4360
 RMD160 8e8e54c393253adde1589c94208702a373a81259 git-1.4.1.1.ebuild 4360
@@ -34,14 +34,14 @@ EBUILD git-1.4.2.4.ebuild 4393 RMD160 d0e4639c5010abdf1db46ba846630b1101826355 S
 MD5 606a5c6c1743185bbb17516c2cb3b4e9 git-1.4.2.4.ebuild 4393
 RMD160 d0e4639c5010abdf1db46ba846630b1101826355 git-1.4.2.4.ebuild 4393
 SHA256 6aeb1f74b7d02495b918686240377885630a787deb5a74dd902d20687b2e9b23 git-1.4.2.4.ebuild 4393
-EBUILD git-1.4.3.ebuild 4422 RMD160 63aeaccd30c46a7e70e3dc3d2986c0d7a82ac8e4 SHA1 f14325abe67f68a118ef4a983e056d0d74a54404 SHA256 ac9e51feba393395d0fb813929afb6c3d78243fdc9a1bb32270785f48a33c090
-MD5 0e134b482725a801b6155a8baa069620 git-1.4.3.ebuild 4422
-RMD160 63aeaccd30c46a7e70e3dc3d2986c0d7a82ac8e4 git-1.4.3.ebuild 4422
-SHA256 ac9e51feba393395d0fb813929afb6c3d78243fdc9a1bb32270785f48a33c090 git-1.4.3.ebuild 4422
-MISC ChangeLog 19824 RMD160 da42b93525e7d3d4454630caf694d2fa693a44a3 SHA1 75ac9ab136d0102ced5f2a00a1164f86a0074749 SHA256 9be4b231920725dfb260ff17fae96ba9582bce926684c7ea255e26190b10a3d9
-MD5 753415904fbb56764b542ec4482cf999 ChangeLog 19824
-RMD160 da42b93525e7d3d4454630caf694d2fa693a44a3 ChangeLog 19824
-SHA256 9be4b231920725dfb260ff17fae96ba9582bce926684c7ea255e26190b10a3d9 ChangeLog 19824
+EBUILD git-1.4.3.1.ebuild 4437 RMD160 8d4177c08c7934bb656348d5b5139f5931d2ecd1 SHA1 59163bb3f63c8534bd6246dfb3bd1f8161b93645 SHA256 efe8b847fea38683a20b441fb49c8d28ea3a23e7ff7081a6411f58d567be48df
+MD5 fba77a9324348599ba371f164eae0517 git-1.4.3.1.ebuild 4437
+RMD160 8d4177c08c7934bb656348d5b5139f5931d2ecd1 git-1.4.3.1.ebuild 4437
+SHA256 efe8b847fea38683a20b441fb49c8d28ea3a23e7ff7081a6411f58d567be48df git-1.4.3.1.ebuild 4437
+MISC ChangeLog 19991 RMD160 dd5de457284d7998dd971cb330d10bfc9ba49536 SHA1 1d9cbfdbcb6a99461628969aff65fa643803db44 SHA256 b6224375c2de624967abe0ea711ade748c7db2de93771ac6c781657ea17fdbdf
+MD5 7a204209a805e6b1f039db827ecd3aa3 ChangeLog 19991
+RMD160 dd5de457284d7998dd971cb330d10bfc9ba49536 ChangeLog 19991
+SHA256 b6224375c2de624967abe0ea711ade748c7db2de93771ac6c781657ea17fdbdf ChangeLog 19991
 MISC metadata.xml 255 RMD160 db414d29c445e388d486f826b368b5359b74f72d SHA1 0317bb4c83bba580ddb586efe8a929b85759d0d2 SHA256 45f65b01b99f13e87c53843765ab287065988ab80e675287cdcc81ce3e22f9a2
 MD5 c2a7223a6caa6908d13db012ce74b388 metadata.xml 255
 RMD160 db414d29c445e388d486f826b368b5359b74f72d metadata.xml 255
@@ -52,13 +52,13 @@ SHA256 c4659a8be91474f1005a6c0fec5ea794c5f406dd9b74ffe047ceef76517891a4 files/di
 MD5 9fb07bda15a4aab8cfe357e7c558d1aa files/digest-git-1.4.2.4 765
 RMD160 174be578a6d9b7fe8b580b1ab1e77d1842a9f151 files/digest-git-1.4.2.4 765
 SHA256 d48ebc25dd2dcb75d72f633f74f2754ddb2fd25894abe15cb0159e429dccb7a5 files/digest-git-1.4.2.4 765
-MD5 3d8daf3e474239ca9d7e61f3a1c49cf5 files/digest-git-1.4.3 747
-RMD160 167a79c210c73e0782ad4f4a37c0f429cf13e6ad files/digest-git-1.4.3 747
-SHA256 f135a376ed3c6df861d0bc0cbe9368f845e58fd974f97ecdc5df51c1cec8d6b0 files/digest-git-1.4.3 747
+MD5 6fbffdbc1a21f78036aa02633544bf23 files/digest-git-1.4.3.1 765
+RMD160 2dbdd154871a9739bfeae6915878a1ff858b80e3 files/digest-git-1.4.3.1 765
+SHA256 5bfc7d9f467f44ed10f221b6e087f687ecb872d7c97ae5bc138000caddf8f51d files/digest-git-1.4.3.1 765
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFOh7wwLwTda5NScMRAkvvAJ4m197iooskO5zn8Ekv62EEFjoV3wCeI0ga
-oD9dwC8AiRbznArSXeMCxUM=
-=QaxF
+iD8DBQFFOqi7ViELBEf1JB0RAsdhAJ0R9Jd6QA6NB3l2ltwVvz2yhiNfcwCfc+L0
+vKmZtG1BQCmunpI3yOM/sGA=
+=CbaV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.3 b/dev-util/git/files/digest-git-1.4.3
deleted file mode 100644
index 24ea38c13a7c..000000000000
--- a/dev-util/git/files/digest-git-1.4.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 d21d1f3075c69ebf913f96a2e215d171 git-1.4.3.tar.bz2 858845
-RMD160 c22d51f70469df10d56869a72695e68b39a1f87f git-1.4.3.tar.bz2 858845
-SHA256 2110d13f93a11ba7416d2c77d23a397a7d996a4894a7aa4497512bb38582ee5b git-1.4.3.tar.bz2 858845
-MD5 68a747caa106cf68d6a7a4752a129d37 git-htmldocs-1.4.3.tar.bz2 301187
-RMD160 6b486e8b4974ce63a6d9cbca84449c52b0c1373c git-htmldocs-1.4.3.tar.bz2 301187
-SHA256 1290b5f17788ef07e246925a3d32b7e6caa47ca6ac1cfbc4191f2baef5c8125d git-htmldocs-1.4.3.tar.bz2 301187
-MD5 7894dc74b0f906c10705c06243639054 git-manpages-1.4.3.tar.bz2 96534
-RMD160 0bfb5209ae9b7654ae79d6bc6d9e2434de3fe30d git-manpages-1.4.3.tar.bz2 96534
-SHA256 521913205de68801ad7262495231691b8c2727014a036963fdb3b2bbac43626a git-manpages-1.4.3.tar.bz2 96534
diff --git a/dev-util/git/git-1.4.3.ebuild b/dev-util/git/git-1.4.3.ebuild
deleted file mode 100644
index 621ca3611cf8..000000000000
--- a/dev-util/git/git-1.4.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.3.ebuild,v 1.2 2006/10/20 06:51:38 ferdy Exp $
-
-inherit python toolchain-funcs eutils elisp-common perl-module
-
-DOC_VER=${PV}
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="mirror://kernel/software/scm/git/${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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc emacs gtk mozsha1 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
-		>=dev-lang/python-2.3
-		app-text/rcs
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
-
-# 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"
-
-	# Older python versions need own subproccess.py
-	python_version
-	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
-
-	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	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):" \
-		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
-
-	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"
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo
-	einfo "If you want to import arch repositories into git, consider using the"
-	einfo "git-archimport command. You should install dev-util/tla before."
-	einfo
-	einfo "If you want to import cvs repositories into git, consider using the"
-	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before."
-	einfo
-	einfo "If you want to import svn repositories into git, consider using the"
-	einfo "git-svnimport command. You should install dev-util/subversion before."
-	einfo
-	einfo "If you want to manage subversion repositories using git, consider"
-	einfo "using git-svn. You should install dev-util/subversion and dev-perl/libwww-perl."
-	einfo
-	einfo "If you want to import a quilt series into git, consider using the"
-	einfo "git-quiltimport command. You should install dev-util/quilt before."
-	einfo
-	einfo "If you want to use the included CVS server you will need to install"
-	einfo "dev-perl/DBI and dev-perl/DBD-SQLite."
-	einfo
-}
-
-pkg_postrm() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}