public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2016-01-03 15:06 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2016-01-03 15:06 UTC (permalink / raw
  To: gentoo-commits

commit:     802ef2292be0775d0103dfaf920d8e2d5d41143f
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 15:05:20 2016 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 15:05:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802ef229

app-text/xiphos: Version bump

Package-Manager: portage-2.2.26

 app-text/xiphos/Manifest            |  1 +
 app-text/xiphos/xiphos-4.0.4.ebuild | 89 +++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 177535e..1126e42 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,2 +1,3 @@
 DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
 DIST xiphos-3.2.2.tar.gz 7088153 SHA256 2326efd2bad1b27d6c4231cba68077f71f91ee31f73bdada1cbe2c3bd11eadc6 SHA512 14dd33f99217de4062e6ff6c4030fce748f57bc7e4a984aa7927acb7779f3720da21a51eb2943d5be93eac702dcc32b023f9e39a91acb7182ce59b3c90941dbf WHIRLPOOL 488f3fb65b591a9122cc8fc8a1c118cb461ce1890205d53d5957633bb8ff240166616e4de3169afccf5799fb2db40e1e90ac8cef61f3f133e135dd9578227de8
+DIST xiphos-4.0.4-20150830.tar.gz 8040173 SHA256 413bb8acb444946ccde1fb9fcfa3ff4bdb622cb56995b557f3215fab42193f20 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda WHIRLPOOL a1795b6fe5c978fcfc2c1f17f48844797bcf6e07a272181168717807dfd0a7b6e9359380a21fa330c539f1197c54c7e7293457f7733ab55d9dcca274ba044991

diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
new file mode 100644
index 0000000..b5fbabd
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20150830"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	net-libs/biblesync
+	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
+
+	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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2016-05-24 23:44 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2016-05-24 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     f49f686064ce61d014b60d5a1d83db9925702524
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 23:43:18 2016 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Tue May 24 23:44:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49f6860

app-text/xiphos: Revision bump. Use webkitgtk:4 to build, thanks to Derk W te Bokkel for pointing out the fix.

Gentoo-Bug: 572982

Package-Manager: portage-2.2.28

 app-text/xiphos/{xiphos-4.0.4.ebuild => xiphos-4.0.4-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
similarity index 97%
rename from app-text/xiphos/xiphos-4.0.4.ebuild
rename to app-text/xiphos/xiphos-4.0.4-r1.ebuild
index b5fbabd..18f485b 100644
--- a/app-text/xiphos/xiphos-4.0.4.ebuild
+++ b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
 	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:3
+	net-libs/webkit-gtk:4
 	x11-libs/gtk+:3
 	dbus? ( dev-libs/dbus-glib )
 "
@@ -63,6 +63,7 @@ src_configure() {
 		./waf -v \
 			--prefix=/usr \
 			--gtk=3 \
+			--enable-webkit2 \
 			--debug-level=$(use debug && echo debug || echo release) \
 			$(use dbus || echo --disable-dbus) \
 			configure || die


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2016-05-25 23:47 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2016-05-25 23:47 UTC (permalink / raw
  To: gentoo-commits

commit:     10952fc55c50a1a401159157f2f399c5298064fb
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 23:29:32 2016 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Wed May 25 23:44:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10952fc5

app-text/xiphos: Restore 4.0.4 and mask 4.0.4-r1 due to text display breakage.

Package-Manager: portage-2.2.28

 app-text/xiphos/xiphos-4.0.4.ebuild | 89 +++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
new file mode 100644
index 0000000..b5fbabd
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20150830"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	net-libs/biblesync
+	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
+
+	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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2017-01-10 14:56 Agostino Sarubbo
  0 siblings, 0 replies; 23+ messages in thread
From: Agostino Sarubbo @ 2017-01-10 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4506da05a4ea15c20ba58eec5092cdd5df586055
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 14:55:07 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 14:55:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4506da05

app-text/xiphos: amd64 stable wrt bug #605142

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/xiphos/xiphos-4.0.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
index b5fbabd..7108c91 100644
--- a/app-text/xiphos/xiphos-4.0.4.ebuild
+++ b/app-text/xiphos/xiphos-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2017-01-10 23:14 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2017-01-10 23:14 UTC (permalink / raw
  To: gentoo-commits

commit:     518780cb19df4d83b04d7716da17435c47873317
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 23:08:42 2017 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 23:12:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518780cb

app-text/xiphos: cleanup old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/xiphos/Manifest            |  2 -
 app-text/xiphos/metadata.xml        |  3 --
 app-text/xiphos/xiphos-3.1.5.ebuild | 92 -------------------------------------
 app-text/xiphos/xiphos-3.2.2.ebuild | 88 -----------------------------------
 4 files changed, 185 deletions(-)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 1126e42..e118bc6 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,3 +1 @@
-DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
-DIST xiphos-3.2.2.tar.gz 7088153 SHA256 2326efd2bad1b27d6c4231cba68077f71f91ee31f73bdada1cbe2c3bd11eadc6 SHA512 14dd33f99217de4062e6ff6c4030fce748f57bc7e4a984aa7927acb7779f3720da21a51eb2943d5be93eac702dcc32b023f9e39a91acb7182ce59b3c90941dbf WHIRLPOOL 488f3fb65b591a9122cc8fc8a1c118cb461ce1890205d53d5957633bb8ff240166616e4de3169afccf5799fb2db40e1e90ac8cef61f3f133e135dd9578227de8
 DIST xiphos-4.0.4-20150830.tar.gz 8040173 SHA256 413bb8acb444946ccde1fb9fcfa3ff4bdb622cb56995b557f3215fab42193f20 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda WHIRLPOOL a1795b6fe5c978fcfc2c1f17f48844797bcf6e07a272181168717807dfd0a7b6e9359380a21fa330c539f1197c54c7e7293457f7733ab55d9dcca274ba044991

diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 4dc80c8..139d2b7 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -4,9 +4,6 @@
 	<maintainer type="project">
 		<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>
 	<upstream>
 		<remote-id type="sourceforge">gnomesword</remote-id>
 	</upstream>

diff --git a/app-text/xiphos/xiphos-3.1.5.ebuild b/app-text/xiphos/xiphos-3.1.5.ebuild
deleted file mode 100644
index 1d3f301..00000000
--- a/app-text/xiphos/xiphos-3.1.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: waf-utils.eclass ?
-
-EAPI=5
-PYTHON_COMPAT=( python2_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.6.1
-	>=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 \
-			--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; }

diff --git a/app-text/xiphos/xiphos-3.2.2.ebuild b/app-text/xiphos/xiphos-3.2.2.ebuild
deleted file mode 100644
index c5d5720..00000000
--- a/app-text/xiphos/xiphos-3.2.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: waf-utils.eclass ?
-
-EAPI=5
-PYTHON_COMPAT=( python2_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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.3
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	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
-
-	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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2017-08-21  0:55 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2017-08-21  0:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a290a166bd138022885798abc5f6daa65b2c579b
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 00:53:51 2017 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 00:53:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a290a166

app-text/xiphos: Bump to 4.0.6a wrt bug 623804

Gentoo-Bug: 623804
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-text/xiphos/Manifest             |  1 +
 app-text/xiphos/xiphos-4.0.6a.ebuild | 90 ++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index e118bc67a1c..8ab8f859c84 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1 +1,2 @@
 DIST xiphos-4.0.4-20150830.tar.gz 8040173 SHA256 413bb8acb444946ccde1fb9fcfa3ff4bdb622cb56995b557f3215fab42193f20 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda WHIRLPOOL a1795b6fe5c978fcfc2c1f17f48844797bcf6e07a272181168717807dfd0a7b6e9359380a21fa330c539f1197c54c7e7293457f7733ab55d9dcca274ba044991
+DIST xiphos-4.0.6a-20170820.tar.gz 30584893 SHA256 f5d8464974828dd4f1cf27269ed00f64739ad4afa7c0d853c55b7713e25eb31d SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b WHIRLPOOL 251aff54a9113c42eb2c8cb46f7c7c581177d906177f34681c82abf81c611cd5bd41fd597539b5b228c35e605c5c02f5d51b70795c9ae971323d703181201258

diff --git a/app-text/xiphos/xiphos-4.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a.ebuild
new file mode 100644
index 00000000000..ee8a6ba21b8
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.6a.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20170820"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	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
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2017-12-29 18:40 Mikle Kolyada
  0 siblings, 0 replies; 23+ messages in thread
From: Mikle Kolyada @ 2017-12-29 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     700c8c3b4eaea8ba281a6879e438f64d6c4492ea
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 18:39:44 2017 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 18:40:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700c8c3b

app-text/xiphos: amd64 stable wrt bug #639638

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-text/xiphos/xiphos-4.0.6a.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xiphos/xiphos-4.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a.ebuild
index ee8a6ba21b8..1bd7cf90e5b 100644
--- a/app-text/xiphos/xiphos-4.0.6a.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2017-12-30  2:26 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2017-12-30  2:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c50cd1c2ce55512a78aa4122de4cf3e34cb60a9d
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 02:24:17 2017 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 02:24:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50cd1c2

app-text/xiphos: Remove old

Closes: https://bugs.gentoo.org/639638
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/xiphos/Manifest               |  1 -
 app-text/xiphos/xiphos-4.0.4-r1.ebuild | 89 ----------------------------------
 app-text/xiphos/xiphos-4.0.4.ebuild    | 88 ---------------------------------
 3 files changed, 178 deletions(-)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 35841fce143..8399d748651 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,2 +1 @@
-DIST xiphos-4.0.4-20150830.tar.gz 8040173 BLAKE2B d70641d1ead8bde745fe64a758df2f441bf38e1c1b55ea78eecfb60cbb9d7e41c120c87fb4cade81ed17e2f3530b9dcc04ebe7150aca5faea5bf5a47b991a6c9 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b

diff --git a/app-text/xiphos/xiphos-4.0.4-r1.ebuild b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
deleted file mode 100644
index a68d218a8e3..00000000000
--- a/app-text/xiphos/xiphos-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20150830"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	net-libs/biblesync
-	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
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--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 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; }

diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
deleted file mode 100644
index 12931a93f01..00000000000
--- a/app-text/xiphos/xiphos-4.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20150830"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	net-libs/biblesync
-	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
-
-	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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2018-06-20  1:21 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2018-06-20  1:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7be1d3d7c7808cb0683a30a83b695c3262ab043f
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 01:20:19 2018 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 01:21:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be1d3d7

app-text/xiphos: Version bump

Closes: https://bugs.gentoo.org/658342
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/xiphos/Manifest            |  1 +
 app-text/xiphos/xiphos-4.1.0.ebuild | 88 +++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 8399d748651..3bb3026e088 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1 +1,2 @@
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
+DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400

diff --git a/app-text/xiphos/xiphos-4.1.0.ebuild b/app-text/xiphos/xiphos-4.1.0.ebuild
new file mode 100644
index 00000000000..9824202606e
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_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="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.8.0
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	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
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2018-08-21  5:26 Mart Raudsepp
  0 siblings, 0 replies; 23+ messages in thread
From: Mart Raudsepp @ 2018-08-21  5:26 UTC (permalink / raw
  To: gentoo-commits

commit:     829e21338223e709ecdab46801749a5543fb4d26
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 05:25:32 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 05:25:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829e2133

app-text/xiphos: fix invalid dev-libs/glib[$PYTHON_USEDEP] deps

Also fix >=glib-2 dep to glib:2 and libxml2 dep to libxml2:2 while here

Closes: https://bugs.gentoo.org/664088
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 app-text/xiphos/{xiphos-4.0.6a.ebuild => xiphos-4.0.6a-r1.ebuild} | 6 +++---
 app-text/xiphos/{xiphos-4.1.0.ebuild => xiphos-4.1.0-r1.ebuild}   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
similarity index 94%
rename from app-text/xiphos/xiphos-4.0.6a.ebuild
rename to app-text/xiphos/xiphos-4.0.6a-r1.ebuild
index 1bd7cf90e5b..c8c02b73669 100644
--- a/app-text/xiphos/xiphos-4.0.6a.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libxml2:2[${PYTHON_USEDEP}]
 	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14

diff --git a/app-text/xiphos/xiphos-4.1.0.ebuild b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
similarity index 96%
rename from app-text/xiphos/xiphos-4.1.0.ebuild
rename to app-text/xiphos/xiphos-4.1.0-r1.ebuild
index 9824202606e..a9f5298597b 100644
--- a/app-text/xiphos/xiphos-4.1.0.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-text/sword-1.8.0
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libxml2:2[${PYTHON_USEDEP}]
 	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2019-02-28  2:06 Chris Reffett
  0 siblings, 0 replies; 23+ messages in thread
From: Chris Reffett @ 2019-02-28  2:06 UTC (permalink / raw
  To: gentoo-commits

commit:     6a7d7d6406e829341c4168f182ff6c281fd4d054
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 02:05:30 2019 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 02:06:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7d7d64

app-text/xiphos: Add glib-utils as a dependency

Fixes: https://bugs.gentoo.org/668896
Signed-off-by: Chris Reffett <creffett <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-text/xiphos/xiphos-4.0.6a-r1.ebuild | 3 ++-
 app-text/xiphos/xiphos-4.1.0-r1.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
index c8c02b73669..c131ac2b16a 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 	app-text/rarian
 	dev-libs/libxslt[${PYTHON_USEDEP}]
 	dev-util/intltool
+	dev-util/glib-utils
 	>=net-libs/biblesync-1.1.2-r1[-static]
 	virtual/pkgconfig
 	sys-devel/gettext

diff --git a/app-text/xiphos/xiphos-4.1.0-r1.ebuild b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
index a9f5298597b..355ed3f118c 100644
--- a/app-text/xiphos/xiphos-4.1.0-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
 	app-text/rarian
 	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/glib-utils
 	dev-util/intltool
 	>=net-libs/biblesync-1.1.2-r1[-static]
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2020-05-01 10:02 Mart Raudsepp
  0 siblings, 0 replies; 23+ messages in thread
From: Mart Raudsepp @ 2020-05-01 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     3c4a83102994ee8b691dd8070729f8a4126f9d5c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 10:02:25 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri May  1 10:02:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4a8310

app-text/xiphos: drop python req on libxslt and gnome-doc-utils

gnome-doc-utils had its python2 revision dropped, breaking the tree for
xiphos. Instead of removing it, dropping the PYTHON_MULTI_USEDEP requirement
here, as xiphos appears to only call xml2po and xsltproc utilities, not
import any of the gnome-doc-utils or libxslt python API.
Also PYTHON_MULTI_USEDEP doesn't make sense for a BDEPEND.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-text/xiphos/xiphos-4.0.6a-r2.ebuild | 6 ++----
 app-text/xiphos/xiphos-4.1.0-r2.ebuild  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index 4ca64d0c5aa..dd5177d45fa 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -39,10 +39,8 @@ DEPEND="${RDEPEND}
 	>=net-libs/biblesync-1.1.2-r1[-static]
 	virtual/pkgconfig
 	sys-devel/gettext
-	$(python_gen_cond_dep '
-		app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
-		dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
-	')
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
 "
 
 pkg_setup() {

diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 159e9351269..24314a606c4 100644
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -37,10 +37,8 @@ DEPEND="${RDEPEND}
 	>=net-libs/biblesync-1.1.2-r1[-static]
 	virtual/pkgconfig
 	sys-devel/gettext
-	$(python_gen_cond_dep '
-		app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
-		dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
-	')
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
 "
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2020-06-27 20:45 Andreas K. Hüttel
  0 siblings, 0 replies; 23+ messages in thread
From: Andreas K. Hüttel @ 2020-06-27 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     6bbb5ae8c4918d42136025967c76bc61bfe00812
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sat Jun 20 15:56:48 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 20:44:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbb5ae8

app-text/xiphos: update homepage

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 app-text/xiphos/xiphos-4.0.6a-r2.ebuild | 2 +-
 app-text/xiphos/xiphos-4.1.0-r2.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index dd5177d45fa..7521fa24db4 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
 MY_PV="${PV}-20170820"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
+HOMEPAGE="https://xiphos.org/"
 SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"

diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 24314a606c4..49bfe5394fc 100644
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_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/"
+HOMEPAGE="https://xiphos.org/"
 SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2020-07-27 14:43 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2020-07-27 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b33f9d4db5c2f9d75bf0d2756f1c439b3b334858
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 17:11:16 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 14:42:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33f9d4d

app-text/xiphos: fix net-libs/biblesync dependency in 4.1.0

Closes: https://bugs.gentoo.org/723408
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/xiphos-4.1.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 49bfe5394fc..b65bbc5e791 100644
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 	app-text/rarian
 	dev-util/glib-utils
 	dev-util/intltool
-	>=net-libs/biblesync-1.1.2-r1[-static]
+	>=net-libs/biblesync-1.2.0-r1[-static]
 	virtual/pkgconfig
 	sys-devel/gettext
 	app-text/gnome-doc-utils


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2020-07-27 18:37 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2020-07-27 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1bbecfd9f532b6e9e4a855f9eb0b04a5d281c1cc
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 18:36:14 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 18:37:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbecfd9

app-text/xiphos: remove unstable releases requiring python2_7

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/Manifest               |  1 -
 app-text/xiphos/xiphos-4.1.0-r2.ebuild | 91 ----------------------------------
 2 files changed, 92 deletions(-)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 6ee6ace6925..c2950457f74 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,3 +1,2 @@
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
-DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
 DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077

diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
deleted file mode 100644
index b65bbc5e791..00000000000
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.8.0
-	dev-libs/glib:2
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
-		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/rarian
-	dev-util/glib-utils
-	dev-util/intltool
-	>=net-libs/biblesync-1.2.0-r1[-static]
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-"
-
-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
-	default
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2020-09-18 10:36 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2020-09-18 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6eb0f759c6f29bcb81d02145065a77d6fae0c120
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 10:35:52 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 10:35:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb0f759

app-text/xiphos: remove old

Goodbye, python2 dependency! You shall not be missed.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/Manifest                |  1 -
 app-text/xiphos/xiphos-4.0.6a-r2.ebuild | 93 ---------------------------------
 2 files changed, 94 deletions(-)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index c2950457f74..cb991a816fd 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,2 +1 @@
-DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
 DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077

diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
deleted file mode 100644
index 7521fa24db4..00000000000
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20170820"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	dev-libs/glib:2
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
-		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/rarian
-	dev-util/intltool
-	dev-util/glib-utils
-	>=net-libs/biblesync-1.1.2-r1[-static]
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-"
-
-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
-	default
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--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 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; }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2022-04-12 21:04 Sam James
  0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2022-04-12 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9842f1cc3fa6420fd5cc7795e55a0d709dd451ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 12:29:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 21:03:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9842f1cc

app-text/xiphos: switch to xz

Smaller tarballs.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/xiphos/Manifest            | 2 +-
 app-text/xiphos/xiphos-4.2.1.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index cb991a816fdb..739b78fae71c 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1 +1 @@
-DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077
+DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe

diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1.ebuild
index 6dab6793c988..a5bdd72a9066 100644
--- a/app-text/xiphos/xiphos-4.2.1.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit cmake xdg-utils
 
 DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
 HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2022-05-29 22:07 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2022-05-29 22:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e53ce62d98b7c4033da6850b3f62fc5a371825a5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 09:22:34 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun May 29 22:07:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e53ce62d

app-text/xiphos: disable the editor

The editor still requires either WebKit1 or GtkHTML, and upstream hasn't
made much progress on this in recent years (yes, years). Many other
distros have had the editor disabled for quite a while now (many thanks
to Debian for the patch we now use) and since upstream activity implies
they will make the editor officially optional soon, let's do the same.

Once this version has been stabilised we will finally be able to get rid
of gnome-extra/gtkhtml.

Bug: https://bugs.gentoo.org/667914
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/Manifest               |  1 +
 app-text/xiphos/xiphos-4.2.1-r1.ebuild | 72 ++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 739b78fae71c..fb4e42013ccf 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1 +1,2 @@
+DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
 DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe

diff --git a/app-text/xiphos/xiphos-4.2.1-r1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..599d16c4ff3f
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+COMMON="sys-apps/util-linux
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dbus? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON}
+	>=app-text/sword-1.8.1
+	dev-libs/glib:2
+	dev-libs/icu
+	>=net-libs/biblesync-1.2.0
+	net-libs/webkit-gtk:4
+	sys-libs/zlib[minizip]
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="${COMMON}
+	app-arch/zip
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
+	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDBUS=$(usex dbus)
+		-DDEBUG=$(usex debug)
+		-DPOSTINST=off
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS}; do
+			if ver_test "${rver}" -le "4.2.1"; then
+				ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+				ewarn "Studypad and the personal commentary will no longer work."
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2022-06-30  7:01 Agostino Sarubbo
  0 siblings, 0 replies; 23+ messages in thread
From: Agostino Sarubbo @ 2022-06-30  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     64dc058709dc5baed3e936dc6a075d2caf1b9b67
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 07:01:03 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 07:01:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64dc0587

app-text/xiphos: amd64 stable wrt bug #855008

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/xiphos/xiphos-4.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xiphos/xiphos-4.2.1-r1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
index 599d16c4ff3f..dd9eb10be244 100644
--- a/app-text/xiphos/xiphos-4.2.1-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 COMMON="sys-apps/util-linux


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2022-06-30  9:02 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2022-06-30  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     afac1af1f7b322179f046dade14e7e13235bd399
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 08:13:34 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 09:01:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afac1af1

app-text/xiphos: drop 4.2.1

This removes the last gnome-extra/gtkhtml revdep from the tree.

Bug: https://bugs.gentoo.org/667914
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/xiphos-4.2.1.ebuild | 64 -------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1.ebuild
deleted file mode 100644
index a5bdd72a9066..000000000000
--- a/app-text/xiphos/xiphos-4.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-COMMON="sys-apps/util-linux
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dbus? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON}
-	>=app-text/sword-1.8.1
-	dev-libs/glib:2
-	dev-libs/icu
-	gnome-extra/gtkhtml:4.0
-	>=net-libs/biblesync-1.2.0
-	net-libs/webkit-gtk:4
-	sys-libs/zlib[minizip]
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}"
-BDEPEND="${COMMON}
-	app-arch/zip
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	dev-util/itstool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
-	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
-)
-
-src_configure() {
-	# TODO: stop using gtkhtml, it is deprecated (Bug #667914). However, as
-	# of 4.2.1 it is still required because the WebKit-based editor
-	# does not support webkit-gtk:4.
-	local mycmakeargs=(
-		-DDBUS=$(usex dbus)
-		-DDEBUG=$(usex debug)
-		-DGTKHTML=on
-		-DPOSTINST=off
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2023-02-24 16:50 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2023-02-24 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c35e52208e483aafd4daeeaaa1e8e451f375a17a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 16:46:34 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 16:50:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35e5220

app-text/xiphos: update upstream metadata

Upstream officially moved to GitHub in early 2016. The SourceForge
project still exists but only for archival purposes, with the SVN tree
locked and the mailing lists disabled.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index b844aa2c06ed..e8dbfb149a17 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">gnomesword</remote-id>
+		<remote-id type="github">crosswire/xiphos</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2023-05-19  8:52 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2023-05-19  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     2e2c5e34351090201bcc7af2b0e56c3994d87dc0
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 08:51:42 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 19 08:51:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2c5e34

app-text/xiphos: stabilize 4.2.1-r2 for amd64

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/xiphos-4.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
index 04e20aca65b1..b7ac40476986 100644
--- a/app-text/xiphos/xiphos-4.2.1-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 COMMON="sys-apps/util-linux


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/
@ 2023-05-19  8:52 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2023-05-19  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6aaf0cdf1390db06f704e4c25e486ced6797c6c8
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 08:52:07 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 19 08:52:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aaf0cdf

app-text/xiphos: drop 4.2.1-r1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-text/xiphos/xiphos-4.2.1-r1.ebuild | 72 ----------------------------------
 1 file changed, 72 deletions(-)

diff --git a/app-text/xiphos/xiphos-4.2.1-r1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
deleted file mode 100644
index dd9eb10be244..000000000000
--- a/app-text/xiphos/xiphos-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-COMMON="sys-apps/util-linux
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dbus? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON}
-	>=app-text/sword-1.8.1
-	dev-libs/glib:2
-	dev-libs/icu
-	>=net-libs/biblesync-1.2.0
-	net-libs/webkit-gtk:4
-	sys-libs/zlib[minizip]
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}"
-BDEPEND="${COMMON}
-	app-arch/zip
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	dev-util/itstool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
-	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
-	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDBUS=$(usex dbus)
-		-DDEBUG=$(usex debug)
-		-DPOSTINST=off
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local rver
-		for rver in ${REPLACING_VERSIONS}; do
-			if ver_test "${rver}" -le "4.2.1"; then
-				ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
-				ewarn "Studypad and the personal commentary will no longer work."
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2023-05-19  8:52 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-27 14:43 [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-05-19  8:52 Marek Szuba
2023-05-19  8:52 Marek Szuba
2023-02-24 16:50 Marek Szuba
2022-06-30  9:02 Marek Szuba
2022-06-30  7:01 Agostino Sarubbo
2022-05-29 22:07 Marek Szuba
2022-04-12 21:04 Sam James
2020-09-18 10:36 Marek Szuba
2020-07-27 18:37 Marek Szuba
2020-06-27 20:45 Andreas K. Hüttel
2020-05-01 10:02 Mart Raudsepp
2019-02-28  2:06 Chris Reffett
2018-08-21  5:26 Mart Raudsepp
2018-06-20  1:21 Chris Reffett
2017-12-30  2:26 Chris Reffett
2017-12-29 18:40 Mikle Kolyada
2017-08-21  0:55 Chris Reffett
2017-01-10 23:14 Chris Reffett
2017-01-10 14:56 Agostino Sarubbo
2016-05-25 23:47 Chris Reffett
2016-05-24 23:44 Chris Reffett
2016-01-03 15:06 Chris Reffett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox