gentoo auto-resync : 14:12:2024 - 02:02:07

3 files changed, 103 insertions, 4 deletions

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 64ab8aa42e1c..72014776bd7d 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -6,7 +6,9 @@ AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b
 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
-MISC metadata.xml 701 BLAKE2B 5abe7a50a0c1070b8a90f571b235d6b33508d1ded7b83c6e71a236be21feece6e6b5289e57c6e795dc1c1500f61f8e553f81e305486c9b0c7154b26a8fdc4d72 SHA512 1a0aaebf491bd7c2e01bef46353375ed9c4cb2761bd855543759cfe60539133041ea96c1bb8b6dc280f91825d11186b0936e8cda4b0a006234adf31a6f293f21
+EBUILD etckeeper-1.18.22.ebuild 2411 BLAKE2B 7d65952907029d3d570ed4adc44e86f20b14360a5b598fd9d5e24744198e6f03dcddcda96a72a95495ff4cbff555655a997ca8af624b80ce14b3f617d906ad9c SHA512 e854cd5f5d3974587970d275f8fcebb206f38e86c40f354b5df5f8e8b7f891c5edc20db1220d0e5d7568f6134a1e85085cac19d7af0e7d18601239ad39e4116a
+MISC metadata.xml 621 BLAKE2B edf624cc4c6906d40430cfbea31cc86aacb2c9f0ddf4d474861797798454f03baff2192e44be1c59072506a92cb106e2b58d7a493d92abb178105fab9b3dab47 SHA512 d8b8d3f52fa8452cd58061a5b9488549d67c8dcb3b38d5e3c373fbd149b1e12b503588f8b4578a56ffe12fe860420b27c876866685d90e851b75253ad9680511
diff --git a/sys-apps/etckeeper/etckeeper-1.18.22.ebuild b/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
new file mode 100644
index 000000000000..340b865b2ec8
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.22.ebuild
@@ -0,0 +1,100 @@
+# 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/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 838d76fac7fd..3b40288025ac 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -11,7 +11,4 @@
 	file metadata that revison control systems do not normally support, but that
 	is important for /etc, such as the permissions of /etc/shadow.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">joeyh/etckeeper</remote-id>
-	</upstream>
 </pkgmetadata>