14 files changed, 99 insertions, 134 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index daf8d2909f72..fced56025d69 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 4751f708b19c..420f8eb38c4f 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,5 @@
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
 DIST console-setup_1.227.tar.xz 3886728 BLAKE2B f01ddeb3a6c51edc9f88cdb6778b5dceff16d110bc534f67e7b14d8cc7c241be41b6ad4776aed44f10b7ea3917560fcc3912cfa04273d98b0e81f901fda17702 SHA512 c79d6cc3acb477e1a8947b93777bc385039ed32799e90655d6f8e45c7f7a6036695dfe0d17e8f6e7a82db89099882df232e0937b7baf7b4deeb6a91d76dcfc86
 EBUILD bdf2psf-1.155-r1.ebuild 676 BLAKE2B be55c8593c878c3ac1f6f0dea941894d721b03a51369965ff29b1599dfca6101497c8fda4851ec9ae2e2190f72d18a92cac5733cb401154a0dfe6bd453793966 SHA512 abf68c509038da55c43dbaab9a1c2b66c33e862a00c5c11052a4353c11af73fa235b2fce58ecb98da4cf6adab89460a4d130e2c991812d4a06bda38adf6b78a0
-EBUILD bdf2psf-1.227.ebuild 682 BLAKE2B 8e97e493150ab2e012629c5a22a741c9a3c83913f91d62e864bd7722a2c878f948fcdd72319067e54ae84976b3eb9c306371ab442b0948dc843b6cd7b6b7b086 SHA512 4597812882b06d984f7040bf4e840ebbae67c48d4c486172a74e4f96d4d708748693bf62cfcf00d4ae1aac5271635a3ca62afbc5cefca3cbb74b0f98fee0ca13
+EBUILD bdf2psf-1.227.ebuild 677 BLAKE2B 99a2605dd401f214aa641e14176f805bf9d6b1feb9beb4dd983056f57fdecd62c72efa3f86130769e9e14a2709d4066b73d3ad3d665faebf4416b6a6aabd672d SHA512 4f91ad8626b448b61c406828e6f20e65856343c79da5566c4f133e54ef8d940dd74387659cebb2d7786d8f5e79d26f73a859b30d8215cc1f0e5540627187bcc1
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/bdf2psf/bdf2psf-1.227.ebuild b/app-text/bdf2psf/bdf2psf-1.227.ebuild
index 48fb146f6c2f..7bf0c5e591c6 100644
--- a/app-text/bdf2psf/bdf2psf-1.227.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.227.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/console-setup-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 98f5942a55a5..639a1d3ad130 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,7 +1,3 @@
-DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
-DIST html-xml-utils-8.5.tar.gz 421376 BLAKE2B 8fa959104db2d5765ceaf49be815f16c1422a3c7b94e0e8cd91e3bd0a8b18dfc33dff5d98204d7fe5694cfb711d213a5d82f58159b6d493fc78336d8dae1824d SHA512 f1140a81e66cc2f46dd0507a8948b2c267230fa8aed3dc79e91eeb2b6bcfe7053378da9d35fd053f8a8bc25c46491388aa7fd519c7e1c7757e73a7e1b1c67d87
 DIST html-xml-utils-8.6.tar.gz 421530 BLAKE2B 8c13a36798c5bb2e325f0df38696a9428b6c3ca087bbb4d1e7d9f2dd372e0aff386b7747e117016ad733ac07ab56a38b5ad0bcb1a0aa6b5ffd58de0ba2d8027d SHA512 0050b789a4921fa66b863255f1fd1ef9826e4b778ebc6dc67592fe854ec314b13cd8b162af67dae204018867966cfd5cb9822345917d3de3dc76c797bc0d2ec1
