Restore USE=doc with an extra check in case we're in the middle of a bootstrap #23156.

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index da741c09d7a24862f80be5a5a5b1314a08a22949..83bb5eb11e1a127668632bd5737b55099b8a8338 100644 (file)
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iputils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.35 2005/01/04 04:28:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.36 2005/01/04 04:47:37 vapier Exp $
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
+  Restore USE=doc with an extra check in case we're in the middle of a
+  bootstrap #23156.
 
   03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
   Make sure linux/ipsec.h is usuable before building ipsec stuff #67569.

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 6603b905535945a508d4d39f6bbe0cf19bc9fc3c..08f0b8004bdce4a8cee66d99bd544241b6b6101d 100644 (file)
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eaab0bbaa549583a4463925df84abecb ChangeLog 5212
-MD5 4494c85b5d3a99a6b5837d3290d7ea1f iputils-021109-r3.ebuild 2718
+MD5 484743b0cc8d50291a99b17e467a9f53 ChangeLog 5380
+MD5 2b9ae1f4f45a13d28101170fbbbd1829 iputils-021109-r3.ebuild 2835
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d85216426f34d4e768ab8f9f48c66e4f files/021109-syserror.patch 324
 MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477
@@ -15,7 +15,7 @@ MD5 b4615612d4514f12b35fbaf27d3e04fe files/021109-uclibc-no-ether_ntohost.patch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB2ht3roRuSHgZdywRAsX4AKCB+o7rNtfkE4H8iiYnj7Nx0nwgZQCgj2o6
-R8s2PXh7/42PUEqjYvYz1cI=
-=+uiS
+iD8DBQFB2h/7roRuSHgZdywRAu7wAJ9nysbBERs95UjEmlG3FlF7ALe2KgCfYxHW
+DqoVv71D5IVZDmvW7QGDIVg=
+=lirh
 -----END PGP SIGNATURE-----

diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild
index 20a21c23ce6905970c36d68b2f0c24b282834b7c..50d856ade246c973b5fba7a50d034580d347abb2 100644 (file)
--- a/net-misc/iputils/iputils-021109-r3.ebuild
+++ b/net-misc/iputils/iputils-021109-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.16 2005/01/04 04:28:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.17 2005/01/04 04:47:37 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils toolchain-funcs
 
@@ -12,19 +12,20 @@ SRC_URI="ftp://ftp.inr.ac.ru/ip-routing/${PN}-ss${PV}-try.tar.bz2
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="static ipv6 uclibc" #doc
+IUSE="static ipv6 uclibc doc"
 
 DEPEND="virtual/libc
        virtual/os-headers
        sys-devel/bison
        sys-devel/flex
        dev-libs/openssl
-       sys-devel/autoconf"
-# docs are broken #23156
-#      doc? ( app-text/openjade
-#              dev-perl/SGMLSpm
-#              app-text/docbook-sgml-dtd
-#              app-text/docbook-sgml-utils )
+       sys-devel/autoconf
+       doc? (
+               app-text/openjade
+               dev-perl/SGMLSpm
+               app-text/docbook-sgml-dtd
+               app-text/docbook-sgml-utils
+       )"
 RDEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}
@@ -78,9 +79,12 @@ src_compile() {
        cd ${S}
        emake || die "make main failed"
 
-       #if use doc ; then
-       #       make html || die
-       #fi
+       # We include the extra check for docbook2html 
+       # because when we emerge from a stage1/stage2, 
+       # it may not exist #23156
+       if use doc && type -p docbook2html ; then
+               make html || die
+       fi
        make man || die "make man failed"
 }
 
@@ -103,5 +107,5 @@ src_install() {
        use ipv6 || rm doc/*6.8
        doman doc/*.8
 
-       #use doc && dohtml doc/*.html
+       use doc && dohtml doc/*.html
 }

diff --git a/net-misc/ytalk/Manifest b/net-misc/ytalk/Manifest
index eca9e5c197c076d787fd8c75ffc01ec6ca908d0d..e2140184cfca78ed3030a339bd1150712158d563 100644 (file)
--- a/net-misc/ytalk/Manifest
+++ b/net-misc/ytalk/Manifest
@@ -1,6 +1,6 @@
-MD5 a475722cae684a405a1e27b8659ed948 ytalk-3.1.6.ebuild 700
-MD5 020df5d706186d255dbf3b7cdf180e22 ytalk-3.1.1.ebuild 739
-MD5 c7d73e2e63321d0ad0f3b933b2ad6d31 ChangeLog 1684
+MD5 3ede58a8ec0fa5d893a5237f56a1cb29 ytalk-3.1.1.ebuild 739
+MD5 421a6224e3f7b070a1dbd23fbe8afa9b ytalk-3.2.0.ebuild 702
+MD5 5d09d0a7e9466380af0784023886b350 ChangeLog 1936
 MD5 14651eef0c7d6d035b9da57740df36c8 metadata.xml 398
 MD5 d7c085876eec894758505ef4ad2d36e1 files/digest-ytalk-3.1.1 62
-MD5 19178cec3b832ea77be679a6a50bb200 files/digest-ytalk-3.1.6 63
+MD5 0cf57e06f61a019c5005a6a678d8fe19 files/digest-ytalk-3.2.0 63