1 |
commit: 1b8e6f6772146d6cd66af46f3bd5453850b5e71b |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 27 08:10:12 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 27 08:25:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8e6f67 |
7 |
|
8 |
sys-apps/etckeeper: bump to 1.18.14, removed bzr support |
9 |
|
10 |
it's py2 only which is going away. |
11 |
if bzr gets ported to py3 we can add it back here |
12 |
|
13 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
sys-apps/etckeeper/Manifest | 1 + |
17 |
sys-apps/etckeeper/etckeeper-1.18.14.ebuild | 78 ++++++++++++++++++++ |
18 |
.../etckeeper/files/etckeeper-1.18.14-gentoo.patch | 84 ++++++++++++++++++++++ |
19 |
sys-apps/etckeeper/files/etckeeper.tmpfilesd | 1 + |
20 |
4 files changed, 164 insertions(+) |
21 |
|
22 |
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest |
23 |
index e975ae25561..9a471bb7688 100644 |
24 |
--- a/sys-apps/etckeeper/Manifest |
25 |
+++ b/sys-apps/etckeeper/Manifest |
26 |
@@ -1,2 +1,3 @@ |
27 |
+DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 |
28 |
DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c |
29 |
DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c |
30 |
|
31 |
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..7935c8c83a3 |
34 |
--- /dev/null |
35 |
+++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild |
36 |
@@ -0,0 +1,78 @@ |
37 |
+# Copyright 1999-2020 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=7 |
41 |
+ |
42 |
+inherit bash-completion-r1 prefix systemd tmpfiles |
43 |
+ |
44 |
+DESCRIPTION="A collection of tools to let /etc be stored in a repository" |
45 |
+HOMEPAGE="https://etckeeper.branchable.com/" |
46 |
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="GPL-2" |
49 |
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86" |
50 |
+SLOT="0" |
51 |
+IUSE="cron test" |
52 |
+ |
53 |
+BDEPEND="test? ( |
54 |
+ dev-util/bats |
55 |
+ dev-vcs/git |
56 |
+)" |
57 |
+ |
58 |
+RDEPEND="app-portage/portage-utils |
59 |
+ cron? ( virtual/cron ) |
60 |
+ || ( |
61 |
+ dev-vcs/git |
62 |
+ dev-vcs/mercurial |
63 |
+ dev-vcs/darcs |
64 |
+ ) |
65 |
+" |
66 |
+ |
67 |
+RESTRICT="!test? ( test )" |
68 |
+ |
69 |
+PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch ) |
70 |
+ |
71 |
+src_prepare() { |
72 |
+ default |
73 |
+ hprefixify *.d/* etckeeper |
74 |
+ sed -i \ |
75 |
+ -e s'@zsh/vendor-completions@zsh/site-functions@' \ |
76 |
+ -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \ |
77 |
+ Makefile || die |
78 |
+ rm -v init.d/60darcs-deleted-symlinks || die |
79 |
+} |
80 |
+ |
81 |
+src_compile() { |
82 |
+ : |
83 |
+} |
84 |
+ |
85 |
+src_install(){ |
86 |
+ emake DESTDIR="${ED}" install |
87 |
+ |
88 |
+ doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})" |
89 |
+ |
90 |
+ newbashcomp bash_completion ${PN} |
91 |
+ dodoc doc/README.mdwn |
92 |
+ newdoc "${FILESDIR}"/bashrc-r1 bashrc.example |
93 |
+ |
94 |
+ rm -rv "${ED}/var/cache" || die |
95 |
+ newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf |
96 |
+ |
97 |
+ if use cron ; then |
98 |
+ exeinto /etc/cron.daily |
99 |
+ newexe debian/cron.daily etckeeper |
100 |
+ fi |
101 |
+} |
102 |
+ |
103 |
+pkg_postinst(){ |
104 |
+ tmpfiles_process "${PN}.conf" |
105 |
+ |
106 |
+ elog "${PN} supports git, mercurial and darcs" |
107 |
+ elog "This ebuild just ensures at least one is installed!" |
108 |
+ elog |
109 |
+ elog "You may want to adjust your /etc/portage/bashrc" |
110 |
+ elog "see the example file in /usr/share/doc/${PF}" |
111 |
+ elog |
112 |
+ elog "To initialise your etc-dir as a repository run:" |
113 |
+ elog "${PN} init -d /etc" |
114 |
+} |
115 |
|
116 |
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch |
117 |
new file mode 100644 |
118 |
index 00000000000..e677af993fe |
119 |
--- /dev/null |
120 |
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch |
121 |
@@ -0,0 +1,84 @@ |
122 |
+From 46e299da6914962007fb540a401a68a17d00bca3 Mon Sep 17 00:00:00 2001 |
123 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
124 |
+Date: Sun, 26 Jan 2020 23:24:54 -0800 |
125 |
+Subject: [PATCH] 1.18.14-gentoo |
126 |
+ |
127 |
+--- |
128 |
+ Makefile | 1 - |
129 |
+ etckeeper.conf | 14 ++++++++++++-- |
130 |
+ list-installed.d/50list-installed | 4 ++++ |
131 |
+ update-ignore.d/01update-ignore | 4 ++++ |
132 |
+ 4 files changed, 20 insertions(+), 3 deletions(-) |
133 |
+ |
134 |
+diff --git a/Makefile b/Makefile |
135 |
+index 73d2411..ffcf218 100644 |
136 |
+--- a/Makefile |
137 |
++++ b/Makefile |
138 |
+@@ -68,7 +68,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) |
139 |
+ mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit |
140 |
+ $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py |
141 |
+ endif |
142 |
+- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" |
143 |
+ echo "** installation successful" |
144 |
+ |
145 |
+ clean: etckeeper.spec etckeeper.version |
146 |
+diff --git a/etckeeper.conf b/etckeeper.conf |
147 |
+index f13de1c..16ff71d 100644 |
148 |
+--- a/etckeeper.conf |
149 |
++++ b/etckeeper.conf |
150 |
+@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a" |
151 |
+ |
152 |
+ # The high-level package manager that's being used. |
153 |
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc) |
154 |
+-HIGHLEVEL_PACKAGE_MANAGER=apt |
155 |
++#HIGHLEVEL_PACKAGE_MANAGER=apt |
156 |
++ |
157 |
++# Gentoo specific: |
158 |
++# For portage this is emerge |
159 |
++# For paludis this is cave |
160 |
++HIGHLEVEL_PACKAGE_MANAGER=emerge |
161 |
+ |
162 |
+ # The low-level package manager that's being used. |
163 |
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc) |
164 |
+-LOWLEVEL_PACKAGE_MANAGER=dpkg |
165 |
++#LOWLEVEL_PACKAGE_MANAGER=dpkg |
166 |
++ |
167 |
++# Gentoo specific: |
168 |
++# For portage this is qlist |
169 |
++# For paludis this is cave |
170 |
++LOWLEVEL_PACKAGE_MANAGER=qlist |
171 |
+ |
172 |
+ # To push each commit to a remote, put the name of the remote here. |
173 |
+ # (eg, "origin" for git). Space-separated lists of multiple remotes |
174 |
+diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed |
175 |
+index d89b8ce..2db838d 100755 |
176 |
+--- a/list-installed.d/50list-installed |
177 |
++++ b/list-installed.d/50list-installed |
178 |
+@@ -23,5 +23,9 @@ else |
179 |
+ pkg info -E "*" |
180 |
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then |
181 |
+ apk info -v | sort |
182 |
++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then |
183 |
++ qlist -ICv |
184 |
++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then |
185 |
++ cave print-packages -r installed |
186 |
+ fi |
187 |
+ fi |
188 |
+diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore |
189 |
+index 8733a85..53afbde 100755 |
190 |
+--- a/update-ignore.d/01update-ignore |
191 |
++++ b/update-ignore.d/01update-ignore |
192 |
+@@ -103,6 +103,10 @@ writefile () { |
193 |
+ comment "new versions of conffiles, stored by apk" |
194 |
+ ignore "*.apk-new" |
195 |
+ nl |
196 |
++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then |
197 |
++ comment "new and old versions of conffiles, stored by emerge" |
198 |
++ ignore "._cfg*" |
199 |
++ nl |
200 |
+ fi |
201 |
+ |
202 |
+ comment "old versions of files" |
203 |
+-- |
204 |
+2.25.0 |
205 |
+ |
206 |
|
207 |
diff --git a/sys-apps/etckeeper/files/etckeeper.tmpfilesd b/sys-apps/etckeeper/files/etckeeper.tmpfilesd |
208 |
new file mode 100644 |
209 |
index 00000000000..b13813d6198 |
210 |
--- /dev/null |
211 |
+++ b/sys-apps/etckeeper/files/etckeeper.tmpfilesd |
212 |
@@ -0,0 +1 @@ |
213 |
+d /var/cache/etckeeper 0770 root root - |