Cleanup ebuild, add docs use flag; thanks to Jouni Rinne; bug 158468

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index 00e4cea70c5e991ce8159d9b5269429eef61c4c3..472e243101b665dcd47d96cca07451d4eadc788b 100644 (file)
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/sword
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.30 2006/10/21 17:09:55 squinky86 Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.31 2007/01/21 15:40:49 masterdriverz Exp $
+
+  21 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  -sword-1.5.8-r1.ebuild, sword-1.5.9.ebuild:
+  Cleanup ebuild, add docs use flag; thanks to Jouni Rinne; bug 158468
+
+  21 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  -sword-1.5.8-r1.ebuild, sword-1.5.9.ebuild:
+  Cleanup ebuild, add docs use flag; thanks to Jouni Rinne; bug 158468
 
 *sword-1.5.9 (21 Oct 2006)
 

diff --git a/app-text/sword/sword-1.5.9.ebuild b/app-text/sword/sword-1.5.9.ebuild
index 62ececfce1eaf69f39edcb114c1d5cc1fd0c3473..b6d709d871221dcc12a033afaa678e3020ac0d88 100644 (file)
--- a/app-text/sword/sword-1.5.9.ebuild
+++ b/app-text/sword/sword-1.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.9.ebuild,v 1.1 2006/10/21 17:09:55 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.9.ebuild,v 1.2 2007/01/21 15:40:49 masterdriverz Exp $
 
 DESCRIPTION="Library for Bible reading software."
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="curl debug icu lucene"
+IUSE="curl debug doc icu lucene"
 
 RDEPEND="sys-libs/zlib
        curl? ( net-misc/curl )
@@ -20,9 +20,6 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_compile() {
-       local myconf="--without-lucene --with-zlib --with-conf
-                     $(use_enable debug) $(use_with curl)"
-
        econf --with-zlib \
                --with-conf \
                $(use_enable curl) \
@@ -35,8 +32,15 @@ src_compile() {
 src_install() {
        make DESTDIR="${D}" install || die "install failed"
        dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
-
-       cp -R samples examples ${D}/usr/share/doc/${PF}/
+       if use doc ;then
+               rm -rf examples/.cvsignore
+               rm -rf examples/cmdline/.cvsignore
+               rm -rf examples/cmdline/.deps
+               cp -R samples examples ${D}/usr/share/doc/${PF}/
+       fi
+       # global configuration file
+       insinto /etc
+       doins "${FILESDIR}/sword.conf"
 }
 
 pkg_postinst() {