-EBUILD html-xml-utils-7.8-r1.ebuild 636 BLAKE2B c1a01d75323ce5616297934672afc2a985778962179d92de972ee1f7d5d1644c200d347585c127d27937602fc1e95dc669b8238646f62584506dff955c8f7faf SHA512 a7f8458a34485135c1e90110a66cd7b825e8c7e54961ce28606a86a3e91cff4cc87635207c80f4f1c5e05bd5bc11ec9bab7c66f9bdef9193dd6107ca975ec1e1
-EBUILD html-xml-utils-8.5.ebuild 640 BLAKE2B e305829e9622960920ac0fe06487b561eb4d05eb56f939abc1c5d32e3ccd5229ad6b05a869c9731f72ae36667d74190ce404b139900508ecd609599dfa65549a SHA512 43fb1cb0ba3d981676559ced03cb28ee9a72c91aed5a3d84fd2171fdbddc5a6abf32601386e6aee9fe9e2eb942365a9be44b6d44791631c144bc296b6c6c8005
 EBUILD html-xml-utils-8.6.ebuild 715 BLAKE2B 03c4db027e7e42651fc8496915d7ff3a856d41ad8d070d8b1a62a0ed372653799e2dbf4a071922571291afd0a07bd7f160e871922ee2f744fe1355e6195a49e7 SHA512 84c3adc5acdb3f85f7bc760a4977f39cbcfe4b51b8d8d2c4bf807ba13c10f296bc4532b0a2fc8c364348df8b3653df4cf8eb6027ef084e72cc8e7204880388de
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
deleted file mode 100644
index 40dab6ff6400..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
-SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	net-dns/libidn2:=
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-src_test() {
-	# Lots of tests lack a shebang and use bashisms
-	emake check SHELL="${BROOT}"/bin/bash
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-8.5.ebuild b/app-text/html-xml-utils/html-xml-utils-8.5.ebuild
deleted file mode 100644
index bf51929c322d..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-8.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
-SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	net-dns/libidn2:=
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-src_test() {
-	# Lots of tests lack a shebang and use bashisms
-	emake check SHELL="${BROOT}"/bin/bash
-}
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index a75715b86512..03634d0e8625 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,6 +1,4 @@
-DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
 DIST jo-1.6.tar.gz 151941 BLAKE2B 13d7d68c33d7f89ebb4a5cdb448082bd4d245060ebf8c85149c39f2a184f03f1ac1c380833a742894c37c0815e3627569cfe29f202f9aa3dcec7fa089f99b918 SHA512 a2cb1327c8255e0f8d1b6e6056bbce081d7703192bdb974e908549b863d7db645531dbeff87629a6ed53626295ab7ca8a72816d104f9188846ef175c8a9acb07
-EBUILD jo-1.4.ebuild 488 BLAKE2B e6fa094208c84a74e8f81715ab621b7323c37d13ba04433e64d7c78b1115b2ec80291df2c898e38b99ed998e01cf17096f21b5d610eabe050ebe7f88c875a2e9 SHA512 3c26934e8a5e3c8be1e16bdc530a5e014af4b2b2b80173d46940c8ff0ce6cb14c78f727d1230ad26fcf08e3e309a5c0f64c4162c7f961c1089b55dc747a6b55d
 EBUILD jo-1.6.ebuild 674 BLAKE2B b5e592f309d72a8fd4aca5969712443a5702962e1ace938b23538edc425f49ef84234dfae3a94e29aeea90d07d71b91005120151a429b71539828f78a8006ef7 SHA512 7115adfe0762bec6c2f6e9e16528c9731ea5f82330795c8d2c6349fa2d8069fcf60773e581f3985dd1441917a8360c85a1cfbe643b71bae4eaa0b4444048ff7b
 EBUILD jo-9999.ebuild 674 BLAKE2B b5e592f309d72a8fd4aca5969712443a5702962e1ace938b23538edc425f49ef84234dfae3a94e29aeea90d07d71b91005120151a429b71539828f78a8006ef7 SHA512 7115adfe0762bec6c2f6e9e16528c9731ea5f82330795c8d2c6349fa2d8069fcf60773e581f3985dd1441917a8360c85a1cfbe643b71bae4eaa0b4444048ff7b
 MISC metadata.xml 247 BLAKE2B 77ee4283d7610983bc0d6be575d1baf811d103673c214b0a984093de7b554a02a4f1d507c27a04f998f4d40730b0a47bb5b51c2bf4ff5a633705f6d6de04ccba SHA512 917fef3651bf5165284bc9667848cf1175e8e371a937bf3794958f810094fad2d78c6e86cf6fd2e2193524ddbc8f3ce20bc5ccd0030bcea444c0be0010fa99c0
diff --git a/app-text/jo/jo-1.4.ebuild b/app-text/jo/jo-1.4.ebuild
deleted file mode 100644
index bf84777ca6d8..000000000000
--- a/app-text/jo/jo-1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1
-
-DESCRIPTION="JSON output from a shell"
-HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	export bashcompdir=$(get_bashcompdir)
-	default
-}
-
-src_install() {
-	default
-	mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
-}
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 1a2db2a53471..b06ddbc8d6ca 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,5 +1,5 @@
-DIST pdfminer-20220506.tar.gz 10853104 BLAKE2B b6008db789973fb69537801b8e928761bd0a949cc72ddf380fd71b6373913f6a689b71bee159e6991e99c196b7e8a1fac5530d2bf9c577e53b8b556bed00b85a SHA512 b81916c70f22f3408cf41a50d35937f950ee6205f59fa03603bc7a78d1b1b037311ebaf5661f6d46b9d4190f2f56189fc28b714463dc5854328c14f97fbc28c4
 DIST pdfminer.six-20221105.gh.tar.gz 10857730 BLAKE2B dd9282bfc3c636676f087e6ffc2cfb137f66eee18427f08de488c7bdc13bd27b6cc674d3b75c93d1566668272ee4111e3347664a70152bd4b2f7e4e63664d01b SHA512 72034a75005c91100274f86baa4c8884caad86aacf94ca9d0d5a51d8b3c772aa0bcd766416bed9e26df00bd9a2be585649eaa24321735f532e40a3871e19c6df
