1 |
commit: 168e12d457e434c0f36cacf784bdf01f8c80a6ec |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 6 06:34:12 2021 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 6 06:34:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168e12d4 |
7 |
|
8 |
app-backup/snapper: drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
12 |
|
13 |
app-backup/snapper/Manifest | 2 - |
14 |
app-backup/snapper/files/snapper-0.5.6-swap.patch | 36 ---------- |
15 |
app-backup/snapper/snapper-0.5.6-r1.ebuild | 77 --------------------- |
16 |
app-backup/snapper/snapper-0.8.9-r1.ebuild | 81 ----------------------- |
17 |
4 files changed, 196 deletions(-) |
18 |
|
19 |
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest |
20 |
index 79ab289556a..28f2896b3d4 100644 |
21 |
--- a/app-backup/snapper/Manifest |
22 |
+++ b/app-backup/snapper/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e |
25 |
DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c |
26 |
DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae |
27 |
-DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d |
28 |
|
29 |
diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch |
30 |
deleted file mode 100644 |
31 |
index aa24330d730..00000000000 |
32 |
--- a/app-backup/snapper/files/snapper-0.5.6-swap.patch |
33 |
+++ /dev/null |
34 |
@@ -1,36 +0,0 @@ |
35 |
-commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30 |
36 |
-Author: Spencer Janssen <spencerjanssen@×××××.com> |
37 |
-Date: Mon Dec 3 17:33:49 2018 -0600 |
38 |
- |
39 |
- Work around btrfs v4.19 |
40 |
- |
41 |
- Addresses #459 |
42 |
- |
43 |
-diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc |
44 |
-index cb9f7b3..c05557b 100644 |
45 |
---- a/snapper/Btrfs.cc |
46 |
-+++ b/snapper/Btrfs.cc |
47 |
-@@ -41,6 +41,9 @@ |
48 |
- #include <btrfs/send.h> |
49 |
- #include <btrfs/send-stream.h> |
50 |
- #include <btrfs/send-utils.h> |
51 |
-+#ifdef swap |
52 |
-+#undef swap |
53 |
-+#endif |
54 |
- #include <boost/version.hpp> |
55 |
- #include <boost/thread.hpp> |
56 |
- #endif |
57 |
-diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc |
58 |
-index bada3f8..9edc325 100644 |
59 |
---- a/snapper/BtrfsUtils.cc |
60 |
-+++ b/snapper/BtrfsUtils.cc |
61 |
-@@ -34,6 +34,9 @@ |
62 |
- #ifdef HAVE_LIBBTRFS |
63 |
- #include <btrfs/ioctl.h> |
64 |
- #include <btrfs/send-utils.h> |
65 |
-+#ifdef swap |
66 |
-+#undef swap |
67 |
-+#endif |
68 |
- #endif |
69 |
- #include <algorithm> |
70 |
- #include <functional> |
71 |
|
72 |
diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild |
73 |
deleted file mode 100644 |
74 |
index c6f5ffca2a5..00000000000 |
75 |
--- a/app-backup/snapper/snapper-0.5.6-r1.ebuild |
76 |
+++ /dev/null |
77 |
@@ -1,77 +0,0 @@ |
78 |
-# Copyright 1999-2020 Gentoo Authors |
79 |
-# Distributed under the terms of the GNU General Public License v2 |
80 |
- |
81 |
-EAPI=6 |
82 |
- |
83 |
-inherit systemd |
84 |
- |
85 |
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management" |
86 |
-HOMEPAGE="http://snapper.io/" |
87 |
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2" |
88 |
- |
89 |
-LICENSE="GPL-2" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="amd64 x86" |
92 |
-IUSE="lvm pam xattr" |
93 |
- |
94 |
-RDEPEND="dev-libs/boost:=[threads] |
95 |
- dev-libs/libxml2 |
96 |
- dev-libs/icu:= |
97 |
- sys-apps/acl |
98 |
- sys-apps/dbus |
99 |
- sys-apps/util-linux |
100 |
- >=sys-fs/btrfs-progs-3.17.1 |
101 |
- sys-libs/zlib |
102 |
- virtual/libintl |
103 |
- lvm? ( sys-fs/lvm2 ) |
104 |
- pam? ( sys-libs/pam ) |
105 |
- xattr? ( sys-apps/attr )" |
106 |
- |
107 |
-DEPEND="${RDEPEND} |
108 |
- sys-devel/gettext |
109 |
- virtual/pkgconfig" |
110 |
- |
111 |
-PATCHES=( |
112 |
- "${FILESDIR}"/cron-confd.patch |
113 |
- "${FILESDIR}"/${P}-swap.patch |
114 |
-) |
115 |
- |
116 |
-src_prepare() { |
117 |
- default |
118 |
- |
119 |
- sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ |
120 |
- -i data/Makefile.* \ |
121 |
- || die "Failed to fix systemd services and timers installation path" |
122 |
-} |
123 |
- |
124 |
-src_configure() { |
125 |
- # ext4 code does not work anymore |
126 |
- # snapper does not build without btrfs |
127 |
- local myeconfargs=( |
128 |
- --with-conf="/etc/conf.d" |
129 |
- --disable-zypp |
130 |
- --enable-rollback |
131 |
- --disable-ext4 |
132 |
- --enable-btrfs |
133 |
- $(use_enable lvm) |
134 |
- $(use_enable pam) |
135 |
- $(use_enable xattr xattrs) |
136 |
- ) |
137 |
- |
138 |
- econf "${myeconfargs[@]}" |
139 |
-} |
140 |
- |
141 |
-src_install() { |
142 |
- default |
143 |
- # Existing configuration file required to function |
144 |
- newconfd data/sysconfig.snapper snapper |
145 |
- find "${D}" -name '*.la' -delete || die |
146 |
-} |
147 |
- |
148 |
-pkg_postinst() { |
149 |
- elog "In order to use Snapper, you need to set up" |
150 |
- elog "at least one config first. To do this, run:" |
151 |
- elog "snapper create-config <subvolume>" |
152 |
- elog "For more information, see man (8) snapper or" |
153 |
- elog "http://snapper.io/documentation.html" |
154 |
-} |
155 |
|
156 |
diff --git a/app-backup/snapper/snapper-0.8.9-r1.ebuild b/app-backup/snapper/snapper-0.8.9-r1.ebuild |
157 |
deleted file mode 100644 |
158 |
index 5a5593c2846..00000000000 |
159 |
--- a/app-backup/snapper/snapper-0.8.9-r1.ebuild |
160 |
+++ /dev/null |
161 |
@@ -1,81 +0,0 @@ |
162 |
-# Copyright 1999-2020 Gentoo Authors |
163 |
-# Distributed under the terms of the GNU General Public License v2 |
164 |
- |
165 |
-EAPI=7 |
166 |
- |
167 |
-inherit autotools systemd bash-completion-r1 |
168 |
- |
169 |
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management" |
170 |
-HOMEPAGE="http://snapper.io/" |
171 |
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
172 |
- |
173 |
-LICENSE="GPL-2" |
174 |
-SLOT="0" |
175 |
-KEYWORDS="~amd64 ~x86" |
176 |
-IUSE="lvm pam xattr" |
177 |
- |
178 |
-RDEPEND="dev-libs/boost:=[threads] |
179 |
- dev-libs/libxml2 |
180 |
- dev-libs/icu:= |
181 |
- sys-apps/acl |
182 |
- sys-apps/dbus |
183 |
- sys-apps/util-linux |
184 |
- >=sys-fs/btrfs-progs-3.17.1 |
185 |
- sys-libs/zlib |
186 |
- virtual/libintl |
187 |
- lvm? ( sys-fs/lvm2 ) |
188 |
- pam? ( sys-libs/pam ) |
189 |
- xattr? ( sys-apps/attr )" |
190 |
- |
191 |
-DEPEND="${RDEPEND} |
192 |
- app-text/docbook-xsl-stylesheets |
193 |
- dev-libs/libxslt |
194 |
- sys-devel/gettext |
195 |
- virtual/pkgconfig" |
196 |
- |
197 |
-PATCHES=( |
198 |
- "${FILESDIR}"/cron-confd.patch |
199 |
-) |
200 |
- |
201 |
-src_prepare() { |
202 |
- default |
203 |
- |
204 |
- sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ |
205 |
- -i data/Makefile.* \ |
206 |
- || die "Failed to fix systemd services and timers installation path" |
207 |
- eautoreconf |
208 |
-} |
209 |
- |
210 |
-src_configure() { |
211 |
- # ext4 code does not work anymore |
212 |
- # snapper does not build without btrfs |
213 |
- local myeconfargs=( |
214 |
- --with-conf="/etc/conf.d" |
215 |
- --disable-zypp |
216 |
- --enable-rollback |
217 |
- --disable-ext4 |
218 |
- --enable-btrfs |
219 |
- $(use_enable lvm) |
220 |
- $(use_enable pam) |
221 |
- $(use_enable xattr xattrs) |
222 |
- ) |
223 |
- |
224 |
- econf "${myeconfargs[@]}" |
225 |
-} |
226 |
- |
227 |
-src_install() { |
228 |
- default |
229 |
- # Existing configuration file required to function |
230 |
- keepdir /etc/snapper/configs |
231 |
- newconfd data/sysconfig.snapper snapper |
232 |
- find "${D}" -name '*.la' -delete || die |
233 |
- newbashcomp "${FILESDIR}"/${PN}.bash ${PN} |
234 |
-} |
235 |
- |
236 |
-pkg_postinst() { |
237 |
- elog "In order to use Snapper, you need to set up" |
238 |
- elog "at least one config first. To do this, run:" |
239 |
- elog "snapper create-config <subvolume>" |
240 |
- elog "For more information, see man (8) snapper or" |
241 |
- elog "http://snapper.io/documentation.html" |
242 |
-} |