Filter non-safe flags (bug 202197), fix deps, ebuild cleanup

(Portage version: 2.1.4_rc14)

7 files changed, 71 insertions, 14 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index a7646af13243..8e92fafbe677 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/sword
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.35 2008/01/05 17:41:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.36 2008/01/07 03:19:54 beandog Exp $
+
+*sword-1.5.10-r1 (07 Jan 2008)
+*sword-1.5.9-r1 (07 Jan 2008)
+
+  07 Jan 2008; Steve Dibb <beandog@gentoo.org> +sword-1.5.8-r1.ebuild,
+  -sword-1.5.9.ebuild, +sword-1.5.9-r1.ebuild, -sword-1.5.10.ebuild,
+  +sword-1.5.10-r1.ebuild:
+  Filter non-safe flags (bug 202197), fix deps, ebuild cleanup
 
 *sword-1.5.10 (05 Jan 2008)
 
diff --git a/app-text/sword/files/digest-sword-1.5.10 b/app-text/sword/files/digest-sword-1.5.10-r1
index e8ec4378445f..e8ec4378445f 100644
--- a/app-text/sword/files/digest-sword-1.5.10
+++ b/app-text/sword/files/digest-sword-1.5.10-r1
diff --git a/app-text/sword/files/digest-sword-1.5.8-r1 b/app-text/sword/files/digest-sword-1.5.8-r1
new file mode 100644
index 000000000000..21fc3f6e2cb4
--- /dev/null
+++ b/app-text/sword/files/digest-sword-1.5.8-r1
@@ -0,0 +1,3 @@
+MD5 c36398c84bfb044c0c66ef3ffcf29400 sword-1.5.8.tar.gz 1714799
+RMD160 ce896322d6c4389d4db17cb3d780b8d2a305498c sword-1.5.8.tar.gz 1714799
+SHA256 aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9 sword-1.5.8.tar.gz 1714799
diff --git a/app-text/sword/files/digest-sword-1.5.9 b/app-text/sword/files/digest-sword-1.5.9-r1
index c90617a497e6..c90617a497e6 100644
--- a/app-text/sword/files/digest-sword-1.5.9
+++ b/app-text/sword/files/digest-sword-1.5.9-r1
diff --git a/app-text/sword/sword-1.5.9.ebuild b/app-text/sword/sword-1.5.10-r1.ebuild
index e039779c87ea..35c3fedb1f0c 100644
--- a/app-text/sword/sword-1.5.9.ebuild
+++ b/app-text/sword/sword-1.5.10-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4 2007/03/10 21:06:57 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.10-r1.ebuild,v 1.1 2008/01/07 03:19:54 beandog Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Library for Bible reading software."
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -11,15 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="curl debug doc icu lucene"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	curl? ( net-misc/curl )
 	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-
-DEPEND="${RDEPEND}
+	lucene? ( dev-cpp/clucene )
 	dev-util/pkgconfig"
 
 src_compile() {
+	strip-flags
 	econf --with-zlib \
 		--with-conf \
 		$(use_enable curl) \
@@ -36,7 +37,7 @@ src_install() {
 		rm -rf examples/.cvsignore
 		rm -rf examples/cmdline/.cvsignore
 		rm -rf examples/cmdline/.deps
-		cp -R samples examples ${D}/usr/share/doc/${PF}/
+		cp -R samples examples "${D}/usr/share/doc/${PF}/"
 	fi
 	# global configuration file
 	insinto /etc
diff --git a/app-text/sword/sword-1.5.8-r1.ebuild b/app-text/sword/sword-1.5.8-r1.ebuild
new file mode 100644
index 000000000000..3165949aa6d9
--- /dev/null
+++ b/app-text/sword/sword-1.5.8-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.8-r1.ebuild,v 1.4 2008/01/07 03:19:54 beandog Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software."
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl icu debug"
+
+DEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu )
+	dev-util/pkgconfig"
+
+src_compile() {
+	strip-flags	
+	local myconf="--without-lucene --with-zlib --with-conf
+	              $(use_enable debug) $(use_with curl)"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
+
+	cp -R samples examples "${D}/usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+	echo
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in /usr/share/doc/${PF}/INSTALL.gz."
+	echo
+}
diff --git a/app-text/sword/sword-1.5.10.ebuild b/app-text/sword/sword-1.5.9-r1.ebuild
index 3381b6900d47..4cb46e83d225 100644
--- a/app-text/sword/sword-1.5.10.ebuild
+++ b/app-text/sword/sword-1.5.9-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.10.ebuild,v 1.1 2008/01/05 17:41:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.9-r1.ebuild,v 1.1 2008/01/07 03:19:54 beandog Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Library for Bible reading software."
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -11,15 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="curl debug doc icu lucene"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	curl? ( net-misc/curl )
 	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-
-DEPEND="${RDEPEND}
+	lucene? ( dev-cpp/clucene )
 	dev-util/pkgconfig"
 
 src_compile() {
+	strip-flags
 	econf --with-zlib \
 		--with-conf \
 		$(use_enable curl) \
@@ -36,7 +37,7 @@ src_install() {
 		rm -rf examples/.cvsignore
 		rm -rf examples/cmdline/.cvsignore
 		rm -rf examples/cmdline/.deps
-		cp -R samples examples ${D}/usr/share/doc/${PF}/
+		cp -R samples examples "${D}/usr/share/doc/${PF}/"
 	fi
 	# global configuration file
 	insinto /etc