gentoo auto-resync : 07:09:2024 - 12:29:07

13 files changed, 177 insertions, 158 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 346c17087762..daf8d2909f72 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index df55a487e84c..4ce63878577f 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,8 @@
 DIST ansifilter-2.20.tar.bz2 439551 BLAKE2B 71a24e904d7d3769bd0fed4ce93d960fbe434b117dc9f0e0d6b43ced40ce78d315ad58a5b83925ea0d16595e79e0ae415fc1e52323a0c367c63edc1ede57c039 SHA512 f05942eee53513cc81054bfb853fa9a946ffc0c488564975b06e3d1feb15d8ee7be05c561905cdc5944f4d083f04196af0f7c90665b8048ca7e400537517498c
 DIST ansifilter-2.20.tar.bz2.asc 488 BLAKE2B 2f2bb56e3cd81e79cd3b5b34e0f5224a79e26977f94708c64ea4278b186acc72e28ce9509fa3c0f31619b3d3ea8e35ee83656d7560152c05bafcffcb12204456 SHA512 5002436eb38399bb7cf96914fd1778ed53a9a0d8fd029b37ae50c6db8b411248f602efcd7bcb9a69871f2b3526fccf4875e3f958afccaeea94e286ddb0f071db
+DIST ansifilter-2.21.tar.bz2 434994 BLAKE2B 57d85bf0b1feabf6665b4b84e6b2418985c72a12a62e0e8f39f1b5f32190b64f3224dbe84d124631a8adfe08a1699c59b072a963770d44b09f9a97662ca0b274 SHA512 9bdaf7ec769ec58258c27723ae1aab5f8227b61fe8b8ddb4b429787819c7e40f8a911daacd21427b93e2668555e97b2dc28d502c971ba496a3b50a1eeec5fbb1
+DIST ansifilter-2.21.tar.bz2.asc 488 BLAKE2B 80fdedbe258417cd9eb858bbb342583a00e1cc2bf7344c30cbdbccb5a781770ecc73ae237ad03701d19a97b6c1eb7f0b49c02307533725d56b54141fd67b3c99 SHA512 f58d355aaa1362912ebae214bb6b6f5d355a6cf3fbc9ad42e8d2be8d3f0106a8eb2f7e2db69460f92816f57f5a6b33b28ad21d2c86301686975b6ad3b49c2a59
 DIST ansifilter2_logo_256.png 54539 BLAKE2B f8b98e22b08c62769bc679f17b3f9d2faeee806d95af3b4a4876e4938813694a4924ed4684163e962d94d3f1efdd31facdae4c3eb75c98322da228bdf0a130be SHA512 ff6f76a91a4809289f90db2bcefc01e772e043a478d7f84b33b4313ed163692e7d2f87880e5fdb64f0e419f6c1ef6ec85240f5a9984223e9059f0803be313de5
 EBUILD ansifilter-2.20.ebuild 1940 BLAKE2B dce9c87de7fa5c6d932b3224e9ed13ddc25cf04516a8f8687838f0f28e3d743d0ccc8b10d2732af6dd5153b09f90e36a6630b5581efd8b79978ce8ba7cdf1ca0 SHA512 585a4ce4b99d14d0f5a04a9325abcdfa101571fbed48a6309d5480df67133851313c15d73f92121a740607a37bec10f3eebf6c06e61632f153f1aeda22ef295d
+EBUILD ansifilter-2.21.ebuild 1903 BLAKE2B 9158d1696e0ce28334abe8a96076272cc7cfe291a3321517a32b92caafe047605d2dd2f980b0887862dcf8e63943212bde00a85084f5692e1df526a36f3eb42a SHA512 5535fb4cbc37ceb6d13541f1bb49128effcc5aa1c399cc3edb160aa365b6a86ea6b1b640201395ad7176c38957db3571b9963959c8d88a673c59d415165004ae
 MISC metadata.xml 330 BLAKE2B bd53d42fa198c95c42d3775b1fcc44b3f0ebff17e6da2397ecedd7f11feab092213e91d4851314e930c263d218a0f360e877b81aec08926176dd313288eedc9e SHA512 499715ace48f835425baf484bc305545933046c6318fa16ac52f8ad363802e0c589b76a40e1b7036c1b204f55d3c069297877b199921fa4c2fe1a55ee9795848
diff --git a/app-text/ansifilter/ansifilter-2.21.ebuild b/app-text/ansifilter/ansifilter-2.21.ebuild
new file mode 100644
index 000000000000..0e78c154385e
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.21.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs qmake-utils verify-sig xdg-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="
+	http://andre-simon.de/doku/ansifilter/en/ansifilter.php
+	https://gitlab.com/saalen/ansifilter/
+"
+SRC_URI="
+	http://andre-simon.de/zip/${P}.tar.bz2
+	gui? ( https://gitlab.com/uploads/-/system/project/avatar/6678914/ansifilter2_logo_256.png )
+	verify-sig? ( http://andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="gui"
+
+DEPEND="
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	verify-sig? ( >=sec-keys/openpgp-keys-andresimon-20240906 )
+"
+
+DOCS=( ChangeLog.adoc README.adoc  )
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+
+src_unpack() {
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/d" \
+		-i makefile || die
+
+	sed \
+		-e "s/-O2//" \
+		-i src/makefile || die
+}
+
+src_configure() {
+	if use gui ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CXX="$(tc-getCXX)"
+
+	if use gui ; then
+		emake -C src/qt-gui
+	fi
+}
+
+src_install() {
+	emake -f makefile \
+		DESTDIR="${ED}" \
+		doc_dir="/usr/share/doc/${PF}" \
+		-j1 \
+		install $(usev gui install-gui)
+
+	einstalldocs
+	if use gui; then
+		newicon -s 256 "${DISTDIR}"/ansifilter2_logo_256.png "${PN}".png
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index bafbebc235ed..8b1d42d0a600 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
-DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
+DIST asciidoc-10.2.1.tar.gz 1280535 BLAKE2B 9e15eb5d40384fe586a6148e53e03e73a6958061841843f7b32b4209a15477f97a6547ea1cb48d23b5d4c9ee5add1bfa87d53c1bfbc14c10f31397ebeb86ba39 SHA512 02d064aab8dfb05af4ae49a7c7bd1381156c6c90f95b2494218c80f01c39987cb971d68c533b5519abade77be9832b3fab653d8ae2ca7bb682c5bb720612839f
 EBUILD asciidoc-10.2.0.ebuild 1448 BLAKE2B d21ab08ffd08ee3799ce73955cd4d5cf3d5340d733a48abf7d7793631bb15cdb7bf2759f42ade59cdd777abb090edc1b2ee9416d580b8efa4f2afb339a40a20f SHA512 329740f7a68ae62d113f51a139d13f324521fa2f436bb6c1ca89ec5be757476bf334a1537d9d797b9156ad03d6ffa21f1514a019c953058efbf1913cf3d2416c
-EBUILD asciidoc-9.1.0.ebuild 2289 BLAKE2B e1412278721c83616614cad672cfd9acf716b1dc536bda8882be0d12322a8e2d48dabc3f539616715879a8a620a8f1f4e31d44d32641cd4bc219fe1a53c27948 SHA512 01033329b222c38addb0789422605af900769fe4d1fe7da6f01210234f66c8f460b22d701cbc5a6662c30f5e276ea41748f06d79807382e1d602db65b578e001
+EBUILD asciidoc-10.2.1.ebuild 1714 BLAKE2B 2edc0f11f57e2de78ad2d236c4e185012ca033fd6ae9d211afe6f785123e829377f93753cc2d5e0e1c13c09b1bb59f70f4977c910411de9199c82388276ac0a3 SHA512 fedfd47cad249e3ce4963b2ad497f631ed5e09f7d754284eaf2d4d38f1c333abcca347d594647c820512e7bba0c3e8cf38822fb6465dbc6b4538d75678e7dcc1
 MISC metadata.xml 437 BLAKE2B daddb5640390428ca681f4efacc9fb3e02d11687644d2ff2d233fc5fa59f7950dbe8cef9f875f3e2af077a74567a4e4f48b187b1eab64e5a9d4ef3f5b1cffa1b SHA512 5d281a8e6fd3dd551a9d5df099f3b0586c363f4295a5e9bdb63c82a501d076e04c3b4a88f0f861d445ef3bb22970b10e15eb98094375f3e634cbbe506432bedd
diff --git a/app-text/asciidoc/asciidoc-10.2.1.ebuild b/app-text/asciidoc/asciidoc-10.2.1.ebuild
new file mode 100644
index 000000000000..af922182340a
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit distutils-r1 optfeature readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="
+	https://asciidoc.org/
+	https://github.com/asciidoc-py/asciidoc-py/
+"
+SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+"
+BDEPEND="
+	test? ( $(python_gen_cond_dep '
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	') )
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# TODO: Consider using Debian patch to allow /usr/share?
+	insinto /usr/share/asciidoc
+	doins -r asciidoc/resources/.
+
+	doman doc/*.1 # bug 834835
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "music filter support" \
+		"media-sound/lilypond virtual/imagemagick-tools"
+	optfeature "source filter support" \
+		"dev-util/source-highlight dev-python/pygments app-text/highlight"
+	optfeature "latex filter support" \
+		"dev-texlive/texlive-latex app-text/dvipng" \
+		"dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "graphviz filter support" "media-gfx/graphviz"
+}
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
deleted file mode 100644
index 075821590784..000000000000
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2
-	"
-DEPEND="
-	test? (
-		${PYTHON_DEPS}
-		app-text/dvipng
-		app-text/dvisvgm
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick[png]
-		media-sound/lilypond
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
-	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
-	   filters/code/code-filter-readme.txt )
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		asciidoc.py || die
-
-	# enforce usage of the configured version of Python
-	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		emake DESTDIR="${D}" docs
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
-	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
-	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 741b0e482ff8..8b7805199583 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -7,5 +7,5 @@ DIST po4a-0.73.tar.gz 5117198 BLAKE2B 3072c3a55751610e565b71a754d79b20529d8d6f1c
 EBUILD po4a-0.69.ebuild 1409 BLAKE2B ba00a654e048bb2d0101e10cfd9a29f5517842a5bece16c0964016000f42a2e5dfbae037edf6fba83bc82bcb4dcc6b221df657d80d8bc7c143da449dac763221 SHA512 ef49ef6cf186bf412f683e5a9873bb5276c73bf7a7b8e781076652d8e313fc56968111ad9350bccd604945c1cfdd5ad086bcca535197c65ece2a4058a45e3b88
 EBUILD po4a-0.71.ebuild 1414 BLAKE2B 569c7a2b8939284c75972f58039bd813f43f706aa83a28861c91cc222edb59ab797050de6c9fbeac6648843af0bf871988f97eb53090cde17e8a83fa311630d2 SHA512 d4602216bf0c638bae626ddac863cc6983f0acb7070d6d96aa7ff897da281aff8f16fcca204cac61d1bea33229455b862fdbaf2e890f95bad21890f60e9cf1c0
 EBUILD po4a-0.72.ebuild 1414 BLAKE2B 569c7a2b8939284c75972f58039bd813f43f706aa83a28861c91cc222edb59ab797050de6c9fbeac6648843af0bf871988f97eb53090cde17e8a83fa311630d2 SHA512 d4602216bf0c638bae626ddac863cc6983f0acb7070d6d96aa7ff897da281aff8f16fcca204cac61d1bea33229455b862fdbaf2e890f95bad21890f60e9cf1c0
-EBUILD po4a-0.73.ebuild 1417 BLAKE2B a784e5608e6722d08ee3c9d87ee8a113dcba0ccdf832187db4d3dc5d77d39a931f10ad9a6fc8449af6e7eeacbab5b655efb19816c6669300cc9654e1d233c26d SHA512 799e0b89cccd87c1ccfc86ccb3123b566af55c15eebb015acb23900eb8d6108e1dfafdf2fdfff776c475ef263acc13ea863eb70010c01e4170b5a6dc63a1bb43
+EBUILD po4a-0.73.ebuild 1415 BLAKE2B f02484df19c306f19024a8825b2dfa2dd7c94c306bf1b626b87a6b010990eb444e53f2fed2fa618aa437e5d1ea4fc88d7a4819fade7757a011d750d473e893d7 SHA512 721bb74dfb76000bcc2fe5f8908d6d1daf3b6e7f110a6625d2e05cd2ea79327a09d28b4097877a2c67c92591c901f1f616decc17ee1d625e1147a6dc000ced21
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.73.ebuild b/app-text/po4a/po4a-0.73.ebuild
index b357dbe88d6d..2e5edcf53f96 100644
--- a/app-text/po4a/po4a-0.73.ebuild
+++ b/app-text/po4a/po4a-0.73.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 02a9ec094eba..5da3da4fdc2a 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,7 +1,5 @@
 DIST vgrep-2.6.0.tar.gz 1589155 BLAKE2B 847954ccf020c2b7f54360aab2fd9e3fc897dfd3ceab7d9ecd79f378c18196048649b37f4f9b62dc8f2af46f874a8433c8a20e5e025ca9e0f08b8f6859b0dd40 SHA512 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846
-DIST vgrep-2.7.0.tar.gz 1998937 BLAKE2B 8f5bf53814604ff3bdf7492ec8ad96811a62c9accc0664d07db86039e117686f551c6aaba40e5af4e1b646289a0e996b4f1cade9fc1a197778504e5c8d114830 SHA512 5cc9e866c6de9b024d29dc9aeeb87d6eea23becde63968b2a9266412bbe44920fa13d5e7dda47bb46135301ff7f5fd79e02ec2da8a9a694183d9e63aad64478d
 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.7.0.ebuild 680 BLAKE2B a5dbb0f96be7f6b0466aaf4ceced2e955f9ca3c3e883d4b103280dbf20a5d4a53704554e2c7810ff681e25e99a1193d4e8e8ae0aef5f382a36c95078329bf513 SHA512 afc29776dcf27de136a55ec7a93e16c12a6916e43655142259bf0c34d9cceda8e457e97f4a195d6501d9b0d230bd1670d0dbed7f8d9dadf950d8cf3b2191432e
-EBUILD vgrep-2.8.0.ebuild 660 BLAKE2B faf456e3fbc73aa77872962049a825c7a42c458644fbe42f4a257e856c8f2518eb3ddfe1c736e59c11a9aad6ab19626a398c73bd8b220e49bbcbf28a24e5fc9f SHA512 393d74662f78a453f6c329fd84b0b587d759981490d2d13cc799485b6eed8f697a45dc3e70cdb43984800256ecef5658c1b8cd9a9a114c40c04bd3fc6bd1d2c1
+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.7.0.ebuild b/app-text/vgrep/vgrep-2.7.0.ebuild
deleted file mode 100644
index eac568a4d663..000000000000
--- a/app-text/vgrep/vgrep-2.7.0.ebuild
+++ /dev/null
@@ -1,35 +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"
-
-# tests just run golangci-lint
-RESTRICT="test"
-
-BDEPEND="dev-go/go-md2man"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -e '/-ldflags/s/-s //' -i Makefile || die # bug 795345
-}
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	einstalldocs
-}
diff --git a/app-text/vgrep/vgrep-2.8.0.ebuild b/app-text/vgrep/vgrep-2.8.0.ebuild
index 097f33c9270a..2b945375c31e 100644
--- a/app-text/vgrep/vgrep-2.8.0.ebuild
+++ b/app-text/vgrep/vgrep-2.8.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64"
 
 # tests just run golangci-lint
 RESTRICT="test"
diff --git a/app-text/xmltoman/Manifest b/app-text/xmltoman/Manifest
index 274a710cafe9..a78706e74bbf 100644
--- a/app-text/xmltoman/Manifest
+++ b/app-text/xmltoman/Manifest
@@ -1,6 +1,4 @@
 AUX xmltoman-0.6-generate-man-pages.patch 2083 BLAKE2B 3f4136a06607d0c1b0d07acc5d82b977b1e3d1097d08bb29d8a626e1d5d86493892e58001fdd2946c5de96e62702bef5fc4f982507e89d5ac4069933d8638196 SHA512 879c11f14b33a3b134817c62a6f6e6470213e7aa7663b1676444746ab177b5b750114b5023dfa563fd85997ca0c7f7f2683264d0d1f985f363365529941a2ed7
-DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
 DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d
-EBUILD xmltoman-0.4-r2.ebuild 752 BLAKE2B f7603efc18af6c31923912bf2b6af2c35cd0d5609d8360e1fcf8f10be4e5256490c5097732a6c7603788b988ef4e2a6cb9976125339c5f4443b7a45b8867a8e4 SHA512 09a715149ed3dee1ca114ce3dec30a3e6107b599c4315684943e02ed0e6cd7bda5d727402612b469dc1d2658192b2cd82aa0e55552c1a84e19cdcc09c183b4bd
 EBUILD xmltoman-0.6.ebuild 817 BLAKE2B d3a18f66e47b35ed9fda5f443749fcd78621c6e616b2293ee1657b61b57f6b95a3ed07363db6a847dfe62ba29720d97d0083867f39f34b521f642ef155f510c9 SHA512 992bc8b984772aed146da86840db303cc82f596846260876d685839a370f03f571be00848d5378ae73c6722bbf0e99e84469903f3654702a330fd7482e7edda6
 MISC metadata.xml 299 BLAKE2B 5bb9887ce9510e2a71a5b30e8b2ada78236ec6f2489bf27d6536b47fcdcaae262b7ada77d3f0f8b00f7a2223e7344a4f130f4636a1c61d64bebb923c916c2d6e SHA512 6fef6c50b720fd2aec25ede9b037c5973de9f4e41383c2836f27f42e68b73c32dcac0d31e1a9ec209d5d685e50ccd8c8347ec0822530be23624bd98d2b9f3095
diff --git a/app-text/xmltoman/xmltoman-0.4-r2.ebuild b/app-text/xmltoman/xmltoman-0.4-r2.ebuild
deleted file mode 100644
index 925a47ce4c20..000000000000
--- a/app-text/xmltoman/xmltoman-0.4-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Simple scripts for converting xml to groff or html"
-HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-	# 'make install' requires GNU install, upstream is dead and carrying
-	# a patch is more space than redoing it here
-	dobin xmltoman xmlmantohtml
-
-	insinto /usr/share/xmltoman
-	doins xmltoman.{css,dtd,xsl}
-
-	dodoc README
-	doman xmltoman.1 xmlmantohtml.1
-}