* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2020-01-27 8:25 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2020-01-27 8:25 UTC (permalink / raw
To: gentoo-commits
commit: 1b8e6f6772146d6cd66af46f3bd5453850b5e71b
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 08:10:12 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 08:25:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8e6f67
sys-apps/etckeeper: bump to 1.18.14, removed bzr support
it's py2 only which is going away.
if bzr gets ported to py3 we can add it back here
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 1 +
sys-apps/etckeeper/etckeeper-1.18.14.ebuild | 78 ++++++++++++++++++++
.../etckeeper/files/etckeeper-1.18.14-gentoo.patch | 84 ++++++++++++++++++++++
sys-apps/etckeeper/files/etckeeper.tmpfilesd | 1 +
4 files changed, 164 insertions(+)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index e975ae25561..9a471bb7688 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1,3 @@
+DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
new file mode 100644
index 00000000000..7935c8c83a3
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 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 ~ppc64 ~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
+ sed -i \
+ -e s'@zsh/vendor-completions@zsh/site-functions@' \
+ -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \
+ 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 debian/cron.daily etckeeper
+ fi
+}
+
+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
new file mode 100644
index 00000000000..e677af993fe
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch
@@ -0,0 +1,84 @@
+From 46e299da6914962007fb540a401a68a17d00bca3 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.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.tmpfilesd b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
new file mode 100644
index 00000000000..b13813d6198
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
@@ -0,0 +1 @@
+d /var/cache/etckeeper 0770 root root -
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2023-01-04 9:59 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2023-01-04 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 578e0fcd9c0fa170e7106997c07bac71b9ab0239
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 09:46:54 2023 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 09:59:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578e0fcd
sys-apps/etckeeper: add 1.18.19
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 1 +
sys-apps/etckeeper/etckeeper-1.18.19.ebuild | 104 +++++++++++++++++++++
.../files/etckeeper-1.18.19-backticks-EOF.patch | 37 ++++++++
3 files changed, 142 insertions(+)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index df174c8a9e2d..012bc415a070 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1 +1,2 @@
DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
+DIST etckeeper-1.18.19.tar.gz 110687 BLAKE2B fe0b1a7cc108b81e15d03fad6f2e10538a4ff991fcbac132bd18930501ea3681786f5e20a942b32c621b6a595bb61d2dc99e33ef4f040e2958a6d8cafa7e4763 SHA512 8b4776f04c98996f0dd1c68694d026cc61e8b8c3b1163a18b98bce37eea95a4676c31bde172996b392fa48e160515a61ddd466798d9e70f4b3dd56615046df16
diff --git a/sys-apps/etckeeper/etckeeper-1.18.19.ebuild b/sys-apps/etckeeper/etckeeper-1.18.19.ebuild
new file mode 100644
index 000000000000..0174a070e7e3
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.19.ebuild
@@ -0,0 +1,104 @@
+# 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 )"
+
+PATCHES=(
+ "${FILESDIR}/etckeeper-1.18.19-backticks-EOF.patch" # sent upstream
+)
+
+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.19-backticks-EOF.patch b/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch
new file mode 100644
index 000000000000..cf47e8108bef
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch
@@ -0,0 +1,37 @@
+From 88cc70458f1dd902d001b63148b0df534b1ebdf6 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 4 Jan 2023 01:29:09 -0800
+Subject: [PATCH] init.d/50vcs-pre-commit-hook: replace backticks
+
+it's in EOF block, so bash tries to execute backticked commands despite
+being commented out.
+
+Initialized empty Git repository in /etc/.git/
+/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: rev-parse: command not found
+Usage: grep [OPTION]... PATTERNS [FILE]...
+Try 'grep --help' for more information.
+/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: worktree: command not found
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ init.d/50vcs-pre-commit-hook | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/init.d/50vcs-pre-commit-hook b/init.d/50vcs-pre-commit-hook
+index 6e0669c..166540d 100755
+--- a/init.d/50vcs-pre-commit-hook
++++ b/init.d/50vcs-pre-commit-hook
+@@ -34,8 +34,8 @@ set -e
+ #
+ ################################################################################
+
+-# Using `rev-parse` + `grep` rather than for instance parsing output from
+-# `worktree list` since the worktree command is not present in older git version
++# Using 'rev-parse' + 'grep' rather than for instance parsing output from
++# 'worktree list' since the worktree command is not present in older git version
+ # and parsing it would be slightly more complex.
+ if git rev-parse --git-dir | grep -q /.git/worktrees
+ then
+--
+2.39.0
+
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2022-11-11 12:00 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2022-11-11 12:00 UTC (permalink / raw
To: gentoo-commits
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 <gyakovlev@gentoo.org>
-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 <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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2022-10-01 4:57 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-10-01 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 6185a73c8a11a8f9ff823020f676c2d4f4af9755
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 04:57:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 04:57:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6185a73c
sys-apps/etckeeper: add 1.18.18
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 1 +
sys-apps/etckeeper/etckeeper-1.18.18.ebuild | 97 ++++++++++++++++++++++
.../etckeeper/files/etckeeper-1.18.18-gentoo.patch | 70 ++++++++++++++++
3 files changed, 168 insertions(+)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 5786d8857e91..96587a2bd2a7 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1,3 @@
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.18.ebuild b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
new file mode 100644
index 000000000000..b63426712a0e
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
@@ -0,0 +1,97 @@
+# 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/files/etckeeper-1.18.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
new file mode 100644
index 000000000000..298671c90004
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
@@ -0,0 +1,70 @@
+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.
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2022-05-15 1:15 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-05-15 1:15 UTC (permalink / raw
To: gentoo-commits
commit: 10a7350da6cb404487231e8bbc88bedf627f2685
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 01:15:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 15 01:15:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a7350d
sys-apps/etckeeper: add 1.18.17
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 1 +
sys-apps/etckeeper/etckeeper-1.18.17.ebuild | 97 ++++++++++++++++++++++
.../files/etckeeper-1.18.17-egrep-deprecated.patch | 85 +++++++++++++++++++
3 files changed, 183 insertions(+)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 538b9972d7a1..5786d8857e91 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1 +1,2 @@
DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
+DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00
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..6c678d1e6e34
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
@@ -0,0 +1,97 @@
+# 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
+ sed -i \
+ -e s'@zsh/vendor-completions@zsh/site-functions@' \
+ -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \
+ 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2021-09-13 10:34 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2021-09-13 10:34 UTC (permalink / raw
To: gentoo-commits
commit: e5c878662182c4bd4de1a090dd0ae8166b483919
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 07:15:29 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 10:34:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c87866
sys-apps/etckeeper: install conf-update.d hook
In newer versions of portage (> 3.0.22), dispatch-conf will invoke
hooks found in /etc/portage/update-conf.d. See also portage commit
6e86186244d0 ("dispatch-conf: Add support for conf-update.d hook
directory") [1].
1:
https://gitweb.gentoo.org/proj/portage.git/commit/?id=6e86186244d048e3edd5c11c18cfb4eee98a0d56
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22075
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
...-1.18.16.ebuild => etckeeper-1.18.16-r1.ebuild} | 5 ++++
.../etckeeper/files/etckeeper-conf-update-hook | 32 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
similarity index 91%
rename from sys-apps/etckeeper/etckeeper-1.18.16.ebuild
rename to sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
index 7338b278ab3..0591f38928e 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
@@ -71,6 +71,11 @@ if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
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() {
diff --git a/sys-apps/etckeeper/files/etckeeper-conf-update-hook b/sys-apps/etckeeper/files/etckeeper-conf-update-hook
new file mode 100644
index 00000000000..d0546c8776d
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-conf-update-hook
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -eu
+
+# etckeeper hook for portage's conf-update hooks (e.g. invoked by
+# dispatch-conf). Requires portage > 3.0.22.
+
+# Do nothing if etckeeper is not initialized.
+if [[ ! -f "/etc/etckeeper/etckeeper.conf" ]]; then
+ exit
+fi
+
+echo "conf-update.d ${@}"
+
+case "${1}" in
+ pre-session)
+ echo "Commiting uncommited changes before starting a configuration update session"
+ etckeeper pre-install
+ ;;
+ post-session)
+ echo "Commiting uncommited changes before after finishing a configuration update session"
+ etckeeper post-install
+ ;;
+ post-update)
+ ACTION=${1}
+ FILE_PATH=${2}
+ FILE=$(basename "${FILE_PATH}")
+
+ echo "Commiting changes for ${FILE}"
+ etckeeper vcs add "${FILE_PATH}"
+ etckeeper vcs commit -m "${FILE}: ${ACTION} (conf-update.d hook)"
+ ;;
+esac
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2020-03-31 12:57 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2020-03-31 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 921ad98183868f5269df7b2f6c4f2b49518ef7ee
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 12:55:01 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 12:55:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921ad981
sys-apps/etckeeper: drop old
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 2 -
sys-apps/etckeeper/etckeeper-1.18.6.ebuild | 71 --------------------
sys-apps/etckeeper/etckeeper-1.18.8.ebuild | 76 ---------------------
.../etckeeper/files/etckeeper-1.18.6-gentoo.patch | 78 ----------------------
sys-apps/etckeeper/metadata.xml | 2 -
5 files changed, 229 deletions(-)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 9a471bb7688..e00ca069370 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,3 +1 @@
DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
-DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
-DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
deleted file mode 100644
index 6ac5a424366..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
- app-portage/portage-utils
- cron? ( virtual/cron )
- bazaar? ( ${PYTHON_DEPS} )
- !bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
- :
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- bzr_install() {
- ${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
- die "bzr support installation failed!"
- }
- use bazaar && python_foreach_impl bzr_install
-
- if use prefix; then
- doenvd "${FILESDIR}"/99${PN}
- eprefixify "${ED%/}"/etc/env.d/99${PN}
- fi
-
- dodoc doc/README.mdwn
- docinto examples
- newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe debian/cron.daily etckeeper
- fi
-}
-
-pkg_postinst() {
- elog "${PN} supports the following VCS: ${VCS_DEPEND}"
- elog " dev-vcs/bzr"
- elog "This ebuild just ensures at least one is installed!"
- elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}/examples"
- 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.8.ebuild b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
deleted file mode 100644
index 7c5d60b113f..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-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 ~ppc64 ~x86"
-SLOT="0"
-IUSE="bazaar cron test"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
- app-portage/portage-utils
- cron? ( virtual/cron )
- bazaar? ( ${PYTHON_DEPS} )
- !bazaar? ( || ( ${VCS_DEPEND} ) )"
-DEPEND="${DEPEND}
- test? ( dev-util/bats )"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
-
-src_prepare() {
- default
- hprefixify *.d/* etckeeper
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- bzr_install() {
- "${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
- die "bzr support installation failed!"
- }
- use bazaar && python_foreach_impl bzr_install
-
- doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
- newbashcomp bash_completion ${PN}
- dodoc doc/README.mdwn
- newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe debian/cron.daily etckeeper
- fi
-}
-
-pkg_postinst() {
- elog "${PN} supports the following VCS: ${VCS_DEPEND}"
- elog " dev-vcs/bzr"
- elog "This ebuild just ensures at least one is installed!"
- elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}/examples"
- 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.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
deleted file mode 100644
index 247f98ede82..00000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Tue, 16 Feb 2016 00:19:07 +0100
-Subject: [PATCH] Support Gentoo's package managers
-
-
-diff --git a/Makefile b/Makefile
-index 70bddfa..6090a4e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,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 0d268bd..81214c7 100644
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -31,11 +31,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 129447f..79d67f2 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -21,5 +21,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 7347287..5dbb398 100755
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -99,6 +99,10 @@ writefile () {
- ignore "*.pacorig"
- ignore "*.pacsave"
- 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.7.1
-
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 3005ddb1247..affe25c2e34 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -6,8 +6,6 @@
<name>Georgy Yakovlev</name>
</maintainer>
<use>
- <flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
- </flag>
<flag name="cron">Install cron script</flag>
</use>
<longdescription>etckeeper is a collection of tools to let /etc be stored in
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2018-02-07 8:51 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2018-02-07 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 9d33bab33e199d28bbd80364ebc6a4fb76f47240
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 7 08:48:59 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 7 08:51:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d33bab3
sys-apps/etckeeper: remove 1.18.1
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-apps/etckeeper/Manifest | 1 -
sys-apps/etckeeper/etckeeper-1.18.1.ebuild | 74 -------------------
sys-apps/etckeeper/files/bashrc | 4 -
.../etckeeper/files/etckeeper-1.18-gentoo.patch | 86 ----------------------
4 files changed, 165 deletions(-)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index e3d58a911bc..b8d805cf951 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1 @@
-DIST etckeeper-1.18.1.tar.gz 56366 BLAKE2B ac3cff677139b09eb400acc757852b7650c68a1c50bc0fd6a13bc170215d7abf32cbaadda44fa6ce55245d1c225b0ea0890465b353c31fa31724dea92d7f06c9 SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35
DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
diff --git a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
deleted file mode 100644
index 2f269c707d0..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
- app-portage/portage-utils
- cron? ( virtual/cron )
- bazaar? ( ${PYTHON_DEPS} )
- !bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-src_prepare(){
- epatch "${FILESDIR}"/${PN}-1.18-gentoo.patch
-}
-
-src_compile() {
- :
-}
-
-src_install(){
- emake DESTDIR="${ED}" install
-
- bzr_install() {
- ${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
- die "bzr support installation failed!"
- }
- use bazaar && python_foreach_impl bzr_install
-
- if use prefix; then
- doenvd "${FILESDIR}"/99${PN}
- eprefixify "${ED%/}"/etc/env.d/99${PN}
- fi
-
- newbashcomp bash_completion ${PN}
- dodoc doc/README.mdwn
- docinto examples
- newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe debian/cron.daily etckeeper
- fi
-}
-
-pkg_postinst(){
- elog "${PN} supports the following VCS: ${VCS_DEPEND}"
- elog " dev-vcs/bzr"
- elog "This ebuild just ensures at least one is installed!"
- elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}/examples"
- elog
- elog "To initialise your etc-dir as a repository run:"
- elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/files/bashrc b/sys-apps/etckeeper/files/bashrc
deleted file mode 100644
index ce53621a22a..00000000000
--- a/sys-apps/etckeeper/files/bashrc
+++ /dev/null
@@ -1,4 +0,0 @@
-case "${EBUILD_PHASE}" in
- preinst|prerm) etckeeper pre-install ;;
- postinst|postrm) etckeeper post-install ;;
-esac
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
deleted file mode 100644
index a5018bd77d1..00000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 385d0e828d57e4998dd62fa34d5d929768fb894d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Sun, 12 Apr 2015 23:39:30 +0200
-Subject: [PATCH] Support Gentoo's package managers.
-
-
-diff --git a/Makefile b/Makefile
-index c95d51a..4be900e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,6 @@ install: etckeeper.version
- mkdir -p $(DESTDIR)$(mandir)/man8
- $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
- mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d
-- $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
- ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
- mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d
- $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
-@@ -52,7 +51,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 2aec35e..0a9c88b 100644
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a"
-
- # The high-level package manager that's being used.
- # (apt, pacman-g2, yum, dnf, zypper 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, pacman-g2, 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 2ac569a..91718d4 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -17,5 +17,9 @@ else
- rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
- pacman -Q
-+ 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 098fab8..88243ea 100755
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -99,6 +99,10 @@ writefile () {
- ignore "*.pacorig"
- ignore "*.pacsave"
- 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.3.5
-
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/
@ 2017-02-01 13:45 Manuel Rüger
0 siblings, 0 replies; 9+ messages in thread
From: Manuel Rüger @ 2017-02-01 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 7284863d8d2b1d207d01741475e134284e4e6f9f
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 13:45:12 2017 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 13:45:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7284863d
sys-apps/etckeeper: Version bump to 1.18.6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/etckeeper/Manifest | 1 +
sys-apps/etckeeper/etckeeper-1.18.6.ebuild | 72 ++++++++++++++++++++
.../etckeeper/files/etckeeper-1.18.6-gentoo.patch | 78 ++++++++++++++++++++++
3 files changed, 151 insertions(+)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index ccfd726..32f8dc6 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,3 +1,4 @@
DIST etckeeper-1.18.1.tar.gz 56366 SHA256 80adee6e17bfc41359ffb85a401d9a510ae25956950adbfdd07a0bda36d99e9b SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 WHIRLPOOL 890b38f761f49a5a4713fa850bc18e09688ed8fb04d9b41f3727f868448fb1ba1ecf92750df777fc6011a3f88abeb8756105fbdc60ebf6fd3e693360764fb27c
DIST etckeeper-1.18.4.tar.gz 67499 SHA256 a8f28c24d2c296db861fd5f1e95e6c9aa924eed19a331487cf42687f49123600 SHA512 fa1d8eda9037be7933fd5be6ea4b5dfb77d6858ffab4ae4dad838d5c6ec066cb254c700732bfa0becd388b952b2b216bd7027cf3a67f806048e6cb3aa9c276c3 WHIRLPOOL df03d41ffbc86c94a2c1a62d50751e117ae7fe52d8551c752e2b53cae34685a3dd0f088d08ed8ac1545aeac0ec16bc3900b8e0d97c95c0da4cfb52ace7b59607
DIST etckeeper-1.18.5.tar.gz 68041 SHA256 a4ddb313037c6861efbc24a55ed8e66cd98591e190aedf2657c8a1071f821889 SHA512 6a0ff1dd2dcc665da8a68bf48ea5bb12c9ae1f1a8737f3bcec47f9d055602e469b69a4ceed9a2042b89492a98c17f2065596f5e65fc228734de1aad7db3a12c1 WHIRLPOOL 6fea65228add2ff3dfe29438d2dd4cde9562e8c0a69ed7ce2c07ac929d7109af3f96dc3d85bfdaceead716394bb80fd0b7206b5cfc3e408e922e215c03985b8e
+DIST etckeeper-1.18.6.tar.gz 73487 SHA256 7db1a2b48c011b5e04ec95af559de8d1d243bdcdf6cd591b3b0b46d1f21e9602 SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c WHIRLPOOL 41805cff70804abe574831ec1bb2bc4e2e5079ff97c777f2597f8af4f6e972009312b5f1760a0c17e0db0f150266b94cdc1f49afb8e15401d8c57ad540112324
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
new file mode 100644
index 00000000..245afd7
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="bazaar cron"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+ dev-vcs/mercurial
+ dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr )"
+RDEPEND="${DEPEND}
+ app-portage/portage-utils
+ cron? ( virtual/cron )
+ bazaar? ( ${PYTHON_DEPS} )
+ !bazaar? ( || ( ${VCS_DEPEND} ) )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+ :
+}
+
+src_install(){
+ emake DESTDIR="${ED}" install
+
+ bzr_install() {
+ ${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
+ die "bzr support installation failed!"
+ }
+ use bazaar && python_foreach_impl bzr_install
+
+ if use prefix; then
+ doenvd "${FILESDIR}"/99${PN}
+ eprefixify "${ED%/}"/etc/env.d/99${PN}
+ fi
+
+ dodoc doc/README.mdwn
+ docinto examples
+ newdoc "${FILESDIR}"/bashrc-r1 bashrc
+
+ if use cron ; then
+ exeinto /etc/cron.daily
+ newexe debian/cron.daily etckeeper
+ fi
+}
+
+pkg_postinst(){
+ elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+ elog " dev-vcs/bzr"
+ elog "This ebuild just ensures at least one is installed!"
+ elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+ elog
+ elog "You may want to adjust your /etc/portage/bashrc"
+ elog "see the example file in /usr/share/doc/${PF}/examples"
+ 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.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
new file mode 100644
index 00000000..a229683
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
@@ -0,0 +1,78 @@
+From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Tue, 16 Feb 2016 00:19:07 +0100
+Subject: [PATCH] Support Gentoo's package managers
+
+
+diff --git a/Makefile b/Makefile
+index 70bddfa..6090a4e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,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 0d268bd..81214c7 100644
+--- a/etckeeper.conf
++++ b/etckeeper.conf
+@@ -31,11 +31,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 129447f..79d67f2 100755
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -21,5 +21,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 7347287..5dbb398 100755
+--- a/update-ignore.d/01update-ignore
++++ b/update-ignore.d/01update-ignore
+@@ -99,6 +99,10 @@ writefile () {
+ ignore "*.pacorig"
+ ignore "*.pacsave"
+ 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.7.1
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-01-04 10:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-27 8:25 [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2023-01-04 9:59 Georgy Yakovlev
2022-11-11 12:00 Georgy Yakovlev
2022-10-01 4:57 Sam James
2022-05-15 1:15 Sam James
2021-09-13 10:34 Georgy Yakovlev
2020-03-31 12:57 Georgy Yakovlev
2018-02-07 8:51 Michael Palimaka
2017-02-01 13:45 Manuel Rüger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox