diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2010-11-11 03:26:16 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2010-11-11 03:26:16 +0000 |
| commit | 343e03d1d2de6cdb3c02ae7308d51bd6b91161e6 (patch) | |
| tree | 43e1646170777cb4a1fa5f71b9c5579f5368990c /dev-vcs | |
| parent | Re-added new upstream major release (diff) | |
| download | historical-343e03d1d2de6cdb3c02ae7308d51bd6b91161e6.tar.gz historical-343e03d1d2de6cdb3c02ae7308d51bd6b91161e6.tar.bz2 historical-343e03d1d2de6cdb3c02ae7308d51bd6b91161e6.zip | |
dev-vcs/git: Merge changes to 9999 back into latest release ebuild.
Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-vcs/git/Manifest | 4 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.2-r1.ebuild | 9 |
3 files changed, 10 insertions, 8 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 53189e26ddcf..38812bb2c4fc 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,9 @@ # 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.46 2010/11/11 01:04:46 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.47 2010/11/11 03:26:16 sping Exp $ + + 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-1.7.3.2-r1.ebuild: + Merge changes to 9999 back into latest release ebuild. 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild: Make live ebuild depend on asciidoc and xmlto independent of flag "doc" diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index cb6d721dfed0..46e60d79e027 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -48,9 +48,9 @@ EBUILD git-1.7.2.2.ebuild 13349 RMD160 8fe7b57a926639b7ac6363fd07c0ccf13c585bbb EBUILD git-1.7.2.3.ebuild 13359 RMD160 c0eed8e75bfaa77181bdd86689bc6c4d2b19e31e SHA1 b149e471636a473c9a323583c675759fc22949bb SHA256 29c5c7359a24ebab8002a87c9ff6aa8726766f2a7653f902d5dbc2383f2a180a EBUILD git-1.7.2.ebuild 11473 RMD160 4a1bdd7d0ffbc8f677fe41216fb7b5e87f70ea3b SHA1 f5c98b2bb8e2240d9dbb43d6f6c4592916dcf5bd SHA256 7748e46b9b8cc17dd4028a4414f9fc578c4e479d85b07a957fff3ddf508bbb0f EBUILD git-1.7.3.1.ebuild 13359 RMD160 4e9fb86202a8561e1542278a089e0a1b878d9d28 SHA1 15ae7b9ed146f2d3be1bf83334f1ff76dd2ceb76 SHA256 62c08e3ce6c744c1127fc9e2a8a41fffc56044fe58fbad7691d0b62da3f578a9 -EBUILD git-1.7.3.2-r1.ebuild 13373 RMD160 1731ac55ee2a698bab20949d2fb4e328d6191035 SHA1 a1aa27772f3ca7ce63be412123830c6aa427680e SHA256 a754c0c6c4447caf3c95e1be815c7e05e09bb70cd19460cf348d923265bb1957 +EBUILD git-1.7.3.2-r1.ebuild 13388 RMD160 7ba00d0898139766f67eb9c9bbd731afebd8cd18 SHA1 c5ed44b7fca3ebcddb9b0fdd774c94b29bd32955 SHA256 e2d4dffd01c2c5a43a6e6fd056c05150d29a47c00aa392507a981d8fcb59b0a0 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 13382 RMD160 a5bfe144fc88e4c1808c8ec93ee7f44563b9a6d9 SHA1 699c1320d25dbcafc2aeafc2a1c52eaf9ed39fec SHA256 c1e9a3b0d920729f0740e5a6eef770c892544e752a91255f42d04b71be3a5893 -MISC ChangeLog 71944 RMD160 dd0f84aeb8d45d30b2a5b2b6e11773aaf4e24ece SHA1 e54c135299da16b33cff134f64684b50e383fade SHA256 2bee24aa3a08a70767fb4841a08393e67ea18df7c77ae0131c7718bb0ff7569c +MISC ChangeLog 72077 RMD160 a6092bbc5fec2abd117f6d94c3a065125512feb4 SHA1 feb37c542559dbda7666b8a7608d1103771b3f6c SHA256 c6ea65ff680c1c96f2e050b68abe207e45708865b7baf5fbfd2fb075dc28ff3d MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b diff --git a/dev-vcs/git/git-1.7.3.2-r1.ebuild b/dev-vcs/git/git-1.7.3.2-r1.ebuild index 7f104d4ebd24..a1b16e695735 100644 --- a/dev-vcs/git/git-1.7.3.2-r1.ebuild +++ b/dev-vcs/git/git-1.7.3.2-r1.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-1.7.3.2-r1.ebuild,v 1.3 2010/11/09 20:49:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.4 2010/11/11 03:26:16 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 |