New upstream version. Trim old ones

(Portage version: 2.0.54)

7 files changed, 15 insertions, 130 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 565ebca7a444..1cadfd6e87ea 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.79 2006/02/23 12:24:05 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.80 2006/03/02 16:00:44 ferdy Exp $
+
+*git-1.2.4 (02 Mar 2006)
+
+  02 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.1.ebuild,
+  -git-1.2.2.ebuild, +git-1.2.4.ebuild:
+  New upstream version. Trim old ones
 
 *git-1.2.3 (23 Feb 2006)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 74b59b4be8d5..05a21e08ee14 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ac2e624b65d7c164c1944cae22daf1ff ChangeLog 12001
 MD5 8623111b91d1c7d14999e96d857384d9 files/digest-git-1.1.6 194
 MD5 deb6af160973bb5e02153efc0df2bc3f files/digest-git-1.2.1 194
 MD5 2659c486d24ea384ff59b25ab22222bd files/digest-git-1.2.2 194
 MD5 36b0ef94a427742feb31bc5d19ea5c90 files/digest-git-1.2.3 194
+MD5 84d4ff578de4ab1679708b38a45bc5a9 files/digest-git-1.2.4 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
 MD5 d706b2feec7dc3f145eb36492d0e8190 git-1.1.6.ebuild 3145
 MD5 9c3462799847383c1dcd56a86fee65d6 git-1.2.1.ebuild 3145
 MD5 2585f26b1ebeb482fc4dc8614500e95f git-1.2.2.ebuild 3145
 MD5 014dca7e8100d23752c99567a5570bc7 git-1.2.3.ebuild 3205
+MD5 014dca7e8100d23752c99567a5570bc7 git-1.2.4.ebuild 3205
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD/al7ViELBEf1JB0RAlmtAJ4ji20owhUWb9FzF6LJ0B1bnl9cgQCghq2y
-JfO8iIUGUqXPUcuaQsMzkMw=
-=28GU
------END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.2.1 b/dev-util/git/files/digest-git-1.2.1
deleted file mode 100644
index 81b938907010..000000000000
--- a/dev-util/git/files/digest-git-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f71ada1678a2df91cc20cd255084606d git-1.2.1.tar.bz2 497237
-MD5 22ae3e972404ed0a84bc035ebbec0aeb git-html-1.2.1.tar.bz2 197721
-MD5 9522c4e3179fd41df93bbd9cebc0ebfe git-man-1.2.1.tar.bz2 71610
diff --git a/dev-util/git/files/digest-git-1.2.2 b/dev-util/git/files/digest-git-1.2.2
deleted file mode 100644
index 61c02294c405..000000000000
--- a/dev-util/git/files/digest-git-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b76307f3106da53ad441b00cff3a08f0 git-1.2.2.tar.bz2 497534
-MD5 9610a54c136831800f01372fe80e5efd git-html-1.2.2.tar.bz2 198061
-MD5 327b9e9f9f52547619f62fcf5a9cfb18 git-man-1.2.2.tar.bz2 71783
diff --git a/dev-util/git/files/digest-git-1.2.4 b/dev-util/git/files/digest-git-1.2.4
new file mode 100644
index 000000000000..e3b5afc8b014
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.2.4
@@ -0,0 +1,3 @@
+MD5 4ddb476031d76614a0a5ab625c516972 git-1.2.4.tar.bz2 501293
+MD5 8e126988d21159d3e7c1f28e05a05697 git-html-1.2.4.tar.bz2 203114
+MD5 e1cde46e570e876048bd061a126a2403 git-man-1.2.4.tar.bz2 74577
diff --git a/dev-util/git/git-1.2.2.ebuild b/dev-util/git/git-1.2.2.ebuild
deleted file mode 100644
index a9cb05b395c4..000000000000
--- a/dev-util/git/git-1.2.2.ebuild
+++ /dev/null
@@ -1,112 +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.2.2.ebuild,v 1.1 2006/02/19 22:32:41 ferdy Exp $
-
-inherit python toolchain-funcs eutils
-
-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://gentoo/${PN}-man-${DOC_VER}.tar.bz2
-		doc? ( mirror://gentoo/${PN}-html-${DOC_VER}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		app-text/rcs
-		tcltk? ( dev-lang/tk )
-		dev-perl/String-ShellQuote
-		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
-
-# 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
-
-	use gitsendemail && 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"
-
-	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} prefix=/usr || die "make failed"
-}
-
-src_install() {
-	make ${MY_MAKEOPTS} DESTDIR=${D} prefix=/usr install || die "make install failed"
-
-	use tcltk || rm ${D}/usr/bin/gitk
-
-	doman ${WORKDIR}/${PN}-man-${DOC_VER}/man?/*
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		dodoc Documentation/technical/*
-		dodir /usr/share/doc/${PF}/html
-		cp -r ${WORKDIR}/${PN}-html-${DOC_VER}/* ${D}/usr/share/doc/${PF}/html
-	fi
-
-	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
-	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
-}
-
-src_test() {
-	cd ${S}
-	make ${MY_MAKEOPTS} test || die "tests failed"
-}
-
-pkg_postinst() {
-	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
-}
diff --git a/dev-util/git/git-1.2.1.ebuild b/dev-util/git/git-1.2.4.ebuild
index bc3e71ce9587..1b5629bf0469 100644
--- a/dev-util/git/git-1.2.1.ebuild
+++ b/dev-util/git/git-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.1 2006/02/16 12:15:57 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.2.4.ebuild,v 1.1 2006/03/02 16:00:44 ferdy Exp $
 
 inherit python toolchain-funcs eutils
 
@@ -54,6 +54,8 @@ exportmakeopts() {
 	python_version
 	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
 
+	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
 	export MY_MAKEOPTS=${myopts}
 }