Remove -Werror and other unnecessary flags from ./configure wrt #408289. USE="static-libs" and remove useless libtool files.

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

3 files changed, 50 insertions, 35 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index 9683be35c4ab..59b291c48e05 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/sword
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.61 2012/03/15 12:55:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.62 2012/03/15 15:35:46 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> sword-1.6.2.ebuild:
+  Remove -Werror and other unnecessary flags from ./configure wrt #408289.
+  USE="static-libs" and remove useless libtool files.
 
   15 Mar 2012; Agostino Sarubbo <ago@gentoo.org> sword-1.6.2.ebuild:
   Stable for amd64, wrt bug #408255
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 598ba4db8a0e..1c5ab9026f9b 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX escape_range.patch 459 RMD160 ba8b7edc6cccea592fb653175ed6eee5c578aa8d SHA1 a77ebef76f4bdf6593507f88da3498a49659b89f SHA256 f1772e8cdc36cf2405234f1e992a0d5d29b200ce5adc82092c65df65fe034ff1
 AUX sword-1.5.10+gcc-4.3.patch 1120 RMD160 dba12e2cec72acd7d18822c2d5b64128cc583682 SHA1 5846e3a37605b8df4a4fa23119de8be310ba51fa SHA256 43c6f412744a4ba5e7ebd6875a7b49f2f82a755eaf39c17ab65b6f2c7fc365f1
@@ -18,17 +18,17 @@ EBUILD sword-1.5.8-r2.ebuild 1331 RMD160 fb6d2def67fcfd93ccb3d9c5865d4c06af9197a
 EBUILD sword-1.5.9-r2.ebuild 1578 RMD160 2becc8aec4d49b6b68189907849f9a2ed4b91649 SHA1 c3c9334ee11b1958f2006c6736e32fda24e4678b SHA256 32a6d1008011704efdfb7944081c492b5ea429a3af50cdd52f3c6ad274b495c4
 EBUILD sword-1.6.0.ebuild 1489 RMD160 e30dbc142d9b6c72a7fb32893b3fccadca61158b SHA1 48f447ad94e864dcb74dd3451bf23c3815c10850 SHA256 d330cd1537856ec977adfecd6dac53614015f229d2e0dab1d64d40596fc68fc3
 EBUILD sword-1.6.1.ebuild 1590 RMD160 cc00550022f687238efd5b59005938eb9cb46906 SHA1 d727496913de7799066c8f39db48a031b68704ea SHA256 47173453a35ac370b5a5a50932bd5ebf6870ad6f61bce261d75cd6d7e14ed11b
-EBUILD sword-1.6.2.ebuild 1595 RMD160 86cb9b7e8368965999c4ba5702bb7815d404f296 SHA1 38ae61509bebbcce9189447c367674aa15bb5af9 SHA256 314802b8b60bf75cf6a03a32d8e3f961aa591b788cae6583e57c34431cb51d70
-MISC ChangeLog 8199 RMD160 60a3f9084afcf400d7a6f09a8f0b7a15b6bfeac1 SHA1 45eb8670f8214e9066b71ce9bdd7fc5cfb797fc3 SHA256 917cfa2a22a3554d8b26b4dbf1940e5007a8c50f5de8fff589608cf6dd0cca8f
+EBUILD sword-1.6.2.ebuild 1810 RMD160 c726c12d7bb38dcaa552a56816533b9c0555c5f9 SHA1 375f5425545ce8b4af3d2b819975a8b65180bd97 SHA256 a1ae204d91cd122afe0234e0e75b7c646ea900b2147b4bacde14c143e717aa17
+MISC ChangeLog 8409 RMD160 38190f68664bd208604c4047d323771f3154f54c SHA1 c5ed25f1790e3d1fe3f34c8c6b9040d16c9fc2e6 SHA256 2d47fd42ed164d5ebf7a878d811e39eb56bf7ab80cabe4de254796a27767377f
 MISC metadata.xml 587 RMD160 120d4f4fa5da22981921241ab12cb94777e8d6dc SHA1 709b3c5098cc9e4464acee6f38caaf092bf0db23 SHA256 7319e4922bacf9b9a17da615e2a722afbec5e1f7bc1873bdaa9e1d16b216c393
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPYebTAAoJEOTDgjZ80txdR6wH/1QWJ1RuN9sKOEokkSpWksVq
-BXSOnYRlm3bSJaICQXKj6hQ6IEkPlPbGgcgRIiMRnFHATih84nLDGvPyGlDwGMvv
-p9NItUaW1DMGz0d9nJuCnE3jDebykGxjrDJjqBE1M1KmKueSN8KQ1KksAB0zKEaH
-iTWZ52CwVAE0pQ5Y6jEFJKFaOlm6YEZoYVo56HdWth9DGQok0n7D6yS4u+gMJ2kb
-mRKFDghxa0MS9aHHzzImXA1WR1j8SNJ2kCSy+y4R6fpNkQWMSkSq260gZE4Mx3kA
-yA2iDSzvqwSBhCS8K8GbkOc3xHp/NddPzj4Xj8HMoO327viDvfBF1uipANfV9jg=
-=SPxb
+iQEcBAEBAgAGBQJPYgxVAAoJEEdUh39IaPFNW9MH/0vs2jxmHaucKpEW52pZcSQK
+ptSEzAZ7TzeGuioOgJtSqu/G5bAyz4xF+KG40ANkbthto3kwGurTT4MEuPj4pMBY
+CMp7CR3OoKyT2BaClKuGwQWRI0uZg2C0jybxdomX0jZcvOhRTixL9awoolhKkpyz
+U0+bB+tA5H6UKBE6MwnM91rblTzq0dtKF63YR7tOn2BCzxxflXnwv5N2C3OEJtEZ
+sa84+tg32uAKR70cIrXel/sUcjVR+qEkeeA6AIU0Q4oTwF/f8usv+JKfrlIL0AMH
+CdE0AvMEQKOGt0CsxlJlTWt9rutDdVfEJqfhDyptdrXivK0Hv2IpuI4v2dMXKng=
+=l8FA
 -----END PGP SIGNATURE-----
diff --git a/app-text/sword/sword-1.6.2.ebuild b/app-text/sword/sword-1.6.2.ebuild
index d91033ac3c69..2acadea43d38 100644
--- a/app-text/sword/sword-1.6.2.ebuild
+++ b/app-text/sword/sword-1.6.2.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.2.ebuild,v 1.3 2012/03/15 12:55:41 ago Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.2.ebuild,v 1.4 2012/03/15 15:35:46 ssuominen Exp $
 
+EAPI=4
 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.6/${P}.tar.gz"
-LICENSE="GPL-2"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
-IUSE="curl debug doc icu"
+IUSE="curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib
 	curl? ( net-misc/curl )
@@ -21,43 +20,55 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
 src_prepare() {
+	sed -i \
+		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+		configure || die
+
+	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
 	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
 
-	cat > "${T}"/sword.conf <<- _EOF
-		[Install]
-		DataPath=${EPREFIX}/usr/share/sword/
-	_EOF
+	cat <<-EOF > "${T}"/${PN}.conf
+	[Install]
+	DataPath=${EPREFIX}/usr/share/${PN}/
+	EOF
 }
 
 src_configure() {
+	# TODO: Why is this here and can we remove it?
 	strip-flags
-	econf --with-zlib \
-		--with-conf \
-		$(use_with curl) \
+
+	econf \
+		$(use_enable static-libs static) \
 		$(use_enable debug) \
-		$(use_with icu) || die "configure failed"
+		--with-zlib \
+		$(use_with icu) \
+		--with-conf \
+		$(use_with curl)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CODINGSTYLE ChangeLog README
-	if use doc ;then
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
 		rm -rf examples/.cvsignore
 		rm -rf examples/cmdline/.cvsignore
 		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${ED}/usr/share/doc/${PF}/"
+		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
 	fi
-	# global configuration file
+
 	insinto /etc
-	doins "${T}/sword.conf"
+	doins "${T}"/${PN}.conf
 }
 
 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 ${EPREFIX}/usr/share/doc/${PF}/"
-	echo
+	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
 }