Fix installing documentation by Chris Mayo (bug #416787).

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

3 files changed, 19 insertions, 10 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/Manifest b/net-firewall/conntrack-tools/Manifest
index fe99df4c23fe..1c3cde4895a7 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -11,14 +11,14 @@ DIST conntrack-tools-1.2.2.tar.bz2 476888 SHA256 e1da5f4c46094c252df5a167b28ecf2
 EBUILD conntrack-tools-0.9.14.ebuild 1720 SHA256 15506dcb9785bf6405439375dc9935d6ae30d74f7eb9659f508c242183ef8d16 SHA512 9fad03b21a92486a6a03a0a46c80e71407e6f8c51f6415dcd80d13cfac789168d3229e214c8c246518f432540a227344df64f925c8a0ea9f014bb1db20d94726 WHIRLPOOL a937ed316d1df6428dda76dcc2c37e829fa2688000a9f8e542658169aab53dbf38352d945c8a8a8b74feaed6f35920cd648f568b810b23b61d1fe5b310ad651c
 EBUILD conntrack-tools-1.0.0.ebuild 1724 SHA256 1570444cbbae8353a17f860be8f07f51b792a75b680c66c22d60b936bd2a8702 SHA512 57dfb27561bab9c7468f489f8ced80cb6fbb96350dca48fc0c9fed29a46bfafb8a28547b37c1fd7983256740d6ea1244d35b362e312d38b907dba1f434e54591 WHIRLPOOL 688940cb52e891815e839bcf99bbb40b897a4165d4da12fa2d4920756c6551b81d0ed82e146a66459b2cc425dff6148d5aa67dbc9174e4b0530e1a579b11c81f
 EBUILD conntrack-tools-1.0.1.ebuild 1584 SHA256 a828c6e39000d59bc4dbf277fbf7da7f338c90973b20383e57bee9075e0d670f SHA512 9cc34a641a62885bfe3784d3dc6d2ef2c524a4f85a4dfb5ffb5d5c42f459101d57a213dc4494eea097b920757809d14903738c7395874a4a16ed6dddc9ed04bb WHIRLPOOL d88918c1f4cf6e1f8fd814bd4fe3867fa13c7239a1f06685a84f4abd48e8c576beb07ad12ce2346be4f13022b19b6b7ac45210b686836c6ab049220973741460
-EBUILD conntrack-tools-1.2.2-r1.ebuild 1635 SHA256 6f9cd2b24d6d0db9a661633b86b2cf9ea4f779a34c61a496915a84d406d77c5b SHA512 d13ecd16bb2212eec521192f35fe0cf6a53504cb9908438f20f5cd8c852748c92c3d482fa5dda67ec6d43391c5089b690a9cc3fab8772b3403bd08c9331ca866 WHIRLPOOL 630cf8ea3b7224be3530c92842c0791ddaa7589e13dbd2e37750a2ea5664c9121254eba066023e25f82a6eb5b5d72180e8fcc5e7773b1aee78eee84c17274b73
+EBUILD conntrack-tools-1.2.2-r1.ebuild 1760 SHA256 1f7fc9a6346e39afbec212005fdbe3598f1464d519dbe4cb9cb73bf91a0e0757 SHA512 fba095f1b4c8bf2d3ccfa2e599c6d3defdd478b6aa207c66d3081a964e6144f1f9f4c90149c5ca127546e28cc4538f90294a1b986c8f1598c1cacbbc50efed30 WHIRLPOOL 5977f7fcf1ffe326a9eb936289da02f761e7b07acb2eae0efd36ca4f0f2675728483393a5cec22e6238d7a7fb24261b6eb5318863679d1e5053a3feaddcad271
 EBUILD conntrack-tools-1.2.2.ebuild 1632 SHA256 21047d2dc283ab75fa42baa616003d09d6ccf2629910f44a5d9845b5a27803d1 SHA512 e5a8304cd06b35cbfc12d08b641003294c30f34d9dbf118c4a86073f486f7b417d05c2707a640f9fa8089fc8738491c156632883d17f39403afbbf55a5b6b10c WHIRLPOOL 7c3a4e1fb96c2d07cf101abe01dd794f6e355b8cdc15a68a859bb18c8815e0c3e2dae9f7d986d1affaccdc83049e53e9e41246563064864e9b458a192e6105d5
-MISC ChangeLog 8072 SHA256 58f6b96d79098dd33fc310f6837c4d5f0749f97aa4d0380711262bd787ee91a6 SHA512 1e21f354a6f3d9c330e598b5749de4bb0f2a48896042a1cb7625f4d670d94c6c61c10ec859b699c2c8deb1fdddf5d188f3b5e77e24412375b3aac57538ba8535 WHIRLPOOL 9099aef21fee01a3d7a1c107abad7942e75831ca9f8212f4f6af5fb5126b43d7641d6a8d9f953cab0fdf14adda0b0d02a4543ae3608f812273886cdbe12ff2ab
+MISC ChangeLog 8213 SHA256 dbc09e076cb3f42f3d42b17dfcb2b1818b8dd4118330eced1cd9555a232e0290 SHA512 38e76e135a66910e09b4fc600ecd5f2cbf6e0c95b63a9fd06e9d27ae3fed750c3353e71acb56cc3a50313f1cec0fd3522a4e9dd1667bab76514d61a7851bcdb4 WHIRLPOOL 6b8d877d4e295b4fc5c99c759b06a6587ceb5c6db36b26cc114fb7fce682d6bef43118f2d5f09341a7cabd2b7b0a1fc15f85a25fd62327b6c1174726fc82d88c
 MISC metadata.xml 647 SHA256 b4a43fb3d145d95a50c2612d43e69894277644779e734bf2f0d4c2d6579121f0 SHA512 a362d145aace1a28c441c4367d03602c2e8dbeb781edc123bf4e1758d6668e90b5c5a5fa67894ed8fd9dbc63c9c2a75178ccd199202474a36d611af18cf8ed1e WHIRLPOOL 8bbb507711121009f96387069fc6153b8f4c6457d5ec18d0ad0b715d7659e4a7323d1a6807c4156dcf9d9377d29d2550ac23a5fec26bbab5c93d6eb798ec0c75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBItP0ACgkQVWmRsqeSphO7BwCeNK25JHeisPSvwb7ZymODsQJz
-wjYAmwefWinaipaR1icAe57ynkiQ9612
-=AdLx
+iEYEAREIAAYFAlBIwjIACgkQVWmRsqeSphMqyQCcCx66xIeuEWBTVT4QOBDJZHTM
+Yx4An21t+ccW8t1cZABsaPJ/t5VjSFUQ
+=fs6F
 -----END PGP SIGNATURE-----
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
 }