Make docs optional. Bug #353592. Thanks to tbartdev@gmx-topmail.de for the patch

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

4 files changed, 51 insertions, 34 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index dd42b22371d9..1cdc6a3cf06b 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.29 2011/02/13 18:31:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.30 2011/02/16 16:16:42 hwoarang Exp $
+
+  16 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  libfm-0.1.15_pre20110213.ebuild, libfm-9999.ebuild:
+  Make docs optional. Bug #353592. Thanks to tbartdev@gmx-topmail.de for the
+  patch
 
 *libfm-0.1.15_pre20110213 (13 Feb 2011)
 
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index df4085a94239..4551ef75ad71 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 DIST libfm-0.1.12.tar.gz 607593 RMD160 5c7da7e3e4717b1a147a4fc9b066e58f7bfc2b92 SHA1 15b9d56c2ddf26838217764c95ab739b6b25e7c7 SHA256 9746ce0c1771c7156214058f6972f6e3594d9612c2b4915836164e0e79efbe19
 DIST libfm-0.1.15_pre20110213.tar.gz 395420 RMD160 22dfbfe7a0e80584bf29c010ac88d5cef562e5cf SHA1 38a3660bce7bc2301feda3521553cc5d1e0fe257 SHA256 93eec68f1c205ab80e75ff20bce93ca19db546679e785c3d8621c23e0f70826e
 EBUILD libfm-0.1.12.ebuild 915 RMD160 2d55b9e204c099e1ea038043c7821ea7aee0fb2c SHA1 463be28e6f77c0f03103737f0b0ebac04f7b620c SHA256 dcce225690318b7da1907ac28cb24e2744db1e53447ee187c8d10df29aca7625
-EBUILD libfm-0.1.15_pre20110213.ebuild 1611 RMD160 64ab6cee4d7b6ac1e58616e6e57a355043497048 SHA1 1ef5ffcb061adfd640b7f21fddfbf344e08cb7da SHA256 1ad5fa9991bdba9e7370484e1abd83ce87c845fa10ee5147810c06ff82b9ed21
-EBUILD libfm-9999.ebuild 1580 RMD160 0fc2788bf595aff6c75863dbde123ed164822468 SHA1 6982bf37eb35eddf4da56312558f8b756cc77c06 SHA256 4c78f29a0bd5027a8b24bee4ab2aa3c9dca59a22bc2cf08acb0a48cdc9c52409
-MISC ChangeLog 4056 RMD160 7832dd3d3b2eea3f8d14695e788aa414f05a7fa0 SHA1 17171b477e2a91057f0b4c5b4efb5a224d4d6859 SHA256 a496a26a165e57500925c4694c50a387075518d853a64c1754926d32578ee0d1
+EBUILD libfm-0.1.15_pre20110213.ebuild 1776 RMD160 50632f99faa534c20ac0ccfe7b52f13d30d4ae5f SHA1 d0b4a40228cbe4427455285578c641518bde32ff SHA256 896d61ec8869791f94a9e7733f3d281f2819a1ae19fedb09e37e626d7765d77f
+EBUILD libfm-9999.ebuild 1763 RMD160 3e9d4044755850b24ab5ae6acf377f7db39207e4 SHA1 254c4a486d2d0a4af3441d9c875aa3e0e5e07181 SHA256 0fe1c0d8c370535c98b22c0993116e4ddfa28226faee9d7203f8581fb1399da6
+MISC ChangeLog 4249 RMD160 934cd7017eaa96a0e807409e7bb6ffb3b379d019 SHA1 1afbc2107ca5a54f3b1a7d929d7ef88983cb31c5 SHA256 8c6522cd26fc8ed0d1490211a7cfd7a519e2f834ae55845e5245d90aa80a4666
 MISC metadata.xml 315 RMD160 b97bee0eac6e3d997d55ef2f1f56df0ea4b81650 SHA1 8a2649a802082dd219590897d39798a0e14bff02 SHA256 1fc7172db4f825aa57aad8210f32c984d470b65c608f2e3cb6bda786c5902cef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNWCOFAAoJEPqDWhW0r/LCrfEQAK4qKrVen7ZSLbQ0GrkO7Nnc
