new upstream version, remove 1.1.1

Package-Manager: portage-2.0.53

6 files changed, 20 insertions, 41 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 58d1705cf2d0..93ad83e370f7 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # 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.63 2006/01/14 13:08:44 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.64 2006/01/17 13:16:54 ferdy Exp $
+
+*git-1.1.3 (17 Jan 2006)
+
+  17 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.1.ebuild,
+  +git-1.1.3.ebuild:
+  new upstream version, remove 1.1.1
 
 *git-1.1.2 (14 Jan 2006)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 13eda2576144..9f031f89b876 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 74c92386a25fdccf0890923f7b5be081 ChangeLog 9959
+MD5 42b8eb878024e8797b32868a4697db19 ChangeLog 10161
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
 MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
 MD5 ede5785dc3531d89fe224f16c233e8d2 files/digest-git-0.99.9n 64
 MD5 9a11cbe923c58faff7973a8c5c028cd4 files/digest-git-1.0.6 194
-MD5 351b0834c71cc843076ad4b8a7267dea files/digest-git-1.1.1 194
 MD5 230e9a8cc03278203cb84256b4440b69 files/digest-git-1.1.2 194
-MD5 b93efac41283dbe10bde50d202c35184 files/git-1.1.1-glossary-from-1.1.0.diff 889
+MD5 7802209c7fb6646dd6c3a252a4e77db0 files/digest-git-1.1.3 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 d35a0c0793dbfc65191588d2eca405d1 git-0.99.8a.ebuild 2835
 MD5 836fd3f0a31e670e7cdb6350d38f5323 git-0.99.9n.ebuild 3342
 MD5 ad6e42cb0d33b430c8f21c46aaf151a8 git-1.0.6.ebuild 3199
-MD5 6fda296a40f256b708e86c7754dfdbed git-1.1.1.ebuild 3263
 MD5 9262f28884ed065e89446ea487a3c3e8 git-1.1.2.ebuild 3145
+MD5 680bc86005af5083ed24702cec5f3230 git-1.1.3.ebuild 3145
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyPfzViELBEf1JB0RAjDbAJ9bep13UmEHTnmhFfZloVkE3e+vTgCdFOZ0
-kaH4LWtFU2Sx4DNRPRBLc/I=
-=6wm8
+iD8DBQFDzO5jViELBEf1JB0RAqZ1AJ9sCqZwGgG6pbfBRx4C4U11+a50iQCeJwGZ
+gdrlReoHQcyH5YY41bnIKu0=
+=Pucw
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.1.1 b/dev-util/git/files/digest-git-1.1.1
deleted file mode 100644
index ecb91a90ed1e..000000000000
--- a/dev-util/git/files/digest-git-1.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65ea352a9db8afb3b185fb41dacbdefe git-1.1.1.tar.bz2 477646
-MD5 291a0ce11c38872ecb7108b2fd0c69d7 git-html-1.1.0.tar.bz2 202385
-MD5 44e34680b5f1eb0186599a56fffcdd14 git-man-1.1.0.tar.bz2 66316
diff --git a/dev-util/git/files/digest-git-1.1.3 b/dev-util/git/files/digest-git-1.1.3
new file mode 100644
index 000000000000..f2f8fc5ff6d9
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.1.3
@@ -0,0 +1,3 @@
+MD5 7633e120b9007ccaa7565393ac6deb46 git-1.1.3.tar.bz2 478468
+MD5 146b93a99b88dcb6773b509f79556834 git-html-1.1.3.tar.bz2 205258
+MD5 56ed373211a346a7c8d5745f202e1a47 git-man-1.1.3.tar.bz2 67614
diff --git a/dev-util/git/files/git-1.1.1-glossary-from-1.1.0.diff b/dev-util/git/files/git-1.1.1-glossary-from-1.1.0.diff
deleted file mode 100644
index 99387ff578bb..000000000000
--- a/dev-util/git/files/git-1.1.1-glossary-from-1.1.0.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
-index 2331be5..02a9d9c 100644
---- a/Documentation/glossary.txt
-+++ b/Documentation/glossary.txt
-@@ -111,6 +111,17 @@ branch::
- 	a particular revision, which is called the branch head. The
- 	branch heads are stored in `$GIT_DIR/refs/heads/`.
- 
-+master::
-+	The default branch. Whenever you create a git repository, a branch
-+	named "master" is created, and becomes the active branch. In most
-+	cases, this contains the local development.
-+
-+origin::
-+	The default upstream branch. Most projects have one upstream
-+	project which they track, and by default 'origin' is used for
-+	that purpose.  New updates from upstream will be fetched into
-+	this branch; you should never commit to it yourself.
-+
- ref::
- 	A 40-byte hex representation of a SHA1 pointing to a particular
- 	object. These may be stored in `$GIT_DIR/refs/`.
diff --git a/dev-util/git/git-1.1.1.ebuild b/dev-util/git/git-1.1.3.ebuild
index 02d2ee326406..e34590346ed6 100644
--- a/dev-util/git/git-1.1.1.ebuild
+++ b/dev-util/git/git-1.1.3.ebuild
@@ -1,10 +1,10 @@
 # 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.1.1.ebuild,v 1.2 2006/01/12 18:00:26 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.1.3.ebuild,v 1.1 2006/01/17 13:16:54 ferdy Exp $
 
 inherit python toolchain-funcs eutils
 
-DOC_VER="1.1.0"
+DOC_VER=${PV}
 
 DESCRIPTION="GIT - the stupid content tracker"
 HOMEPAGE="http://kernel.org/pub/software/scm/git/"
@@ -59,13 +59,8 @@ exportmakeopts() {
 
 src_unpack() {
 	unpack ${A}
-
-	if use doc ; then
-		cd ${WORKDIR}/${PN}-html-${DOC_VER}/
-		epatch "${FILESDIR}/${P}-glossary-from-1.1.0.diff"
-	fi
-
 	cd ${S}
+
 	sed -i \
 		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
 		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \