New upstream version.

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

3 files changed, 17 insertions, 177 deletions

diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 8fe5dfe1ada8..0a887985634b 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.3.tar.bz2 858389 RMD160 3d42661991b805c7e179551cf88b513440bfa164 SHA1 45d341606e48d7d3723a768eaed4bcd117bd409d SHA256 550e8b79e5a4e3c57d4b6cdccc307baab4e4d41ffb23db382a0e3be24e46d42d
+DIST git-1.4.3.4.tar.bz2 859033 RMD160 eaa8d066ff5f1d18e733da6be435e54b5a916626 SHA1 086bf9565e86c2a4579838b1fc60035eef62b9ae SHA256 08b842e62019b7fca5e659e1d65807707a3bef5207b0ca65d85b840b5599a318
 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.3.tar.bz2 302246 RMD160 d491a7db58b6cf37ab71c9b151089d0229d6e113 SHA1 fd6feea9b385648f49a2595317cd6294c2d81c93 SHA256 87d5f62fe3d0a62168f8ec1dd7318fc029dafe185e43fafda730cdf2a8df5332
+DIST git-htmldocs-1.4.3.4.tar.bz2 305714 RMD160 627fc695081eca3efcbfe6f7b945e528fc08f1d2 SHA1 e34bcf68852fc54217de2fe522714f753ba9bd6f SHA256 e378a0adf19b7fb6352eb9aa5df414f02bf4c4129b448dad4db647158db858d6
 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.3.tar.bz2 96856 RMD160 81b4aabfaaf3a90a3eace11f5de991136884636b SHA1 934f970036e3c876e8821ccc0d24cc0534d39f8e SHA256 3c0617129eb3044ac6fde66b4554e5c0c125c7389b35f70749a864d758cdc248
+DIST git-manpages-1.4.3.4.tar.bz2 98021 RMD160 fdc3bf7ca64695f87ebf845e3a4abeafa9105b8c SHA1 5b20693f2204d4ffd9e6504f03de5741a9f7dad9 SHA256 f5f06a744d920910b30c6e959d173b0c96bbf4fe5764d54bae348c118c653269
 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 4391 RMD160 5ab5d4435f6f4558940efbef30c949ba0bb89075 S
 MD5 0580d7372ccedb5b8786edfadcebdd45 git-1.4.2.4.ebuild 4391
 RMD160 5ab5d4435f6f4558940efbef30c949ba0bb89075 git-1.4.2.4.ebuild 4391
 SHA256 1732597c174769767948704b6c89160ff6cd89a853cc99881a89c12aa93ffe81 git-1.4.2.4.ebuild 4391
-EBUILD git-1.4.3.3.ebuild 4057 RMD160 36d9d652e117b061fe19835d5f839c8d9a81085b SHA1 79947b0a8f6b829683fea6f63d6762c7a0d2543a SHA256 fb3bedc2cd88f052a1a62458366de8f695c8c24b46d90d6be953ca1556194fb7
-MD5 2b4b52860647d222a06ff041808f6172 git-1.4.3.3.ebuild 4057
-RMD160 36d9d652e117b061fe19835d5f839c8d9a81085b git-1.4.3.3.ebuild 4057
-SHA256 fb3bedc2cd88f052a1a62458366de8f695c8c24b46d90d6be953ca1556194fb7 git-1.4.3.3.ebuild 4057
-MISC ChangeLog 20484 RMD160 d56dfeee40093d77f0308b624f00faa0123f095b SHA1 1b230d471098612193e693973e8f6509f8bd9014 SHA256 15d6a72bdd5b38c06df45095195b5427d861d5b71181a34c3cd0f20ab4c4aefb
-MD5 446ffa5e04f2591f3458e8d6098d8791 ChangeLog 20484
-RMD160 d56dfeee40093d77f0308b624f00faa0123f095b ChangeLog 20484
-SHA256 15d6a72bdd5b38c06df45095195b5427d861d5b71181a34c3cd0f20ab4c4aefb ChangeLog 20484
+EBUILD git-1.4.3.4.ebuild 4057 RMD160 f823ef30eddfb7816fb86fb16bc634b1259b1073 SHA1 c53e2ae8e4463f87566331d06474dee2113f533a SHA256 ade6099b592f9c8fde63f6bdd50a7532db74f210385225a6290175afbfe33c24
+MD5 93beff3a63e1a92449aa37169e62f103 git-1.4.3.4.ebuild 4057
+RMD160 f823ef30eddfb7816fb86fb16bc634b1259b1073 git-1.4.3.4.ebuild 4057
+SHA256 ade6099b592f9c8fde63f6bdd50a7532db74f210385225a6290175afbfe33c24 git-1.4.3.4.ebuild 4057
+MISC ChangeLog 20634 RMD160 a3edd8c890dcc2ae084c407dce28cd029c2f29a1 SHA1 05cf2895e7b707ea5d6406a700c99343d6fa1425 SHA256 d1b4fb76fdb9ed21485bf38ceb7b3758eb59f6d0c69f0bb2b580d72c74751033
+MD5 d60bc2ab22344dac20d501758f72bc7e ChangeLog 20634
+RMD160 a3edd8c890dcc2ae084c407dce28cd029c2f29a1 ChangeLog 20634
+SHA256 d1b4fb76fdb9ed21485bf38ceb7b3758eb59f6d0c69f0bb2b580d72c74751033 ChangeLog 20634
 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 9dcd22e32fe329101e5271f033a24a7e files/digest-git-1.4.3.3 765
