gentoo resync : 29.12.2022

4 files changed, 191 insertions, 2 deletions

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 8355577910f4..aa8022d11510 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,8 +1,11 @@
 AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
+AUX etckeeper-1.18.17-egrep-deprecated.patch 3246 BLAKE2B 24d09c53fb52f1cb6115097a7a66f47b87b739190d6bdcd291fffb3059f45fd1194cee51b8ef02df18f5d505f55e10cf5011b3d0678dbfb7bc516fdac9cfcd30 SHA512 aaf9525f413d7f09139fc1c441a15f193f9625ac6428eabf10ee0e51d92ed1975839c5907e6291d062c51234de968497a33b58ca815651b51f3fe2fbee14651d
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-EBUILD etckeeper-1.18.16-r1.ebuild 2115 BLAKE2B b248c6c5c6f9965becb299df408b93598984867faec4c24db9303fe6f4a82b3bb0b7f5525a939a28115f9683ec31af9c54a3109240077711a40bebbd2102ecda SHA512 d3c8e2a9d7ce65836d699261ad51e5083f033b3147275412b774de2d385e0fafa07f7bedd33e1e4d94687a6aa977e180af0398372afd1967b09ce02b3c65ad60
+DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00
+EBUILD etckeeper-1.18.16-r1.ebuild 2204 BLAKE2B 7a8bbbd23ca0abdf6c78f1ec44c888dfeff7307bbc000ebe0a06e16f4e3ed329eabd9c602697a343ec7dfb461afb98f0ac41a1b79c28745cbb6c5cb16ddae68e SHA512 9a46883c094c997623f8ae7a316c9ed526eee01dbc3b51c260b3ea3ba4b81b0fbf91e60e4c430e0a9186e3688fe305fc85df7e1318d5a40df1543e0669170ff4
+EBUILD etckeeper-1.18.17.ebuild 2271 BLAKE2B a55f09701c013ed97bf537345f08009665384bb1bdd1e15c369cf64ee239edd3446bc5acbe7769cb648e051a36b04a0a7fad940d25e810d8cb4973113cd8697e SHA512 fc794397bcd16c3927a875c6a301abda95caae227f6540163bddf50432e509c399d9c669feee0d3eda0a7ac2b436a12c4b6803a61cdbd64925a6373f9e47d3da
 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
index e42c1c08f094..1b87e32407f4 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
@@ -35,9 +35,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18.14-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@"$(systemd_get_systemunitdir)"@" \
+		-e s"@/lib/systemd/system@"${systemdunitdir}"@" \
 		Makefile || die
 	rm -v init.d/60darcs-deleted-symlinks || die
 }
diff --git a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
new file mode 100644
index 000000000000..3e5e00bb3400
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
@@ -0,0 +1,99 @@
+# 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=(
+	"${FILESDIR}"/${PN}-1.18.14-gentoo.patch
+
+	# Sent upstream
+	"${FILESDIR}"/${P}-egrep-deprecated.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/files/etckeeper-1.18.17-egrep-deprecated.patch b/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch
new file mode 100644
index 000000000000..c329deb0f5c4
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch
@@ -0,0 +1,85 @@
+From 0338d14862cdf5c50be451809af94232d8ca60a8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 15 May 2022 01:12:05 +0000
+Subject: [PATCH] Replace obsolete usage of 'egrep' with 'grep -E'
+
+egrep is considered deprecated (and is an alias to grep -E),
+so replace it with grep -E.
+--- a/doc/todo/regex_in_20-warn-problem-files.mdwn
++++ b/doc/todo/regex_in_20-warn-problem-files.mdwn
+@@ -1,11 +1,11 @@
+     exclude_internal () {
+-            egrep -v '(^|/)(.git|.hg|.bzr|_darcs)/'
++            grep -E -v '(^|/)(.git|.hg|.bzr|_darcs)/'
+     }
+ 
+ should probably escape the `.`s. 
+ 
+     exclude_internal () {
+-            egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
++            grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
+     }
+ 
+ > [[fixed|done]] --[[Joey]]
+--- a/etckeeper
++++ b/etckeeper
+@@ -84,7 +84,7 @@ elif [ "$command" = "pre-apt" ]; then
+ 	command=pre-install
+ fi
+ 
+-if echo "$command" | LANG=C egrep -q '[^-a-z_]'; then
++if echo "$command" | LANG=C grep -E -q '[^-a-z_]'; then
+ 	echo "etckeeper: invalid command $command" >&2
+ 	exit 1
+ fi
+@@ -142,7 +142,7 @@ else
+ 	# fallback if perl isn't present
+ 	for script in $ETCKEEPER_CONF_DIR/$command.d/*; do
+ 		if [ ! -d "$script" -a -x "$script" ]; then
+-			echo "$script" | egrep -q "/[-a-zA-Z0-9]+$"
++			echo "$script" | grep -E -q "/[-a-zA-Z0-9]+$"
+ 			[ $? -eq 0 ] && "$script" "$@"
+ 		fi
+ 	done
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -17,7 +17,7 @@ else
+ 	# format "package version\n" (or something similar).
+ 	if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
+ 		dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \
+-			egrep '(ok installed|ok config-files)' | cut -f2,3
++			grep -E '(ok installed|ok config-files)' | cut -f2,3
+ 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ 		rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
+ 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
+--- a/post-install.d/50vcs-commit
++++ b/post-install.d/50vcs-commit
+@@ -66,7 +66,7 @@ if etckeeper unclean; then
+ 			get_changed_packages | sort | uniq > $pl.found-pkgs
+ 			if [ -s $pl.found-pkgs ]; then
+ 				sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs
+-				etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
++				etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
+ 				if [ -s $pl.found-packages ]; then
+ 					echo "Packages with configuration changes:"
+ 					cat $pl.found-packages || true
+@@ -74,7 +74,7 @@ if etckeeper unclean; then
+ 				fi
+ 			fi
+ 			echo "Package changes:"
+-			etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' || true
++			etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' || true
+ 		) | etckeeper commit --stdin
+ 	else
+ 		etckeeper commit "$(printf "$message")"
+--- a/pre-commit.d/20warn-problem-files
++++ b/pre-commit.d/20warn-problem-files
+@@ -2,7 +2,7 @@
+ set -e
+ 
+ exclude_internal () {
+-	egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
++	grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
+ }
+ 
+ if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then