summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2010-11-11 01:04:46 +0000
committerSebastian Pipping <sping@gentoo.org>2010-11-11 01:04:46 +0000
commit073b7a022192b5a66a473a75123b7c91b2ef05ee (patch)
treef90f6a5a81cf8c2570d870a47c4c9cd771a27499 /dev-vcs
parentAdded ~arm keyword (bug #344959) (diff)
downloadhistorical-073b7a022192b5a66a473a75123b7c91b2ef05ee.tar.gz
historical-073b7a022192b5a66a473a75123b7c91b2ef05ee.tar.bz2
historical-073b7a022192b5a66a473a75123b7c91b2ef05ee.zip
dev-vcs/git: Fix dependencies of live ebuild (bug #343063)
Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog6
-rw-r--r--dev-vcs/git/Manifest4
-rw-r--r--dev-vcs/git/git-9999.ebuild9
3 files changed, 11 insertions, 8 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 65e4447f155b..53189e26ddcf 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.45 2010/11/09 20:49:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.46 2010/11/11 01:04:46 sping Exp $
+
+ 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild:
+ Make live ebuild depend on asciidoc and xmlto independent of flag "doc"
+ (bug #343063)
09 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.3.ebuild,
git-1.7.3.ebuild, git-1.7.3.1.ebuild, git-1.7.3.2.ebuild,
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 126f4a3dca21..cb6d721dfed0 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -51,6 +51,6 @@ EBUILD git-1.7.3.1.ebuild 13359 RMD160 4e9fb86202a8561e1542278a089e0a1b878d9d28
EBUILD git-1.7.3.2-r1.ebuild 13373 RMD160 1731ac55ee2a698bab20949d2fb4e328d6191035 SHA1 a1aa27772f3ca7ce63be412123830c6aa427680e SHA256 a754c0c6c4447caf3c95e1be815c7e05e09bb70cd19460cf348d923265bb1957
EBUILD git-1.7.3.2.ebuild 12889 RMD160 a8893e8bee2ad28e7f2cd7d0d5d3ff0af30dc431 SHA1 1ebfb0c9baec3944b59c0c2af52d1d209d48fe71 SHA256 fb9324d08d98dc39dd48dd5be4b889c4d8aaade5dedb96767ad393818bcc85a7
EBUILD git-1.7.3.ebuild 13357 RMD160 a2462a4ca78fcdc9f1a9e2d1936126efa635d0f8 SHA1 4f62d8278bbb6789a72dee4a9e5de228c2d0216b SHA256 00a8e520e7f1af28eaf5b62d6618e5a5a08dad2b3406fe3e63aee1f282412d89
-EBUILD git-9999.ebuild 13367 RMD160 a9fcb13af16a6ad025f46730ef4cb32ad06e2cc3 SHA1 7498c184c999acdbde08f534766ad8c0fce20a39 SHA256 737b9a31949ade39e3c4f4a7aa000793a866309b6a22ebea65a79f58dbe04257
-MISC ChangeLog 71786 RMD160 71327f5b4d13abdd30e2c6d7a59876f56ff675b7 SHA1 a24516eef5de7b97c9270364e46cf8508d986aa7 SHA256 b1840ad4335a5fa19e41f854c05c4af6c24e9a3762271401fda00b7d31e10ac3
+EBUILD git-9999.ebuild 13382 RMD160 a5bfe144fc88e4c1808c8ec93ee7f44563b9a6d9 SHA1 699c1320d25dbcafc2aeafc2a1c52eaf9ed39fec SHA256 c1e9a3b0d920729f0740e5a6eef770c892544e752a91255f42d04b71be3a5893
+MISC ChangeLog 71944 RMD160 dd0f84aeb8d45d30b2a5b2b6e11773aaf4e24ece SHA1 e54c135299da16b33cff134f64684b50e383fade SHA256 2bee24aa3a08a70767fb4841a08393e67ea18df7c77ae0131c7718bb0ff7569c
MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 252c84b4c98b..f4906a6c02b8 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.7 2010/10/29 19:45:42 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.8 2010/11/11 01:04:46 sping Exp $
EAPI=3
@@ -70,12 +70,11 @@ DEPEND="${CDEPEND}
sys-apps/texinfo
)"
-# Live ebuild builds HTML docs, additionally
+# Live ebuild builds man pages and HTML docs, additionally
if [ "$PV" == "9999" ]; then
DEPEND="${DEPEND}
- doc? (
- app-text/xmlto
- )"
+ app-text/asciidoc
+ app-text/xmlto"
fi
SITEFILE=50${PN}-gentoo.el