-RMD160 97497c4dcc1c2f17d3a2c9b261010bf39168a095 files/digest-git-1.4.3.3 765
-SHA256 9224f5a982a136c1ec99b9aeab4cff0d7bbfbe7a725ca8e417cf28c6b7043860 files/digest-git-1.4.3.3 765
+MD5 6f76581bc2bfe8b44b5756c29e0d1fa8 files/digest-git-1.4.3.4 765
+RMD160 b5d2d61d01cfab535e3d384ff07349bd63e21f63 files/digest-git-1.4.3.4 765
+SHA256 f8e0f9ecabac5470293713fe1e1ec95bd5a5526eb493aacbe6a2fd993a7b0540 files/digest-git-1.4.3.4 765
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFRdbrViELBEf1JB0RAkqhAJ9LN/iS3QbcIAA6KIZtSbLi+J9l5gCfTk8n
-WJNCnXybo/0qWGkEWvYiaaU=
-=jDxK
+iD8DBQFFTe47ViELBEf1JB0RAhckAJ4t4VJVTJtMXnmnAdPUfRM20ekVdQCfWl7b
+nXGnIarJNDUhudU7HgQsLGA=
+=Oujw
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.3.3 b/dev-util/git/files/digest-git-1.4.3.3
deleted file mode 100644
index 6c8efc5e4cd5..000000000000
--- a/dev-util/git/files/digest-git-1.4.3.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a40394f8072950ae45cf95746036803d git-1.4.3.3.tar.bz2 858389
-RMD160 3d42661991b805c7e179551cf88b513440bfa164 git-1.4.3.3.tar.bz2 858389
-SHA256 550e8b79e5a4e3c57d4b6cdccc307baab4e4d41ffb23db382a0e3be24e46d42d git-1.4.3.3.tar.bz2 858389
-MD5 7d045008058a161fb44f8babd16c6ced git-htmldocs-1.4.3.3.tar.bz2 302246
-RMD160 d491a7db58b6cf37ab71c9b151089d0229d6e113 git-htmldocs-1.4.3.3.tar.bz2 302246
-SHA256 87d5f62fe3d0a62168f8ec1dd7318fc029dafe185e43fafda730cdf2a8df5332 git-htmldocs-1.4.3.3.tar.bz2 302246
-MD5 95e28a5cc55113e01c02d9e39f8db981 git-manpages-1.4.3.3.tar.bz2 96856
-RMD160 81b4aabfaaf3a90a3eace11f5de991136884636b git-manpages-1.4.3.3.tar.bz2 96856
-SHA256 3c0617129eb3044ac6fde66b4554e5c0c125c7389b35f70749a864d758cdc248 git-manpages-1.4.3.3.tar.bz2 96856
diff --git a/dev-util/git/git-1.4.3.3.ebuild b/dev-util/git/git-1.4.3.3.ebuild
deleted file mode 100644
index fb73dc5cfc31..000000000000
--- a/dev-util/git/git-1.4.3.3.ebuild
+++ /dev/null
@@ -1,151 +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.3.ebuild,v 1.1 2006/10/30 10:41:26 ferdy Exp $
-
-inherit python toolchain-funcs eutils elisp-common perl-module bash-completion
-
-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 elibc_uclibc 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}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	einfo "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-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
-
-	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"
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "These additional scripts need some dependencies:"
-	einfo
-	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" "dep-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
-}