-EBUILD pdfminer-20220506.ebuild 1123 BLAKE2B d887decf4a6b950d7c70c1d92be1e9a48f2ab6b0b5d841ec27c16691b2958eec6c1a8c71bf6bee285d3a4677d90681d614b5e0e3a0e235887831362f99b60f91 SHA512 e94042adfdf07dca07525e47a31a99ad61da2610b09f533c4229ea79a498a3023e37b9cb8740074f6cd52339ac71d17ad235a04b188791f9919224bcdb9eb964
+DIST pdfminer.six-20240706.gh.tar.gz 11010877 BLAKE2B 7253d9fbdd44bce80b46d2006caa530b628327c2a2c5d68dd165267b7f2c1078895361da62b508991e4c0938163835a3381356e7353efd7208ee7b9e5ee3a0bd SHA512 01359926e889788daf92db8845978c3cd6e0b88c0659041d2df26d48e558a2918aa373ab86db19bc3c314220ed8c5070778d5b7fd1457b9145fe67aa735a94b5
 EBUILD pdfminer-20221105.ebuild 1005 BLAKE2B cfb847947603bf8685d8b1874b2ed83e5e9712bb9751b09819488c086bc5d0572173811fe162bdc5d0472ea1fa6f6c61a32a0d84c93605b1d1f95a8ce54e7080 SHA512 2bc6301ef424361ad5f5f956468f21561eb59a1332ec898c165ae012e6833882d3005d17d68a771e7535797fbf6eed4dcb7c6458ef8affa85cffa98ba0797624
+EBUILD pdfminer-20240706.ebuild 1027 BLAKE2B f688efb9132064610de77dddf84f78df0f7c6dc8f19ecfdee30e9beee1ad9e1a968cba526ff1f5d882eaa6f3a2facc20c7f4294d5a113d3e6a3099c48c993d63 SHA512 750f72fb41fed5ebdd8f70e024fc4878992ae4d230ddd32aba215897cd30f08c54c4d1e089830429e66bee8576e74b63c12d329b8fe18016998c6d7774e7589e
 MISC metadata.xml 304 BLAKE2B ff3b83eb539e3b10c265d9a8708bd87ac8c071e19540afea2ff14a41c4643065b2d37e651473e040db8c13f0a80b9d5f2d5346763f458bbfb896aa75e0129b02 SHA512 136520029f2cc0394890d854da1b270537ae36cee617a4ae69923ae8da758705a31b0f023ad973f380efd742a0f45411809b86af67d757c163b5723166a28002
diff --git a/app-text/pdfminer/pdfminer-20220506.ebuild b/app-text/pdfminer/pdfminer-20240706.ebuild
index cbc3e5638e44..5ce145c1bb21 100644
--- a/app-text/pdfminer/pdfminer-20220506.ebuild
+++ b/app-text/pdfminer/pdfminer-20240706.ebuild
@@ -1,42 +1,36 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit distutils-r1
 
 MY_P="${PN}.six-${PV}"
 DESCRIPTION="Python tool for extracting information from PDF documents"
 HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/"
 # Release tarballs lack tests
