Fix gcc 4.3 compilation, bug 226659, thanks to Marek Miller for patch; Add missing dep, bug 227145

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-tuxonice-r3 x86_64

4 files changed, 92 insertions, 12 deletions

diff --git a/app-text/gnomesword/ChangeLog b/app-text/gnomesword/ChangeLog
index bdaf6bc712c1..3409d9a05ddd 100644
--- a/app-text/gnomesword/ChangeLog
+++ b/app-text/gnomesword/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gnomesword
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.28 2008/05/02 15:02:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.29 2008/06/26 01:47:25 beandog Exp $
+
+*gnomesword-2.3.1-r2 (26 Jun 2008)
+
+  26 Jun 2008; Steve Dibb <beandog@gentoo.org>
+  +files/gnomesword-gcc43.patch, +gnomesword-2.3.1-r2.ebuild:
+  Fix gcc 4.3 compilation, bug 226659, thanks to Marek Miller for patch; Add
+  missing dep, bug 227145
 
   02 May 2008; Doug Goldstein <cardoe@gentoo.org> gnomesword-2.1.7.ebuild,
   gnomesword-2.3.1-r1.ebuild:
diff --git a/app-text/gnomesword/Manifest b/app-text/gnomesword/Manifest
index 5ef4b97e306f..0acb3fc1677d 100644
--- a/app-text/gnomesword/Manifest
+++ b/app-text/gnomesword/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnomesword-2.1.7-commentary_dialog.c.patch 3650 RMD160 339564b85ebf2078e04eb5a4d8f62c9a0ace50ed SHA1 d08e21bfa563abb2ef2d474d12025382e89c90ba SHA256 4a6daf46d0b114acc1eca0c18101cb276cf1d5c531f79dbae57dd25313fe1665
+AUX gnomesword-gcc43.patch 702 RMD160 d7aa4ea0f9ab9fe5eb6f3715a242ff22644e2e1a SHA1 3f9178eeac377f1990502ad649b7aa310c25b6d3 SHA256 b75c95b5c7bbbe7bde4108bcb32a6aa382c6beb821fbeaeb212907afef284f10
 DIST gnomesword-2.1.7.tar.gz 2516069 RMD160 ecae162431f0fbd7147cd67e18a56a79eb8e55f6 SHA1 fdb77d43788e68228cc353b312d876ee5ab2ab20 SHA256 9478c6b0826d2d21343db8ce35a56ab6260db588d591e59c069d57ffc3c07a87
 DIST gnomesword-2.3.1.tar.gz 4127235 RMD160 efc17c79d2eff6d128b076507bccc6701e33328e SHA1 73e831e90ac5d2af63f4288262eab54a77de01ad SHA256 97690220529bcb51d90dd9bf392e615fa2e2dfc5f60b115fc3e556b6aca9d6ab
 EBUILD gnomesword-2.1.7.ebuild 1192 RMD160 6850391dd2565caf20927d44edec3c6512a032f7 SHA1 05ef79d2429b7f6f300c13d9213a233f3a3948f1 SHA256 9cc5e4b01ead85cb2253582039419226eab9a901c00b6835a392af419bd3db8a
 EBUILD gnomesword-2.3.1-r1.ebuild 1365 RMD160 c9f107b6f493577390ef7d1f0e91fb81b0ab2940 SHA1 7e384c09a411d59f81cd1355571776481fda9408 SHA256 fe8df0fcf73743736a47c7dc4f3085081743b58720f010010ce0f3c73cfd2020
