Only generate man pages for USE=doc until next release where they include man pages...

Package-Manager: portage-2.1.2_rc3-r8

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 5861a4b1cfd25be8378bbbd4453689ddad9aece9..26e149ca8194ad49a2591ead0422a10a7b1b9d5d 100644 (file)
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.43 2006/12/20 16:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.44 2006/12/21 05:34:25 vapier Exp $
+
+  21 Dec 2006; Mike Frysinger <vapier@gentoo.org> iputils-20060512.ebuild:
+  Only generate man pages for USE=doc until next release where they include
+  man pages #158660.
 
 *iputils-20060512 (20 Dec 2006)
 

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 191825434a59f037354ba0edc5964fbc6d62d17d..cc0965e7d2e2318ca954148e50d6e4e98dffd725 100644 (file)
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -63,14 +63,14 @@ EBUILD iputils-021109-r3.ebuild 2478 RMD160 4dd808a39dda06bd9cf610a6db233d37cffa
 MD5 31bb4f0403d1bbf7919def937f33c240 iputils-021109-r3.ebuild 2478
 RMD160 4dd808a39dda06bd9cf610a6db233d37cffa12a9 iputils-021109-r3.ebuild 2478
 SHA256 3d8b4110f6c6b833e6acd574a119ebda4450f3f07f24e6eeabef850d3b94b625 iputils-021109-r3.ebuild 2478
-EBUILD iputils-20060512.ebuild 2082 RMD160 00f6773a2ac51be4e582354b88754a2f46f8775a SHA1 c902bfab4315928847e15f19cca466e5d5da9bda SHA256 bdedf1771388422e6eee93d5369eb853191f90da05b5e82dfa1ed73faa18a5de
-MD5 b2d3ff82fd8262b3b7be124164fb9a1b iputils-20060512.ebuild 2082
-RMD160 00f6773a2ac51be4e582354b88754a2f46f8775a iputils-20060512.ebuild 2082
-SHA256 bdedf1771388422e6eee93d5369eb853191f90da05b5e82dfa1ed73faa18a5de iputils-20060512.ebuild 2082
-MISC ChangeLog 6832 RMD160 85ef2d46d8266176642ad9336d1a1bdc59bd38ad SHA1 7eb9be05557dbc2346c8722083681fa3205f7380 SHA256 87094fd43d2f2db470b959dac4557c13b4ad2c7f4232796c49a6e365352966d3
-MD5 047152814f5c65df5eb03178458e8ee5 ChangeLog 6832
-RMD160 85ef2d46d8266176642ad9336d1a1bdc59bd38ad ChangeLog 6832
-SHA256 87094fd43d2f2db470b959dac4557c13b4ad2c7f4232796c49a6e365352966d3 ChangeLog 6832
+EBUILD iputils-20060512.ebuild 2064 RMD160 8386cf3aa69214520a23f04b5631d995a6015389 SHA1 85a3815ddfac8eb9377d126d5bd0368bbfa8d7db SHA256 6ed3f8c8579c3799b12cf0855796352c5be11014b200137cda60c4e4f26591f3
+MD5 fb5950c3bcee50424fc8bba25ee1062f iputils-20060512.ebuild 2064
+RMD160 8386cf3aa69214520a23f04b5631d995a6015389 iputils-20060512.ebuild 2064
+SHA256 6ed3f8c8579c3799b12cf0855796352c5be11014b200137cda60c4e4f26591f3 iputils-20060512.ebuild 2064
+MISC ChangeLog 7005 RMD160 dad54436e8ed84e2267b53a5473fd20ad3d7c469 SHA1 38ae97fdeff02b03c219ea24fc7864a244911002 SHA256 4fa8f4bfd24126b374901bc4119d840c34730bb3d20d66424c4d57362a3e7808
+MD5 b8ae9a9812ab17f7d47881bc2f0820d8 ChangeLog 7005
+RMD160 dad54436e8ed84e2267b53a5473fd20ad3d7c469 ChangeLog 7005
+SHA256 4fa8f4bfd24126b374901bc4119d840c34730bb3d20d66424c4d57362a3e7808 ChangeLog 7005
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -82,9 +82,9 @@ MD5 d1a03b4e8b248518bfbdb595e328f009 files/digest-iputils-20060512 253
 RMD160 3af2bac60b9609d76247499078f8beb978cedea4 files/digest-iputils-20060512 253
 SHA256 cc03114cb4292c3e01b341a32fe72f00b3f736f2af9cd00c6ed6480510dcee35 files/digest-iputils-20060512 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD4DBQFFiV+yK9sYciBdMQMRAuUYAJY4Rke/QMp0LtzxoUchDxuDAv70AJ9paGqH
-oJUZtapVtaIe8TkvhkS+ig==
-=p7W8
+iD8DBQFFihz6K9sYciBdMQMRAirbAJ0T/Go8RhPJDP4iwgY+qjzSbjsFwQCcCswc
+NG6w+33q/ZzCMs6W15ombNE=
+=+rOS
 -----END PGP SIGNATURE-----

diff --git a/net-misc/iputils/iputils-20060512.ebuild b/net-misc/iputils/iputils-20060512.ebuild
index de9447a65eebb48d20227d6168d0d7e7be113ae7..60130737e6401c8383cfc67c047e2061dcc9f7a0 100644 (file)
--- a/net-misc/iputils/iputils-20060512.ebuild
+++ b/net-misc/iputils/iputils-20060512.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/net-misc/iputils/iputils-20060512.ebuild,v 1.1 2006/12/20 16:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20060512.ebuild,v 1.2 2006/12/21 05:34:25 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -48,9 +48,8 @@ src_compile() {
        # because when we emerge from a stage1/stage2, 
        # it may not exist #23156
        if use doc && type -p docbook2html ; then
-               emake -j1 html || die
+               emake -j1 html man || die
        fi
-       emake -j1 man || die "make man failed"
 }
 
 src_install() {
@@ -68,11 +67,13 @@ src_install() {
 
        dodoc INSTALL RELNOTES
 
-       rm -f doc/setkey.8
-       use ipv6 \
-               && dosym ping.8 /usr/share/man/man8/ping6.8 \
-               || rm -f doc/*6.8
-       doman doc/*.8
+       if use doc ; then
+               rm -f doc/setkey.8
+               use ipv6 \
+                       && dosym ping.8 /usr/share/man/man8/ping6.8 \
+                       || rm -f doc/*6.8
+               doman doc/*.8
 
-       use doc && dohtml doc/*.html
+               dohtml doc/*.html
+       fi
 }