gentoo resync : 09.07.2022

3 files changed, 2 insertions, 67 deletions

diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 92664526daba..c7f3597f6ea2 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -2,6 +2,5 @@ AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a8822465
 AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5e91c3e878318690cb159a7ab83dca134d3e536edb3e9c5462f25bcdebbd25a617b0811e6175ad9bb62583ca588907f14d4b89304eeca7 SHA512 6641739c9f3fa195321f16a1d5d7ed844a0a99c6d65ceba5367270d82c0701a6c906de7c1e430ca010fcd8c35a247bb11f3fccbbfdf80c1ee28b21af2a7a2bd3
 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
-EBUILD xiphos-4.2.1-r1.ebuild 1682 BLAKE2B 4136fd1c7010e96030296e471a71184efd9505f189e983e7df25f0151794018cc6332d6b50e26aecfa85a2de75647d12eb272e67abaa547d1ed33dff37894f60 SHA512 273d988a3ce76216d9ecb557e7a5cbff227c7da10ea0ba871084e6eb08dbc721ed7f0b7a4f5cc24ddd560d23e7e40793b7267b96dc6dce078160fe3558eeeef4
-EBUILD xiphos-4.2.1.ebuild 1393 BLAKE2B 6e59124485b686c670c090ef6f7386a5333d0c5c8f0ae3464b7e4cd6634d82e20e23cf5a2f0168f4478d677d37d9e8b1ce80fb6f23b0cd902f4a789c64df31e6 SHA512 14bef0d296789b79dc19f76991b74e4aedd4bb6a313cf87061236b822d3d6ecd9996ec215d38542db671787d933c88a1d1bf76f4f0b1229e1c9e322f7430a173
+EBUILD xiphos-4.2.1-r1.ebuild 1681 BLAKE2B 4b8661873c0959c5bd265608ad677c374310eaa651984e3a864088a4d8232f18d8c00ba295e72022be7676264ef8340d3d14ae4621fb19ade211831eef57ef1d SHA512 5956b27da6610fb8c17df3d51993847842360653e4eb78cdae14585f5a2e1f43de33b6278ea1de90335b9b856cef835182f52ca12280eb9dbb1a8d09e18b8cca
 MISC metadata.xml 326 BLAKE2B 6e99d7d8c95e9bfa87837796634393c1ebf086accebfaa22345c6c262c66ab90761576acec3f90424285b9109b80a46d45b80e877a0159331a52676501eb1882 SHA512 bfafd9d630dc1419404e6fddef05f8de268b3130bb6cc34dc77233e7d05e292b7ab50eab1727d1815ece71cef6aaec881e03e30a0345b38e9252a433092efd7c
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
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
-}