Don't pull in asciidoc/xmlto unless USE=doc

(Portage version: 2.1_pre7-r4)

3 files changed, 35 insertions, 44 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index c655a2b7f7a4..22b241dbc344 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.27 2006/06/01 17:25:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.28 2006/06/10 15:04:41 agriffis Exp $
+
+  10 Jun 2006; Aron Griffis <agriffis@gentoo.org> mercurial-0.9.ebuild:
+  Don't pull in asciidoc/xmlto unless USE=doc
 
   01 Jun 2006; Aron Griffis <agriffis@gentoo.org> mercurial-0.9.ebuild:
   Mark 0.9 stable on alpha/ia64
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index b46538d40ade..2d4578c1bc5b 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -1,42 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST mercurial-0.8.1.tar.gz 284529 RMD160 0dca740eb32297813489162f9564ba349747be35 SHA256 ee364621625a4a503da2ae9747d46534dc2d297a3c0ff23572a9440729c555fa
-DIST mercurial-0.8.tar.gz 229641 RMD160 45f84b85c09d0bff6020dabdb7c595d4e5becf3c SHA256 f62d5ecbf15a57e985ce80760c4866a0398132427bd05c0cd11457bc57619d06
-DIST mercurial-0.9.tar.gz 326107 RMD160 4ab0646abeea17bebf2262457448ef39959b5311 SHA256 43de312de90ca5d155101d775c7bdaafc9ff61f179dd2940d8e22b2df5090a5b
-EBUILD mercurial-0.8.1.ebuild 1190 RMD160 2fb44d244619b776768765e4152ef62df9bc012c SHA1 bf110cf2f21f6f0339fbdb32fbe504b1f2a128b3 SHA256 4d82b66e5a50a910bb3b4fec4e9bf1a7343d7d954055adceacc67e21ceb14ae0
-MD5 b2bfce7cb703a45fc6ae5a54af8ce636 mercurial-0.8.1.ebuild 1190
-RMD160 2fb44d244619b776768765e4152ef62df9bc012c mercurial-0.8.1.ebuild 1190
-SHA256 4d82b66e5a50a910bb3b4fec4e9bf1a7343d7d954055adceacc67e21ceb14ae0 mercurial-0.8.1.ebuild 1190
-EBUILD mercurial-0.8.ebuild 1178 RMD160 d4013c9f3b3d5f4be193958c7735bffe98a8dfbd SHA1 cafd55bc85da7861560800280a0aad058ea7d032 SHA256 1148704c3c75fad612d614bd6b770a853f77f500cffe2923d232a986a48a01b4
-MD5 15059b27ac50163db47fcbb163d68520 mercurial-0.8.ebuild 1178
-RMD160 d4013c9f3b3d5f4be193958c7735bffe98a8dfbd mercurial-0.8.ebuild 1178
-SHA256 1148704c3c75fad612d614bd6b770a853f77f500cffe2923d232a986a48a01b4 mercurial-0.8.ebuild 1178
-EBUILD mercurial-0.9.ebuild 1189 RMD160 7c38a1e37c93671b6e6ebf664b689f68f1183576 SHA1 0f2120810d858a83357af1e9afae7961fd142ff6 SHA256 66a5adcebb27ed0561f1f087c3cd65b1d0dbff84adf9d8f72b5112208a5f19c7
-MD5 67ffe3cac3eba1c2a4c22283e1ff4ea8 mercurial-0.9.ebuild 1189
-RMD160 7c38a1e37c93671b6e6ebf664b689f68f1183576 mercurial-0.9.ebuild 1189
-SHA256 66a5adcebb27ed0561f1f087c3cd65b1d0dbff84adf9d8f72b5112208a5f19c7 mercurial-0.9.ebuild 1189
-MISC ChangeLog 4208 RMD160 8dabc55243e90cf7a5f19d00087d63b1d213bcfd SHA1 0aedeec81c8de1468298a55c45ff1fa421c41cac SHA256 dab50efd922781c31c6a951afa47b6fbc709288977597f7f383e20f53e1b0b5b
 MD5 44b071a3bf242f260c05f836c499df14 ChangeLog 4208
 RMD160 8dabc55243e90cf7a5f19d00087d63b1d213bcfd ChangeLog 4208
 SHA256 dab50efd922781c31c6a951afa47b6fbc709288977597f7f383e20f53e1b0b5b ChangeLog 4208
-MISC metadata.xml 252 RMD160 6ee0365432e003d39675634adda53c87812f3c6c SHA1 f7b0c469e60ad5a5bf498bb3985df08742cf171d SHA256 8b648c81d1a574574a039336cbbb29330f22c121b1ca09c2a4d626e514fe512b
-MD5 a665f2675f13020037bd5fe782c1c546 metadata.xml 252
-RMD160 6ee0365432e003d39675634adda53c87812f3c6c metadata.xml 252
-SHA256 8b648c81d1a574574a039336cbbb29330f22c121b1ca09c2a4d626e514fe512b metadata.xml 252
 MD5 9269659eeb841b48a7ae89b9f92340cb files/digest-mercurial-0.8 241
 RMD160 6f1100ae9280b97d7bdbd58d4f026c303ef46134 files/digest-mercurial-0.8 241
 SHA256 0a5be9a2a8bc22dd12f0b792e1c1c4738804fb5a00ac4b760d5a65a598ad9127 files/digest-mercurial-0.8 241
 MD5 9c496da3816798cf4036d1c5f07cd6c5 files/digest-mercurial-0.8.1 247
 RMD160 7b4da6bcd2f69aa3e053e2f4d390bbef92094daa files/digest-mercurial-0.8.1 247
