commit: 77c8b3a40581c5cc3290cdb34a1ed655591ec07d Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Fri Nov 11 11:59:49 2022 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri Nov 11 12:00:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c8b3a4
sys-apps/etckeeper: drop 1.18.16-r1, 1.18.17 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-apps/etckeeper/Manifest | 2 - sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild | 94 -------------------- sys-apps/etckeeper/etckeeper-1.18.17.ebuild | 99 ---------------------- .../etckeeper/files/etckeeper-1.18.14-gentoo.patch | 84 ------------------ .../files/etckeeper-1.18.17-egrep-deprecated.patch | 85 ------------------- 5 files changed, 364 deletions(-) diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 96587a2bd2a7..df174c8a9e2d 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,3 +1 @@ -DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 -DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00 DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild deleted file mode 100644 index 032befe6c640..000000000000 --- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ) - -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.17.ebuild b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild deleted file mode 100644 index 3e5e00bb3400..000000000000 --- a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild +++ /dev/null @@ -1,99 +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=( - "${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.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch deleted file mode 100644 index e677af993fe7..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 46e299da6914962007fb540a401a68a17d00bca3 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.14-gentoo - ---- - Makefile | 1 - - etckeeper.conf | 14 ++++++++++++-- - list-installed.d/50list-installed | 4 ++++ - update-ignore.d/01update-ignore | 4 ++++ - 4 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 73d2411..ffcf218 100644 ---- 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 -diff --git a/etckeeper.conf b/etckeeper.conf -index f13de1c..16ff71d 100644 ---- 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 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 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 -diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed -index d89b8ce..2db838d 100755 ---- a/list-installed.d/50list-installed -+++ b/list-installed.d/50list-installed -@@ -23,5 +23,9 @@ else - pkg info -E "*" - elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then - apk info -v | sort -+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then -+ qlist -ICv -+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then -+ cave print-packages -r installed - fi - fi -diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore -index 8733a85..53afbde 100755 ---- a/update-ignore.d/01update-ignore -+++ b/update-ignore.d/01update-ignore -@@ -103,6 +103,10 @@ writefile () { - comment "new versions of conffiles, stored by apk" - ignore "*.apk-new" - 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" --- -2.25.0 - 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 deleted file mode 100644 index c329deb0f5c4..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 0338d14862cdf5c50be451809af94232d8ca60a8 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -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
