gentoo auto-resync : 24:02:2025 - 19:24:56

24 files changed, 98 insertions, 615 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 73d5bc8b3498..ce985e99f754 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 5722a7dc2fa0..6691980ebd9b 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1,4 +1,3 @@
 DIST biosdevname-0.7.3.tar.gz 96231 BLAKE2B d572b15f86ba1ddaba191f859afcfbd39fa0fe397ee6968ab794e217d37b875b9f9d20c219cb44f62fc5d3fede7aa487963f54423ca20086c75c15b17d755c8e SHA512 9cd2b7d115d6ee487f4aafa21b00025a3917d3c89489fe70ab3de8aa979158477a1d0b5287101b7cec7200fef0d2f6894a0e6389a174d6f8670dcd7530dc445d
 EBUILD biosdevname-0.7.3-r1.ebuild 734 BLAKE2B ec535de5f23bc10437e527654fb9362ea5f7ab18f60c018c2a4581206c03e93bdc85ce17ec0648265bddbf9e7dc16e1a31be8d92bdce2fc388ccb85d3788d44d SHA512 684d952a08a9894f5a66d1c6c8e95c892ad6d06dc39bba53f89aff07c6d718e10c4e8d16be617106a9b1e4755f3d3653ffb5beac79aaf344e932129e84717f97
-EBUILD biosdevname-0.7.3.ebuild 626 BLAKE2B e1b95694af9223e0ed37998155a1ef21dacc216f8192d1fce9a8dd6d57a9c6620cc49027d0ed052cf1288c4b88f7816778abba58a91923812cef620671c09934 SHA512 b9447820c7d320bcdfe1f08a3c5f06755cb2fa29e1894181f4ffefec208f03ec622c82154e35ff3e6c09b4cb95abd35bfaac94893da49c50067e190dca40f0d1
 MISC metadata.xml 603 BLAKE2B fdeffd51ab9a0e2590d6d14b0c4caaa515a4a0e32ae64d2d84b81be0657e676647decc11c2d5e5bdbbf878c6e98cac345263c113b502d50d4ee742b5c93275b1 SHA512 da4bfe4ceb9e097750173c5bdb5d9ff024afb927ddd9e9240824e73a1f27352ff22d5dce52b6b6d1d8cdc711eff13d594db7801b1be4d152477287c8f0c4c339
diff --git a/sys-apps/biosdevname/biosdevname-0.7.3.ebuild b/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
deleted file mode 100644
index 08955d3cbcfd..000000000000
--- a/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools udev
-
-DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
-HOMEPAGE="http://linux.dell.com/biosdevname/"
-SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	sys-apps/pciutils"
-
-src_prepare() {
-	default
-
-	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
-	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure.ac || die
-
-	eautoreconf
-}
diff --git a/sys-apps/ckbcomp/Manifest b/sys-apps/ckbcomp/Manifest
index 457d0b7de93a..694334c250d4 100644
--- a/sys-apps/ckbcomp/Manifest
+++ b/sys-apps/ckbcomp/Manifest
@@ -1,5 +1,3 @@
-DIST console-setup-1.217.tar.gz 3273430 BLAKE2B cf48a8dbd250f3ee0e1093b3dc0b13d9b23a13e456f7c0c60d4d8764bc1ed41bc6f0da57d4f0e5642fdceca9a26d02e5b986df019644d238bab0c91028958aed SHA512 20b148e3ffa1a57509e1bdab091ae36df04f363c7ca54e1decc15c14325df85b3d100e4b9a1e5884c18d47d45066b029bd450c9588f3103c03ad102d348869ad
 DIST console-setup-1.230.tar.gz 3282273 BLAKE2B 4d61f2cf0e4fe5230e4cbbee3ccda1a518ca72b5d78cd3bd1bac075456966faad2df384d2c02247ed3ab1406c72b74f5bd9e27dfc918e5680cdf1be28d7f061d SHA512 86c8d20ae5609ea881a9d73c774d3f4db7d8ea1da9789bfee7e5e4277783c13311ab923657d579133efd8803bded32cb07e9564464f79c14dba90b9bcafefdf9
-EBUILD ckbcomp-1.217.ebuild 680 BLAKE2B 6f8c305028e5583cdeb526a8a88a07e48fd08b3b404cee4f7bc07aac9b08996fc2958dbbaa53384721e883015f6e4a1de9a3da2c8488d1d633504cf30cbdf804 SHA512 9e5b02cb52c50ba4788428c9f114a125c4912fb3e006c994530a5f90906dcef1d8285bdfb1d472fe227b121dbc79b3c6f2748e18c193b1f8dbcd9450d5d95dd0
 EBUILD ckbcomp-1.230.ebuild 679 BLAKE2B c65035866864472e02a1bdde984100da647687ca3a59d40a3f0b81aaa024f750e2c097335a125834890504ed885b70cc91ba3a66b4ff3104d90113bd0bc862ea SHA512 52a978ac60c3802c54bea64f7809b8cec68aaa4463500d1b890913dc8bd38a159fa05bbff003101794a2c1c83cf37970ae3a42ec2a4b62cc3a3e20824a2cf015
 MISC metadata.xml 171 BLAKE2B 589206ffd9c243712f27e366177e5448ebcf58bf71e2e0f49a3f0c5292e1341ccd68238b36065d2349be51ef530c8ee2634a260f077826c6ebcc0f7e665e98d9 SHA512 67c15eac3c1637b76d429a0c96476ce57a9c38a608e7ae0829489d4802e9f3b5effdeb375b4a7ba19a5c794b3d990c8f09fabbac2462b1aa08f3c72651f0c8f8
diff --git a/sys-apps/ckbcomp/ckbcomp-1.217.ebuild b/sys-apps/ckbcomp/ckbcomp-1.217.ebuild
deleted file mode 100644
index 2f1e3536465f..000000000000
--- a/sys-apps/ckbcomp/ckbcomp-1.217.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Compile an XKB keymap for loadkeys"
-HOMEPAGE="https://anonscm.debian.org/cgit/d-i/console-setup.git"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anonscm.debian.org/git/d-i/console-setup.git"
-else
-	SRC_URI="https://salsa.debian.org/installer-team/console-setup/-/archive/${PV}/console-setup-${PV}.tar.gz"
-	S="${WORKDIR}"/console-setup-${PV}
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-lang/perl
-	sys-apps/kbd
-	x11-misc/xkeyboard-config
-"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin Keyboard/ckbcomp
-}
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index a33bb2ba1f1f..c8e4d1018704 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -1,7 +1,7 @@
 AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc84170d1cedbb17cba7e8063de08bee7d18cfa39388097073193b824a68c2b8e9f51c5d52b12c84074f8 SHA512 81d9f238f4240d452e6316e0a94c489fc88eb3c8fe189958292a02dd0ce669bf957e614cd2864b7ccada8a174c94c6ee1cda7216e4fe96582a5cc266657710ea
-AUX daisydog.init.d 356 BLAKE2B 0b7c59435e39e17f1afe3678f84b25ff65276ebf93664d689f38a746c5c5b2945fa86e9f0d104a5b7577f7939214e4f4f15b04470af0c843468f7a732fcb082c SHA512 1ad3cdf515777e5ba8eedc40a82177ca7cfeaecb0ac82fe5d5757c81c298e43a8fcfc5f46f6d8d31c83534793d7acf798d8b16ce8d7a6bd2868820cebf898feb
 AUX daisydog.init.d-r1 328 BLAKE2B ffaa2733df070d7c52ce64e0bdb084ec7ec3b25679e7eeb85aa9b6d1c3a7c6dda5ce8f41469a20f2ca25c76588ffab8811b9dd705f93238c11a0b218e1f647f6 SHA512 7612f31d8c83fd3b48e800576f6a16f06bb67574d294808f003980ececd565bf8bea6d2d3ce6f55593c0fa1c5ffc901ff3fcf59778115804e708324463d00178
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
+DIST daisydog-c24ad8bc3682292d289537dfaa19bf549abfcc15.tar.gz 11417 BLAKE2B 17ea1045125812f8373ef492a539dacf2d0d1774251f86fbd87b85d01009ecdd8f04aba60b1fa70f1f45da4cc9b402dbda0760e89121baa62b44cb05408cc2a3 SHA512 01638d45f27dfb490f5a8535b9c39df41179c671754126c48ff41bb19f7c773c002e95e898e6564535c22421518506e70e24af06c11b75cca1648ecac5702790
 EBUILD daisydog-2014.05.30-r1.ebuild 877 BLAKE2B 103ba5470f63cf0700c86ee00c892091e8abfbb15af534cd474020c38cb1b6a01317e5c1b927a5f7bb660db8d2b7a3b6277f445b39394bbcf63a85e096e06965 SHA512 69e69e4206d9f17c1c486bf70178f5ea1cd9204c50252d4987e49d2945e538ea29b97c8405158a6adf32e7fb226edb665bc5d1ddb04b710b4d1476aa6c43fa27
-EBUILD daisydog-2014.05.30.ebuild 874 BLAKE2B bafa19bebe4191c35160c148369946d8af49979e02439d1c73138516dcc92845ad9456e36a0f91f56c702bf42eed07fffd715d25726be460885c5e787165d268 SHA512 d5226c81a8c1ece1f20ad30bd6295a0137a59df55007c934f53194b03df4f5cd4fc5e2f9e4187971918b8ef2b0b41157121fd63f439f5d97f8aab90fb86603ca
+EBUILD daisydog-2024.07.12.ebuild 845 BLAKE2B 1a2f5948e8e14763e1ffa0e84d3494c863bf7da256505c19753b1a7d5188023e287f75da9d425d3aa17ea46716f6707641d7be9a5109c3bf3fe9fd668763a2ba SHA512 1615838b27fd2d7b0964034cafcf001fba58221a53f1bfbf9a40715d9756341cec5cdad56671b777d37f413a638a46559bc32a898b734b17862c0a8f84fdc171
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/daisydog/daisydog-2014.05.30.ebuild b/sys-apps/daisydog/daisydog-2024.07.12.ebuild
index 190a49b1212c..1c9ce7d845e7 100644
--- a/sys-apps/daisydog/daisydog-2014.05.30.ebuild
+++ b/sys-apps/daisydog/daisydog-2024.07.12.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit toolchain-funcs flag-o-matic
 
