summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2015-02-18 15:06:08 +0000
committerChris Reffett <creffett@gentoo.org>2015-02-18 15:06:08 +0000
commit30452d85eca9f11cd289e180d11d8fa7f9001099 (patch)
tree7f34b1013ef37a4f8cb0f2f68f30f467d3efc140 /app-text/xiphos
parentcosmetics (diff)
downloadgentoo-2-30452d85eca9f11cd289e180d11d8fa7f9001099.tar.gz
gentoo-2-30452d85eca9f11cd289e180d11d8fa7f9001099.tar.bz2
gentoo-2-30452d85eca9f11cd289e180d11d8fa7f9001099.zip
Make dep on webkit-gtk mandatory, bug 516256. Drop old.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xD1BAB6B528DB029C)
Diffstat (limited to 'app-text/xiphos')
-rw-r--r--app-text/xiphos/ChangeLog8
-rw-r--r--app-text/xiphos/xiphos-3.1.6.ebuild91
-rw-r--r--app-text/xiphos/xiphos-3.2.2.ebuild21
3 files changed, 15 insertions, 105 deletions
diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog
index 0611db384a94..60cc12d73aa8 100644
--- a/app-text/xiphos/ChangeLog
+++ b/app-text/xiphos/ChangeLog
@@ -1,6 +1,10 @@
# 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.17 2014/10/14 19:01:57 creffett Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.18 2015/02/18 15:06:08 creffett Exp $
+
+ 18 Feb 2015; Chris Reffett <creffett@gentoo.org> -xiphos-3.1.6.ebuild,
+ xiphos-3.2.2.ebuild:
+ Make dep on webkit-gtk mandatory, bug 516256. Drop old.
*xiphos-3.2.2 (14 Oct 2014)
diff --git a/app-text/xiphos/xiphos-3.1.6.ebuild b/app-text/xiphos/xiphos-3.1.6.ebuild
deleted file mode 100644
index 4d4d627a236a..000000000000
--- a/app-text/xiphos/xiphos-3.1.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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; }
diff --git a/app-text/xiphos/xiphos-3.2.2.ebuild b/app-text/xiphos/xiphos-3.2.2.ebuild
index a2e4fa5cd869..a5127142de89 100644
--- a/app-text/xiphos/xiphos-3.2.2.ebuild
+++ b/app-text/xiphos/xiphos-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.2.2.ebuild,v 1.1 2014/10/14 19:01:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.2.2.ebuild,v 1.2 2015/02/18 15:06:08 creffett Exp $
# TODO: waf-utils.eclass ?
@@ -15,26 +15,26 @@ 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"
+IUSE="dbus debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=app-text/sword-1.7.3
- >=dev-libs/glib-2
- dev-libs/libxml2
- gnome-base/gconf
+ >=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 )
- webkit? ( net-libs/webkit-gtk:3 )
"
DEPEND="${RDEPEND}
app-text/docbook2X
- app-text/gnome-doc-utils
+ app-text/gnome-doc-utils[${PYTHON_USEDEP}]
app-text/rarian
- dev-libs/libxslt
+ dev-libs/libxslt[${PYTHON_USEDEP}]
dev-util/intltool
virtual/pkgconfig
sys-devel/gettext
@@ -56,9 +56,6 @@ src_configure() {
tc-export AR CC CPP CXX RANLIB
- local backend=gtkhtml
- use webkit && backend=webkit
-
CCFLAGS="${CFLAGS}" \
LINKFLAGS="${LDFLAGS}" \
SGML2MAN="$(type -P docbook2man.pl)" \