-D7y+L9zA52neEduFfFFNeipvtJDiw4bpwexqNLMjAtYvB66bLVGQve7O94rA1MTE
-/UjxsPIVbQDJzu47RB8atG0UqldI2gRo+3PrrRg2+B+I1W259CXTkGHHiZuP62vm
-lbaYlgZy/jwCt4gsnCxIZiDN0c6Aw/1MANKTpqU1r+4Ps6ko1v+cspoIwhBKO/UJ
-w6FsgB7ylYXlecObrAlZDkPoDCsuvBA5GQN6yah5T+K0gpRRGZ7lw3hSrs2cXscR
-EteTl/EwfdtRHYXpjsNM47XxyEJfifBdjhR1YEGdbPf1u7BzEp0x003dTxrZ1eoQ
-YH9jtoDLx9Tmcf6bt+2LseWN63xtY43ndxEavA/mBEK3A8SjOgfdv+4ZwWIvk7KS
-SW2HFz9/a42DL+vISqKzYi3MbXQMYth2LzD0KGgDYAP2JvKiEXUmflB9n67W1e/C
-zEn5WqymHqkz6PupmF5/50IiyYTx0ptj901bCUZWEJ5ZF7QrHp/dj16Lgu4hkrmb
-XuFH1qi2rp7MHv87oQpRCSJgn1/dwEfb/GrJjZS4iB1VBKDnN0YMYY3jROHtfQwU
-+GX21wkjJL4FBAmeUD1boAPiwRwLLgOX39mZ3ig79TSMtiUouviO42SC9WxtNzrQ
-IvoYb9ATyEGBo9l8787/
-=mZFD
+iQIcBAEBCgAGBQJNW/hkAAoJEPqDWhW0r/LCZ+cQAIq7IVIpXQIcP4Rxk0TNaVW1
+MBwUyiM53JJYLzT2Fgk6VjEOi05SwIsFqHYNpPv1JfiSmF/gf1T1Dz5THnABIg7Q
+xhoCh0M7I5gqLjnzfuZbARuC8Yrbzr5xKUxtXOF6RM/InZrOYOsOG94IepTh8dOo
+/xm3GPgrSRP/QKrICor9BksJe4cLeytjrjI+JHnC4TxCtH/IS+DI2dWBTvM0R3no
+cDyHWbD7h+44B6oGK7AxSyFRkAoBu2DRFnMCPkCKNydD3lbRtE1Covv8L7CZ07Rm
+qEmPtu5mQoEiLWKpX+BgAQQsm7/YUxhuEorm0InVQee0fEy3Icr6X2f73KbPvTTu
+XdCfP+5SofbmZbxiirEUGZbTsv24d/4RQfndQ1FLsphhSlLmJ3aeXt7ZRXT0IW7X
+u6UbJE3zHecC2h8w3sIuQuKpCgNTDXImULjDJfqiVzzqE6jfpWGnZHip9E/LaagS
+Zw65joJPi65jqQWo+eg3m49S905K0UyH/K8iAREOF1TdjHwRbiua2dE9Oyjx5pVY
+IlIR19E1hkms5jkcfaolhJJuJBTvszRMK43b6jgjCOqqNhZQMei4JU+ww7i28qrV
+d/eSTH847BQNLHAj3mH1rTBss5ISIZ4r0eeiimLyC0qr0DQSYBUmIMqBg8rhssRn
+L0BjAYX1RLovc5f06u+K
+=hFb3
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libfm/libfm-0.1.15_pre20110213.ebuild b/x11-libs/libfm/libfm-0.1.15_pre20110213.ebuild
index d4abd630bb38..4e1c11862d65 100644
--- a/x11-libs/libfm/libfm-0.1.15_pre20110213.ebuild
+++ b/x11-libs/libfm/libfm-0.1.15_pre20110213.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.15_pre20110213.ebuild,v 1.1 2011/02/13 18:31:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.15_pre20110213.ebuild,v 1.2 2011/02/16 16:16:42 hwoarang Exp $
 
 EAPI=2
 
@@ -8,8 +8,6 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
 	inherit autotools git
 	SRC_URI=""
-	EXTRA_DEPEND="dev-util/gtk-doc
-		dev-util/gtk-doc-am"
 else
 	inherit autotools
 	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
@@ -23,7 +21,7 @@ HOMEPAGE="http://pcmanfm.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug examples udev"
+IUSE="debug doc examples udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
@@ -33,14 +31,21 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
 	udev? ( sys-fs/udisks )"
 DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
 src_prepare() {
-	gtkdocize --copy || die
+	if ! use doc; then
+		sed -ie '/SUBDIRS=/s#docs##' "${WORKDIR}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	else
+		gtkdocize --copy || die
+	fi
 	intltoolize --force --copy --automake || die
 	eautoreconf
 }
@@ -53,6 +58,7 @@ src_configure() {
 		$(use_enable udev udisks) \
 		$(use_enable examples demo) \
 		$(use_enable debug) \
+		$(use_enable doc gtk_doc) \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index eddfee2c183f..f5bbbc16e0ca 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.9 2011/01/22 14:26:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.10 2011/02/16 16:16:42 hwoarang Exp $
 
 EAPI=2
 
@@ -8,10 +8,9 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
 	inherit autotools git
 	SRC_URI=""
-	EXTRA_DEPEND="dev-util/gtk-doc
-		dev-util/gtk-doc-am"
 else
-	SRC_URI="mirror://sourceforge/pcmanfm/${P}.tar.gz"
+	inherit autotools
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 fi
 
@@ -22,7 +21,7 @@ HOMEPAGE="http://pcmanfm.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug examples udev"
+IUSE="debug doc examples udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
@@ -32,17 +31,23 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
 	udev? ( sys-fs/udisks )"
 DEPEND="${COMMON_DEPEND}
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
-	sys-devel/gettext
-	${EXTRA_DEPEND}"
+	sys-devel/gettext"
 
 src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
+	if ! use doc; then
+		sed -ie '/SUBDIRS=/s#docs##' "${WORKDIR}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	else
 		gtkdocize --copy || die
-		intltoolize --force --copy --automake || die
-		eautoreconf
 	fi
+	intltoolize --force --copy --automake || die
+	eautoreconf
 }
 
 src_configure() {
@@ -53,6 +58,7 @@ src_configure() {
 		$(use_enable udev udisks) \
 		$(use_enable examples demo) \
 		$(use_enable debug) \
+		$(use_enable doc gtk_doc) \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }