19 files changed, 4 insertions, 547 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f0cecd7436a2..09ca6169b186 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index f5751cfb44d6..15fc54ce647c 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -3,6 +3,5 @@ AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43
 AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
-EBUILD drush-6.7.0-r3.ebuild 1662 BLAKE2B 0751cb188decdb40fdadb7262e76f64dd4714969280d6c86fffa244da69548a231f80410db736fe02d9642d6e3af2f865c708d2c6a7d8596e6d11688a4897546 SHA512 9d679410746ed141b629e4aea2af3ef847062740dc8a7825bc0803f42f117f362309e8741f0dea904ae0d115ac6adc8e5cd0488dd71b90ebc6650f04fbf78820
 EBUILD drush-6.7.0-r4.ebuild 1731 BLAKE2B 209588f8a0e5a2ec602600d8a5d10e465517230f102a7ab3af0753561469c2ad1fd06ca48dd06be0c18e79ef9f95c65a1bc142ce66adf7333606c08085a947d3 SHA512 492a35026e2c3e781c082a17e2a3d15fbad235bb5ed56bc50f98b501fb7c8f97efd0b98a807257fcbe0d0b420504a5ddeeef67339592dac7f49ad9a78defe0eb
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r3.ebuild b/app-admin/drush/drush-6.7.0-r3.ebuild
deleted file mode 100644
index 1ecfe2c05382..000000000000
--- a/app-admin/drush/drush-6.7.0-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command line shell and scripting interface for Drupal"
-HOMEPAGE="https://github.com/drush-ops/drush"
-SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
-	dev-php/PEAR-Console_Table"
-
-PATCHES=(
-	"${FILESDIR}/update-bash-completion-script-for-2.1.patch"
-	"${FILESDIR}/array-syntax.patch"
-)
-
-src_prepare() {
-	default
-
-	# dodoc compresses all of the documentation, so we fix the filenames
-	# in a few places.
-	#
-	# First, the README location in bootstrap.inc.
-	sed -i -e \
-		"s!/share/doc/drush!/share/doc/${PF}!" \
-		-e "s!README\.md!\0.bz2!g" \
-		includes/bootstrap.inc || die
-
-	# Next, the list of documentation in docs.drush.inc. Note that
-	# html files don't get compressed.
-	sed -i \
-		-e "s!\.bashrc'!.bashrc.bz2'!" \
-		-e "s!\.inc'!.inc.bz2'!" \
-		-e "s!\.ini'!.ini.bz2'!" \
-		-e "s!\.md'!.md.bz2'!" \
-		-e "s!\.php'!.php.bz2'!" \
-		-e "s!\.script'!.script.bz2'!" \
-		-e "s!\.txt'!.txt.bz2'!" \
-		commands/core/docs.drush.inc || die
-}
-
-src_install() {
-	# Always install the examples; they're referenced within the source
-	# code and too difficult to exorcise.
-	dodoc -r README.md docs examples
-
-	insinto /usr/share/drush
-	doins -r classes commands includes lib misc
-	doins drush_logo-black.png drush.info drush.php
-
-	exeinto /usr/share/drush
-	doexe drush
-	dosym ../share/drush/drush /usr/bin/drush
-
-	keepdir /etc/drush
-	newbashcomp drush.complete.sh drush
-}
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index a48e3ca40935..d07da56d25b8 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,7 +1,3 @@
-DIST entr-5.0.tar.gz 25480 BLAKE2B 5de00d6b1042667e209b2c33d7d019bad4833a0711a18d47eddb129ef60f5518c42fc2af3169510f57eb39f861d416ab67d7cd83e4a631cfcaa4cc7ac266f82d SHA512 f485efb7d05f1d099c85d8af2f313e3ed2f36720483afc3004479b5b8754c60c52a108b827efd017c674f01d6ced2878a317addef3960c8cdf9e6b142f2ad5fd
-DIST entr-5.1.tar.gz 25674 BLAKE2B e456c415198f4d5be49fd52785cd8cce41756d2ebe14c493891c3fa05f3a763c9e3be65538d3150b484e48e0d23615556dd6c45fdbefc7b2052fc36f265ca685 SHA512 b8ee7dae5bda503af814eb109a0180c9864fa1b1cf5a2fe53c9915b6536e9471f8293c63d138d881da7bf70dfee24a6c271b82ecb6ccb2cb6ea664cabedba202
 DIST entr-5.2.tar.gz 25834 BLAKE2B c14eddaaf26994679991c43b38dcea0f1cbf53ce517af462cfed9dea2c914d9c1719053cb3b9f28f04d0cbf8719fe5612963c1428832e02bd55545ba33c72556 SHA512 b12310b6695f0b3d3d830b651dd182ddf2321aad38f569066cc2e5b17570070e48eb4900725c88c1d31a8ff71099aba78fb7508ad60706265cbdf8f29257eaaa
