Fixup manpage install.

Package-Manager: portage-2.2_pre5

3 files changed, 28 insertions, 16 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index c07646b568dc..c1387ddbd6e8 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.65 2008/03/28 15:21:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.66 2008/03/29 02:27:21 vapier Exp $
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org> iputils-20071127.ebuild:
+  Fixup manpage install.
 
   28 Mar 2008; Brent Baude <ranger@gentoo.org> iputils-20071127.ebuild:
   stable ppc, bug 214734
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 5164965b8dfb..e020b089f937 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 021109-uclibc-no-ether_ntohost.patch 635 RMD160 234010cd5aadc5086beb638c19514659974939f8 SHA1 8e7fda98a1cc1fae5b8f75f9aec200fcb3afee49 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b
 AUX iputils-021109-gcc34.patch 2313 RMD160 354dcdc651bcfb88bd96d9008367854e91a5f7f7 SHA1 97baa39948144d83f0d484d2c5df0c8efc924590 SHA256 f015536e6b043aacdc7e55afd2394ecdea4d1aeeb33780e3857374788321bf9e
 AUX iputils-20060512-kernel-ifaddr.patch 1732 RMD160 88d0f57dc248e67fd7a7c6ca5705a721c553a177 SHA1 6e2617524eb6167476bd51461f43b24e619fcc1a SHA256 6b6d1e80ecb2a1bf8b5887c653abd6403e5edd743638d60eb07bc491b91bd7fe
@@ -7,9 +10,17 @@ AUX iputils-20070202-no-open-max.patch 367 RMD160 e69a4be1e3ff09a7a5c77a5aee871b
 AUX iputils-20071127-gcc34.patch 2312 RMD160 8f63290b181d68216fb2c849212e5a40a561a056 SHA1 1227638d432b1dd6b84d790133a976c3dd1ad409 SHA256 8780a50156a8dfa3126668e1bf2e041ee54dd9e1d558d7e2b9d772bc99a35845
 AUX iputils-20071127-kernel-ifaddr.patch 1467 RMD160 25082fb7976aaefdd6f4da753871d7d744fc171d SHA1 8ea5c4fe3aeed984bd6f6e377b4e304f38127c5d SHA256 24d24c86676c8d6febb52650e53f202051ec9f185932b87d8400eee0f77f569e
 DIST iputils-s20070202.tar.bz2 88678 RMD160 f6c3600a350537210d6ca43d1b82806bc0fa88f7 SHA1 44a299db16543a68fb80b06d5e6c88760af2aa6e SHA256 86f9f9970b4e2258e5e985d4d74b6ba9145410006c73b6482170525deb0c1957
+DIST iputils-s20071127-manpages.tar.bz2 11796 RMD160 ce07a3837501c32af297914260273c89e134f42a SHA1 76a333ef987bab15abdea77d7edcf5977f5d781e SHA256 891363d013e8c939892a5860e8b2d1e0f002d6f2372c546490346d9348318d0c
 DIST iputils-s20071127.tar.bz2 88796 RMD160 2ca3d0ca25c7e0a197176a7438d803171d4e74e6 SHA1 56c8b6c5999b96f47f5b3b37dcf014a33cc7cb22 SHA256 dbbd87554d66e438245487ac31aa4a542a1c6c1ec8273cfacbbfeda09eb44a93
 EBUILD iputils-20070202.ebuild 2023 RMD160 4e979738bb6d49f9273b107c33d1ddfc2fedef61 SHA1 3446abab2a6b452049dd36ae76eb5aea66ce14f3 SHA256 631e169c0fe40487e141e93882f4c0f0b7e051dbad8f95daf8fe93f917321935
-EBUILD iputils-20071127.ebuild 2016 RMD160 b85b33b85f681487766473b2378c08f36ba95176 SHA1 e0ad1f50b39b8175f290783a9ef0c3497a8ca232 SHA256 db309a58ded5d78f8f45610939ad37776a9c86f9e0389e60ce65dfc72dc7a24c
+EBUILD iputils-20071127.ebuild 2037 RMD160 cf5281bb7cfb25c03cb28708b1b0dd2f4f83ab02 SHA1 4974b90ecc39bd2bb6bcae294b0aa56894b23e9e SHA256 bc613328aaa71f92d81bac20dc0e6d58434c6b5f88da89476dccb3dda783d211
 EBUILD iputils-99999999.ebuild 1674 RMD160 ae3426f9153b6bbb9df2489e17b6ac3328b304ff SHA1 6082ad8b50c59379550b87b2f82121ebc8bb925b SHA256 b44d82b8f2c777c52ade0bae14058b7dc1ddbc2b3433f066940ef9c3a5b8216b
-MISC ChangeLog 9435 RMD160 1edb0da3beadb776510ddeccad54b57367ea5a92 SHA1 a2b1b5802f65a9e4ff80cf871d12057c3a9631e4 SHA256 4df9c0bdf53193f6b3f577d0621623f2019b4c5b638db4a0de73834e7472c076
+MISC ChangeLog 9536 RMD160 0a8e5f21ed90bf0b9859f5ac6e53f39e243791c8 SHA1 d74df0b2e635b51119dc03b772f278ad1109695b SHA256 1be237c77a42063f568f6c143c27b055bc2a00da91a381723cafa170524f261f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH7anVj9hvisErhMIRAjrkAJ91oEOl+ZOFen4MBZ+gfb/tmCr6cgCg6rhx
+3MjnLJ062UkvvIMllyVCBNI=
+=wYvx
+-----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/iputils-20071127.ebuild b/net-misc/iputils/iputils-20071127.ebuild
index 7a11aeb1968f..ce92fa6670fd 100644
--- a/net-misc/iputils/iputils-20071127.ebuild
+++ b/net-misc/iputils/iputils-20071127.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20071127.ebuild,v 1.2 2008/03/28 15:21:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20071127.ebuild,v 1.3 2008/03/29 02:27:21 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="http://www.skbuff.net/iputils/"
-SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2"
+SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
+	iputils-s${PV}-manpages.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -45,8 +46,8 @@ src_compile() {
 	# 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
-		emake -j1 html man || die
+	if use doc && type -P docbook2html >/dev/null ; then
+		emake -j1 html || die
 	fi
 }
 
@@ -64,14 +65,11 @@ src_install() {
 	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
 
 	dodoc INSTALL RELNOTES
+	use ipv6 \
+		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
+		|| rm -f doc/*6.8
+	rm -f doc/setkey.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
-
-		dohtml doc/*.html
-	fi
+	use doc && dohtml doc/*.html
 }