New upstream version. Removed Carlos from metadata.xml as he requested. Removed some old versions, too.

(Portage version: 2.1)

7 files changed, 170 insertions, 4 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 8bf5ccce49cc..2c0d87b9f127 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,14 @@
 # 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.97 2006/05/21 01:18:43 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.98 2006/06/10 22:16:52 ferdy Exp $
+
+*git-1.4.0 (10 Jun 2006)
+
+  10 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> metadata.xml,
+  -git-1.2.6.ebuild, -git-1.3.1.ebuild, -git-1.3.2.ebuild,
+  +git-1.4.0.ebuild:
+  New upstream version. Removed Carlos from metadata.xml as he requested.
+  Removed some old versions, too.
 
   21 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +files/70git-gentoo.el,
   git-1.3.3.ebuild:
diff --git a/dev-util/git/files/digest-git-1.1.6 b/dev-util/git/files/digest-git-1.1.6
index f43be0e37c59..48643aef1280 100644
--- a/dev-util/git/files/digest-git-1.1.6
+++ b/dev-util/git/files/digest-git-1.1.6
@@ -1,3 +1,9 @@
 MD5 9c664d5b5dc9111fc5312c568b907f0c git-1.1.6.tar.bz2 478466
+RMD160 c88fb437ff78955cc54256488c18125adfc6ddef git-1.1.6.tar.bz2 478466
+SHA256 87eedea8af9dec73ea9648e2983d20fe058003bf703f18f90125bafe398bf8af git-1.1.6.tar.bz2 478466
 MD5 ea324b0611d2bc9a13234d6a2d371d43 git-html-1.1.6.tar.bz2 214805
+RMD160 4a4cb45ae7ec212a15c63e6f5554b52e14797d1a git-html-1.1.6.tar.bz2 214805
+SHA256 ae097fdd46d236e4897dc16a6fdec897b77ebd4c2f9d69b5c97814704aa31eac git-html-1.1.6.tar.bz2 214805
 MD5 377616586d6ce1ebe5da203a2202390a git-man-1.1.6.tar.bz2 69088
+RMD160 4e8bc8067c903caa8ed9b9a6a04c89ab15483aab git-man-1.1.6.tar.bz2 69088
+SHA256 68042818e789b08a2f8c913c5d7deb5f6f41f6a5c9b989898a98eed61c6e5c72 git-man-1.1.6.tar.bz2 69088
diff --git a/dev-util/git/files/digest-git-1.2.4 b/dev-util/git/files/digest-git-1.2.4
index e3b5afc8b014..ed36d78c9ddd 100644
--- a/dev-util/git/files/digest-git-1.2.4
+++ b/dev-util/git/files/digest-git-1.2.4
@@ -1,3 +1,9 @@
 MD5 4ddb476031d76614a0a5ab625c516972 git-1.2.4.tar.bz2 501293
+RMD160 c804a9339bfe13efdf4deea3e7be41c44bbc21cc git-1.2.4.tar.bz2 501293
+SHA256 755b946a294d06d5a098eb9362612597aaabdc506ff8d65260dd4e9d34092a37 git-1.2.4.tar.bz2 501293
 MD5 8e126988d21159d3e7c1f28e05a05697 git-html-1.2.4.tar.bz2 203114
+RMD160 7b721fb0ce390f35fab231a52e9aa38cd7566de9 git-html-1.2.4.tar.bz2 203114
+SHA256 ef117a23966b0cc1d36e2d6b5bf0c12c15d28ca32bce7944636acb829a37ab1a git-html-1.2.4.tar.bz2 203114
 MD5 e1cde46e570e876048bd061a126a2403 git-man-1.2.4.tar.bz2 74577
+RMD160 a9cfadc61474fe8398933ac158064da38e3881b1 git-man-1.2.4.tar.bz2 74577
+SHA256 85e5706b1a551e988a6dc0dbafb27b9651388ad781a3d1b256e8a11dc533aeb3 git-man-1.2.4.tar.bz2 74577
diff --git a/dev-util/git/files/digest-git-1.3.3 b/dev-util/git/files/digest-git-1.3.3
index e14134269704..068ef9ba2f79 100644
--- a/dev-util/git/files/digest-git-1.3.3
+++ b/dev-util/git/files/digest-git-1.3.3
@@ -1,3 +1,9 @@
 MD5 b4297c57969ee0740746261aaf493195 git-1.3.3.tar.bz2 623559
+RMD160 6d46164ddc05653076aa566287da469a415359bb git-1.3.3.tar.bz2 623559
+SHA256 44acb56ef73247175968c731eb4d08cf56865fb9bd84dab09e94a0b2cd99f8f0 git-1.3.3.tar.bz2 623559
 MD5 eb34311d9fb3811d85bdcdc1e6f7604a git-html-1.3.3.tar.bz2 216532
+RMD160 9011b25399c38dee312288b9d4385485bf5a8053 git-html-1.3.3.tar.bz2 216532
+SHA256 46df206de0f83beba964a79e22e3697ea0784a0cdc0b2cb466b0f0fef8b99980 git-html-1.3.3.tar.bz2 216532
 MD5 c23205afdad02be2c64172c026a77b4e git-man-1.3.3.tar.bz2 80305
+RMD160 5160f22045ce203d35b585b84003988fb8ace3ca git-man-1.3.3.tar.bz2 80305
+SHA256 d68ab285813f1e14a898bb509405fa3f82788aa6a848d0ff8dc70ef928513185 git-man-1.3.3.tar.bz2 80305
diff --git a/dev-util/git/files/digest-git-1.4.0 b/dev-util/git/files/digest-git-1.4.0
new file mode 100644
index 000000000000..5823e7cdd1ad
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.0
@@ -0,0 +1,9 @@
+MD5 923fa60aca74db3ce175c9a2c665f240 git-1.4.0.tar.bz2 717181
+RMD160 1010a0818efd5309f1a0ba1228f953f97d575038 git-1.4.0.tar.bz2 717181
+SHA256 abdb48005e7b2f8988498a6c6724e2e6f6162f30915f591be6586df57dd3f2fa git-1.4.0.tar.bz2 717181
+MD5 10e0736ed8bcb35d639caf6f86ea8b99 git-htmldocs-1.4.0.tar.bz2 262492
+RMD160 b98ce629edc28cf8933e0a6f4d59df07d68cf636 git-htmldocs-1.4.0.tar.bz2 262492
+SHA256 c8d8dffefe3dfc7ec190ee7502d20aa36f150ea633d5621b4a55156672a2ea97 git-htmldocs-1.4.0.tar.bz2 262492
+MD5 87900e25961bf7bab51a1efe9c335d10 git-manpages-1.4.0.tar.bz2 83698
+RMD160 6bfb8fa2e1ae34fd4576e84fee720a239323a65d git-manpages-1.4.0.tar.bz2 83698
+SHA256 f275b1a3fb1eab0368dbb704628e76a4c34a0724ddece1de11b2f53ee327d5d4 git-manpages-1.4.0.tar.bz2 83698
diff --git a/dev-util/git/git-1.4.0.ebuild b/dev-util/git/git-1.4.0.ebuild
new file mode 100644
index 000000000000..0695d047498b
--- /dev/null
+++ b/dev-util/git/git-1.4.0.ebuild
@@ -0,0 +1,134 @@
+# 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.0.ebuild,v 1.1 2006/06/10 22:16:52 ferdy Exp $
+
+inherit python toolchain-funcs eutils elisp-common
+
+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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc emacs mozsha1 ppcsha1 webdav X"
+
+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
+		X? ( dev-lang/tk )"
+
+# 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} 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 X || 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
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+}
+
+src_test() {
+	cd "${S}"
+	emake ${MY_MAKEOPTS} 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 "If you want to import a quilt series into git, donsider 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
+}
diff --git a/dev-util/git/metadata.xml b/dev-util/git/metadata.xml
index 4dd048a90f73..8902feede625 100644
--- a/dev-util/git/metadata.xml
+++ b/dev-util/git/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>r3pek@gentoo.org</email>
-</maintainer>
-<maintainer>
   <email>ferdy@gentoo.org</email>
   <name>Fernando J. Pereda</name>
 </maintainer>