-EBUILD entr-5.0.ebuild 575 BLAKE2B 24498e497a23e8b5ae5b96b0275b0fbcde28f9465ceccb7dead8a12fe9a13b7537ffbc4d1dec11eaaa7328b7dcac375e717d3ed9c7a9740c4c0be1458787eeb0 SHA512 363af574c8398b7c929c00f1d756a83d92ec658f8e674a853f1d7c53c93855baded13efccb6ffbb4f8919c2602ac90a7b982c61801c484e75f4244d7bb71edb4
-EBUILD entr-5.1.ebuild 575 BLAKE2B fa955429d501d1eb8cc6fec1d092209cc086020ec93c188f3943b8e5887cd7e93ea2d95e2de2fe58574284a704b980b88780a5c4a83a795713f97a48484b8826 SHA512 6c8b7e0b18a46ad3f52d30fce9dac7e3fad2fc8c909f9199aa052fccd29a4e745785cc2fc5ee6bdddfa6914a042728c32e4ccd93f7acd5977f28adff90395230
 EBUILD entr-5.2.ebuild 611 BLAKE2B ae084f4e1104a3e8652ae939bc338cb36777ef2f380c328d449217a42caa9f0734369c1f872301732742b0845ac9fbf7989049119eb4196baf9711014cfd2f8d SHA512 9e07fe4c426f03c751e52c7f94ec0f0ee5799755e9cae56c47067e15fbc14898e6104fc1f2028b4efdc5f89dc703a8cc95dd5dd4ef786c9707bb97b6923431e9
 MISC metadata.xml 455 BLAKE2B 294fe2a1c6597cc0988c97a080f00c8dc1f48d96f87eecd329425d66f8bbb7e39b1152bcb7645f51b7cc0aa97186f05528c4766ae90e636ac5ab482dceac423c SHA512 d08a5678831d0d97c31588ffc0844acf137a0527d88c529a51d4c3a72f04ee71ea49450a79bd5a9a442c443c792b4d771bdff4551c9c64c2cacfd55048f40c94
diff --git a/app-admin/entr/entr-5.0.ebuild b/app-admin/entr/entr-5.0.ebuild
deleted file mode 100644
index 760aed913403..000000000000
--- a/app-admin/entr/entr-5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="https://eradman.com/entrproject/"
-SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	default
-}
-
-src_test() {
-	export CC="$(tc-getCC)"
-	default
-}
diff --git a/app-admin/entr/entr-5.1.ebuild b/app-admin/entr/entr-5.1.ebuild
deleted file mode 100644
index 53c88c3095c2..000000000000
--- a/app-admin/entr/entr-5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="https://eradman.com/entrproject/"
-SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	default
-}
-
-src_test() {
-	export CC="$(tc-getCC)"
-	default
-}
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index f381b5f1ada4..1258949f11b2 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1,6 +1,4 @@
 AUX hardinfo-0.6-fix-function-declarations.patch 5559 BLAKE2B df1c7393b645067f68a128fbf39b2eb75501fd40c4f5de52662aeaa77ed94193b6e0b7975993fbb1e64619a1e9f0a6e72c4333ec51e30ba6f4483319f3fd041e SHA512 5d5fef6fd8e6f9817b871b635a53c1682f193a7303b308d7a3493f63b2334589f278b4a40d7e87b62634aeffab82a2227cf142f29c9b8548d13a07d69133fead
