xulrunner bulid bug fix, bug 386853; thanks to Niko R. for patch

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 68 insertions, 3 deletions

diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
index 415aa49fe6b1..a064ef130bea 100644
--- a/app-text/glosung/Manifest
+++ b/app-text/glosung/Manifest
@@ -3,10 +3,12 @@ DIST glosung-3.2.1.tar.bz2 46158 RMD160 ba0408b842c5c2100855d8637deb7f7a6b12c168
 DIST glosung-3.2.2.tar.bz2 42510 RMD160 f5831b865a63f39b8cb6020273409c92d7c7c0b3 SHA1 1b1a5c8a1350e83d71b3ffdcd248373671589fce SHA256 804347e777caee76adbe761918f7c60f280694b07e0266c33c37b076bd301d13
 DIST glosung-3.4.1.tar.bz2 55616 RMD160 b871b2dfa70f00979460f7f7d4379439277a6451 SHA1 9fb5a8f92e458d32e9b0cddbe52b47da060c4fe6 SHA256 8dce3c9734297d546d76dbcb2e35a8323dd78b1591da62b08faf9d1864a5d36e
 DIST glosung-3.4.2.tar.bz2 52114 RMD160 416a4863027bd670dc83eb969a6d3feac2c1195f SHA1 131650d87e6c75467dbc366fb49f46838a4fbfac SHA256 c9b421bf912f417852bf783fe700014e44e8d85102eaa7b32da8447187d41c40
+DIST glosung-3.5.2.tar.bz2 58794 RMD160 52507577537f932993b61cbb9d0e15a0e6460093 SHA1 6b5e02c585a52241069c3da6fe73f3615cbb196c SHA256 12aeec2a66cd158a600cfba1b8aa17ed4d30b137f65144bdea86b182918eeefc
 EBUILD glosung-2.1.3.ebuild 913 RMD160 4ff8e07922e1e39c6d6328e0c11b4a506ed777ee SHA1 460a778e15ab57841da36cc25301cd1594bc3a17 SHA256 5513e38d69fc47ab71ec83065ac8525c9dea1caa153a42731d943ddbd41dd2b0
 EBUILD glosung-3.2.1.ebuild 840 RMD160 9fc2a95c25692842a0ae5e8f9c5cb527c1e84e8a SHA1 88643fa35ba500a0150fd07c1bfe37eca825192a SHA256 f99c5e84bc4531de3dcc327f1a2251b984aff1f3545a2b5cb4068c7394c8289e
 EBUILD glosung-3.2.2.ebuild 840 RMD160 f0a81030c336360ca4d238573f79d10230bdeb60 SHA1 c73e2386d8102066a57c0728bdb2dbd0829df9b5 SHA256 8d10c91f3acbb27a8d45d47b17c1b58f5d07c97f66d6bb42cd5c9477a6014005
 EBUILD glosung-3.4.1.ebuild 840 RMD160 cd5ffc3451c7d4dc58fcfb52b3c7fd2b5690e9ab SHA1 d8d373862bff11e4b7099dbf1dee54b713a20fc0 SHA256 2046ae52b25616332c6532d9461f91490a46a5abeb5c98ab677cfdf1a9bc73fc
 EBUILD glosung-3.4.2.ebuild 840 RMD160 0d0303841cb885b9564640bdc29ccc2a20c59fd6 SHA1 bb4e0eceafcf4f0f356a62f410198b9287eb975c SHA256 70fe263ecaa9fded6473ea925332f38c6ae34cdee20d7c60706fc80dbfc0ad6b
-MISC ChangeLog 1590 RMD160 8639c9f91c5fd96829c77a83d0c5c55602a2709b SHA1 33e31ef586649a9ab339dc0d74be6f4fe325d65b SHA256 8945b5d2b62814cfbee909ad71a998005ef57f2052e9c754d7e4a7419f76af04
+EBUILD glosung-3.5.2.ebuild 840 RMD160 b55740888db475fb8f081c70b867c84ac72dc2b8 SHA1 f189a1a5e9b8e6893038a7300e266bd4c8526bd6 SHA256 57a96c6a04a3c07e5f7be4b917c0b0fc5393d906958a80c07dd4bdf01f62f99d
+MISC ChangeLog 1707 RMD160 64f9f9645d8b93c2284b70d2fb2cb58544e48652 SHA1 31722d87e824ae55908ec0848a3303f61b8c1e33 SHA256 6c270f2e027a2a677952b6a71f35dd23e6ef4dfe575e06fb2f109696a9a4a8f7
 MISC metadata.xml 225 RMD160 85b15c992c3c155290f10acea186147d766b0620 SHA1 31c995eec7e4afb352888c1d9c65e9107f894d0b SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006
diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog
index ba16d5d5bf76..49b3c22d1a37 100644
--- a/app-text/xiphos/ChangeLog
+++ b/app-text/xiphos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xiphos
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.7 2010/05/07 15:23:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.8 2010/05/16 00:29:08 beandog Exp $
+
+*xiphos-3.1.3-r1 (16 May 2010)
+
+  16 May 2010; Steve Dibb <beandog@gentoo.org> +xiphos-3.1.3-r1.ebuild:
+  xulrunner bulid bug fix, bug 386853; thanks to Niko R. for patch
 
   07 May 2010; Samuli Suominen <ssuominen@gentoo.org> xiphos-3.1.2.ebuild:
   amd64/x86 stable wrt #316145, thanks to Andreas Schürch for testing.
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index ad9eb420715d..2d80e5ea3c59 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,7 @@
 DIST xiphos-3.1.2.tar.gz 4308575 RMD160 d045307738d7bda4b7747f080c6a3b6941ba07c8 SHA1 85906be12bf51a1613cabc74d388a633f7105ebe SHA256 002f520db9aa833eab672daf68f7f75b3a9db687f2e8cd3d6c961405180fad8e
 DIST xiphos-3.1.3.tar.gz 4405305 RMD160 a1eb841b8951e2475e294113de7c8f7b5c9bbcdf SHA1 a6740c2b942e8b34ce70ecf81cba47f821bb464f SHA256 345c04d3521239f8e8dff8d0a8447ce6eba6809d22fe699c69a0677894e87b4c
 EBUILD xiphos-3.1.2.ebuild 1308 RMD160 9e70c13a65ad3a48a926296fb60490f6563e8423 SHA1 65dd3542db56c43c73fb5a7a207ca8385dfc64f4 SHA256 7ba0c27d32ef973544fa9f832d9651e2bfa3bcf0e8c5afb9eb36d9bfa6877b2d
+EBUILD xiphos-3.1.3-r1.ebuild 1378 RMD160 b4e188a73f2bf46e07ac2e9ee4e3ba50ea51041d SHA1 baf9272045cb0a169aeecca4ed028555e05fc12a SHA256 f3ea0a409c3664d957e6a806468a161c3ef9a5f9768313727580887001f289db
 EBUILD xiphos-3.1.3.ebuild 1308 RMD160 e02746b43c15a4819b166499781088a730893734 SHA1 23b31bcba1194d99fd9eade001a6867468832c5d SHA256 7ef1e5521a4b3b2b5592faebb5f9775c1addb294653a1edc705818c20effe2ca
-MISC ChangeLog 1208 RMD160 be32ad291b28bf2ba9804f9222882d301dbca2c2 SHA1 c68e299c76078cdbbbfb9f6505e4f5383b5580b0 SHA256 d5c271ca524b90a418ad722c5b8ed2a5ee387767c7b7f41e28ba7c0b4762cbf7
+MISC ChangeLog 1378 RMD160 e821db24ac6725bd0d8f02ba069432d7362b3bc5 SHA1 7ca584e39673464fa9d952ea28c051f3c4bedbdd SHA256 d14a77a27d979132a78a49420c7150b990ec806512b8640d60cdbc4e386a38fb
 MISC metadata.xml 225 RMD160 85b15c992c3c155290f10acea186147d766b0620 SHA1 31c995eec7e4afb352888c1d9c65e9107f894d0b SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006
diff --git a/app-text/xiphos/xiphos-3.1.3-r1.ebuild b/app-text/xiphos/xiphos-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..68dcadb436ed
--- /dev/null
+++ b/app-text/xiphos/xiphos-3.1.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.3-r1.ebuild,v 1.1 2010/05/16 00:29:08 beandog Exp $
+
+EAPI=2
+GCONF_DEBUG=no
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="GTK+ based Bible study software, formerly gnomesword"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xulrunner"
+
+RDEPEND="dev-libs/glib:2
+	>=x11-libs/gtk+-2.14:2
+	dev-libs/libxml2
+	>=gnome-base/libglade-2
+	>=gnome-extra/gtkhtml-3.23
+	>=app-text/sword-1.6
+	dev-libs/dbus-glib
+	gnome-extra/libgsf
+	xulrunner? ( >=net-libs/xulrunner-1.9.1.3:1.9 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext
+	app-text/rarian
+	>=app-text/gnome-doc-utils-0.3.2
+	dev-libs/nspr"
+
+pkg_setup() {
+	G2CONF="--docdir=/usr/share/doc/${PF}
+		--disable-dependency-tracking"
+
+	if ! use xulrunner; then
+		G2CONF="${G2CONF} --without-gecko"
+	fi
+
+	append-cppflags -I/usr/include/nspr
+}
+
+src_install() {
+	gnome2_src_install
+	prepalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "Xiphos requires modules to be of any use. You may install the"
+	elog "sword modules packages in app-dicts/, or download modules"
+	elog "individually from the sword website: http://crosswire.org/sword/"
+}