New upstream version, remove ancient one

Package-Manager: portage-2.0.54

6 files changed, 135 insertions, 54 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index d9f88a652aa7..9db31d5156a5 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.74 2006/02/15 21:23:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.75 2006/02/16 12:15:57 ferdy Exp $
+
+*git-1.2.1 (16 Feb 2006)
+
+  16 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.7.ebuild,
+  +git-1.2.1.ebuild:
+  New upstream version, remove ancient one
 
   15 Feb 2006; Markus Rothe <corsair@gentoo.org> git-1.1.6.ebuild:
   Stable on ppc64; bug #122887
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 6ecde3692881..a0d8c8d9abc0 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,10 +1,20 @@
-MD5 ecf4b9dcb9789a32868774d82eb76245 ChangeLog 11370
-MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cd218ccf4cf262724d87f31ee68ccf4d ChangeLog 11529
 MD5 8623111b91d1c7d14999e96d857384d9 files/digest-git-1.1.6 194
 MD5 b46487fd3358e8a1ed607752045c5fd3 files/digest-git-1.2.0 194
+MD5 deb6af160973bb5e02153efc0df2bc3f files/digest-git-1.2.1 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
-MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 07a0f37c0db70c991496e860e6a673d1 git-1.1.6.ebuild 3149
 MD5 831a6c13c1a3fde048e37ec872d90402 git-1.2.0.ebuild 3145
+MD5 9c3462799847383c1dcd56a86fee65d6 git-1.2.1.ebuild 3145
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD9G0PViELBEf1JB0RAqGcAJ4sGAA3cTYr7ljxf7MMj45DSxi7kgCeNTFq
+568dv3PCUu6cpd7MWazwb4Q=
+=+zco
+-----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-0.7 b/dev-util/git/files/digest-git-0.7
deleted file mode 100644
index 2d748b2d2507..000000000000
--- a/dev-util/git/files/digest-git-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 036e3a031d03d1cb4ac4cbe16cca141b git-0.7.tar.bz2 52108
diff --git a/dev-util/git/files/digest-git-1.2.1 b/dev-util/git/files/digest-git-1.2.1
new file mode 100644
index 000000000000..81b938907010
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.2.1
@@ -0,0 +1,3 @@
+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/git-0.7.ebuild b/dev-util/git/git-0.7.ebuild
deleted file mode 100644
index 4df1b633f584..000000000000
--- a/dev-util/git/git-0.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.7.ebuild,v 1.9 2005/09/12 10:49:54 r3pek Exp $
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://git.or.cz/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc sparc"
-IUSE="mozsha1 ppcsha1"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		net-misc/curl
-		!dev-util/cogito
-		!app-misc/git"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:" \
-		Makefile
-}
-
-src_compile() {
-	if use mozsha1; then
-		export MOZILLA_SHA1=yes
-	elif use ppcsha1; then
-		export PPC_SHA1=yes
-	fi
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin git-cat-file git-check-files git-checkout-cache git-commit-tree \
-		git-convert-cache git-diff-cache git-diff-files git-diff-tree \
-		git-diff-tree-helper git-export git-fsck-cache git-http-pull \
-		git-init-db git-ls-tree git-merge-base git-merge-cache git-mktag \
-		git-prune-script git-pull-script git-read-tree git-rev-list \
-		git-rev-tree git-rpull git-rpush git-show-files git-tag-script \
-		git-tar-tree git-unpack-file git-update-cache git-write-tree \
-		git-merge-one-file-script
-
-	dodoc README || die "dodoc failed"
-}
diff --git a/dev-util/git/git-1.2.1.ebuild b/dev-util/git/git-1.2.1.ebuild
new file mode 100644
index 000000000000..bc3e71ce9587
--- /dev/null
+++ b/dev-util/git/git-1.2.1.ebuild
@@ -0,0 +1,112 @@
+# 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 $
+
+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
+}