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

Package-Manager: portage-2.1.4_rc14

8 files changed, 96 insertions, 32 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/Manifest b/app-text/sword/Manifest
index 84de5ae9d7f4..fecc7941baef 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -5,32 +5,39 @@ SHA256 5656c02ccb594d922f0fb6cc1b8babec3b6047385ade02d003182917c5b3e933 files/sw
 DIST sword-1.5.10.tar.gz 1856793 RMD160 0585155c2a21bb062ea3a7885d4e881fbcb4d59b SHA1 993c40a8db4d33e82d219254ab13f45c395f3f5a SHA256 5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
 DIST sword-1.5.8.tar.gz 1714799 RMD160 ce896322d6c4389d4db17cb3d780b8d2a305498c SHA1 e8996f0a0ccb4b91b4e3b7b0390a9ea10ae234c9 SHA256 aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9
 DIST sword-1.5.9.tar.gz 1816315 RMD160 7fb20370801c493afcce76f2bad1651d77722973 SHA1 9ba3680c0acef5fc305487ecfb8583985047ea89 SHA256 dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
-EBUILD sword-1.5.10.ebuild 1469 RMD160 8aee2644cf7e978c445fd95597d4f78f484573e6 SHA1 cd7457576cfc6794da07595f4c1575aadbd1050d SHA256 aba4f52c72cb8b373b4ed7f96401f6ae7a60a4c053d7b3dcc1e584b380f9ef6b
-MD5 c49f7d5acce83e506bd13b62c77df3f5 sword-1.5.10.ebuild 1469
-RMD160 8aee2644cf7e978c445fd95597d4f78f484573e6 sword-1.5.10.ebuild 1469
-SHA256 aba4f52c72cb8b373b4ed7f96401f6ae7a60a4c053d7b3dcc1e584b380f9ef6b sword-1.5.10.ebuild 1469
+EBUILD sword-1.5.10-r1.ebuild 1487 RMD160 a5ff3690cbc3682d635cdca19a9bc8baefc03249 SHA1 5e3adf1bdad658f2108433748ffbfd10bbd8cb55 SHA256 051c66d6190828d7cba40be759e21ce327a4e902dfb874088395ec5d9e4a3132
+MD5 c6d3805f305bea0f9c7780b9692d826c sword-1.5.10-r1.ebuild 1487
+RMD160 a5ff3690cbc3682d635cdca19a9bc8baefc03249 sword-1.5.10-r1.ebuild 1487
+SHA256 051c66d6190828d7cba40be759e21ce327a4e902dfb874088395ec5d9e4a3132 sword-1.5.10-r1.ebuild 1487
+EBUILD sword-1.5.8-r1.ebuild 1242 RMD160 f04e07b441a9c2c74b90645d56baa96d8477dec9 SHA1 323be588fd5a393dad8801f7015f23aef9a04f2e SHA256 3148e0da9618ebefc20bb1ef69fb06a5d189067e889facdc2fd06d296189e1fd
+MD5 44a81e6ded75968333cfc45d2c3a567e sword-1.5.8-r1.ebuild 1242
+RMD160 f04e07b441a9c2c74b90645d56baa96d8477dec9 sword-1.5.8-r1.ebuild 1242
+SHA256 3148e0da9618ebefc20bb1ef69fb06a5d189067e889facdc2fd06d296189e1fd sword-1.5.8-r1.ebuild 1242
 EBUILD sword-1.5.8.ebuild 1219 RMD160 13fe9a8fe65f83193d0d0645a83f1823a29ba5b3 SHA1 e044425f685ee91818405282e17112bc86534e1b SHA256 9eed3e6ee7c02ffe6d922e620a79ac883ba67793e6d0a9344dfff61fc857acfa
 MD5 d12779c666ec3c1afdd0aefec42dd031 sword-1.5.8.ebuild 1219
 RMD160 13fe9a8fe65f83193d0d0645a83f1823a29ba5b3 sword-1.5.8.ebuild 1219
 SHA256 9eed3e6ee7c02ffe6d922e620a79ac883ba67793e6d0a9344dfff61fc857acfa sword-1.5.8.ebuild 1219