-DIST hardinfo-0.6_alpha_pre20201116.tar.gz 1294614 BLAKE2B d585be00603a5da2873d0e15829039f3f5212e2ab294b71d7f53299d7eecdfbb2d46ee8d56913039bf03807cebe3f100f41ce6560a1a33fcd712eab59c2a92a9 SHA512 34ce849f2d1a9ea129502abfb186b43a0d8ddecc853d2edc3128389944a34efa3580c6d8a35b8fc40b55d64cc8f3c0d33b97f198a449ed0cacdbff2520853c1c
 DIST hardinfo-0.6_alpha_pre20221113-a798cbaed6f1b083cc3c26dbede74cf40947d0ef.tar.gz 1411038 BLAKE2B 8a6ca1a8e2bd53804cd6f55f0b9ce89d24d61aff9e267636301331d329229cd11778ea087e1906e7313cb1bd077ca69766e6fdf86c21985deba51f942cedf904 SHA512 faa7db1c8a7ac4f432a27cf10d21b453091136dd2d171b63f0b91eeea65c3cec25e7b4c2a845dfb64ff572ee6acaddfec56bd51f7292ed8b3674b44755a7a631
-EBUILD hardinfo-0.6_alpha_pre20201116-r1.ebuild 807 BLAKE2B dc8c789d2a758ead03efc6b12b0ebf9015ecfa4629c6298df5060e76f7c24ba74feb3157a2d92a9f69a271d9a80632caa151165c366d2ac4175b2ff1a14f3a13 SHA512 9aa490c2632ca915a6c95cdfcea9f381bd688042f5165a85a1e03f372c0beeaf87cd587e64485ef45a6291731140d0a7e2e1665ccf1d5e7fa4c310beafbbfa2e
 EBUILD hardinfo-0.6_alpha_pre20221113.ebuild 893 BLAKE2B ba5df1f6e715fbac549772425462c42fd2d925940f852fc663f673041a49f2d8b0f6c20644840b45132cb1c36ea6aeb80065c1bddf365f8350b2ba6611a32cfa SHA512 d028a13b55ad831e870257d7a143d4845134ac04abe8828ed8f7bc6083a0bc966695f37f8de3c76a99929f2587eb007e1422e3dc846fedd7db7882453832d86c
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 250 BLAKE2B ba7b806be711ae1988ec55d849a15675432fc0e75efb82b2e7fdd8a2366dbc01fbf0d56985af11c2da599849b01e5edf6a4076a5c3d3cb5893145e87bf3cdab1 SHA512 b08f58427154512cd38957b241f0226ef4cdd2edc202044af62720696116d408164773ca67f86b72ffd83587827ea2d4717f3feb7ba7fc978633079b08989bc2
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
deleted file mode 100644
index 3185f5988b51..000000000000
--- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-GIT_COMMIT="54b2e307af763ce87bc8c88e80785d8114bf38dd"
-
-DESCRIPTION="System information and benchmark tool for Linux systems"
-HOMEPAGE="https://github.com/lpereira/hardinfo"
-SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	net-libs/libsoup:2.4
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.0:3"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHARDINFO_GTK3=1
-		-DHARDINFO_DEBUG=$(usex debug 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
index 115e9d64a669..4571b973d5b5 100644
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">lpereira/hardinfo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index 57079e88a0f2..ff83c512b79c 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -2,8 +2,6 @@ AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf8427
 AUX radmind-1.15.4-autoreconf-libsnet.patch 9471 BLAKE2B e5ce9df01acf6e14f7342fa17fc6f238febc302ddf56a07778588359b7fda9cf7bc4ea2879e8ba8c2a41a0f8e99f9905e00e6d8fc9dcc7f96dce082eb2444233 SHA512 10ef61fb110e8bf8c3176b946466ba219ffba449ddb55167f256cf9df419eb4bda3be7b4a2b5a9e5c463cb9953ccf65fac5b0cb772ba295c5ae073a085a4f978
 AUX radmind-1.15.4-autoreconf.patch 13383 BLAKE2B f5f2acdae992bf05dc02ceef5b38987a6477badd838e16b7503a691fe2b0a3b168b74ddce69f69c8881454c57ce6386e5acefb9ae2780d2b7b83b593758cc10b SHA512 790a1b7eb7e2c42d7070e7f2dfbb78595cc19e6664c07fa75e8b50e00a06d7aa6f4623859d1b6a3f1d2e6cf5c64fc565387a92cd93b457c9f372c07afdbe90de
 AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
-DIST radmind-1.15.3.tar.gz 843033 BLAKE2B 3d4446e5ce9e668039277f63a16c014dbbecca870886e68603af4100cdbf4a0adf074d26c90985968ec1a680fb483395676b85020134ec56686318b3d0664d99 SHA512 121fa2ea4dc9532bdbb1440c3ee485db1d6a1e770bd01dc0e832d51ee26112441ff47bea8e7f063feffc4d5bf3cfc5ce53d316bb469ff4ff0a65ca5463c99d11
 DIST radmind-1.15.4.tar.gz 413132 BLAKE2B 1327b429e12b09d49866e393b344ec7e2c471313a9437e5cb979f25674c7871948a0a4374c05d4939a697702675df70279ac476b3ed6a437b99afe5c98918e25 SHA512 538165123dfebc5c3890ae0864bc32988170e5235093d291a18ea7cf86eb50e9cf90c8a0530ae4b72611e95b5faa9474561f411ad646374173ee7b14235b5a5b
-EBUILD radmind-1.15.3-r1.ebuild 642 BLAKE2B c410e25715c3836debb460709a2bc0d256316ceb8b39f1e9b4f22f9886fdd97ab3da3eb7c2f17c4290eda0d0966a400a55a39321cf83570973f0a35b9f9403f6 SHA512 15916229fea4a73545e3988bef5b6aadb918dc060b93ba7135ff5d3592adb5de0da15e9aea4afd08cdb3ac8010b62e11946d29c1e660ff4547f69bd6cc8d73b8
 EBUILD radmind-1.15.4-r1.ebuild 1189 BLAKE2B eabbf77d75f4c259c567326131c3f64f48f2a7ab2fb28931f5216bcc91ea7de8c04bae2c1d90db6c97129a520a8da16cb939aa34f04a6634fbe8e8dcb66b73d6 SHA512 c7255bc8ad3981c5c46dc09323a3ab2b371de5b65166bfd3941be69793180d121320c44486842ee766220e1638b9db0779eb25e820b4b0e8dcaad29efe831f84
 MISC metadata.xml 460 BLAKE2B aaf1b73647e24b19e28454b8584a49e144d7d201291056f5ebd5d624a5ffa0015cbf92a6320462fde926ef554cddf9ff9db5e8af729d443ac0bfa53b2ac40050 SHA512 5117fb2c14b96d8bbca062d9164e84448000b108fc450dfeb7a605c5080958f39b8dedef519652af3f6222ad5205eff2d1cb3b3f834b5de81aad2f005bc5056d
diff --git a/app-admin/radmind/radmind-1.15.3-r1.ebuild b/app-admin/radmind/radmind-1.15.3-r1.ebuild
deleted file mode 100644
index 972433fc9009..000000000000
--- a/app-admin/radmind/radmind-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tools and server to remotely administer multiple Unix filesystems"
-HOMEPAGE="https://github.com/Radmind https://sourceforge.net/projects/radmind/"
-SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-gentoo.patch
-	"${FILESDIR}"/${PN}-1.14.1-glibc225.patch
-)
-
-src_install() {
-	default
-	keepdir /var/radmind/{cert,client,postapply,preapply}
-}
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 8b9b7f943ce8..4a2c344ddbc4 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,9 +1,6 @@
-AUX patches/ulogd.patch 210 BLAKE2B 0a0822badb915fa6f2ed95e16c19c4a5d06322fd973e42391dc7ceff874ec9d138d33dac2e134d41e8ae669564f978c715b24188d6ac5f6b51fb9651a4e8599c SHA512 91183e53bfd00ed391a086705411771e275b2c9df7edce34829703f46152b7f4c194eafc53428a0d780c5798052356442b751546e3f96ed474cc0a3778e7f428
 AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1ae7ab2645a6de84eddf25e82a48c4185a6a9a991b4e3562e7d06579ba8a9b2fb36a9f5b0b7de SHA512 87331bc32592fc9153274a8716a5206392af99087f89d8ba51539c477805a1932706ad2fbb8f71947ef3534a368cb2559fd2f54ae0038ab49eccda85763e7a99
 AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
-DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
 DIST ulogd-2.0.8.tar.bz2 435434 BLAKE2B 8922a722d635b24dd8bed9bff9e96cbbdf1ac790defd3b205b6867f32d7abcd6dff1c37097305ed3ed627d66da1bdb1f7aa2a9fe7e29a2b2104959a986207478 SHA512 9f99f6f35bad5da4559d788dc3ba3dae17d4ae972737cae3313ecf68f08eaf5f55514fce6f30503437e4158fd30a06438b9249d5d20f6343964cbf690f87309d
-EBUILD ulogd-2.0.7-r3.ebuild 3181 BLAKE2B 475527691cc65a992b3cc52c685e775e8e115975372fe4dd0a33394bc65bffd644cd3e42d0953df91759eb8a0929d2939eb5b3046cec91bfd6365511b3f9785a SHA512 93f98c8731d5b82dd71a75f2c01700b3eecea5bc422381f5f085a214fba9540179965735dabcbcdf6945e6552bfb3b969a95c0bf402d75b39a1d3287652ad500
 EBUILD ulogd-2.0.8.ebuild 3164 BLAKE2B 2a2305cb2e1ab975d2879cb2592b3ffa7977bd4dd1a73e434b3bf455325e3cfea4faba144376f7024a623e147c0dc0bbff61fb1c6e6a4b6472e90c1e2bfcad5c SHA512 5549c5096483c1c00d9daf3e32ce801d0cbc7f6abf52dab4b376bc0e45a64d7b035d51db476c231025c720a6aa4b784750b9852ab6a8e92b8e83a40d7c446463
 MISC metadata.xml 908 BLAKE2B a03a79c9a3d2a9b6f0b59bd9593f7b506c2f95656bd0130e0282088b7b7822eeff98136675af356939f17f0e8f2cd32ec59836c7afe3278390e46b1e695f60aa SHA512 9b9ef498ad464f3e3cfc2c86f2fb3f7ec39f2cbf6134af63d6cff28fd523d977c8c154849ff1a10f574e9df346c06cf9fd3fdfa86be27e11e0d40352a7a8f170
