Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
Date: Tue, 07 Dec 2021 08:37:07
Message-Id: 1638866198.da0f4c3b66e8c7273cd4b80a6286a08bc160d7f0.dlan@gentoo
1 commit: da0f4c3b66e8c7273cd4b80a6286a08bc160d7f0
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 7 08:36:38 2021 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 7 08:36:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0f4c3b
7
8 app-backup/snapper: drop olds
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
12
13 app-backup/snapper/Manifest | 3 -
14 .../snapper/files/snapper-0.8.15-testsuite.patch | 83 --------------------
15 .../snapper/files/snapper-0.9.0-testsuite.patch | 83 --------------------
16 app-backup/snapper/snapper-0.8.15-r2.ebuild | 89 ----------------------
17 app-backup/snapper/snapper-0.8.16-r1.ebuild | 89 ----------------------
18 app-backup/snapper/snapper-0.9.0-r1.ebuild | 89 ----------------------
19 6 files changed, 436 deletions(-)
20
21 diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
22 index 2bdc33b55a9c..caae74396a11 100644
23 --- a/app-backup/snapper/Manifest
24 +++ b/app-backup/snapper/Manifest
25 @@ -1,4 +1 @@
26 -DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c
27 -DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae
28 -DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
29 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
30
31 diff --git a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch
32 deleted file mode 100644
33 index 237e0705c98d..000000000000
34 --- a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch
35 +++ /dev/null
36 @@ -1,83 +0,0 @@
37 -diff --git a/configure.ac b/configure.ac
38 -index 839d012..ceac54d 100644
39 ---- a/configure.ac
40 -+++ b/configure.ac
41 -@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
42 -
43 - CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
44 -
45 -+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
46 -+ [with_tests=$enableval],[with_tests=yes])
47 -+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
48 -+if test "x$with_tests" = "xyes"; then
49 -+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
50 -+fi
51 -
52 - AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
53 - [with_btrfs=$enableval],[with_btrfs=yes])
54 -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
55 -index 81104bf..9c29477 100644
56 ---- a/testsuite-cmp/Makefile.am
57 -+++ b/testsuite-cmp/Makefile.am
58 -@@ -2,6 +2,7 @@
59 - # Makefile.am for snapper/testsuite-cmp
60 - #
61 -
62 -+if ENABLE_TESTS
63 - AM_CPPFLAGS = -I$(top_srcdir)
64 - AM_LDFLAGS = -lboost_system
65 -
66 -@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
67 -
68 - EXTRA_DIST = $(noinst_SCRIPTS)
69 -
70 -+endif
71 -diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
72 -index 717313a..527843d 100644
73 ---- a/testsuite-real/Makefile.am
74 -+++ b/testsuite-real/Makefile.am
75 -@@ -2,6 +2,7 @@
76 - # Makefile.am for snapper/testsuite-real
77 - #
78 -
79 -+if ENABLE_TESTS
80 - CXXFLAGS += -std=gnu++0x
81 -
82 - AM_CPPFLAGS = -I$(top_srcdir)
83 -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
84 -
85 - EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
86 -
87 -+endif
88 -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
89 -index d7e30b8..72ef5ee 100644
90 ---- a/testsuite/Makefile.am
91 -+++ b/testsuite/Makefile.am
92 -@@ -2,6 +2,7 @@
93 - # Makefile.am for snapper/testsuite
94 - #
95 -
96 -+if ENABLE_TESTS
97 - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
98 -
99 - LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
100 -@@ -40,3 +41,4 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils
101 - getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
102 -
103 - lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
104 -+endif
105 -diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
106 -index 7b52e13..71cb545 100644
107 ---- a/zypp-plugin/testsuite/Makefile.am
108 -+++ b/zypp-plugin/testsuite/Makefile.am
109 -@@ -1,3 +1,5 @@
110 -+
111 -+if ENABLE_TESTS
112 - if HAVE_ZYPP
113 - TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
114 -
115 -@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
116 -
117 - EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
118 - endif
119 -+endif
120
121 diff --git a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
122 deleted file mode 100644
123 index 7aa089569b4a..000000000000
124 --- a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
125 +++ /dev/null
126 @@ -1,83 +0,0 @@
127 -diff --git a/configure.ac b/configure.ac
128 -index 06e4721..c89d0aa 100644
129 ---- a/configure.ac
130 -+++ b/configure.ac
131 -@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
132 -
133 - CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
134 -
135 -+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
136 -+ [with_tests=$enableval],[with_tests=yes])
137 -+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
138 -+if test "x$with_tests" = "xyes"; then
139 -+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
140 -+fi
141 -
142 - AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
143 - [with_btrfs=$enableval],[with_btrfs=yes])
144 -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
145 -index 81104bf..9c29477 100644
146 ---- a/testsuite-cmp/Makefile.am
147 -+++ b/testsuite-cmp/Makefile.am
148 -@@ -2,6 +2,7 @@
149 - # Makefile.am for snapper/testsuite-cmp
150 - #
151 -
152 -+if ENABLE_TESTS
153 - AM_CPPFLAGS = -I$(top_srcdir)
154 - AM_LDFLAGS = -lboost_system
155 -
156 -@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
157 -
158 - EXTRA_DIST = $(noinst_SCRIPTS)
159 -
160 -+endif
161 -diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
162 -index 717313a..527843d 100644
163 ---- a/testsuite-real/Makefile.am
164 -+++ b/testsuite-real/Makefile.am
165 -@@ -2,6 +2,7 @@
166 - # Makefile.am for snapper/testsuite-real
167 - #
168 -
169 -+if ENABLE_TESTS
170 - CXXFLAGS += -std=gnu++0x
171 -
172 - AM_CPPFLAGS = -I$(top_srcdir)
173 -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
174 -
175 - EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
176 -
177 -+endif
178 -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
179 -index ccb84d3..409e265 100644
180 ---- a/testsuite/Makefile.am
181 -+++ b/testsuite/Makefile.am
182 -@@ -2,6 +2,7 @@
183 - # Makefile.am for snapper/testsuite
184 - #
185 -
186 -+if ENABLE_TESTS
187 - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
188 -
189 - LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
190 -@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
191 - range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
192 -
193 - limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
194 -+endif
195 -diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
196 -index 7b52e13..71cb545 100644
197 ---- a/zypp-plugin/testsuite/Makefile.am
198 -+++ b/zypp-plugin/testsuite/Makefile.am
199 -@@ -1,3 +1,5 @@
200 -+
201 -+if ENABLE_TESTS
202 - if HAVE_ZYPP
203 - TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
204 -
205 -@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
206 -
207 - EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
208 - endif
209 -+endif
210
211 diff --git a/app-backup/snapper/snapper-0.8.15-r2.ebuild b/app-backup/snapper/snapper-0.8.15-r2.ebuild
212 deleted file mode 100644
213 index 04ec37fa6255..000000000000
214 --- a/app-backup/snapper/snapper-0.8.15-r2.ebuild
215 +++ /dev/null
216 @@ -1,89 +0,0 @@
217 -# Copyright 1999-2021 Gentoo Authors
218 -# Distributed under the terms of the GNU General Public License v2
219 -
220 -EAPI=7
221 -
222 -inherit autotools systemd bash-completion-r1
223 -
224 -DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
225 -HOMEPAGE="http://snapper.io/"
226 -SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
227 -
228 -LICENSE="GPL-2"
229 -SLOT="0"
230 -KEYWORDS="amd64 x86"
231 -IUSE="doc lvm pam test systemd xattr"
232 -RESTRICT="test"
233 -
234 -RDEPEND="dev-libs/boost:=[threads(+)]
235 - dev-libs/json-c:=
236 - dev-libs/libxml2
237 - dev-libs/icu:=
238 - sys-apps/acl
239 - sys-apps/dbus
240 - sys-apps/util-linux
241 - >=sys-fs/btrfs-progs-3.17.1
242 - sys-libs/zlib
243 - virtual/libintl
244 - lvm? ( sys-fs/lvm2 )
245 - pam? ( sys-libs/pam )
246 - xattr? ( sys-apps/attr )"
247 -
248 -DEPEND="${RDEPEND}
249 - app-text/docbook-xsl-stylesheets
250 - dev-libs/libxslt
251 - sys-devel/gettext
252 - virtual/pkgconfig"
253 -
254 -PATCHES=(
255 - "${FILESDIR}"/cron-confd.patch
256 - "${FILESDIR}"/${P}-testsuite.patch
257 -)
258 -
259 -src_prepare() {
260 - default
261 -
262 - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
263 - -i data/Makefile.* \
264 - || die "Failed to fix systemd services and timers installation path"
265 - eautoreconf
266 -}
267 -
268 -src_configure() {
269 - # ext4 code does not work anymore
270 - # snapper does not build without btrfs
271 - local myeconfargs=(
272 - --disable-silent-rules
273 - --with-conf="/etc/conf.d"
274 - --enable-zypp
275 - --enable-rollback
276 - --enable-btrfs-quota
277 - --disable-ext4
278 - --enable-btrfs
279 - $(use_enable doc)
280 - $(use_enable lvm)
281 - $(use_enable pam)
282 - $(use_enable test tests)
283 - $(use_enable systemd)
284 - $(use_enable xattr xattrs)
285 - )
286 -
287 - econf "${myeconfargs[@]}"
288 -}
289 -
290 -src_install() {
291 - default
292 - # Existing configuration file required to function
293 - keepdir /etc/snapper/configs
294 - newconfd data/sysconfig.snapper snapper
295 - find "${D}" -name '*.la' -delete || die
296 - newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
297 -}
298 -
299 -pkg_postinst() {
300 - elog "In order to use Snapper, you need to set up"
301 - elog "at least one config first. To do this, run:"
302 - elog "snapper create-config <subvolume>"
303 - elog "For more information, see man (8) snapper or"
304 - elog "http://snapper.io/documentation.html"
305 -}
306
307 diff --git a/app-backup/snapper/snapper-0.8.16-r1.ebuild b/app-backup/snapper/snapper-0.8.16-r1.ebuild
308 deleted file mode 100644
309 index 2115112952cc..000000000000
310 --- a/app-backup/snapper/snapper-0.8.16-r1.ebuild
311 +++ /dev/null
312 @@ -1,89 +0,0 @@
313 -# Copyright 1999-2021 Gentoo Authors
314 -# Distributed under the terms of the GNU General Public License v2
315 -
316 -EAPI=7
317 -
318 -inherit autotools systemd bash-completion-r1
319 -
320 -DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
321 -HOMEPAGE="http://snapper.io/"
322 -SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
323 -
324 -LICENSE="GPL-2"
325 -SLOT="0"
326 -KEYWORDS="~amd64 ~x86"
327 -IUSE="doc lvm pam test systemd xattr"
328 -RESTRICT="test"
329 -
330 -RDEPEND="dev-libs/boost:=[threads(+)]
331 - dev-libs/json-c:=
332 - dev-libs/libxml2
333 - dev-libs/icu:=
334 - sys-apps/acl
335 - sys-apps/dbus
336 - sys-apps/util-linux
337 - >=sys-fs/btrfs-progs-3.17.1
338 - sys-libs/zlib
339 - virtual/libintl
340 - lvm? ( sys-fs/lvm2 )
341 - pam? ( sys-libs/pam )
342 - xattr? ( sys-apps/attr )"
343 -
344 -DEPEND="${RDEPEND}
345 - app-text/docbook-xsl-stylesheets
346 - dev-libs/libxslt
347 - sys-devel/gettext
348 - virtual/pkgconfig"
349 -
350 -PATCHES=(
351 - "${FILESDIR}"/cron-confd.patch
352 - "${FILESDIR}"/${PN}-0.8.15-testsuite.patch
353 -)
354 -
355 -src_prepare() {
356 - default
357 -
358 - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
359 - -i data/Makefile.* \
360 - || die "Failed to fix systemd services and timers installation path"
361 - eautoreconf
362 -}
363 -
364 -src_configure() {
365 - # ext4 code does not work anymore
366 - # snapper does not build without btrfs
367 - local myeconfargs=(
368 - --disable-silent-rules
369 - --with-conf="/etc/conf.d"
370 - --enable-zypp
371 - --enable-rollback
372 - --enable-btrfs-quota
373 - --disable-ext4
374 - --enable-btrfs
375 - $(use_enable doc)
376 - $(use_enable lvm)
377 - $(use_enable pam)
378 - $(use_enable test tests)
379 - $(use_enable systemd)
380 - $(use_enable xattr xattrs)
381 - )
382 -
383 - econf "${myeconfargs[@]}"
384 -}
385 -
386 -src_install() {
387 - default
388 - # Existing configuration file required to function
389 - keepdir /etc/snapper/configs
390 - newconfd data/sysconfig.snapper snapper
391 - find "${D}" -name '*.la' -delete || die
392 - newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
393 -}
394 -
395 -pkg_postinst() {
396 - elog "In order to use Snapper, you need to set up"
397 - elog "at least one config first. To do this, run:"
398 - elog "snapper create-config <subvolume>"
399 - elog "For more information, see man (8) snapper or"
400 - elog "http://snapper.io/documentation.html"
401 -}
402
403 diff --git a/app-backup/snapper/snapper-0.9.0-r1.ebuild b/app-backup/snapper/snapper-0.9.0-r1.ebuild
404 deleted file mode 100644
405 index e08297c0ff3a..000000000000
406 --- a/app-backup/snapper/snapper-0.9.0-r1.ebuild
407 +++ /dev/null
408 @@ -1,89 +0,0 @@
409 -# Copyright 1999-2021 Gentoo Authors
410 -# Distributed under the terms of the GNU General Public License v2
411 -
412 -EAPI=7
413 -
414 -inherit autotools systemd bash-completion-r1
415 -
416 -DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
417 -HOMEPAGE="http://snapper.io/"
418 -SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
419 -
420 -LICENSE="GPL-2"
421 -SLOT="0"
422 -KEYWORDS="amd64 ~riscv x86"
423 -IUSE="doc lvm pam test systemd xattr"
424 -RESTRICT="test"
425 -
426 -RDEPEND="dev-libs/boost:=[threads(+)]
427 - dev-libs/json-c:=
428 - dev-libs/libxml2
429 - dev-libs/icu:=
430 - sys-apps/acl
431 - sys-apps/dbus
432 - sys-apps/util-linux
433 - >=sys-fs/btrfs-progs-3.17.1
434 - sys-libs/zlib
435 - virtual/libintl
436 - lvm? ( sys-fs/lvm2 )
437 - pam? ( sys-libs/pam )
438 - xattr? ( sys-apps/attr )"
439 -
440 -DEPEND="${RDEPEND}
441 - app-text/docbook-xsl-stylesheets
442 - dev-libs/libxslt
443 - sys-devel/gettext
444 - virtual/pkgconfig"
445 -
446 -PATCHES=(
447 - "${FILESDIR}"/cron-confd.patch
448 - "${FILESDIR}"/${P}-testsuite.patch
449 -)
450 -
451 -src_prepare() {
452 - default
453 -
454 - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
455 - -i data/Makefile.* \
456 - || die "Failed to fix systemd services and timers installation path"
457 - eautoreconf
458 -}
459 -
460 -src_configure() {
461 - # ext4 code does not work anymore
462 - # snapper does not build without btrfs
463 - local myeconfargs=(
464 - --disable-silent-rules
465 - --with-conf="/etc/conf.d"
466 - --enable-zypp
467 - --enable-rollback
468 - --enable-btrfs-quota
469 - --disable-ext4
470 - --enable-btrfs
471 - $(use_enable doc)
472 - $(use_enable lvm)
473 - $(use_enable pam)
474 - $(use_enable test tests)
475 - $(use_enable systemd)
476 - $(use_enable xattr xattrs)
477 - )
478 -
479 - econf "${myeconfargs[@]}"
480 -}
481 -
482 -src_install() {
483 - default
484 - # Existing configuration file required to function
485 - keepdir /etc/snapper/configs
486 - newconfd data/sysconfig.snapper snapper
487 - find "${D}" -name '*.la' -delete || die
488 - newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
489 -}
490 -
491 -pkg_postinst() {
492 - elog "In order to use Snapper, you need to set up"
493 - elog "at least one config first. To do this, run:"
494 - elog "snapper create-config <subvolume>"
495 - elog "For more information, see man (8) snapper or"
496 - elog "http://snapper.io/documentation.html"
497 -}