-#SRC_URI="https://github.com/pdfminer/pdfminer.six/releases/download/${PV}/${MY_P}.tar.gz"
-SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
+SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]"
 
+distutils_enable_sphinx docs/source "dev-python/sphinx-argparse"
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	sed -i -e "s:package.__version__:${PV}:" setup.py || die
-
+	sed -i -z -e "s:setuptools_git_versioning={[^}]*}:version=${PV}:" setup.py || die
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	use examples && emake -C samples all
-}
-
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
 	use examples && dodoc -r samples
 	distutils-r1_python_install_all
 }
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 8ad745bb64d6..cc35286decd1 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,6 +2,8 @@ DIST Sigil_User_Guide_2022.05.17.epub 8894634 BLAKE2B 8a7c5b5add54d87dfe791a0dbb
 DIST Sigil_User_Guide_2024.08.15.epub 12641984 BLAKE2B feaa8a4f6b64786d5cbf494a61c8726a5dd3e169ca8902348e2fee9f890ab7496b5ad018d49d6cecd65cb3d3d4a9b4a6bda019ac52c324fa92fad3e7b5dbc680 SHA512 10199c037a57f4b9ed913a8c726a58e376dcd34300a98cdd4cf934fd3a2f9a26d2f92bd85131af7ee1084824d7b082f7becdec9b0731a62f9cde712bfada5a09
 DIST sigil-2.2.1.tar.gz 26131954 BLAKE2B b467d33a1e98733d7bf051cc152a5e8980af83c0992c4ca755d5dd666d5ea753b51d2642b6027a8c52e86077f3a92e999867cb774f619f729df3c51424fa3795 SHA512 a0f7e0529286e9d5020a97c6179791a1312df93cbbca4f5966dea40517eb9ab8979dd7048fe54f3cc821ef165ddf8a5bcb2ca6ffdde1b51196f6d2a7376162f0
 DIST sigil-2.3.0.tar.gz 17480782 BLAKE2B abcb5eac75ec56e9bc83a50175e6e9dc8a494aec0a8aca1585503a5a5727557bef9039d1b457f8e03ef00a8baf1bcb9fae29a6f720483ee30fa3bace777e7066 SHA512 1a12022f7af26e4713083c0c84b07c4ebe2825667391f8d47cd5984e69547daad58fe3bdf7a40c3b4f1aa4c4037a548c011833a9dd8754c1c914555548a0ca8f
+DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
 EBUILD sigil-2.2.1.ebuild 2658 BLAKE2B 0e2946c04521844adc0d492ecaa8137b2ff02883182664597dc7e0a6de2851b433c096691ac7f0edd2f3a03613dab9ff28f6c92d0b1fb034fc401eaba45de048 SHA512 d265f2756b29f4b2ad71ef5d72ebc3f5c963d0b31fe69f7ef64ba60a740e26fc05019865fb20e02e1eef141883b53cd6fb6a5b8b2ba4dde05ef109716e2d3d4b
 EBUILD sigil-2.3.0.ebuild 2240 BLAKE2B 2a52db970e91a1de12a74d273dca8149f29a9285e8972791ac8db3235f64c509c090df724dab900566b42f81890586af133f8723c8fe04c16e92774430c7c2cc SHA512 56ef2cf8783dc4d7db7e8017c58b58c5b6e1aff6d04a77ba9c16711448af1847168dbd72941d91e92a88dc46138f33104abaf931fd14cc3796d6e39afa01c6ee
