gentoo auto-resync : 19:05:2023 - 16:15:42

6 files changed, 4 insertions, 77 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b309c95f3698..921a1aa1d715 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index bd11c8ff0a26..03ed316e6c5c 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -5,6 +5,6 @@ DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d0
 DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f
 DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d
 EBUILD xdvik-22.87.03-r4.ebuild 2857 BLAKE2B 8e6c0ed78bcd16c9ae0e96544e4b29d8cf136c4ee59853587eabdfe2f41a4a77382b7bfa80c00fe11bd9098e7a84f3e30f1a3bc51fc30744bd2a47f334d550d2 SHA512 b9264180fae4c2206cd84a3268fc7718b6a93633041be8b3cdf4490c22d9e2d60f2a14375b87093efccc4bfdaa463f82ee8c7d9d5dc553398b7b9bcb9c75156e
-EBUILD xdvik-22.87.06-r1.ebuild 3012 BLAKE2B a673ca0f628db7629fa6bed1a788515d4cdd3ea5dc9afed27d4e7d2dc0b29200a5f306e773c24477673719e19bec3a55021621b8c74227064ecb1cdff73a6cf6 SHA512 5b5b255f7d6fca80d9365c723f45fa30edf94945494b529726d29e746df14e2af62f7ff5d4fa94a232efe7254a0f73e66f21c05b2df8faad5d1470e1f372384f
+EBUILD xdvik-22.87.06-r1.ebuild 3011 BLAKE2B 389b204d23d75d7e60187fa70f7c5d9f139557098abc0b6d847e9d88d1798e7b2dab62ff12506b460608b8ee6c24daa8b96d35588d720b967f6d8bdfac2fa084 SHA512 8e524470b749727f34fbaa15d94ed89d590cb2c3412c7d013cff41da2cc28971f52c0cb99f8f620d3d64f42950a3c233abf356d7df3701e74c38e5bde541b772
 EBUILD xdvik-22.87.06.ebuild 2868 BLAKE2B 1df58483454a7116931eb0a4f62ada6bbde31aa73e6b6d39ae5ab23b35dc66c9a56e572f41fbd3a82e98181f17942ac3f2b583f62862b17a89e58e8256b0772b SHA512 82f5e22e0d93671321ebd4543b2be372c968f693a817bd4249e89a834718e84ae79f490c2967578c7599dc9b3105c69f189282afcf5513a6776a3d2b6d3c30dd
 MISC metadata.xml 595 BLAKE2B 200debd0214e5985f3f59cabdac72252b556edef5224c77f5dbd91de347f57ab492dd0f7ce846c335179344bc9215b02af61572ff859c9c44ca947235ce5062b SHA512 bf925b9c9738c62f26ebbb2f88782597d6cee471a19258b553e0dc7aa397443149adfceba6cfcdd045196eecc3319541b980850ba5e572f51266da1945b65e4a
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index 4e0b3e1fbc70..8db1bb80a71f 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/${PN}/${PN}_192.png"
 S="${WORKDIR}"/${P}/texk/xdvik
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 8364a13bc610..79f7e6aec9fa 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -3,6 +3,5 @@ AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5
 AUX xiphos-4.2.1-webkit41.patch 426 BLAKE2B 373d93182db65e5dccb8588658d713961461f49f64170abed279c7158ccf8292fafd44b041ff7cd9ea7bdcb52af34284cba5a7cb0ccd9c5dae6e5d30046d3ea8 SHA512 8a8e8bcb34d257b07eee48249fb46db928fd358765ed3fb35b5f2b5aba6280414fcf25bef3866dbca99bbef90464257409a091e7319f79833c461e23173a2f97
 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 1681 BLAKE2B 4b8661873c0959c5bd265608ad677c374310eaa651984e3a864088a4d8232f18d8c00ba295e72022be7676264ef8340d3d14ae4621fb19ade211831eef57ef1d SHA512 5956b27da6610fb8c17df3d51993847842360653e4eb78cdae14585f5a2e1f43de33b6278ea1de90335b9b856cef835182f52ca12280eb9dbb1a8d09e18b8cca
-EBUILD xiphos-4.2.1-r2.ebuild 1726 BLAKE2B b656c1c9fdb322d5d372c9cb24b480cce5cee7df3142185fc1c01b3f5c7b599c4b89b1bf9cfd8117a802bbe0e23d8a1ea8e72a24b157716b0bbb18db14475634 SHA512 ae8f4bf28e20f906da0f42204f172e0455fb494fc8c1d813f9d282be22b5d59d56514573b1e8b689aa2d9657631ca0d87b4f50a035e3ec3340106f0d8b755873
+EBUILD xiphos-4.2.1-r2.ebuild 1725 BLAKE2B 3bdd0c1126813b498d073753d0da227bc82085af03daf047698461c36e13863def7d1a0171c092452143a944049f6839aa96d179fb472d5667aef7453e375dde SHA512 8e8abf75f81312867eeff2ee54043924bd9a71f41675e3bd8cf6d6e5458678496edf618311c66e6f5570fce0a9c6b041b90eb3ec6b8d569ea73bd6b897aae711
 MISC metadata.xml 327 BLAKE2B 0925684efe71dfe03c6f3aaed9bc07b49594eed7edefaeb0b47c15fc67ddfaa5e5e4f8f1ec752e5c08c8770960e4ff5732f43e36c081c75e6c9265b77ef68e10 SHA512 a8c931bd1d0c7250c51d7b9bfb684a1433422604ea992d4c26fe3fd5b871f4dd92032b1907a9cceca4a7c7c87437cf3f26e0790e7f6adb27610f13b0b17b1cc2
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
-}
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