diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-11 15:30:13 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-11 15:30:13 +0000 |
commit | 469b5d8f31adfd054c5c493fc3df2f9c89c9fa00 (patch) | |
tree | f51c77713647680335a341aeb6c5a7fa019a000b /sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch | |
parent | 7d6f532c36268a2a8f53fa33c8e547c59702faa6 (diff) |
gentoo auto-resync : 11:11:2022 - 15:30:13
Diffstat (limited to 'sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch')
-rw-r--r-- | sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch | 84 |
1 files changed, 0 insertions, 84 deletions
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 - |