+EBUILD sigil-2.3.1.ebuild 2240 BLAKE2B 2a52db970e91a1de12a74d273dca8149f29a9285e8972791ac8db3235f64c509c090df724dab900566b42f81890586af133f8723c8fe04c16e92774430c7c2cc SHA512 56ef2cf8783dc4d7db7e8017c58b58c5b6e1aff6d04a77ba9c16711448af1847168dbd72941d91e92a88dc46138f33104abaf931fd14cc3796d6e39afa01c6ee
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-2.3.1.ebuild b/app-text/sigil/sigil-2.3.1.ebuild
new file mode 100644
index 000000000000..cb9aa8b5f970
--- /dev/null
+++ b/app-text/sigil/sigil-2.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit xdg cmake python-single-r1
+
+DOC_VERSION="2024.08.15"
+DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub"
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )"
+S=${WORKDIR}/${P^}
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +plugins +system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/libpcre2:=[pcre16]
+	dev-qt/qtbase:6[concurrent,cups,network,widgets,xml]
+	dev-qt/qtwebengine:6[widgets]
+	dev-qt/qtsvg:6
+	sys-libs/zlib[minizip]
+	$(python_gen_cond_dep '
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	plugins? (
+		$(python_gen_cond_dep '
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/cssselect[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+			dev-python/regex[${PYTHON_USEDEP}]
+			dev-python/PyQt6[${PYTHON_USEDEP}]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}]
+		')
+		$(python_gen_impl_dep 'tk')
+	)
+	system-mathjax? ( >=dev-libs/mathjax-3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-qt/qttools:6[linguist]
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DTRY_NEWER_FINDPYTHON3=1
+		-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+		-DPython3_LIBRARY="$(python_get_library_path)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DINSTALL_BUNDLED_DICTS=0
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DUSE_SYSTEM_LIBS=1
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+
+	if use doc; then
+		dodoc "${DISTDIR}/${DOC_FILE}"
+		docompress -x /usr/share/doc/${PF}/${DOC_FILE}
+	fi
+}
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 5da3da4fdc2a..5c9d9771f3d1 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,5 +1,3 @@
-DIST vgrep-2.6.0.tar.gz 1589155 BLAKE2B 847954ccf020c2b7f54360aab2fd9e3fc897dfd3ceab7d9ecd79f378c18196048649b37f4f9b62dc8f2af46f874a8433c8a20e5e025ca9e0f08b8f6859b0dd40 SHA512 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846
 DIST vgrep-2.8.0.tar.gz 2039369 BLAKE2B a01191c860fb615ff569e3b3e9b49dfeab9d534bd8a94d07ff8ce49f65bedd75eda8ae79127e0e3eb7cf2343e6493815a954f74318296c89397a384566448f69 SHA512 1fbd674a7fddffede70a9d0715bf09359d48abf5c238cace43996a222e3e34ec73a7911f62b8476a2dcef40485ce192476067fd99d52b7fa0e7e3fe9297f461e
-EBUILD vgrep-2.6.0.ebuild 634 BLAKE2B 98d0e18bbca2de0fc6c1a8d46ac6afe50590565b875fc5dac292f36f8844ad150e6f2c4618fd246a68e8f381df0782ee2a2501ddf5b1814a2fd3bc810694383f SHA512 1433c4df0a32316b2160e1309ca9daf61cf263ce01124b850eb1a0020afc1e9657fee0e397911f4212a252751ae528e58b19c75539713295b719593c192dccbe
 EBUILD vgrep-2.8.0.ebuild 659 BLAKE2B ccac6ee1249ce1c3771ec271639b48a8848c55f845e86a13f17e4145d1feeb100fa7531780496a5d11ec0ea9f7fb5387c9035895c0ab9b300584042b460ab47b SHA512 6686d905dfe67e1b788b7a3ddde7f7051fc9c1190b5aff07a974ab806b1f8135c7c362cdd1cc4758de13ffcdf165abd04ee9fdc67062d5f0905189f8e208adc8
 MISC metadata.xml 311 BLAKE2B 9bb01955c88bd8e6141c6f891ddac6dce2f197516c593e95d417352b730b3413cee53a2c8833f8075e97de0533fbd66c71077f265409759ab601e0be8d3ab6b6 SHA512 7e03ea65761a58c9efb263ba701e91550548f10d25fc9708b6b2ba58ae35d4f870cbd0532c1ef6cddf87e6f76226bc6f03fa657cfc3ba18324ca8391e241a328
diff --git a/app-text/vgrep/vgrep-2.6.0.ebuild b/app-text/vgrep/vgrep-2.6.0.ebuild
deleted file mode 100644
index 1b3329afca49..000000000000
--- a/app-text/vgrep/vgrep-2.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD GPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# golangci-lint is required to run tests which is not yet packaged
-RESTRICT="strip test"
-
-BDEPEND="dev-go/go-md2man"
-
-DOCS=( README.md )
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	einstalldocs
-}