-GIT_SHA1="3182aa85c087446e4358370549adc45db21ec124"
+GIT_SHA1="c24ad8bc3682292d289537dfaa19bf549abfcc15"
 MY_P="${PN}-${GIT_SHA1}"
 
 DESCRIPTION="A very simple /dev/watchdog daemon"
 HOMEPAGE="https://chromium.googlesource.com/chromiumos/third_party/daisydog/+/master"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	https://chromium.googlesource.com/chromiumos/third_party/daisydog/+archive/${GIT_SHA1}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="
+	https://chromium.googlesource.com/chromiumos/third_party/daisydog/+archive/${GIT_SHA1}.tar.gz
+		-> ${MY_P}.tar.gz
+"
 S="${WORKDIR}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 src_configure() {
@@ -25,9 +27,10 @@ src_configure() {
 }
 
 src_install() {
+	einstalldocs
+
 	dobin daisydog
-	dodoc README.chromiumos
 
 	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.d-r1 ${PN}
 }
diff --git a/sys-apps/daisydog/files/daisydog.init.d b/sys-apps/daisydog/files/daisydog.init.d
deleted file mode 100644
index 5eae48824b61..000000000000
--- a/sys-apps/daisydog/files/daisydog.init.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/daisydog"
-command_args="${WATCHDOG_OPTS}"
-description="watchdog daemon to pet /dev/watchdog devices"
-start_stop_daemon_args="--make-pidfile --background --pidfile /run/daisydog.pid"
-
-depend() {
-	provide watchdog
-}
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 72014776bd7d..90205099ad1a 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,14 +1,9 @@
 AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
-AUX etckeeper-1.18.18-gentoo.patch 2413 BLAKE2B 91bbb0196c3038a62cfaed56aee7f8c7a4e4853cdb283a5541e60634882fa6e252aaca629d0588284638f15d36ee520bed2b73c375d7dfcbb683662833c2d8a4 SHA512 34ef7d24e738ea0bb49f97d88045e2963283577cfc1f807a41825ca97ee92cc915ed9b96a258bf2d44f8882472e920087ce0670cc82a0a86b78c314268b9895f
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
-DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
-DIST etckeeper-1.18.20.tar.gz 110787 BLAKE2B 8d69cd65a1cad7ff64eae95d70a3da70c60adfd2fa15ae34d45a394456ba362376a5fc93116841f25f907c71fb4df2af2e1d5ffe155e11c368f6862c53d39135 SHA512 b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6
 DIST etckeeper-1.18.21.tar.gz 116961 BLAKE2B ad765ebc1e3b393a896b6491f21195a7c1081212f798b8586966adc72578c2bffe9adfb5a6004cba7ff87efb66f4318314dd3646e538d9bbe7a686250ea1f160 SHA512 c23bd0f24e04b565ceae77e552eb00926dae16f4a6c8c183c5a6bb404d5351ee7a040e01287b7c0d3d530bc8dea62cd2336b3151a349998aa9c145f1258ac2a0
 DIST etckeeper-1.18.22.tar.gz 119999 BLAKE2B 579e94ef6ab6f198c162be78148ea2032149e558d73bfc5d040cb9288f33d6b5c48b0073c5578fae4050b647943cbb6bb5b67cce87f9687531fa84a21c287ff9 SHA512 e35ab90862c1f4426c17aec4d9ffe5975c652b290645ac333e9f27fcc157b9eba5e0efe73553a400464102c939f085f4e08f4b04564a015ad6941b1d50dbbe76
-EBUILD etckeeper-1.18.18.ebuild 2229 BLAKE2B 893d9dd8e5396b7c2e09c257e5a76336de8137fdd48e163d1dec4c3e4e0476c1d8cb18a31eb442bd4367db8066ab401c46359dc8a345f68847dddca7ea66f4a8 SHA512 a0e84e59fb262669829960f02b6ea1d3172a9a5d515900f2328eef73851cd5d8c675f264ba4d82a31a688444c7a6fb11576d570a7fb4c74149be8ec57a5b4fa4
-EBUILD etckeeper-1.18.20.ebuild 2405 BLAKE2B d77f64607cf4099ec8ad15421cfca19dba945ad05216a035451e20306ce38254510fed68e34ce8eca33ee2b336e665f1acba094a30be8bfab46bc7b556a88e95 SHA512 3dd78111f59a71a2980906214a8d46cfefd260edc36d6c9f773c785e1acdbc6d723ac0c70a8d70c14f21095af0685e575ba2820899335ebd6ef4bea6e65c8a13
 EBUILD etckeeper-1.18.21.ebuild 2405 BLAKE2B e38b137e069420eae0b4c6d43d396621884e741fb88c70e121dc253f2c63995202bd15b38257b117410fb255b7bfed5eec700b21ae092c9362762666f760547a SHA512 39bcdb77a8ddc3e7115f0f8d49ad6f5cdbed86ba391deb38c39b593ff544ba8c96a9735700aea5e2563bef0136c84aaefa3ebabf19f7ae4f0bca816b1abc3bd4
