From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 app-text/xiphos/Manifest                |  4 +-
 app-text/xiphos/xiphos-4.0.6a-r2.ebuild | 93 ---------------------------------
 app-text/xiphos/xiphos-4.2.1.ebuild     |  2 +-
 3 files changed, 2 insertions(+), 97 deletions(-)
 delete mode 100644 app-text/xiphos/xiphos-4.0.6a-r2.ebuild

(limited to 'app-text/xiphos')

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 9e1b0097d603..4924011fa392 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,4 @@
 AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
-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
-EBUILD xiphos-4.0.6a-r2.ebuild 2053 BLAKE2B b9bd97ee6e3da5a10b98db3eaf45e6d5a746e852e4b7762e9fafca1213c471794035170fb9b43563144e7666709e749aa8748701435331e399d647441ca12ec6 SHA512 1a9b16294c1013f4b35da37c3bd3c6169e3e067f95f8d9505ab1042294df1c5d4877eb9353018f1ff71843e915c676127157b4c4a8d27ac77a4ee42f64c629d5
-EBUILD xiphos-4.2.1.ebuild 1335 BLAKE2B 22174bc8c2942e832255746e6151bfa0807574bdaa1f53858344c38958b8e2958195e2620570745c6aecabd6a8d6dd3539e76b54b06f35c29f97af180d5eddae SHA512 14019cd40634b2891de9aa894e932db91055ce9c26d5a514392ee50f43a75e27470a399101a0e11c9fa246425976b8991c7c3398c1675823468c4539e20e83a3
+EBUILD xiphos-4.2.1.ebuild 1334 BLAKE2B b69913a9017a167adac3c5012a7d3965ebfa9055a32fbb4ab9cbe9110bc694ce5ccb8f1b1fe7917d7b290e8e467299f571564743855168ef3cb401c58628c6a2 SHA512 e0c4a9c7d94f3c796aea434b1811c3c4ac5eb1ee1592a47a4955ec7b82c5c151769593540f2d6e605306f41203097e6f2806935e196041cdf3525d5533487690
 MISC metadata.xml 325 BLAKE2B 1fcf098a010153588db7bd29c726c965e4d0505841c47be0b7a75f07b4e785d7c42a3321d67079a66782ab5edf4f39611a9f4ac2578d552f93462632c872bfeb SHA512 0b9f3bfac06d3847983a5117be9d101d01ddb02511b5fc832451de6cec703ac46f5a18d10e330af1d79147338b077b957d4d1263b8113dc3e0bded92267714a6
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 7521fa24db4e..000000000000
--- 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; }
diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1.ebuild
index 7a03b2cb28bb..a79db9af7296 100644
--- a/app-text/xiphos/xiphos-4.2.1.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 COMMON="sys-apps/util-linux
-- 
cgit v1.2.3