version bump; this is 1.0rc2. Remove old version (aka 1.0rc1)

(Portage version: 2.0.51.22-r3)

6 files changed, 104 insertions, 41 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 97437b69b4d9..69646be14a73 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.44 2005/11/15 14:57:26 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.45 2005/11/19 11:13:16 ferdy Exp $
+
+*git-0.99.9j (19 Nov 2005)
+
+  19 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/git-0.99.9j-diff.patch, -git-0.99.9i.ebuild, +git-0.99.9j.ebuild:
+  version bump; this is 1.0rc2. Remove old version (aka 1.0rc1)
 
 *git-0.99.9i (15 Nov 2005)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index c57c5fcb5873..a09d7363778d 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,3 +1,4 @@
+MD5 9e110159bbc875fc6d76df4400b52387 git-0.99.9j.ebuild 3358
 MD5 d35a0c0793dbfc65191588d2eca405d1 git-0.99.8a.ebuild 2835
 MD5 f44337ff508cae4b222eeed20a98ef43 git-0.99.9i.ebuild 2999
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
@@ -5,6 +6,8 @@ MD5 94fa996f965b00e063cac43215694df4 ChangeLog 6811
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
+MD5 12958d9f4b9aea856ed8d9133e6bfa22 files/git-0.99.9j-diff.patch 1453
 MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
 MD5 d8f17f42668784e5a8d69ac423a68aa9 files/digest-git-0.99.9i 69
