[gentoo-commits] gentoo-x86 commit in sys-apps/etckeeper/files: etckeeper-1.12-gentoo.patch

[gentoo-commits] gentoo-x86 commit in sys-apps/etckeeper/files: etckeeper-1.12-gentoo.patch

[Manuel Rueger (mrueg)]

mrueg       14/06/14 12:50:47

  Added:                etckeeper-1.12-gentoo.patch
  Log:
  Version bump. Add paludis support by Taahir Ahmed. Fixes bug #503274.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

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

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

Index: etckeeper-1.12-gentoo.patch
===================================================================
From bca936861ff64309383875c8dffcce0be6b8b00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
Date: Sat, 14 Jun 2014 14:47:55 +0200
Subject: [PATCH] Support Gentoo's package managers.


diff --git a/Makefile b/Makefile
index 13ce4fe..37b09de 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ install:
 	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
@@ -47,7 +46,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
 	$(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
diff --git a/etckeeper.conf b/etckeeper.conf
index f988c10..29ea111 100644
--- a/etckeeper.conf
+++ b/etckeeper.conf
@@ -31,11 +31,17 @@ DARCS_COMMIT_OPTIONS="-a"
 
 # The high-level package manager that's being used.
 # (apt, pacman-g2, yum, zypper etc)
-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
+# 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 f392027..02eb179 100755
--- a/list-installed.d/50list-installed
+++ b/list-installed.d/50list-installed
@@ -9,4 +9,8 @@ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
 	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
diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
index a3aa73d..ba59b7e 100755
--- a/update-ignore.d/01update-ignore
+++ b/update-ignore.d/01update-ignore
@@ -99,6 +99,14 @@ writefile () {
 		ignore "*.pacorig"
 		ignore "*.pacsave"
 		nl
+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then
+		comment "new and old versions of conffiles, stored by emerge"
+		ignore "._cfg*"
+		nl
+	elif [ "$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.0.0