9 files changed, 103 insertions, 8 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 346e32e24f5d..5df78c96ddd0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index bc8a50533331..76a6a856db8b 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,5 +3,5 @@ AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb3
 DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
 DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac
 EBUILD hunspell-1.7.1.ebuild 2265 BLAKE2B 68cc8b03df9eba1f4fcbb66063ecc49157cd1c30acf0cc4dd2e6eca03d8eaa1490009281f474670a777d4479e3b1c9f21ce8e17b364e5f3990c085992290b0e4 SHA512 97b9896e07c3e004af7ed252968b21da15a626ebd4e2ad08c4bea1da61638f9c3d16a5be924c339e1d7d3164f9d13067ad53834fe2d8ffa61b8c5f82b62c4826
-EBUILD hunspell-1.7.2.ebuild 2272 BLAKE2B 5806405bc5a10fac6267ee5932daf4fce35518e26b7a194bfaf5eb7681d97d34eb2266676720bd6a13ca2e374f32cf42760fb5cd389d4b137c8ddbc0748ee5f3 SHA512 3fff22c1f38645c6880632904abdf1c7b1b1439162439877eda0cabeb4fd23b2c0349cff563bd70a21511fc18df343b70fb95edda1030dc215f05642ed61406c
+EBUILD hunspell-1.7.2.ebuild 2266 BLAKE2B 5e5a126bc493818f50f5c31bd992a75198d6a11580966885864a2fd2922d88b27865e812641369d025e3513c5994ac4891d7fe65d67e26d99ba965d57ed1dafc SHA512 3f41ff41ee184e3fa952d3c94d4d43b3af48c2061e2d3da443b2a4e70654c4f564c7d68db7e166b0467f46658bae34a63ada65dea750c59be81bf780202852c6
 MISC metadata.xml 301 BLAKE2B b51f61b0ee48d57bc3cb55e7b82b28395877d7c5b4b715f1e79330da95cf6874c1361341a0ac85ab0ecdc1420b2046d278913571ed69604142cf0cd73181099b SHA512 c83f8543e28a964670c59474527d3866c941e211c60c14b23a2c950ac8b9fad35983af5303820ad96920931ddcc676c0d7201ede9fc56f1b41e7c63e15b8a261
diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
index fa4279305dc0..2db419cb5e12 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index d18124d91e8c..be70f44bdf21 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -2,5 +2,5 @@ AUX linuxdoc-tools-0.9.82-configure-clang16.patch 4677 BLAKE2B 7160430998bd80ca2
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 DIST linuxdoc-tools-0.9.82.tar.bz2 550046 BLAKE2B 3bf9b9680659a3a6873e31116975fca7372167a701e630d762d37fcacf7acb9f1df4031558c4db24769e598a17b206e1c09607e341fc90f91497c15ff0cb05a1 SHA512 82560d9dc4db231e0a2c1fa3732d062bfd6af2cd3c5ffa0960939b2888533882437ddeeb54219e31acc7eaa10fdeee84ba206d32516cc5ed4f3fba2eab1ec0e4
 EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1956 BLAKE2B 6434070af0621f3da002e10a83bc38bc3907ef0ba69fcbc9438dbe2320aed950227bb15a5436ba7727aa89519c80ac73ac01610e95707b9c0194442fbbea521b SHA512 a7dc53a87a5f8b1e2ff4d55f1dbfacc84da78fc62e5b11a5bb1d0f2839e351c931204df88debb276587c9c0622f298a421da40f5c61bbfbec5d837a8dd949758
-EBUILD linuxdoc-tools-0.9.82.ebuild 2014 BLAKE2B 6ed6a20bec2f10007dd797553e09943c0f69eed800f0dcd5c03da506cdddd6c2fbc8cc97eefa97377c7bda74c1ebee4cea736f1a524b2d54d214d0d9ac9ca8b5 SHA512 816a38afd491e7ab111cb7903361c4fa904eaf59541e87d56bb62495868e5f71a34a07852874a20428304d52c5631fbfd84ec15a55c6135ce39e1617820843cc
+EBUILD linuxdoc-tools-0.9.82.ebuild 2011 BLAKE2B ab9e3d3d43cde7e3000ac0cdd4cda05320a2d1666b861aec7dc61f08231e2e8f813285062e7baa21b0b08899c1b1be2425cccf38d51c5cbffeb665449867aa07 SHA512 860cf0284cfb0f515992266b6dec1548fcdcf4df66ec8fcebbebdb0f41b9231c3f2ecd266c9a5a0a4193768d46f17af4c31c0963202ebcf53dcbdcb911c43250
 MISC metadata.xml 713 BLAKE2B 5bb40701020a2a88bccfc3293098732f464066af3317724cdff560819de1db44e33a6ef20ef3b09edce61580a50184e8cc5112d60d415ee42cabe6409e94d384 SHA512 10311f69090d7dbe3ccdf8047daf15ad6b86ae3cc58028b11629c581708c5de543c7fa1ab1bdbd173dbf5037e1dd23d68267de8e11d1a9da9e56659034f1316d
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
index b4403ab283ff..b6da8848f4c7 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index c7f3597f6ea2..8364a13bc610 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,8 @@
 AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
 AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5e91c3e878318690cb159a7ab83dca134d3e536edb3e9c5462f25bcdebbd25a617b0811e6175ad9bb62583ca588907f14d4b89304eeca7 SHA512 6641739c9f3fa195321f16a1d5d7ed844a0a99c6d65ceba5367270d82c0701a6c906de7c1e430ca010fcd8c35a247bb11f3fccbbfdf80c1ee28b21af2a7a2bd3
+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
-MISC metadata.xml 326 BLAKE2B 6e99d7d8c95e9bfa87837796634393c1ebf086accebfaa22345c6c262c66ab90761576acec3f90424285b9109b80a46d45b80e877a0159331a52676501eb1882 SHA512 bfafd9d630dc1419404e6fddef05f8de268b3130bb6cc34dc77233e7d05e292b7ab50eab1727d1815ece71cef6aaec881e03e30a0345b38e9252a433092efd7c
+EBUILD xiphos-4.2.1-r2.ebuild 1726 BLAKE2B b656c1c9fdb322d5d372c9cb24b480cce5cee7df3142185fc1c01b3f5c7b599c4b89b1bf9cfd8117a802bbe0e23d8a1ea8e72a24b157716b0bbb18db14475634 SHA512 ae8f4bf28e20f906da0f42204f172e0455fb494fc8c1d813f9d282be22b5d59d56514573b1e8b689aa2d9657631ca0d87b4f50a035e3ec3340106f0d8b755873
+MISC metadata.xml 327 BLAKE2B 0925684efe71dfe03c6f3aaed9bc07b49594eed7edefaeb0b47c15fc67ddfaa5e5e4f8f1ec752e5c08c8770960e4ff5732f43e36c081c75e6c9265b77ef68e10 SHA512 a8c931bd1d0c7250c51d7b9bfb684a1433422604ea992d4c26fe3fd5b871f4dd92032b1907a9cceca4a7c7c87437cf3f26e0790e7f6adb27610f13b0b17b1cc2
diff --git a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
new file mode 100644
index 000000000000..8de40e28c64e
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
@@ -0,0 +1,20 @@
+--- a/cmake/XiphosDependencies.cmake
++++ b/cmake/XiphosDependencies.cmake
+@@ -84,7 +84,7 @@
+   "gdk-pixbuf-2.0"
+   "gio-2.0"
+   "gobject-2.0"
+-  "libsoup-2.4"
++  "libsoup-3.0"
+   "pango"
+   "minizip"
+   "zlib"
+@@ -144,7 +144,7 @@
+     # Gtk+-3.0 + Webkit2 + GtkHtml-editor
+      pkg_check_modules(Gtk REQUIRED IMPORTED_TARGET
+       "gtk+-3.0"
+-      "webkit2gtk-4.0"
++      "webkit2gtk-4.1"
+       )
+   endif()
+ endif (GTK2)
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>
diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..04e20aca65b1
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 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.1
+	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
+	"${FILESDIR}"/${PN}-4.2.1-webkit41.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
+}