+MD5 91db0a3e055f36edcabe5a4cb0c07d4d files/digest-git-0.99.9j 64
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
diff --git a/dev-util/git/files/digest-git-0.99.9i b/dev-util/git/files/digest-git-0.99.9i
deleted file mode 100644
index 293dc585d9bc..000000000000
--- a/dev-util/git/files/digest-git-0.99.9i
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d10e29a4d9730324fe3ef1864ef8b354 git-core-0.99.9i.tar.bz2 436896
diff --git a/dev-util/git/files/digest-git-0.99.9j b/dev-util/git/files/digest-git-0.99.9j
new file mode 100644
index 000000000000..919321aa8721
--- /dev/null
+++ b/dev-util/git/files/digest-git-0.99.9j
@@ -0,0 +1 @@
+MD5 0c8f24ac4129ffa6b43427bc33ff9141 git-0.99.9j.tar.bz2 441690
diff --git a/dev-util/git/files/git-0.99.9j-diff.patch b/dev-util/git/files/git-0.99.9j-diff.patch
new file mode 100644
index 000000000000..6d5e0965b52f
--- /dev/null
+++ b/dev-util/git/files/git-0.99.9j-diff.patch
@@ -0,0 +1,46 @@
+From: Junio C Hamano <junkio@cox.net>
+Date: Fri, 18 Nov 2005 04:46:29 +0000 (-0800)
+Subject:     Deal with binary diff output from GNU diff 2.8.7
+X-Git-Url: http://kernel.org/git/?p=git/git.git;a=commitdiff;h=3200d1aee0c22a34d075aafefe3e92f4f7d08840
+
+  Deal with binary diff output from GNU diff 2.8.7
+  
+  Some vintage of diff says just "Files X and Y differ\n", instead
+  of "Binary files X and Y differ\n", so catch both patterns.
+  
+  Signed-off-by: Junio C Hamano <junkio@cox.net>
+---
+
+--- a/apply.c
++++ b/apply.c
+@@ -893,12 +893,24 @@ static int parse_chunk(char *buffer, uns
+ 	patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
+ 
+ 	if (!patchsize) {
+-		static const char binhdr[] = "Binary files ";
+-
+-		if (sizeof(binhdr) - 1 < size - offset - hdrsize &&
+-		    !memcmp(binhdr, buffer + hdrsize + offset,
+-			    sizeof(binhdr)-1))
+-			patch->is_binary = 1;
++		static const char *binhdr[] = {
++			"Binary files ",
++			"Files ",
++			NULL,
++		};
++		int i;
++		int hd = hdrsize + offset;
++		unsigned long llen = linelen(buffer + hd, size - hd);
++
++		if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
++			for (i = 0; binhdr[i]; i++) {
++				int len = strlen(binhdr[i]);
++				if (len < size - hd &&
++				    !memcmp(binhdr[i], buffer + hd, len)) {
++					patch->is_binary = 1;
++					break;
++				}
++			}
+ 
+ 		/* Empty patch cannot be applied if:
+ 		 * - it is a binary patch and we do not do binary_replace, or
diff --git a/dev-util/git/git-0.99.9i.ebuild b/dev-util/git/git-0.99.9j.ebuild
index 3e1c9b81df12..62fe1cf60581 100644
--- a/dev-util/git/git-0.99.9i.ebuild
+++ b/dev-util/git/git-0.99.9j.ebuild
@@ -1,62 +1,76 @@
 # 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.99.9i.ebuild,v 1.1 2005/11/15 14:57:26 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.9j.ebuild,v 1.1 2005/11/19 11:13:16 ferdy Exp $
 
-inherit python
+inherit python toolchain-funcs eutils
 
 DESCRIPTION="GIT - the stupid content tracker"
 HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${PN}-core-${PV}.tar.bz2"
+SRC_URI="http://kernel.org/pub/software/scm/git/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail"
-S="${WORKDIR}/${PN}-core-${PV}"
+IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail webdav"
 
 DEPEND="dev-libs/openssl
 		sys-libs/zlib
-		app-text/rcs
 		!app-misc/git
+		curl? ( net-misc/curl )
+		webdav? ( dev-libs/expat )
 		doc? ( >=app-text/asciidoc-7.0.1 app-text/xmlto )"
 RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
+		app-text/rcs
 		tcltk? ( dev-lang/tk )
-		curl? ( net-misc/curl )
 		dev-perl/String-ShellQuote
 		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:" \
-		Makefile
-}
-
-src_compile() {
-	# Use python_version to check for python 2.4.
-	# If the user don't have version 2.4 have then we set WITH_OWN_SUBPROCESS_PY
-	# that makes use of a suplied version of subprocess.py
-	python_version()
-	[[ $PYVER < 2.4 ]] && export WITH_OWN_SUBPROCESS_PY=yes
+# 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
-		export MOZILLA_SHA1=yes
+		myopts="${myopts} MOZILLA_SHA1=YesPlease"
 	elif use ppcsha1 ; then
-		export PPC_SHA1=yes
+		myopts="${myopts} PPC_SHA1=YesPlease"
 	fi
 
-	if ! use curl; then
-		export NO_CURL=yes
-		ewarn "git-http-pull will not be built because you are not"
-		ewarn " using the curl use flag"
+	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 && export WITH_SEND_EMAIL=yes
+	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"
 
-	emake prefix=/usr || die "make failed"
+	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"
+
+	epatch "${FILESDIR}/${P}-diff.patch"
+
+	exportmakeopts
+}
+
+src_compile() {
+	emake ${MY_MAKEOPTS} prefix=/usr || die "make failed"
 
 	if use doc ; then
 		sed -i \
@@ -67,21 +81,15 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} prefix=/usr install || die "make install failed"
-
-	if use gitsendemail ; then
-		exeinto /usr/bin
-		newexe git-send-email.perl git-send-email
-	else
-		sed -i -e '/^send-email *$/d' ${D}/usr/bin/git
-	fi
+	make ${MY_MAKEOPTS} DESTDIR=${D} prefix=/usr install || die "make install failed"
 
 	use tcltk || rm ${D}/usr/bin/gitk
 
-	dodoc README COPYING
+	dodoc README COPYING SubmittingPatches
 	if use doc ; then
 		doman Documentation/*.1 Documentation/*.7
 		make install-webdoc -C Documentation/
+		dodoc technical/*
 	fi
 
 	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
@@ -90,7 +98,7 @@ src_install() {
 
 src_test() {
 	cd ${S}
-	make test || die "tests failed"
+	make ${MY_MAKEOPTS} test || die "tests failed"
 }
 
 pkg_postinst() {