1 |
commit: 9d33bab33e199d28bbd80364ebc6a4fb76f47240 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 7 08:48:59 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 7 08:51:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d33bab3 |
7 |
|
8 |
sys-apps/etckeeper: remove 1.18.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-apps/etckeeper/Manifest | 1 - |
13 |
sys-apps/etckeeper/etckeeper-1.18.1.ebuild | 74 ------------------- |
14 |
sys-apps/etckeeper/files/bashrc | 4 - |
15 |
.../etckeeper/files/etckeeper-1.18-gentoo.patch | 86 ---------------------- |
16 |
4 files changed, 165 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest |
19 |
index e3d58a911bc..b8d805cf951 100644 |
20 |
--- a/sys-apps/etckeeper/Manifest |
21 |
+++ b/sys-apps/etckeeper/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST etckeeper-1.18.1.tar.gz 56366 BLAKE2B ac3cff677139b09eb400acc757852b7650c68a1c50bc0fd6a13bc170215d7abf32cbaadda44fa6ce55245d1c225b0ea0890465b353c31fa31724dea92d7f06c9 SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 |
24 |
DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c |
25 |
|
26 |
diff --git a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 2f269c707d0..00000000000 |
29 |
--- a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,74 +0,0 @@ |
32 |
-# Copyright 1999-2015 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=5 |
36 |
- |
37 |
-PYTHON_COMPAT=( python2_7 ) |
38 |
- |
39 |
-inherit eutils bash-completion-r1 prefix python-r1 |
40 |
- |
41 |
-DESCRIPTION="A collection of tools to let /etc be stored in a repository" |
42 |
-HOMEPAGE="https://etckeeper.branchable.com/" |
43 |
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="GPL-2" |
46 |
-KEYWORDS="amd64 ~arm x86" |
47 |
-SLOT="0" |
48 |
-IUSE="bazaar cron" |
49 |
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )" |
50 |
- |
51 |
-VCS_DEPEND="dev-vcs/git |
52 |
- dev-vcs/mercurial |
53 |
- dev-vcs/darcs" |
54 |
-DEPEND="bazaar? ( dev-vcs/bzr )" |
55 |
-RDEPEND="${DEPEND} |
56 |
- app-portage/portage-utils |
57 |
- cron? ( virtual/cron ) |
58 |
- bazaar? ( ${PYTHON_DEPS} ) |
59 |
- !bazaar? ( || ( ${VCS_DEPEND} ) )" |
60 |
- |
61 |
-src_prepare(){ |
62 |
- epatch "${FILESDIR}"/${PN}-1.18-gentoo.patch |
63 |
-} |
64 |
- |
65 |
-src_compile() { |
66 |
- : |
67 |
-} |
68 |
- |
69 |
-src_install(){ |
70 |
- emake DESTDIR="${ED}" install |
71 |
- |
72 |
- bzr_install() { |
73 |
- ${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" || |
74 |
- die "bzr support installation failed!" |
75 |
- } |
76 |
- use bazaar && python_foreach_impl bzr_install |
77 |
- |
78 |
- if use prefix; then |
79 |
- doenvd "${FILESDIR}"/99${PN} |
80 |
- eprefixify "${ED%/}"/etc/env.d/99${PN} |
81 |
- fi |
82 |
- |
83 |
- newbashcomp bash_completion ${PN} |
84 |
- dodoc doc/README.mdwn |
85 |
- docinto examples |
86 |
- newdoc "${FILESDIR}"/bashrc-r1 bashrc |
87 |
- |
88 |
- if use cron ; then |
89 |
- exeinto /etc/cron.daily |
90 |
- newexe debian/cron.daily etckeeper |
91 |
- fi |
92 |
-} |
93 |
- |
94 |
-pkg_postinst(){ |
95 |
- elog "${PN} supports the following VCS: ${VCS_DEPEND}" |
96 |
- elog " dev-vcs/bzr" |
97 |
- elog "This ebuild just ensures at least one is installed!" |
98 |
- elog "For dev-vcs/bzr you need to enable 'bazaar' useflag." |
99 |
- elog |
100 |
- elog "You may want to adjust your /etc/portage/bashrc" |
101 |
- elog "see the example file in /usr/share/doc/${PF}/examples" |
102 |
- elog |
103 |
- elog "To initialise your etc-dir as a repository run:" |
104 |
- elog "${PN} init -d /etc" |
105 |
-} |
106 |
|
107 |
diff --git a/sys-apps/etckeeper/files/bashrc b/sys-apps/etckeeper/files/bashrc |
108 |
deleted file mode 100644 |
109 |
index ce53621a22a..00000000000 |
110 |
--- a/sys-apps/etckeeper/files/bashrc |
111 |
+++ /dev/null |
112 |
@@ -1,4 +0,0 @@ |
113 |
-case "${EBUILD_PHASE}" in |
114 |
- preinst|prerm) etckeeper pre-install ;; |
115 |
- postinst|postrm) etckeeper post-install ;; |
116 |
-esac |
117 |
|
118 |
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch |
119 |
deleted file mode 100644 |
120 |
index a5018bd77d1..00000000000 |
121 |
--- a/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch |
122 |
+++ /dev/null |
123 |
@@ -1,86 +0,0 @@ |
124 |
-From 385d0e828d57e4998dd62fa34d5d929768fb894d Mon Sep 17 00:00:00 2001 |
125 |
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@××××.eu> |
126 |
-Date: Sun, 12 Apr 2015 23:39:30 +0200 |
127 |
-Subject: [PATCH] Support Gentoo's package managers. |
128 |
- |
129 |
- |
130 |
-diff --git a/Makefile b/Makefile |
131 |
-index c95d51a..4be900e 100644 |
132 |
---- a/Makefile |
133 |
-+++ b/Makefile |
134 |
-@@ -28,7 +28,6 @@ install: etckeeper.version |
135 |
- mkdir -p $(DESTDIR)$(mandir)/man8 |
136 |
- $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 |
137 |
- mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d |
138 |
-- $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper |
139 |
- ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) |
140 |
- mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d |
141 |
- $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper |
142 |
-@@ -52,7 +51,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) |
143 |
- mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit |
144 |
- $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py |
145 |
- endif |
146 |
-- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" |
147 |
- echo "** installation successful" |
148 |
- |
149 |
- clean: etckeeper.spec etckeeper.version |
150 |
-diff --git a/etckeeper.conf b/etckeeper.conf |
151 |
-index 2aec35e..0a9c88b 100644 |
152 |
---- a/etckeeper.conf |
153 |
-+++ b/etckeeper.conf |
154 |
-@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a" |
155 |
- |
156 |
- # The high-level package manager that's being used. |
157 |
- # (apt, pacman-g2, yum, dnf, zypper etc) |
158 |
--HIGHLEVEL_PACKAGE_MANAGER=apt |
159 |
-+#HIGHLEVEL_PACKAGE_MANAGER=apt |
160 |
-+ |
161 |
-+# Gentoo specific: |
162 |
-+# For portage this is emerge |
163 |
-+# For paludis this is cave |
164 |
-+HIGHLEVEL_PACKAGE_MANAGER=emerge |
165 |
- |
166 |
- # The low-level package manager that's being used. |
167 |
- # (dpkg, rpm, pacman, pacman-g2, etc) |
168 |
--LOWLEVEL_PACKAGE_MANAGER=dpkg |
169 |
-+#LOWLEVEL_PACKAGE_MANAGER=dpkg |
170 |
-+ |
171 |
-+# Gentoo specific: |
172 |
-+# For portage this is qlist |
173 |
-+# For paludis this is cave |
174 |
-+LOWLEVEL_PACKAGE_MANAGER=qlist |
175 |
- |
176 |
- # To push each commit to a remote, put the name of the remote here. |
177 |
- # (eg, "origin" for git). Space-separated lists of multiple remotes |
178 |
-diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed |
179 |
-index 2ac569a..91718d4 100755 |
180 |
---- a/list-installed.d/50list-installed |
181 |
-+++ b/list-installed.d/50list-installed |
182 |
-@@ -17,5 +17,9 @@ else |
183 |
- rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort |
184 |
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then |
185 |
- pacman -Q |
186 |
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then |
187 |
-+ qlist -ICv |
188 |
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then |
189 |
-+ cave print-packages -r installed |
190 |
- fi |
191 |
- fi |
192 |
-diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore |
193 |
-index 098fab8..88243ea 100755 |
194 |
---- a/update-ignore.d/01update-ignore |
195 |
-+++ b/update-ignore.d/01update-ignore |
196 |
-@@ -99,6 +99,10 @@ writefile () { |
197 |
- ignore "*.pacorig" |
198 |
- ignore "*.pacsave" |
199 |
- nl |
200 |
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then |
201 |
-+ comment "new and old versions of conffiles, stored by emerge" |
202 |
-+ ignore "._cfg*" |
203 |
-+ nl |
204 |
- fi |
205 |
- |
206 |
- comment "old versions of files" |
207 |
--- |
208 |
-2.3.5 |
209 |
- |