-SHA256 751d2ad08a6f52fe559757706aa5d197aae4468b640ff13b2e6f1fa7f1be2033 files/digest-mercurial-0.8.1 247
+SHA256 e96f7befb254503bfc37ed1fd2ca514ab77c3043409f1f9ccc8e91219c3bfb76 files/digest-mercurial-0.8.1 247
 MD5 f8129e7dd059951d4ff39748cf94d884 files/digest-mercurial-0.9 241
 RMD160 29e7ec22999ac83629486c352910e2614d65c23b files/digest-mercurial-0.9 241
 SHA256 8db15c292dba282f9ac7d07f2a28b98a2a243c3d556a60a73b7dfd177fe501a0 files/digest-mercurial-0.9 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEfyMoJrHF4yAQTrARAg5MAJ9F+UkIpC50Wdw17GAmmDe+f42V0QCgkB6s
-jsf5PsJYqLdYvfru8slsdoc=
-=B/Nm
------END PGP SIGNATURE-----
+MD5 b2bfce7cb703a45fc6ae5a54af8ce636 mercurial-0.8.1.ebuild 1190
+RMD160 2fb44d244619b776768765e4152ef62df9bc012c mercurial-0.8.1.ebuild 1190
+SHA256 4d82b66e5a50a910bb3b4fec4e9bf1a7343d7d954055adceacc67e21ceb14ae0 mercurial-0.8.1.ebuild 1190
+MD5 15059b27ac50163db47fcbb163d68520 mercurial-0.8.ebuild 1178
+RMD160 d4013c9f3b3d5f4be193958c7735bffe98a8dfbd mercurial-0.8.ebuild 1178
+SHA256 1148704c3c75fad612d614bd6b770a853f77f500cffe2923d232a986a48a01b4 mercurial-0.8.ebuild 1178
+MD5 738c059ef8cc82c58e2c6a46dfb2cd99 mercurial-0.9.ebuild 1257
+RMD160 047dc1ff3e5cb29566d0f8ad1b7548e70e95d10b mercurial-0.9.ebuild 1257
+SHA256 f533c2817150f4c4b2a82c8a922a75db23809b070958b569ba579fdd8fa610f9 mercurial-0.9.ebuild 1257
+MD5 a665f2675f13020037bd5fe782c1c546 metadata.xml 252
+RMD160 6ee0365432e003d39675634adda53c87812f3c6c metadata.xml 252
+SHA256 8b648c81d1a574574a039336cbbb29330f22c121b1ca09c2a4d626e514fe512b metadata.xml 252
diff --git a/dev-util/mercurial/mercurial-0.9.ebuild b/dev-util/mercurial/mercurial-0.9.ebuild
index 15e807269aa4..8c6d33f23e53 100644
--- a/dev-util/mercurial/mercurial-0.9.ebuild
+++ b/dev-util/mercurial/mercurial-0.9.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/mercurial/mercurial-0.9.ebuild,v 1.3 2006/06/01 17:25:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.ebuild,v 1.4 2006/06/10 15:04:41 agriffis Exp $
 
 inherit bash-completion distutils
 
@@ -13,11 +13,13 @@ SRC_URI="http://www.selenic.com/mercurial/release/${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.3
-	app-text/asciidoc
-	app-text/xmlto"
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
 
 if [[ ${PV} == *_p* ]]; then
 	S=${WORKDIR}/mercurial-snapshot
@@ -28,13 +30,15 @@ fi
 src_compile() {
 	distutils_src_compile
 
-	cd doc
-	local x
-	for x in *.?.txt; do
-		asciidoc -d manpage -b docbook $x || die
-		xmlto man ${x%txt}xml || die
-		sed -nie '/./p' ${x%.*} || die
-	done
+	if use doc; then
+		cd doc
+		local x
+		for x in *.?.txt; do
+			asciidoc -d manpage -b docbook $x || die
+			xmlto man ${x%txt}xml || die
+			sed -nie '/./p' ${x%.*} || die
+		done
+	fi
 }
 
 src_install() {
@@ -45,7 +49,9 @@ src_install() {
 	dodoc CONTRIBUTORS PKG-INFO README *.txt
 	cp hgweb*.cgi ${D}/usr/share/doc/${PF}/
 	cp -r contrib ${D}/usr/share/doc/${PF}/
-	doman doc/*.?
+	if use doc; then
+		doman doc/*.?
+	fi
 }
 
 pkg_postinst() {