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

5 files changed, 3 insertions, 275 deletions

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.