Version bump wrt #348057. Thanks to Joost Ruis and others.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 102 insertions, 6 deletions

diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog
index 98b6ab517bb0..730bde4631e5 100644
--- a/app-text/xiphos/ChangeLog
+++ b/app-text/xiphos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xiphos
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.9 2011/03/21 21:46:36 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.10 2012/03/14 19:18:41 ssuominen Exp $
+
+*xiphos-3.1.5 (14 Mar 2012)
+
+  14 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +xiphos-3.1.5.ebuild,
+  metadata.xml:
+  Version bump wrt #348057. Thanks to Joost Ruis and others.
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> xiphos-3.1.2.ebuild,
   xiphos-3.1.3-r1.ebuild:
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 4793618b140b..494d7059b016 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>theology</herd>
-<maintainer>
-  <email>theology@gentoo.org</email>
-</maintainer>
+  <herd>theology</herd>
+  <maintainer>
+    <email>theology@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name='webkit'>Use <pkg>net-libs/webkit-gtk</pkg> instead of <pkg>gnome-extra/gtkhtml</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/app-text/xiphos/xiphos-3.1.5.ebuild b/app-text/xiphos/xiphos-3.1.5.ebuild
new file mode 100644
index 000000000000..ef85b122a0d1
--- /dev/null
+++ b/app-text/xiphos/xiphos-3.1.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.5.ebuild,v 1.1 2012/03/14 19:18:41 ssuominen Exp $
+
+# TODO: waf-utils.eclass ?
+
+EAPI=4
+inherit flag-o-matic gnome2-utils python toolchain-funcs
+
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus debug webkit"
+
+RDEPEND=">=app-text/sword-1.6.1
+	>=dev-libs/glib-2
+	dev-libs/libxml2
+	gnome-base/gconf
+	>=gnome-extra/libgsf-1.14
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+	!webkit? ( gnome-extra/gtkhtml:4.0 )
+	webkit? ( net-libs/webkit-gtk:3 )"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
+	dev-util/intltool
+	dev-util/pkgconfig
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	sys-devel/gettext"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	local backend=gtkhtml 
+	use webkit && backend=webkit
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--backend=${backend} \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog NEWS README RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }