diff options
| author |   Fernando J. Pereda <ferdy@gentoo.org> | 2006-01-12 18:00:26 +0000 |
|---|---|---|
| committer | Fernando J. Pereda <ferdy@gentoo.org> | 2006-01-12 18:00:26 +0000 |
| commit | 2531d8b0d3a727710dd0b970236142d11900a871 (patch) | |
| tree | d30ec0b309b61d4cd6674eff02e36ba7a238f496 /dev-util | |
| parent | Add gcc-4.1 patch for bug 118151. (diff) | |
| download | historical-2531d8b0d3a727710dd0b970236142d11900a871.tar.gz historical-2531d8b0d3a727710dd0b970236142d11900a871.tar.bz2 historical-2531d8b0d3a727710dd0b970236142d11900a871.zip | |
We should only try to apply git-1.1.1-glossary-from-1.1.0.diff if USE=doc. Fixes bug #118755, thanks to Christian Heim <phreak@gentoo.org>
Package-Manager: portage-2.0.53
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/git/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/git/Manifest | 10 | ||||
| -rw-r--r-- | dev-util/git/git-1.1.1.ebuild | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 6a43c51dc843..bf7a79154ac3 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,10 @@ # 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.61 2006/01/11 19:52:31 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.62 2006/01/12 18:00:26 ferdy Exp $ + + 12 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.1.ebuild: + We should only try to apply git-1.1.1-glossary-from-1.1.0.diff if USE=doc. + Fixes bug #118755, thanks to Christian Heim <phreak@gentoo.org> *git-1.1.1 (11 Jan 2006) diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 46bd705283d2..c8293196eaac 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3da072ed739dc22c4b9961af15bea557 ChangeLog 9622 +MD5 bf38c5be854386fe84ae711f252ae256 ChangeLog 9837 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 @@ -14,12 +14,12 @@ 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 d3c41f78b2e89e9ec1971bf7a7ae211f git-1.1.1.ebuild 3238 +MD5 6fda296a40f256b708e86c7754dfdbed git-1.1.1.ebuild 3263 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDxWISViELBEf1JB0RAqDkAJ974v0lYFjTbTZspV1fBLbHhoCCXQCeJXeS -pUSAlWiqB21BT97NFKqMFK8= -=v1Pv +iD8DBQFDxplTViELBEf1JB0RAhEjAJ4sW9eOU0CyKRL53KpcpmFMLKE+PACfaoeL +3/fnVIV+rUUNZ27NfmNVWWs= +=q+c4 -----END PGP SIGNATURE----- diff --git a/dev-util/git/git-1.1.1.ebuild b/dev-util/git/git-1.1.1.ebuild index 08c1ca43216f..02d2ee326406 100644 --- a/dev-util/git/git-1.1.1.ebuild +++ b/dev-util/git/git-1.1.1.ebuild @@ -1,6 +1,6 @@ # 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.1 2006/01/11 19:52:31 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.1.1.ebuild,v 1.2 2006/01/12 18:00:26 ferdy Exp $ inherit python toolchain-funcs eutils @@ -60,8 +60,10 @@ exportmakeopts() { src_unpack() { unpack ${A} - cd ${WORKDIR}/${PN}-html-${DOC_VER}/ - epatch "${FILESDIR}/${P}-glossary-from-1.1.0.diff" + if use doc ; then + cd ${WORKDIR}/${PN}-html-${DOC_VER}/ + epatch "${FILESDIR}/${P}-glossary-from-1.1.0.diff" + fi cd ${S} sed -i \ |