diff --git a/app-admin/ulogd/files/patches/ulogd.patch b/app-admin/ulogd/files/patches/ulogd.patch
deleted file mode 100644
index c82e5022ed35..000000000000
--- a/app-admin/ulogd/files/patches/ulogd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ulogd.c
-+++ b/src/ulogd.c
-@@ -65,6 +65,7 @@
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <sched.h>
-+#include <limits.h>
- #include <ulogd/conffile.h>
- #include <ulogd/ulogd.h>
- #ifdef DEBUG
diff --git a/app-admin/ulogd/ulogd-2.0.7-r3.ebuild b/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
deleted file mode 100644
index 43b27f76543b..000000000000
--- a/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
-
-DEPEND="
-	|| ( net-firewall/iptables net-firewall/nftables )
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson:= )
-	nfacct? (
-		>=net-libs/libmnl-1.0.4
-		>=net-libs/libnetfilter_acct-1.0.3
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.1 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/ulogd
-	acct-group/ulogd
-	selinux? ( sec-policy/selinux-ulogd )
-"
-BDEPEND="
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-	You must have at least one logging stack enabled to make ulogd work.
-	Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
-"
-
-PATCHES=( "${FILESDIR}"/patches/ulogd.patch )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires a kernel >= 3.3."
-	fi
-
-	if use ulog && kernel_is ge 3 17 0; then
-		ewarn "ULOG target has been removed in the 3.17 kernel release."
-		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Change default settings to:
-	# - keep log files in /var/log/ulogd instead of /var/log;
-	# - create sockets in /run instead of /tmp.
-	sed -i \
-		-e "s|var/log|var/log/${PN}|g" \
-		-e 's|tmp|run|g' \
-		ulogd.conf.in || die
-}
-
-src_configure() {
-	append-lfs-flags
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-		$(use_enable ulog)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default_src_compile
-
-	if use doc; then
-		# Prevent access violations from bitmap font files generation.
-		export VARTEXFONTS="${T}/fonts"
-		emake -C doc
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/${PN}.html )
-
-	default_src_install
-	find "${ED}" -name '*.la' -delete || die
-
-	readme.gentoo_create_doc
-	doman ${PN}.8
-
-	use doc && dodoc doc/${PN}.{dvi,ps,txt}
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	use sqlite && dodoc doc/sqlite3.table
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/${PN}.conf
-	fperms 640 /etc/${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 94e406ec46e5..78aa89a48d54 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,10 +1,5 @@
 AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
-AUX xstow-1.0.1-gcc12-clang.patch 1016 BLAKE2B e14b1e6af041fa6c4f0bde9466a7cbba0def66e064cf05eb015643f83395b14e12e9556ae945f3cf4d4e1d08df43b8d334b30bef10f1f3b938d27e54f3fe1114 SHA512 e5861676c5093219048cba1d63c62d3e2c1768553277aba17fad472799c312d9deb54a9864174e30dbb3a72eb923970dcc0dc150b96977da187ced8e8628888a
-AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
 AUX xstow-1.1.0-clang.patch 1092 BLAKE2B b00444730f525ce39c2692e7f1ab120b40d1e671d88c1c4f9b2b85f0c97ef34a89f12ba47c8eabd53464d05e5e3a94f28f84c3ce277072a983c34e188f149edd SHA512 804df13381f1d0f365303547c1b8e8b5fa2dd06e357596bd65ba349fe6b63e906491e78a19a6bf9190e7e8a81ae26b77a66f0f5290ff5b640f91024eca136537
-DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
 DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015
-EBUILD xstow-1.0.2-r1.ebuild 1283 BLAKE2B d808e405f774c50dd5939076c87fc8827267dc4933e76088bc3b136d2017045c77cf1d26eabd043a02038240d0164ac533634581ea7ece0766f43fd7a07268f9 SHA512 ed6510d9b59242f42694989461807a70035098b572be64aff02f2cffc214a154b31036c65473a1e5675e5ead49b6d822e39998d6e277d6a35d42a776dbc63c33
-EBUILD xstow-1.0.2.ebuild 1232 BLAKE2B b4c313abba4222528ce1f7f92c3a75386ff82344089399706516b0820298a0c96e65296dbb1b72625cc782afb3c88bb5447ec4e2e15f2636a2d9aee7fcc41129 SHA512 cf5b480a23372a207f9c779c1de2c766b1adce38446e1ab8d7dd9d58eabeb55162a4d63abda6ad4e5234b3cc6d9155696171b0c8dceec77e296c268d2b24aafc
 EBUILD xstow-1.1.0.ebuild 1225 BLAKE2B 7f58c2726265412a7544d99388a9ebb36d990045cca4fa52078005837b2a51369bd3bf132bc045c11ccd4f61e9d90a187e844095b8fd16fcf320949a04b3b98d SHA512 6ce9e4287bd20c77731e30206ecec2d2d740fdcbac36082f10174d43f99d6ce4a0a72c0ef3be165432e661421a0f7a80b7ec456427544e3401a4dca474279100
 MISC metadata.xml 301 BLAKE2B aace14f4b6ef5f8874f165c8bf5f6c3df1c8a259a54f48cf8805a62baa9530bdeea7dbe85a9c445151fdac6a53674f1967bf960ef0c9b26e4ccc8923d89cef55 SHA512 dafc481314893bacf1024daa509819b09d99f7f7c2bbb0613ac092cc0e14eb61ec708ba1a6d5b3d48774855707481745d0da462b94a973dd88a22ec64cc667de
diff --git a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
deleted file mode 100644
index 982d6bc5cb12..000000000000
--- a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__string_utils.h?revision=319588&view=co&pathrev=319588
-https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__leoini.h?revision=319588&view=co&pathrev=319588
-https://bugs.gentoo.org/840359
-https://bugs.gentoo.org/729114
-
---- a/src/leoini.h
-+++ b/src/leoini.h
-@@ -260,11 +260,9 @@
- 
-     if( start == std::string::npos ||
- 	end == std::string::npos )
--      s = "";
--    else
--      s = s.substr( start+1, start-end -1 );
-+      return s2x<A>("");
- 
--    return s2x<A>(s);
-+    return s2x<A>(s.substr( start+1, start-end -1 ));
-   }
- } // namespace Leo
- 
---- a/src/string_utils.h
-+++ b/src/string_utils.h
-@@ -28,6 +28,9 @@
- #  define STRSTREAM
- #endif  
- 
-+typedef std::vector<std::string> vec_string;
-+std::ostream& operator<<( std::ostream& out, const vec_string &v );
-+
- std::string toupper( std::string s );
- std::string strip( const std::string& str, const std::string& what = " \t\n\0" );
- bool is_int( const std::string &s );
diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
deleted file mode 100644
index b7d29f287e7f..000000000000
--- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,11 +91,12 @@
- 			AC_MSG_RESULT(disabled)
- 			support_curses=0
- 		else
-+			AC_MSG_RESULT(enabled)
- 			support_curses=1
- 		fi
- 	],
--	[
--		AC_MSG_RESULT(enabled)
-+	[])
-+if test $support_curses -eq 1; then
- 		AC_CHECK_HEADER([curses.h],
- 				[
- 				  # test which libraray to use
-@@ -146,7 +147,7 @@
- 				  fi
- 
- 				  if test $support_curses -eq 1; then
--				  	AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
-+				  	AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
- 				        AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
- 				  fi
- 
-@@ -154,8 +155,7 @@
- 				[
- 				  support_curses=0
- 				])
--	])
--
-+fi
- 
- NO_STL_SSTREAM=0
- NO_STL_STRSTREAM=0
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -46,7 +46,7 @@
- 	backtrace.h \
- 	backtrace.cpp
- 
--xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
-+xstow_LDADD= $(LDFLAGS_DYNAMIC)
- 
- if ENABLE_MERGE
- 
-@@ -63,7 +63,7 @@
- 			backtrace.h \
- 			backtrace.cpp
- 
--merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
-+merge_info_LDADD= $(LDFLAGS_DYNAMIC)
- 
- endif
- 
diff --git a/app-admin/xstow/xstow-1.0.2-r1.ebuild b/app-admin/xstow/xstow-1.0.2-r1.ebuild
deleted file mode 100644
index 85b4c928574f..000000000000
--- a/app-admin/xstow/xstow-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-ncurses.patch
-	"${FILESDIR}"/${PN}-1.0.1-gcc12-clang.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ncurses curses)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# Create new STOWDIR
-	keepdir /var/lib/xstow
-
-	# Install env.d file to add STOWDIR to PATH and LDPATH
-	doenvd "${FILESDIR}"/99xstow
-}
-
-pkg_postinst() {
-	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
-	elog "instead of /usr/local in order to avoid conflicts with the"
-	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
-	elog "(regarding app-admin/stow, equally applicable to XStow) for"
-	elog "more details on this change."
-	elog "For your convenience, PATH has been updated to include"
-	elog "/var/lib/bin."
-}
diff --git a/app-admin/xstow/xstow-1.0.2.ebuild b/app-admin/xstow/xstow-1.0.2.ebuild
deleted file mode 100644
index 879bda8dfbaa..000000000000
--- a/app-admin/xstow/xstow-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-ncurses.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ncurses curses)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# create new STOWDIR
-	dodir /var/lib/xstow
-
-	# install env.d file to add STOWDIR to PATH and LDPATH
-	doenvd "${FILESDIR}/99xstow"
-}
-
-pkg_postinst() {
-	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
-	elog "instead of /usr/local in order to avoid conflicts with the"
-	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
-	elog "(regarding app-admin/stow, equally applicable to XStow) for"
-	elog "more details on this change."
-	elog "For your convenience, PATH has been updated to include"
-	elog "/var/lib/bin."
-}