diff options
Diffstat (limited to 'sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch')
| -rw-r--r-- | sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch deleted file mode 100644 index ae151377ec7e..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch +++ /dev/null @@ -1,61 +0,0 @@ -Original patch by Luke-Jr (luke-jr+gentoobugs@utopios.org) -Minor fixes by Manuel Rueger (mrueg@rueg.eu) - -https://bugs.gentoo.org/show_bug.cgi?id=216114 -Gentoo specific additions - ---- Makefile -+++ Makefile -@@ -23,7 +23,6 @@ - $(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf - $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper - $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 -- $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper - ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) - $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper - mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex -@@ -36,7 +35,6 @@ - $(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py - $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf - endif -- -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" - echo "** installation successful" - - clean: etckeeper.spec ---- etckeeper.conf -+++ etckeeper.conf -@@ -31,8 +31,10 @@ - - # The high-level package manager that's being used. - # (apt, pacman-g2, yum etc) --HIGHLEVEL_PACKAGE_MANAGER=apt -+# For gentoo this is emerge -+HIGHLEVEL_PACKAGE_MANAGER=emerge - - # The low-level package manager that's being used. - # (dpkg, rpm, pacman-g2, etc) --LOWLEVEL_PACKAGE_MANAGER=dpkg -+# For gentoo this is qlist -+LOWLEVEL_PACKAGE_MANAGER=qlist ---- list-installed.d/50list-installed -+++ list-installed.d/50list-installed -@@ -7,4 +7,6 @@ - egrep '(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" = qlist ]; then -+ qlist -ICv - fi ---- update-ignore.d/01update-ignore -+++ update-ignore.d/01update-ignore -@@ -99,6 +99,10 @@ - ignore "*.pacorig" - ignore "*.pacsave" - nl -+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then -+ comment "new and old versions of conffiles, stored by emerge" -+ ignore "*.cfg_*" -+ nl - fi - - comment "old versions of files" |