Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/etckeeper/files: etckeeper-1.3-gentoo.patch
Date: Fri, 31 May 2013 19:35:06
Message-Id: 20130531193502.992E92171E@flycatcher.gentoo.org
hasufell    13/05/31 19:35:02

  Added:                etckeeper-1.3-gentoo.patch
  Log:
  version bump wrt #469370 by Manuel Rüger
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.1                  sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch?rev=1.1&content-type=text/plain

Index: etckeeper-1.3-gentoo.patch
===================================================================
Original patch by Luke-Jr (luke-jr+gentoobugs@×××××××.org)
Minor fixes by Manuel Rueger (mrueg@××××.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
@@ -39,7 +37,6 @@
 ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
 	$(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
 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,11 +31,13 @@

 # The high-level package manager that's being used.
 # (apt, pacman-g2, yum, zypper 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
 
 # To push each commit to a remote, put the name of the remote here.
 # (eg, "origin" for git).
--- 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"