Version bump. Remove 1.1.0 as it reported a wrong version and might make confuse bugreports.

Package-Manager: portage-2.0.53

5 files changed, 45 insertions, 11 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index fb0b6b39bfcd..6a43c51dc843 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.60 2006/01/09 10:24:27 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.61 2006/01/11 19:52:31 ferdy Exp $
+
+*git-1.1.1 (11 Jan 2006)
+
+  11 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.0.ebuild,
+  +git-1.1.1.ebuild:
+  Version bump. Remove 1.1.0 as it reported a wrong version and might make
+  confuse bugreports.
 
   09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.0.ebuild:
   http://kernel.org/pub -> mirror://kernel/ in SRC_URI
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 58af6eb187f4..46bd705283d2 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7f879a8f2ff0852bc3bab9c0d6b187fc ChangeLog 9360
+MD5 3da072ed739dc22c4b9961af15bea557 ChangeLog 9622
 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 88167ba468fc8ed2d45539b9d2887e6c files/digest-git-1.1.0 194
+MD5 351b0834c71cc843076ad4b8a7267dea files/digest-git-1.1.1 194
+MD5 b93efac41283dbe10bde50d202c35184 files/git-1.1.1-glossary-from-1.1.0.diff 889
 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 12168e7855b5c9934f57fd2979f31d51 git-1.1.0.ebuild 3145
+MD5 d3c41f78b2e89e9ec1971bf7a7ae211f git-1.1.1.ebuild 3238
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDwjnsViELBEf1JB0RAoCnAKCAPMBzX8gMcqLx4RVxlg3XBBZq7gCfQ7Jl
-F6s10cfPx1LCFDSL29Q3bNI=
-=dXoG
+iD8DBQFDxWISViELBEf1JB0RAqDkAJ974v0lYFjTbTZspV1fBLbHhoCCXQCeJXeS
+pUSAlWiqB21BT97NFKqMFK8=
+=v1Pv
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.1.0 b/dev-util/git/files/digest-git-1.1.1
index 81b1fba07864..ecb91a90ed1e 100644
--- a/dev-util/git/files/digest-git-1.1.0
+++ b/dev-util/git/files/digest-git-1.1.1
@@ -1,3 +1,3 @@
-MD5 a64303be08f0faec4737f619cbb63d5c git-1.1.0.tar.bz2 477526
+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/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
new file mode 100644
index 000000000000..99387ff578bb
--- /dev/null
+++ b/dev-util/git/files/git-1.1.1-glossary-from-1.1.0.diff
@@ -0,0 +1,22 @@
+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.0.ebuild b/dev-util/git/git-1.1.1.ebuild
index 4736a9e077b7..08c1ca43216f 100644
--- a/dev-util/git/git-1.1.0.ebuild
+++ b/dev-util/git/git-1.1.1.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.0.ebuild,v 1.2 2006/01/09 10:24:27 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.1.1.ebuild,v 1.1 2006/01/11 19:52:31 ferdy Exp $
 
 inherit python toolchain-funcs eutils
 
-DOC_VER=${PV}
+DOC_VER="1.1.0"
 
 DESCRIPTION="GIT - the stupid content tracker"
 HOMEPAGE="http://kernel.org/pub/software/scm/git/"
@@ -59,8 +59,11 @@ exportmakeopts() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 
+	cd ${WORKDIR}/${PN}-html-${DOC_VER}/
+	epatch "${FILESDIR}/${P}-glossary-from-1.1.0.diff"
+
+	cd ${S}
 	sed -i \
 		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
 		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \