Fix building with GCC 4.4. Thanks to Kent Fredric for the patch. (bug

#269190)
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 39 insertions, 7 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index b0b8972e00a6..c5c31607b286 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/sword
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.50 2009/02/26 15:41:41 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.51 2009/05/15 05:30:29 dirtyepic Exp $
+
+  15 May 2009; Ryan Hill <dirtyepic@gentoo.org> sword-1.5.11.ebuild,
+  +files/sword-1.5.11-gcc44.patch:
+  Fix building with GCC 4.4. Thanks to Kent Fredric for the patch. (bug
+  #269190)
 
   26 Feb 2009; Joseph Jezak <josejx@gentoo.org> sword-1.5.11.ebuild:
   Marked ppc stable for bug #245855.
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 6289a8576f49..242ca362c958 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,14 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
+AUX sword-1.5.11-gcc44.patch 238 RMD160 e90efea927b29a73cbeb2a58a213e8ba7277173b SHA1 e77689428f2d669cb0d59f7387371f42f2745e5b SHA256 65f00926c8c03c2671dccfe75068a8737cb378cd32752d907f104dc17fc2f3dc
 AUX sword.conf 37 RMD160 faba7da387461ae680fdc514eb382ff0c2bf3b9c SHA1 1c25331915d8c6a420d3c8bd3e276fe1d07279b3 SHA256 5656c02ccb594d922f0fb6cc1b8babec3b6047385ade02d003182917c5b3e933
 DIST sword-1.5.10.tar.gz 1856793 RMD160 0585155c2a21bb062ea3a7885d4e881fbcb4d59b SHA1 993c40a8db4d33e82d219254ab13f45c395f3f5a SHA256 5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
 DIST sword-1.5.11.tar.gz 1799625 RMD160 3c3278b477542b40413d4936ad0e066c6e50b475 SHA1 d0ff7f039e27c6be5727d548abee929f648ced79 SHA256 120a881f12c7d2f4fa21cf39616f7246ce1eeae2d6268f432f404720988269a6
 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-r2.ebuild 1628 RMD160 f5a03d5bfbf2864703a9ceff1fae70d818acbd06 SHA1 8f7f40a663cd93dfd96a999a97c08aacd51b4fb4 SHA256 aa5836a4cba76b9ffb3f14b57bf02d73496f17e1922af6f3474f69669de311ee
-EBUILD sword-1.5.11.ebuild 1501 RMD160 3e993e901cf1747915bad1e511b7c4eef31885c7 SHA1 0e540244e2c8b29e451361fcad5ab08d814752d1 SHA256 5b4b41abfcfc776306f1072189a8c51a9edc3460878df5519f84e58d95dd4fd2
+EBUILD sword-1.5.11.ebuild 1602 RMD160 a43ff42ed3b5e9785acbcd356978ed1f8f5fe57d SHA1 62078817d5ca4a75f3cd0e313ee9f32806e07346 SHA256 a4b9598132993415833c8826802dbd90866af19eec8f0b841ba2784767465718
 EBUILD sword-1.5.8-r2.ebuild 1339 RMD160 ef7589e35ce5a32c216a99c7caaa3fe032f2b2ec SHA1 99021c53c3d726cee3b7eb4d0720e0ffc418a409 SHA256 e0217bea876361234bba1f57b7d4becda08e57a0ebad4d1ef5fd2d2f542b77b7
 EBUILD sword-1.5.8.ebuild 1219 RMD160 d022318c3a085a86a7e797dcdde431812ee696fb SHA1 e02f99cf7145e7657c23c028a4616b40306bb13f SHA256 a2780b6dd21e3a3c2b2214fb6b5e3ac33446cfd1e206a08c658413d70b789e21
 EBUILD sword-1.5.9-r2.ebuild 1589 RMD160 9359fad8dde6a2f3b265b4c436363e8f8c055215 SHA1 fca6cffc31eaaaaa081717a5d56f6fa654438175 SHA256 e51e0c10ef9d4d9f85b13004193acc9087a7b7e892de2159b0ae344196d2c7f9
-MISC ChangeLog 6774 RMD160 af4abf3fa268abd7d8bc9132e95e2f14233e40bb SHA1 1e3a119b4cc5b64a0ab9a23f1080e503596c125d SHA256 cf3d5727dcb47cb9a41cd410994c71e0ebef9cb1402fef9a4a55305db78487de
+MISC ChangeLog 6965 RMD160 ad1af20ec4bacdae4f277fadd5a3c3db10837a4a SHA1 0d2a175e9ea3cf0e7020d2f363d4b8c4101f6ced SHA256 72812fe77289eb1a79afba4ec87651f21b60470ab964723cc3a944a343502ca8
 MISC metadata.xml 587 RMD160 120d4f4fa5da22981921241ab12cb94777e8d6dc SHA1 709b3c5098cc9e4464acee6f38caaf092bf0db23 SHA256 7319e4922bacf9b9a17da615e2a722afbec5e1f7bc1873bdaa9e1d16b216c393
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoM/nsACgkQiqiDRvmkBmLrowCaAz/C4eZNuAPMoFzkB1hXp/ir
+lY0AoK7ySC7eSV2ZeHkEIrwQSmcqRi1S
+=988G
+-----END PGP SIGNATURE-----
diff --git a/app-text/sword/files/sword-1.5.11-gcc44.patch b/app-text/sword/files/sword-1.5.11-gcc44.patch
new file mode 100644
index 000000000000..c2dd3d0fa706
--- /dev/null
+++ b/app-text/sword/files/sword-1.5.11-gcc44.patch
@@ -0,0 +1,10 @@
+--- sword-1.5.11-orig/utilities/emptyvss.cpp
++++ sword-1.5.11/utilities/emptyvss.cpp
+@@ -2,6 +2,7 @@
+ #include <swmodule.h>
+ #include <versekey.h>
+ #include <iostream>
++#include <cstdio>
+ 
+ #ifndef NO_SWORD_NAMESPACE
+ using sword::SWMgr;
diff --git a/app-text/sword/sword-1.5.11.ebuild b/app-text/sword/sword-1.5.11.ebuild
index c345166bfcff..6006912f0177 100644
--- a/app-text/sword/sword-1.5.11.ebuild
+++ b/app-text/sword/sword-1.5.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.11.ebuild,v 1.4 2009/02/26 15:41:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.11.ebuild,v 1.5 2009/05/15 05:30:29 dirtyepic Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Library for Bible reading software."
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -20,6 +20,12 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc44.patch		#269190
+}
+
 src_compile() {
 	strip-flags
 	econf --with-zlib \
@@ -32,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
 	if use doc ;then
 		rm -rf examples/.cvsignore