Version bump wrt #310623, #282279, #295758 and #300412.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 60 insertions, 126 deletions

diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog
index 7eb2b516823f..39d3f28d6ee3 100644
--- a/app-text/xiphos/ChangeLog
+++ b/app-text/xiphos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xiphos
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.4 2009/08/10 00:39:05 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.5 2010/03/22 05:32:53 ssuominen Exp $
+
+*xiphos-3.1.2 (22 Mar 2010)
+
+  22 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +xiphos-3.1.2.ebuild:
+  Version bump wrt #310623, #282279, #295758 and #300412.
 
 *xiphos-3.1.1 (10 Aug 2009)
 
diff --git a/app-text/xiphos/xiphos-3.1.1.ebuild b/app-text/xiphos/xiphos-3.1.1.ebuild
deleted file mode 100644
index 1da66e98892c..000000000000
--- a/app-text/xiphos/xiphos-3.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.1.ebuild,v 1.1 2009/08/10 00:39:05 beandog Exp $
-
-EAPI="2"
-
-inherit libtool gnome2 eutils
-
-DESCRIPTION="GTK+ based Bible study software, formerly gnomesword"
-HOMEPAGE="http://xiphos.org"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="firefox seamonkey spell xulrunner +gtkhtml"
-RDEPEND="
-	=app-text/sword-1.6.0
-	>=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* ) ) )
-	!xulrunner? ( !firefox? ( !seamonkey? ( gtkhtml? ( >=gnome-extra/gtkhtml-3.18 ) ) ) )
-	spell? (
-		app-text/gnome-spell
-		>=gnome-base/libbonoboui-2 )"
-DEPEND="${RDEPEND}
-	!app-text/gnomesword
-	>=dev-util/pkgconfig-0.12
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.14"
-
-pkg_setup() {
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	elif use firefox; then
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	elif use seamonkey; then
-		G2CONF="${G2CONF} --with-gecko=seamonkey"
-	elif use gtkhtml; then
-		G2CONF="${G2CONF} --enable-gtkhtml"
-	else
-		eerror "Setup your USE flags to specify a backend to use:"
-		eerror "xulrunner, firefox, seamonkey or gtkhtml"
-		die "Fix USE flags"
-	fi
-	G2CONF="${G2CONF} $(use_enable spell pspell)"
-	DOCS="NEWS ChangeLog README TODO"
-
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "Xiphos requires modules to be of any use. You may install the"
-	einfo "sword modules packages in app-dicts/, or download modules"
-	einfo "individually from the sword website: http://crosswire.org/sword/"
-}
diff --git a/app-text/xiphos/xiphos-3.1.2.ebuild b/app-text/xiphos/xiphos-3.1.2.ebuild
new file mode 100644
index 000000000000..2604359e29c8
--- /dev/null
+++ b/app-text/xiphos/xiphos-3.1.2.ebuild
@@ -0,0 +1,53 @@
+# 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.2.ebuild,v 1.1 2010/03/22 05:32:53 ssuominen Exp $
+
+EAPI=2
+GCONF_DEBUG=no
+inherit gnome2
+
+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"
+
+pkg_setup() {
+	G2CONF="--docdir=/usr/share/doc/${PF}
+		--disable-dependency-tracking"
+
+	if ! use xulrunner; then
+		G2CONF="${G2CONF} --without-gecko"
+	fi
+}
+
+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/"
+}
diff --git a/app-text/xiphos/xiphos-3.1.ebuild b/app-text/xiphos/xiphos-3.1.ebuild
deleted file mode 100644
index 87e91f010daa..000000000000
--- a/app-text/xiphos/xiphos-3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.ebuild,v 1.3 2009/08/01 04:59:11 beandog Exp $
-
-EAPI="2"
-
-inherit libtool gnome2 eutils
-
-DESCRIPTION="GTK+ based Bible study software, formerly gnomesword"
-HOMEPAGE="http://xiphos.org"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="firefox seamonkey spell xulrunner +gtkhtml"
-RDEPEND="
-	=app-text/sword-1.6.0
-	>=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* ) ) )
-	!xulrunner? ( !firefox? ( !seamonkey? ( gtkhtml? ( >=gnome-extra/gtkhtml-3.18 ) ) ) )
-	spell? (
-		app-text/gnome-spell
-		>=gnome-base/libbonoboui-2 )"
-DEPEND="${RDEPEND}
-	!app-text/gnomesword
-	>=dev-util/pkgconfig-0.12
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.14"
-
-pkg_setup() {
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	elif use firefox; then
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	elif use seamonkey; then
-		G2CONF="${G2CONF} --with-gecko=seamonkey"
-	elif use gtkhtml; then
-		G2CONF="${G2CONF} --enable-gtkhtml"
-	else
-		eerror "Setup your USE flags to specify a backend to use:"
-		eerror "xulrunner, firefox, seamonkey or gtkhtml"
-		die "Fix USE flags"
-	fi
-	G2CONF="${G2CONF} $(use_enable spell pspell)"
-	DOCS="NEWS ChangeLog README TODO"
-
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "Xiphos requires modules to be of any use. You may install the"
-	einfo "sword modules packages in app-dicts/, or download modules"
-	einfo "individually from the sword website: http://crosswire.org/sword/"
-}