summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-03-29 02:27:21 +0000
committerMike Frysinger <vapier@gentoo.org>2008-03-29 02:27:21 +0000
commit454da9b16da9a3c08d0a1d3dba0b1067faf8da78 (patch)
treee4c54715724e3bff5d8788fe2a8d09e6d8fdc442
parentVersion Bump. see #214636 (diff)
downloadgentoo-2-454da9b16da9a3c08d0a1d3dba0b1067faf8da78.tar.gz
gentoo-2-454da9b16da9a3c08d0a1d3dba0b1067faf8da78.tar.bz2
gentoo-2-454da9b16da9a3c08d0a1d3dba0b1067faf8da78.zip
Fixup manpage install.
(Portage version: 2.2_pre5)
-rw-r--r--net-misc/iputils/ChangeLog5
-rw-r--r--net-misc/iputils/iputils-20071127.ebuild24
2 files changed, 15 insertions, 14 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/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
}