| 1 |
commit: 7bc4160787b5ab1ed4bbb9f7e02fd515f61995fa |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Nov 3 11:21:21 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 4 07:09:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc41607 |
| 7 |
|
| 8 |
sys-apps/etckeeper: remove unused patch |
| 9 |
|
| 10 |
.../etckeeper/files/etckeeper-1.18.3-gentoo.patch | 78 ---------------------- |
| 11 |
1 file changed, 78 deletions(-) |
| 12 |
|
| 13 |
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch |
| 14 |
deleted file mode 100644 |
| 15 |
index 8661d391f9c..00000000000 |
| 16 |
--- a/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,78 +0,0 @@ |
| 19 |
-From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001 |
| 20 |
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@××××.eu> |
| 21 |
-Date: Tue, 16 Feb 2016 00:19:07 +0100 |
| 22 |
-Subject: [PATCH] Support Gentoo's package managers |
| 23 |
- |
| 24 |
- |
| 25 |
-diff --git a/Makefile b/Makefile |
| 26 |
-index 70bddfa..6090a4e 100644 |
| 27 |
---- a/Makefile |
| 28 |
-+++ b/Makefile |
| 29 |
-@@ -58,7 +58,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) |
| 30 |
- mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit |
| 31 |
- $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py |
| 32 |
- endif |
| 33 |
-- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" |
| 34 |
- echo "** installation successful" |
| 35 |
- |
| 36 |
- clean: etckeeper.spec etckeeper.version |
| 37 |
-diff --git a/etckeeper.conf b/etckeeper.conf |
| 38 |
-index 0d268bd..81214c7 100644 |
| 39 |
---- a/etckeeper.conf |
| 40 |
-+++ b/etckeeper.conf |
| 41 |
-@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a" |
| 42 |
- |
| 43 |
- # The high-level package manager that's being used. |
| 44 |
- # (apt, pacman, pacman-g2, yum, dnf, zypper etc) |
| 45 |
--HIGHLEVEL_PACKAGE_MANAGER=apt |
| 46 |
-+#HIGHLEVEL_PACKAGE_MANAGER=apt |
| 47 |
-+ |
| 48 |
-+# Gentoo specific: |
| 49 |
-+# For portage this is emerge |
| 50 |
-+# For paludis this is cave |
| 51 |
-+HIGHLEVEL_PACKAGE_MANAGER=emerge |
| 52 |
- |
| 53 |
- # The low-level package manager that's being used. |
| 54 |
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, etc) |
| 55 |
--LOWLEVEL_PACKAGE_MANAGER=dpkg |
| 56 |
-+#LOWLEVEL_PACKAGE_MANAGER=dpkg |
| 57 |
-+ |
| 58 |
-+# Gentoo specific: |
| 59 |
-+# For portage this is qlist |
| 60 |
-+# For paludis this is cave |
| 61 |
-+LOWLEVEL_PACKAGE_MANAGER=qlist |
| 62 |
- |
| 63 |
- # To push each commit to a remote, put the name of the remote here. |
| 64 |
- # (eg, "origin" for git). Space-separated lists of multiple remotes |
| 65 |
-diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed |
| 66 |
-index 129447f..79d67f2 100755 |
| 67 |
---- a/list-installed.d/50list-installed |
| 68 |
-+++ b/list-installed.d/50list-installed |
| 69 |
-@@ -21,5 +21,9 @@ else |
| 70 |
- pacmatic -Q |
| 71 |
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then |
| 72 |
- pkg info -E "*" |
| 73 |
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then |
| 74 |
-+ qlist -ICv |
| 75 |
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then |
| 76 |
-+ cave print-packages -r installed |
| 77 |
- fi |
| 78 |
- fi |
| 79 |
-diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore |
| 80 |
-index 7347287..5dbb398 100755 |
| 81 |
---- a/update-ignore.d/01update-ignore |
| 82 |
-+++ b/update-ignore.d/01update-ignore |
| 83 |
-@@ -99,6 +99,10 @@ writefile () { |
| 84 |
- ignore "*.pacorig" |
| 85 |
- ignore "*.pacsave" |
| 86 |
- nl |
| 87 |
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then |
| 88 |
-+ comment "new and old versions of conffiles, stored by emerge" |
| 89 |
-+ ignore "._cfg*" |
| 90 |
-+ nl |
| 91 |
- fi |
| 92 |
- |
| 93 |
- comment "old versions of files" |
| 94 |
--- |
| 95 |
-2.7.1 |
| 96 |
- |
Archives