3 files changed, 2 insertions, 104 deletions
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 2dc472de8fbf..178096a2286b 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,8 +2,6 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
-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.21.ebuild 2405 BLAKE2B e38b137e069420eae0b4c6d43d396621884e741fb88c70e121dc253f2c63995202bd15b38257b117410fb255b7bfed5eec700b21ae092c9362762666f760547a SHA512 39bcdb77a8ddc3e7115f0f8d49ad6f5cdbed86ba391deb38c39b593ff544ba8c96a9735700aea5e2563bef0136c84aaefa3ebabf19f7ae4f0bca816b1abc3bd4
-EBUILD etckeeper-1.18.22.ebuild 2406 BLAKE2B 4baa340818903c3bf820244faaa8f87ce2127cb1714dbc3753df098a2acfa683732f5818b3b3431d9e052d906dbaef375ad99d06d7d88cb042defdfa74ff3ba5 SHA512 e761c91a37483945f4b8a0ea1e0a1176bb4f2f47e11351813c717b90767d5c958bd8a8dc8a1e719173df04860301002bf83a1b725e5cf95ee4ba51f4b56907cb
+EBUILD etckeeper-1.18.22.ebuild 2405 BLAKE2B ffee9896d5067d7c4a4e1e17efb5b7226812efe9e8a0d5f0bb4b957c98561ed6046a46949aed45b397b0775cba6a9ecf34805a3df183da839796d4e5714dcd15 SHA512 f37d1499cdba1b9dfa96a050da4de9134d37aa4627a03248fae09cd1f617ce5a652abe1ea3b19ef4a6715129cf45ce67de24d091faa529f2f5882b0cc70e3436
 MISC metadata.xml 621 BLAKE2B edf624cc4c6906d40430cfbea31cc86aacb2c9f0ddf4d474861797798454f03baff2192e44be1c59072506a92cb106e2b58d7a493d92abb178105fab9b3dab47 SHA512 d8b8d3f52fa8452cd58061a5b9488549d67c8dcb3b38d5e3c373fbd149b1e12b503588f8b4578a56ffe12fe860420b27c876866685d90e851b75253ad9680511
diff --git a/sys-apps/etckeeper/etckeeper-1.18.21.ebuild b/sys-apps/etckeeper/etckeeper-1.18.21.ebuild
deleted file mode 100644
index 32271399bfb1..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.21.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 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 ef2efd5b3863..bbbd1dc2d665 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="cron test"
 
 BDEPEND="test? (