-MISC ChangeLog 3986 RMD160 f44c3ec82a18047c87293d560a289f6fc7dd91cd SHA1 86fec9029f30847ec9768e80049242efa56f63f8 SHA256 7fdcbc33740180e785c425d57accdefb421839dfcdeb98c63e822898dc17d97a
+EBUILD gnomesword-2.3.1-r2.ebuild 1486 RMD160 1d33594dc5ce60c5ca9a597dbb49984220be6d1d SHA1 d22a17cc3cee3e206e0aa4029717ad6db6d41c1c SHA256 6b15d35199d52ee09da06358241e0662bffb8e5f1325f5bda7f7a39d95a1ca1d
+MISC ChangeLog 4236 RMD160 95f0e846ece77516b5393f2511d179be6fbe9e38 SHA1 87222ede506ed657a53909d4f904655e7f504f4b SHA256 60f510d4042af255cefd80dea8ecf54587f6bc192a8aff06c7676b3dbdd11f68
 MISC metadata.xml 225 RMD160 85b15c992c3c155290f10acea186147d766b0620 SHA1 31c995eec7e4afb352888c1d9c65e9107f894d0b SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgbLRQACgkQoeSe8B0zEfzyeQCfVpNQo7xaVQRGOZjctI2K48/p
-xM8AnjfbhM/yYqmJD8wf14w9smkT2xuS
-=gdJX
------END PGP SIGNATURE-----
diff --git a/app-text/gnomesword/files/gnomesword-gcc43.patch b/app-text/gnomesword/files/gnomesword-gcc43.patch
new file mode 100644
index 000000000000..31fb4edf14e1
--- /dev/null
+++ b/app-text/gnomesword/files/gnomesword-gcc43.patch
@@ -0,0 +1,30 @@
+--- src/backend/sword_main.hh.orig	2008-06-15 12:43:54.000000000 +0000
++++ src/backend/sword_main.hh	2008-06-15 12:44:24.000000000 +0000
+@@ -22,7 +22,7 @@
+ #ifndef _SWORD_MAIN_HH_
+ #define _SWORD_MAIN_HH_
+ 
+-	
++#include <string>	
+ #include <swmgr.h>
+ #include <swbuf.h>
+ #include <versekey.h>
+
+--- src/main/display.hh.orig	2008-06-15 12:45:19.000000000 +0000
++++ src/main/display.hh	2008-06-15 12:45:59.000000000 +0000
+@@ -25,13 +25,13 @@
+ #endif
+ 
+ #ifdef __cplusplus
++#include "backend/sword_main.hh"
+ extern "C" {
+ 
+ #include <gtk/gtk.h>
+ #include <swmgr.h>
+ #include <swdisp.h>
+ #include "main/global_ops.hh"
+-#include "backend/sword_main.hh"
+ #include "gui/utilities.h"
+ 
+ using namespace sword;
+
diff --git a/app-text/gnomesword/gnomesword-2.3.1-r2.ebuild b/app-text/gnomesword/gnomesword-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..f5e17ab5ffcd
--- /dev/null
+++ b/app-text/gnomesword/gnomesword-2.3.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.3.1-r2.ebuild,v 1.1 2008/06/26 01:47:25 beandog Exp $
+
+inherit libtool gnome2 eutils
+
+DESCRIPTION="Gnome Bible study software"
+HOMEPAGE="http://gnomesword.sf.net/"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="firefox seamonkey spell xulrunner"
+RDEPEND=">=gnome-extra/gtkhtml-3.14
+	=app-text/sword-1.5.10*
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprintui-2.2
+	>=gnome-base/libglade-2
+	app-text/gnome-doc-utils
+	dev-libs/libxml2
+	xulrunner? ( =net-libs/xulrunner-1.8* )
+	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
+	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
+	spell? (
+		app-text/gnome-spell
+		>=gnome-base/libbonoboui-2 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12
+	>=dev-util/intltool-0.29
+	>=app-text/scrollkeeper-0.3.14"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable spell pspell)"
+	DOCS="NEWS ChangeLog README TODO"
+}
+
+src_unpack() {
+	unpack $A
+	cd "${S}"
+	# bug 226659
+	epatch "${FILESDIR}/${PN}-gcc43.patch"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	einfo "Gnomesword requires modules to be of any use. You may install the"
+	einfo "sword-modules package, or download modules individually from the"
+	einfo "sword website: http://crosswire.org/sword/"
+}