-EBUILD etckeeper-1.18.22.ebuild 2411 BLAKE2B 7d65952907029d3d570ed4adc44e86f20b14360a5b598fd9d5e24744198e6f03dcddcda96a72a95495ff4cbff555655a997ca8af624b80ce14b3f617d906ad9c SHA512 e854cd5f5d3974587970d275f8fcebb206f38e86c40f354b5df5f8e8b7f891c5edc20db1220d0e5d7568f6134a1e85085cac19d7af0e7d18601239ad39e4116a
+EBUILD etckeeper-1.18.22.ebuild 2411 BLAKE2B 1036538bbc1d8a96b96684686750f93c78dc29ac08dcadc9881287d5f2469fa6af3b2b93f62d2543161e55a56b65f425959aa1cbb7a3524239ec0c33a402b6fe SHA512 131d33649c9ecf5f20c53eeeefa0546c076ad9c5d1a43a3172ec6fbb4a4e893bb42f76f206b2882ad755f2e2fb77c7dc417cb376b596d2264c57ffcd0e578492
 MISC metadata.xml 621 BLAKE2B edf624cc4c6906d40430cfbea31cc86aacb2c9f0ddf4d474861797798454f03baff2192e44be1c59072506a92cb106e2b58d7a493d92abb178105fab9b3dab47 SHA512 d8b8d3f52fa8452cd58061a5b9488549d67c8dcb3b38d5e3c373fbd149b1e12b503588f8b4578a56ffe12fe860420b27c876866685d90e851b75253ad9680511
