Version bump to be compatible with sword-1.7

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 104 insertions, 6 deletions

diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog
index fd676d5934a0..ebfd8e6f8a2f 100644
--- a/app-text/xiphos/ChangeLog
+++ b/app-text/xiphos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xiphos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.15 2014/01/06 02:01:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.16 2014/02/04 23:59:22 creffett Exp $
+
+*xiphos-3.1.6 (04 Feb 2014)
+
+  04 Feb 2014; Chris Reffett <creffett@gentoo.org> +xiphos-3.1.6.ebuild:
+  Version bump to be compatible with sword-1.7
 
   06 Jan 2014; Chris Reffett <creffett@gentoo.org> xiphos-3.1.5.ebuild:
   Bump to EAPI 5, change to python-single-r1
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 666b0286fd7f..a24c01c4b6c8 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
+DIST xiphos-3.1.6.tar.gz 6873107 SHA256 21f0024d57b3976526093279ef7ab7f3ed8afe07436ab983bd3049a14c3bdfe5 SHA512 5c25850ba549723993c7574c8629cfa75f4152a46173bfbbed9b62205041edebb34671e8aa5baade7b0aa8fbb218ff7b24292dc0e63ee2bb7e0219a8512feda9 WHIRLPOOL 3d1741e0d07983edfaacb3de85fac1f01352ffa5cb80596eb23b21c6b68a76069eae65d2892a9b987cb8ea41818bd3e92731929cb1c698a37d7886364339241f
 EBUILD xiphos-3.1.5.ebuild 2075 SHA256 e44809376eb1741c47f86c4694fd1aaa9d49cbcaee547734a01f022817e534f7 SHA512 54e70767852a9a2b930391f4266389431e57ff20ef8dd09d76e40e380393183d423d0d533118c62c8952b6b9a21f32e0edf3cf7bacee91ee7c87ffb80580fe71 WHIRLPOOL 66f052c14ee9bf276ea83f9171cd77997b72df9100a82755313df65332d747fb7de625c5f384299cd806221d75ba8c9ed18cf64134fa3990f7ee8071645f668a
-MISC ChangeLog 2326 SHA256 a5baadd54a3b126f7d45ddb5a0ecac530d16ed6eed8d05973bf240f27365f1ee SHA512 90af325b5829e1b087c6c29536e48a0aa5aa0c55a1a2314680ec38fa98c4a6d27d57ee29707859a2883e9e870ce523bb4d918d45152fd8c40ef2e40de8b95411 WHIRLPOOL 0d881ecbb89374c37a59a1206e5914a67a211733a95ff1152fd1ddf8b2b8e3b11d08aec8b45a65024ee49d8f9dec07185b8fd0369cf88a8c84d7a40d7f49955a
+EBUILD xiphos-3.1.6.ebuild 2051 SHA256 b367823e857ddee1f12ead579b23e35a5e0e3633394abe89bc05476bfbedb3d5 SHA512 c2b83d4ccb331069d3639fc7d81463d4f0934f05e2ec4c86dbea6e28e0f3ff80924cee16ab52166d7f8e776e47e442104637c8a4526940c8cfe173fd0373cb8b WHIRLPOOL 710f1d4ba78d59d80d1c452a7772021987fe03ab3f1fe25cd5e61626910c18f86945fb7e7a94173e35434ecb816ea3167142e7cb2c250284c62d73ef5c154896
+MISC ChangeLog 2476 SHA256 3f863339dc3c8bdfaed6bc789829433af199e109ccf988e237688cfa82557062 SHA512 178ed04927335ebd0853c9447f0e1b6f4bb7e366b2dd2cc85bca3e046f9bd4b3864128d65073ed44c8c2960079152045a2b315fbd86ec934cbe001b92ad9a044 WHIRLPOOL c6659dbc2049ada94f9c2b9b67cd3b2e777644d3a06441f17fbb9571fbbf108306d68d35517acd3e4cc9c2ee04495006cc15c1475af1df0d0e88272b0992ab76
 MISC metadata.xml 358 SHA256 b148fed9acaa084618c6f756c36071647f513e0ff421e7766c243ff856191b71 SHA512 78d7cef39c3ae893cf895ba0c4d84caef664fa7d90bba2bc26c390cc2e6da6a73caf434dac191ab7a6a65073a98f45731a30cd044631e189f618da0e87793caf WHIRLPOOL e76674d1fe825921ef5bbaacdaad326a85507ced79836400adcdab179015ae5a8727b4bda082380b405afbb276cb833f7dddbba58f6ad3ff6ac9466a46f6ac8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iKYEAREIAGYFAlLKDohfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iKYEAREIAGYFAlLxfuBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RGfACgnocNwepxa+HBSH5uSszzWw+O
-k6AAn1434ygx4dcpmUGgQU5umds3/Lew
-=ayw7
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RuOgCgiAhWwQK71hh015OnxUoOZTaE
+DlgAn0Vfx4HJBQqlhttcXxKN1B3e2rqg
+=eiIa
 -----END PGP SIGNATURE-----
diff --git a/app-text/xiphos/xiphos-3.1.6.ebuild b/app-text/xiphos/xiphos-3.1.6.ebuild
new file mode 100644
index 000000000000..4d4d627a236a
--- /dev/null
+++ b/app-text/xiphos/xiphos-3.1.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.6.ebuild,v 1.1 2014/02/04 23:59:22 creffett Exp $
+
+# TODO: waf-utils.eclass ?
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit flag-o-matic gnome2-utils python-single-r1 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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.2
+	>=dev-libs/glib-2
+	dev-libs/libxml2
+	gnome-base/gconf
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+	webkit? ( net-libs/webkit-gtk:3 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils
+	app-text/rarian
+	dev-libs/libxslt
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-single-r1_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 \
+			--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; }