commit: 0bebae2b0319fc98ab119a84fc440c1f5ae72a19 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Mon Feb 24 11:00:16 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Mon Feb 24 11:00:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bebae2b
sys-apps/etckeeper: drop 1.18.18, 1.18.20 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> sys-apps/etckeeper/Manifest | 2 - sys-apps/etckeeper/etckeeper-1.18.18.ebuild | 97 -------------------- sys-apps/etckeeper/etckeeper-1.18.20.ebuild | 100 --------------------- .../etckeeper/files/etckeeper-1.18.18-gentoo.patch | 70 --------------- 4 files changed, 269 deletions(-) diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 694aa3e7151d..3e50ec0cb954 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,4 +1,2 @@ -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 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/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 <[email protected]> -Date: Sun, 26 Jan 2020 23:24:54 -0800 -Subject: [PATCH] 1.18.18-gentoo - -Signed-off-by: Sam James <[email protected]> ---- 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.