-EBUILD sword-1.5.9.ebuild 1469 RMD160 9865ba02ba590b6fe5682203717e095c33e39ea1 SHA1 7f6afdbd1261e213eca289520ab58545a426de9e SHA256 3144296f24bbad5cceefb32a5b51e008d1c08a5137b81e8a9a1a7ce6e213f63d
-MD5 41882516f79bff6688dc89e291d689de sword-1.5.9.ebuild 1469
-RMD160 9865ba02ba590b6fe5682203717e095c33e39ea1 sword-1.5.9.ebuild 1469
-SHA256 3144296f24bbad5cceefb32a5b51e008d1c08a5137b81e8a9a1a7ce6e213f63d sword-1.5.9.ebuild 1469
-MISC ChangeLog 4501 RMD160 ea289560d2deb8a773c96213bff744c3b5760cce SHA1 f646f0e4d2c576736219c17a2ebd3e060c2a2d6d SHA256 a0d513247609d8a06d19d394ce025e84fd5516a5fca593084ac3e2edfc4a4ca9
-MD5 3cd20247b269380574951c92e69fd62b ChangeLog 4501
-RMD160 ea289560d2deb8a773c96213bff744c3b5760cce ChangeLog 4501
-SHA256 a0d513247609d8a06d19d394ce025e84fd5516a5fca593084ac3e2edfc4a4ca9 ChangeLog 4501
+EBUILD sword-1.5.9-r1.ebuild 1486 RMD160 1b62d694c3a0f1ef8e17c0153028f15eead02272 SHA1 b929b1c1c5fc297571c7570051c821815d49a149 SHA256 f812f6570dad7c5540e1e783fa4080b8ffcb39e84d95409605f04b11d8614293
+MD5 352fb2706fca70501cdcc751298b979a sword-1.5.9-r1.ebuild 1486
+RMD160 1b62d694c3a0f1ef8e17c0153028f15eead02272 sword-1.5.9-r1.ebuild 1486
+SHA256 f812f6570dad7c5540e1e783fa4080b8ffcb39e84d95409605f04b11d8614293 sword-1.5.9-r1.ebuild 1486
+MISC ChangeLog 4794 RMD160 f447eefb9f3ba6192dec474551ec2f1a79be5b2e SHA1 f92bdc183d67bd279d7211a9e4129f766f82df52 SHA256 b7a5668d555b21cddbcbddfd9d827591785db15c9ac26560aef635ec9ece4508
+MD5 7816bbec569923f9a00903c6a00fcc14 ChangeLog 4794
+RMD160 f447eefb9f3ba6192dec474551ec2f1a79be5b2e ChangeLog 4794
+SHA256 b7a5668d555b21cddbcbddfd9d827591785db15c9ac26560aef635ec9ece4508 ChangeLog 4794
 MISC metadata.xml 469 RMD160 84ca27f8b1c3dd4142a637c9dd89ef7405aec04d SHA1 56e97e8067ac18ff2ed9aa8f42e46dc3be8488c4 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789
 MD5 8b927a6749ad9c05ac41abb219bec49e metadata.xml 469
 RMD160 84ca27f8b1c3dd4142a637c9dd89ef7405aec04d metadata.xml 469
 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789 metadata.xml 469
-MD5 68cd9b7aa0ce8913a853ae0d8cd51c26 files/digest-sword-1.5.10 241
-RMD160 e436f6b92e9003c2ce8ac1f568daa3b06673244e files/digest-sword-1.5.10 241
-SHA256 c684869ba2682970ab9e7b87715db97bd509b0fae375881e98fbf917de7ef260 files/digest-sword-1.5.10 241
+MD5 68cd9b7aa0ce8913a853ae0d8cd51c26 files/digest-sword-1.5.10-r1 241
+RMD160 e436f6b92e9003c2ce8ac1f568daa3b06673244e files/digest-sword-1.5.10-r1 241
+SHA256 c684869ba2682970ab9e7b87715db97bd509b0fae375881e98fbf917de7ef260 files/digest-sword-1.5.10-r1 241
 MD5 204e5bce267e5da7da9fc1e463d802df files/digest-sword-1.5.8 238
 RMD160 cdb04bfc688735bef0c8df3e35b6c51196ca45aa files/digest-sword-1.5.8 238
 SHA256 1feac8a29d430eaa66c0e4ed2e2258809ae8a1da96d1ecc5c007707fc18790e8 files/digest-sword-1.5.8 238
-MD5 c610ec3553ba7c7aab6c14b85a573b95 files/digest-sword-1.5.9 238
-RMD160 2b8f1690c57d406f5fd4ecc24787ca3b5746587d files/digest-sword-1.5.9 238
-SHA256 0c6edd3b6298042b85aac8cb639b7612153b1d53cb5821d3aea801b7993e4257 files/digest-sword-1.5.9 238
+MD5 204e5bce267e5da7da9fc1e463d802df files/digest-sword-1.5.8-r1 238
+RMD160 cdb04bfc688735bef0c8df3e35b6c51196ca45aa files/digest-sword-1.5.8-r1 238
+SHA256 1feac8a29d430eaa66c0e4ed2e2258809ae8a1da96d1ecc5c007707fc18790e8 files/digest-sword-1.5.8-r1 238
+MD5 c610ec3553ba7c7aab6c14b85a573b95 files/digest-sword-1.5.9-r1 238
+RMD160 2b8f1690c57d406f5fd4ecc24787ca3b5746587d files/digest-sword-1.5.9-r1 238
+SHA256 0c6edd3b6298042b85aac8cb639b7612153b1d53cb5821d3aea801b7993e4257 files/digest-sword-1.5.9-r1 238
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