diff --git a/sys-apps/etckeeper/etckeeper-1.18.18.ebuild b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
deleted file mode 100644
index 3bc3ee63044b..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 prefix systemd tmpfiles
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
-SLOT="0"
-IUSE="cron test"
-
-BDEPEND="test? (
-	dev-util/bats
-	dev-vcs/git
-)"
-
-RDEPEND="app-portage/portage-utils
-	cron? ( virtual/cron )
-	|| (
-		dev-vcs/git
-		dev-vcs/mercurial
-		dev-vcs/darcs
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# TODO: submit upstream
-	"${FILESDIR}"/${PN}-1.18.18-gentoo.patch
-)
-
-src_prepare() {
-	default
-	hprefixify *.d/* etckeeper
-	local systemdunitdir="$(systemd_get_systemunitdir)"
-	systemdunitdir="${systemdunitdir#${EPREFIX}}"
-	sed -i \
-		-e s'@zsh/vendor-completions@zsh/site-functions@' \
-		-e s"@/lib/systemd/system@"${systemdunitdir}"@" \
-		Makefile || die
-	rm -v init.d/60darcs-deleted-symlinks || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	rm -rv "${ED}/var/cache" || die
-	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe - etckeeper <<'_EOF_'
-#!/bin/sh
-set -e
-if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
-	. /etc/etckeeper/etckeeper.conf
-	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
-		/etc/etckeeper/daily
-	fi
-fi
-_EOF_
-	fi
-
-	local conf_update_dir="/etc/portage/conf-update.d"
-	insinto "${conf_update_dir}"
-	newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}"
-	fperms 755 "${conf_update_dir}/${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	elog "${PN} supports git, mercurial and darcs"
-	elog "This ebuild just ensures at least one is installed!"
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.20.ebuild b/sys-apps/etckeeper/etckeeper-1.18.20.ebuild
deleted file mode 100644
index 8b7fc8ff184a..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.20.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 prefix systemd tmpfiles
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
-SLOT="0"
-IUSE="cron test"
-
-BDEPEND="test? (
-	dev-util/bats
-	dev-vcs/git
-)"
-
-RDEPEND="app-portage/portage-utils
-	cron? ( virtual/cron )
-	|| (
-		dev-vcs/git
-		dev-vcs/mercurial
-		dev-vcs/darcs
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	hprefixify *.d/* etckeeper
-	local systemdunitdir="$(systemd_get_systemunitdir)"
-	systemdunitdir="${systemdunitdir#${EPREFIX}}"
-	sed -i \
-		-e s'@zsh/vendor-completions@zsh/site-functions@' \
-		-e s"@/lib/systemd/system@"${systemdunitdir}"@" \
-		-e '/etckeeper-bzr\/__init__\.py/d' \
-		Makefile || die
-
-	# pre-configure for portage.
-	sed -i \
-		-e 's/^HIGHLEVEL_PACKAGE_MANAGER=apt/HIGHLEVEL_PACKAGE_MANAGER=emerge/' \
-		-e 's/^LOWLEVEL_PACKAGE_MANAGER=dpkg/LOWLEVEL_PACKAGE_MANAGER=qlist/' \
-		etckeeper.conf || die
-
-	rm -v init.d/60darcs-deleted-symlinks || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	rm -rv "${ED}/var/cache" || die
-	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe - etckeeper <<'_EOF_'
-#!/bin/sh
-set -e
-if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
-	. /etc/etckeeper/etckeeper.conf
-	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
-		/etc/etckeeper/daily
-	fi
-fi
-_EOF_
-	fi
-
-	local conf_update_dir="/etc/portage/conf-update.d"
-	insinto "${conf_update_dir}"
-	newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}"
-	fperms 755 "${conf_update_dir}/${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	elog "${PN} supports git, mercurial and darcs"
-	elog "This ebuild just ensures at least one is installed!"
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.22.ebuild b/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
index 340b865b2ec8..a1c6dee88397 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,8 +10,8 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cron test"
 
 BDEPEND="test? (
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
deleted file mode 100644
index 298671c90004..000000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 5ac7b1861a7e23935bc09cacfa6675d8a086877e Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sun, 26 Jan 2020 23:24:54 -0800
-Subject: [PATCH] 1.18.18-gentoo
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile
-+++ b/Makefile
-@@ -68,7 +68,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
- 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
- 	$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
- endif
--	-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
- 	echo "** installation successful"
- 
- clean: etckeeper.spec etckeeper.version
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a"
- 
- # The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc)
--HIGHLEVEL_PACKAGE_MANAGER=apt
-+#HIGHLEVEL_PACKAGE_MANAGER=apt
-+
-+# Gentoo specific:
-+# For portage this is emerge
-+# For paludis this is cave
-+HIGHLEVEL_PACKAGE_MANAGER=emerge
- 
- # The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc)
--LOWLEVEL_PACKAGE_MANAGER=dpkg
-+#LOWLEVEL_PACKAGE_MANAGER=dpkg
-+
-+# Gentoo specific:
-+# For portage this is qlist
-+# For paludis this is cave
-+LOWLEVEL_PACKAGE_MANAGER=qlist
- 
- # To push each commit to a remote, put the name of the remote here.
- # (eg, "origin" for git). Space-separated lists of multiple remotes
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -30,5 +30,9 @@ else
- 		apk info -v | sort
- 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = xbps ]; then
- 		xbps-query -l | awk '{print $2}' | sed -r 's/-([^-]+)$/ \1/g;'
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
-+		qlist -ICv
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
-+		cave print-packages -r installed
- 	fi
- fi
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -107,8 +107,12 @@ writefile () {
- 		comment "new versions of conffiles, stored by xbps"
- 		ignore "*.new-*_[0-9]*"
- 		nl
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
-+		comment "new and old versions of conffiles, stored by emerge"
-+		ignore "._cfg*"
-+		nl
- 	fi
--	
-+
- 	comment "old versions of files"
- 	ignore "*.old"
- 	# Not currently ignored as admins tend to rely on these files.
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 0d87b032e3b2..89f16bd75abb 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,10 +1,5 @@
 AUX gptfdisk-1.0.10_utf16-to-utf8-conversion.patch 687 BLAKE2B dbbd917aa52cd7386dda06c943dfdf207de9c7b4d1e3438f468cdab001199af3c5262ab06e9fdaae206da0e188e60c81fa869e3f0701bed1e893e6ea2c688769 SHA512 eb419d2837497a1345f8ec665b6daa6a65ab60da4cf5e361d97afa616795cd2515dc9e7d094ce92d4dc1d89e9781d050d0efc1fe5506679e71ecb6aebd30cef0
 AUX gptfdisk-1.0.9-build_flags.patch 286 BLAKE2B d7d59cf82165de5863f4bde47a77cc37a0beb27a249e43f80389c41abceb2b4eaf35c72e196a5b67a60f3bd046c8802bf88292db3ce18eef0f7cd948f044c0e5 SHA512 f2b4717e9ada965a3fb1bf801c8ed1ec683425103933a85e95eef9adec9c174ef79d37a227491a892c11e707a1c3b9e59ef9d6e6adfda2009522715a0d9d7ae2
-AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3
-AUX gptfdisk-1.0.9-musl-1.2.4.patch 819 BLAKE2B 79fde3617e158c1a43ac257e412e2c69cde0f6f7b4352a40fd82573d0f8585bbe1dadd323d6d5c717c0ea9e57abb67a71844648f34dd5586fbfc56c1179b30c9 SHA512 940f7f2647b9165404816d1c9e2d2c4d528a45645b5322b46ee3bba843b36acd088b47caad6348c46360107987cc8a3ab087cc6718e02aa46053abfb246b537e
-AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60
 DIST gptfdisk-1.0.10.tar.gz 220787 BLAKE2B 9047bf68a2c5c254bda9b2815488963dc19a9415c90fbf4a127268a37fe8a545b7d45a333e356bd9da22e37ef649d9f60896ffedfdc35b60c7642a48e4ed2e5a SHA512 76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d
-DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
 EBUILD gptfdisk-1.0.10-r1.ebuild 1368 BLAKE2B bc7943c793a705e854a738049dca03bc29405119e09dadd78add6582472e1b3ebf73919fb977d5f025c2f571a7e7e5a39f35453923f06746f44a910b8a641598 SHA512 672f24d7cb295615eba3cbda4be72eb24a184df842110e1b000c22847d84911a4f199e8a021ab5c4ef73a0906e15ffbcb780f8221c635fdaeedf92f3c16f34af
-EBUILD gptfdisk-1.0.9-r3.ebuild 1453 BLAKE2B 3343d443abc30ce203818975d7ecbd1930acce288e13d4cdc40e55811658e8fbaecdfaaa07c01f35783ed7c273a204928880083f3f0defe41f86f5624100b90e SHA512 9f491efd4146c4aee1b76dbae6eacb218d958ac1145f412c27b91d7d54757c62da4d41aedc50c8e438124a5f71fdbba513834ce90295eb7277e31e957de26b84
 MISC metadata.xml 246 BLAKE2B 3d41e700d98c6016b343a1f59506759ecb12c7e262b16db795bf4fb1f428dc6c6e8f5a5b0b85ecd5ab4b5ea2344e6e202a40057ad614593c3337308689437f4b SHA512 8364da10362a3a706d6afaa5cf13a3ffbe393e8dd538cb11892ef3f46d888f911cfe8685fcb1225aebf522f81adbace01e2169ac8914e7e3a26a5183ceb7208b
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
deleted file mode 100644
index e7a5f68e19ee..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e67faca2c0ca955f56cbd22e90941cdcbdc12597 Mon Sep 17 00:00:00 2001
-From: Rod Smith <rodsmith@rodsbooks.com>
-Date: Sat, 16 Apr 2022 09:32:04 -0400
-Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
-
----
- NEWS    | 3 +++
- guid.cc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index c7add56..3d90d9a 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,6 @@
-+
-+- Updated guid.cc to deal with minor change in libuuid.
-+
- 1.0.9 (4/14/2022):
- ------------------
- 
-diff --git a/guid.cc b/guid.cc
-index 1e73ab7..d3e4fd5 100644
---- a/guid.cc
-+++ b/guid.cc
-@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
- void GUIDData::Randomize(void) {
-    int i, uuidGenerated = 0;
- 
--#ifdef _UUID_UUID_H
-+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
-    uuid_generate(uuidData);
-    ReverseBytes(&uuidData[0], 4);
-    ReverseBytes(&uuidData[4], 2);
--- 
-2.36.1
-
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch
deleted file mode 100644
index 6f019d9eec6f..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: https://sourceforge.net/p/gptfdisk/code/ci/7dfa8984f5a30f313d8675ff6097c8592d636d10/
-
-From 7dfa8984f5a30f313d8675ff6097c8592d636d10 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 12 Dec 2022 12:50:07 -0800
-Subject: [PATCH] Use 64bit time_t on linux as well
-
-Alias 64bit version of stat functions to original functions
-we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/diskio-unix.cc
-+++ b/diskio-unix.cc
-@@ -37,8 +37,12 @@
- 
- using namespace std;
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__linux__)
- #define off64_t off_t
-+#define stat64 stat
-+#define fstat64 fstat
-+#define lstat64 lstat
-+#define lseek64 lseek
- #endif
- 
- // Returns the official "real" name for a shortened version of same.
--- 
-2.41.0
-
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
deleted file mode 100644
index 470defd33cf6..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/gptcl.cc
-+++ b/gptcl.cc
-@@ -156,9 +156,10 @@
- 
-    // Assume first non-option argument is the device filename....
-    device = (char*) poptGetArg(poptCon);
--   poptResetContext(poptCon);
- 
-    if (device != NULL) {
-+      device = strdup(device);
-+      poptResetContext(poptCon);
-       JustLooking(); // reset as necessary
-       BeQuiet(); // Tell called functions to be less verbose & interactive
-       if (LoadPartitions((string) device)) {
-@@ -498,6 +499,7 @@
-          cerr << "Error encountered; not saving changes.\n";
-          retval = 4;
-       } // if
-+      free(device);
-    } // if (device != NULL)
-    poptFreeContext(poptCon);
-    return retval;
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
deleted file mode 100644
index 9258919e0948..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073
-	"${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131
-	"${FILESDIR}"/${PN}-1.0.9-build_flags.patch
-	"${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s: cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index a3081fd5b913..8487c969f818 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,4 +1,3 @@
 DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501
 EBUILD i2c-tools-4.3-r2.ebuild 1492 BLAKE2B 1d4b0263b89d788e1f0a5a1637d66c7b3a9c841717dda0a952355148e2ce5ebbe0ab24377f0f7625075cfc6c45b8c5feac67b2fc6b8b5fe701333f6688b52eb9 SHA512 b6b2c673f056d864a3696ceee76ff0d08026e0aa5d75a3e82320aba88c640a9582547db03a420c1ae3cf401865c0df01e3855c134384e9ef5df5a97c2bdbbccf
-EBUILD i2c-tools-4.3.ebuild 1348 BLAKE2B 899c9433161f81d99c13596af910c5b3c4bc05ba173f64e31d6d579d89e36a8fef57eacbdb72b248ee830870b17fccf93d26e391d457e00423c46f7bb430395f SHA512 34afd003549bdd10c039398be5e60c3aac7d2433a2b18b0aa49674acd7d32281579631da20570f8930c324c8fb660dcea8bc34b455474427c73d647c5c8d2cad
 MISC metadata.xml 260 BLAKE2B cfcc4618143410d07056c569a1ae3543443139a1f4ac0c07c5482a6caaf923f715b135e4b56b313d5b4d16aa49d30caec20f5dce01eb1fdb98bb717fc2a7db9a SHA512 541810c9d5b78246d55be1c5a0cfc6f59e816d8177fd73b20a1123db37de974820846b8752a8ad4eb89d474d7a1bae7b48d99a076d246b9e522b4358dc353808
diff --git a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
deleted file mode 100644
index 86b0f1a7d221..000000000000
--- a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL="1"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
-HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
-SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )"
-BDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use python && distutils-r1_src_configure
-
-	export BUILD_DYNAMIC_LIB=1
-	export USE_STATIC_LIB=0
-	export BUILD_STATIC_LIB=0
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" EXTRA="eeprog"
-
-	if use python ; then
-		cd py-smbus || die
-		append-cppflags -I../include
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	emake EXTRA="eeprog" DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install
-	dodoc CHANGES README
-
-	if use python ; then
-		cd py-smbus || die
-		docinto py-smbus
-		dodoc README*
-		distutils-r1_src_install
-	fi
-}
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index cb0dfdb78696..dcf4cf2d05be 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,6 +1,4 @@
 AUX revert-openrc-management.patch 929 BLAKE2B 58d0fa10956bf930c176a84573a5b780fa4bcb87f6df180a179f0cbac93ede8f2147fe620007f68e563ec4a3e86228efacc2ca33dce135c5d1fa1d639cd7fc82 SHA512 ba046ae948f93d0d861fd70637c2b1acaa37ba3ef225453162eb19ae854504f518a1024c484118b86bde3f57099bb7a44d46e3765bca4b1766bf2565c990f356
-DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88
 DIST init-system-helpers_1.66.tar.xz 44976 BLAKE2B e97d4483c73e7d5c310598eb75d77972f5334ef09708166f3bacb46e4e4495c7f7b2a905e70221180fbcd0524312c6b0962bf55a165092dccc839218f2fc46c5 SHA512 22c8c7f6483de6e95750a48d55b540478de9cd8ed23e806359b30e19528313cdc03f119b076182575ec3e06f76d628a95b0b9568be2d03fcbba278617661c93e
-EBUILD init-system-helpers-1.60.ebuild 981 BLAKE2B ad645e6b3fcddb5acada7e6f18272db6b57d8003d7e04208c749e5a4d740ca7f8672e99284537d019c9743b0acc0b5cec7b02d5981c397a34d82fd7abbe3a723 SHA512 d1d6725effe0d2834c9ecec77e291f63410b5b68ed529038f17ea05f5362bfe498af09bb48184032e0b64d8a12e588d60a3b0b971b6989dbb4b774d217a06f2c
 EBUILD init-system-helpers-1.66.ebuild 1002 BLAKE2B d48d7419044e1f8a20e03895ce89480616e2c7dd3faccb9490cce50724045a8c7e26759f024530deb0e1f5947879b22c2ddc83bb10b7d09fb6aa4fb9f328b013 SHA512 ca9036c8c2e7387f4b75c3366928f7f217fd02b2ca5257429b798821344b6fa47741834816b2821291e121a16fc2388e1aa446fb516349a04d9088db2c51db36
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
deleted file mode 100644
index 99bb4e8eaac6..000000000000
--- a/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Helper scripts useful for both OpenRC and systemd"
-HOMEPAGE="https://packages.debian.org/sid/init-system-helpers"
-# git repo: https://anonscm.debian.org/git/collab-maint/init-system-helpers.git
-SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
-
-BDEPEND=">=dev-python/docutils-0.21.2"
-RDEPEND="!<sys-apps/openrc-0.33"
-
-PATCHES=(
-	"${FILESDIR}/revert-openrc-management.patch"
-)
-
-src_install() {
-	# We only care about 'service' script/manpage:
-	exeinto /sbin/
-	doexe script/service
-
-	rst2man man8/service.rst > man8/service.8 || die "Failed to generate man page"
-
-	# FIXME: need to patch to remove *rc.d references, which we don't ship
-	# And should probably add a list of supported options (e.g., start/stop/etc.)
-	doman man8/service.8
-}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 3e6a8fb0beea..52c3d8aadeb5 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -5,11 +5,13 @@ DIST sandbox-2.41.tar.xz 468180 BLAKE2B cb00ec8605b9b51ce559a9e9baa68d757e17900a
 DIST sandbox-2.42.tar.xz 468676 BLAKE2B c4a17c9c6c1644bf27565eab8d76b37689f2a1ca2083d30d65deffd76449f69f68dd4d56ebb19236ca3111996c037fa4e1e5d034dc942349b93ba7c4c68f6248 SHA512 05076394cec77a6443ccc9ba31209fac32c57497210b817e71d10ffc75388673de75de8be6a86ee2f798a285e02ed1af8f134a988eceb6824a3e94bd5be4fc62
 DIST sandbox-2.43.tar.xz 468420 BLAKE2B c407f7c853d53297d4b0b64f1f3e0a6a26402c32990d7a02f6b2d5aec2b73716a0bb9a931371b87917a5390fb3f80b739e9d2884aec07aa6a1679c32926872ab SHA512 aff9bcbc0a26d4d0df2a469e1978051b9cdd2ce67786c90f857576ddfce20eefa78bfdf6c611fa3f60f0cb0247398c4cf6e4413fed0e4f2eb3bfe11e8a5b6e3e
 DIST sandbox-2.44.tar.xz 447548 BLAKE2B 89241ef5addf84cfe651d5c25986382966216fe380942d17b523b1187cfcc1a294c9de74736828209ad60ed7819229f4662763ccf5464ce6d032668ea405bc89 SHA512 e75276b1228bb2aa96aa8d5ff9583ea6514a00d5ab2a7ef07da18c88114c3438d11fa8edd6c2fa4be4ddaddee6415913673684e95584368df6f2f52e10b3e627
+DIST sandbox-2.45.tar.xz 447840 BLAKE2B df1cfba485668781b7dbf863ecdc523b3ffbc91c82ce815ab5ade6c1f33aa4e97c0674012f67ad212c94d8e6fe5285ab0aa4f96f6155e7d81ee649973366c1b9 SHA512 aad9e746c8e1d964cbd29fef5139b18853dac36204dcb414b8a4a94d6fdc53609fe7949dcd845894b38965e08be9901ebdfc83dacc4fb37e810efd6a01eeb7b8
 EBUILD sandbox-2.39.ebuild 1731 BLAKE2B 0597372e7ed3b698e8a45243170e68b175f025f90f2196bc2b789b058939f8c717d8cac43dbbcbf3789012ed95ad897091ee9cec86dde02541592868ed1c7333 SHA512 f60a5bd80147d724937f87c94e468153c552749c16a10265c2ca55e6ab848bb742e7fe2bcb1c2b9095b63ca820f9c409dc62217cd8481234064e20509e584e92
 EBUILD sandbox-2.40.ebuild 1739 BLAKE2B 090794105c6616689b819cbe1c715714402c81777bda0dc5a7c55ac7669080d775b1e3d09f6abceaa92e403f0ffc56d92eba5165ff3199b47a3b521d822be7d7 SHA512 36b0309d807cc86cce508b2ffea5b504338d35b730eb980d5205a4b420d6e9bc05835cc70259d8b76c532f1e3aea241a47457376a1934745bef7bd159dd6f608
 EBUILD sandbox-2.41.ebuild 1739 BLAKE2B 090794105c6616689b819cbe1c715714402c81777bda0dc5a7c55ac7669080d775b1e3d09f6abceaa92e403f0ffc56d92eba5165ff3199b47a3b521d822be7d7 SHA512 36b0309d807cc86cce508b2ffea5b504338d35b730eb980d5205a4b420d6e9bc05835cc70259d8b76c532f1e3aea241a47457376a1934745bef7bd159dd6f608
 EBUILD sandbox-2.42.ebuild 1739 BLAKE2B 090794105c6616689b819cbe1c715714402c81777bda0dc5a7c55ac7669080d775b1e3d09f6abceaa92e403f0ffc56d92eba5165ff3199b47a3b521d822be7d7 SHA512 36b0309d807cc86cce508b2ffea5b504338d35b730eb980d5205a4b420d6e9bc05835cc70259d8b76c532f1e3aea241a47457376a1934745bef7bd159dd6f608
 EBUILD sandbox-2.43.ebuild 2021 BLAKE2B 97e9b1b819cab880e408dcd7324e1701da1acdb8308a7fa06a6e5f52b23ce0e2f3238e0c6ccb0340605ef086ac8baa8ac3a6f8d73e6b64ce59bef1aee745226f SHA512 a6f03cace3a4ae51e6025b914da89123e6a8720ca9cf51ac5058d9c003a1fbb97c82d09acbc119e8b1d884e4e551bc4a6e49f7564483b3361995beb473953529
 EBUILD sandbox-2.44.ebuild 2021 BLAKE2B 97e9b1b819cab880e408dcd7324e1701da1acdb8308a7fa06a6e5f52b23ce0e2f3238e0c6ccb0340605ef086ac8baa8ac3a6f8d73e6b64ce59bef1aee745226f SHA512 a6f03cace3a4ae51e6025b914da89123e6a8720ca9cf51ac5058d9c003a1fbb97c82d09acbc119e8b1d884e4e551bc4a6e49f7564483b3361995beb473953529
+EBUILD sandbox-2.45.ebuild 2021 BLAKE2B 97e9b1b819cab880e408dcd7324e1701da1acdb8308a7fa06a6e5f52b23ce0e2f3238e0c6ccb0340605ef086ac8baa8ac3a6f8d73e6b64ce59bef1aee745226f SHA512 a6f03cace3a4ae51e6025b914da89123e6a8720ca9cf51ac5058d9c003a1fbb97c82d09acbc119e8b1d884e4e551bc4a6e49f7564483b3361995beb473953529
 EBUILD sandbox-9999.ebuild 2021 BLAKE2B 97e9b1b819cab880e408dcd7324e1701da1acdb8308a7fa06a6e5f52b23ce0e2f3238e0c6ccb0340605ef086ac8baa8ac3a6f8d73e6b64ce59bef1aee745226f SHA512 a6f03cace3a4ae51e6025b914da89123e6a8720ca9cf51ac5058d9c003a1fbb97c82d09acbc119e8b1d884e4e551bc4a6e49f7564483b3361995beb473953529
 MISC metadata.xml 512 BLAKE2B 2befd96e6697e45e04b9e5c6594d30987f035b52fe2d642e10b67b3a2f9657b63f66f48439cd6df71f07ad6fe112220f195d453595c4bf1ef47561cfb8c0428d SHA512 1869fc1c558817f7c7ace988184b74647a82c94e51f0bdb610011bd6736034188abb778e3c5b852ff39daad5a7ef131b09468353b0764a4957dfe72da4767601
diff --git a/sys-apps/sandbox/sandbox-2.45.ebuild b/sys-apps/sandbox/sandbox-2.45.ebuild
new file mode 100644
index 000000000000..42636c70dce6
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.45.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/sandbox.git
+		https://github.com/gentoo/sandbox.git"
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+nnp"
+
+# pax-utils lower bound for bug #265376
+DEPEND=">=app-misc/pax-utils-0.1.19"
+# Avoid folks installing with older file, bug #889046. We still need the
+# >= dep in Portage but this is a safety net if people do partial upgrades.
+RDEPEND="!<sys-apps/file-5.44-r1"
+BDEPEND="app-arch/xz-utils"
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		eautoreconf
+	fi
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+}
+
+src_configure() {
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	filter-lto
+
+	filter-lfs-flags #90228
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}