diff options
Diffstat (limited to 'sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch')
| -rw-r--r-- | sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch | 86 |
1 files changed, 0 insertions, 86 deletions
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 a5018bd77d1a..000000000000 --- 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 - |