[gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/

[Michael Palimaka]

commit:     7bc4160787b5ab1ed4bbb9f7e02fd515f61995fa
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov  3 11:21:21 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 07:09:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc41607

sys-apps/etckeeper: remove unused patch

 .../etckeeper/files/etckeeper-1.18.3-gentoo.patch  | 78 ----------------------
 1 file changed, 78 deletions(-)

diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch
deleted file mode 100644
index 8661d391f9c..00000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Tue, 16 Feb 2016 00:19:07 +0100
-Subject: [PATCH] Support Gentoo's package managers
-
-
-diff --git a/Makefile b/Makefile
-index 70bddfa..6090a4e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,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 0d268bd..81214c7 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, 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, pacmatic, 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 129447f..79d67f2 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -21,5 +21,9 @@ else
- 		pacmatic -Q
- 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then
- 		pkg info -E "*"
-+	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 7347287..5dbb398 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.7.1
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/

[Jeroen Roovers]

commit:     940b00ab5b5e3e8d136a2ef4f51c4d48ecdb0ad8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 16:17:39 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 16:17:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940b00ab

sys-apps/etckeeper: Whitespace

Fixes: https://bugs.gentoo.org/670030
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
index a229683bbb0..247f98ede82 100644
--- a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
@@ -27,7 +27,7 @@ index 0d268bd..81214c7 100644
 -HIGHLEVEL_PACKAGE_MANAGER=apt
 +#HIGHLEVEL_PACKAGE_MANAGER=apt
 +
-+# Gentoo specific:                                                                                                                                                                                                                                
++# Gentoo specific:
 +# For portage this is emerge
 +# For paludis this is cave
 +HIGHLEVEL_PACKAGE_MANAGER=emerge