summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-09-06 15:33:01 +0000
committerJeroen Roovers <jer@gentoo.org>2012-09-06 15:33:01 +0000
commit706c32afcfb6501a5c446b4869d7f96d35abb8ff (patch)
tree1955be7af86bc9c1abf27e56ecd0224a6263581f /net-firewall/conntrack-tools
parentVersion bump. (diff)
downloadgentoo-2-706c32afcfb6501a5c446b4869d7f96d35abb8ff.tar.gz
gentoo-2-706c32afcfb6501a5c446b4869d7f96d35abb8ff.tar.bz2
gentoo-2-706c32afcfb6501a5c446b4869d7f96d35abb8ff.zip
Fix installing documentation by Chris Mayo (bug #416787).
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall/conntrack-tools')
-rw-r--r--net-firewall/conntrack-tools/ChangeLog5
-rw-r--r--net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild14
2 files changed, 14 insertions, 5 deletions
diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index c4212b2f2722..2c83be83fee9 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-firewall/conntrack-tools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.49 2012/09/06 14:36:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.50 2012/09/06 15:33:01 jer Exp $
+
+ 06 Sep 2012; Jeroen Roovers <jer@gentoo.org> conntrack-tools-1.2.2-r1.ebuild:
+ Fix installing documentation by Chris Mayo (bug #416787).
*conntrack-tools-1.2.2-r1 (06 Sep 2012)
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild
index 84572959c169..2ef5138a4dd8 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild,v 1.1 2012/09/06 14:36:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild,v 1.2 2012/09/06 15:33:01 jer Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
+IUSE="doc"
RDEPEND="
>=net-libs/libnetfilter_conntrack-1.0.1
@@ -21,6 +21,7 @@ RDEPEND="
>=net-libs/libnfnetlink-1.0.0
net-libs/libmnl"
DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto )
virtual/pkgconfig
sys-devel/bison
sys-devel/flex"
@@ -50,6 +51,11 @@ pkg_setup() {
"are not set when one at least should be."
}
+src_compile() {
+ default
+ use doc && emake -C doc/manual
+}
+
src_install() {
default
@@ -59,6 +65,6 @@ src_install() {
insinto /etc/conntrackd
doins doc/stats/conntrackd.conf
- insinto /usr/share/doc/${PF}
- doins -r doc/*
+ dodoc -r doc/sync doc/stats AUTHORS TODO
+ use doc && dohtml doc/manual/${PN}.html
}