Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/
Date: Mon, 07 Nov 2022 04:30:26
Message-Id: 1667793448.42e3175414b379991925f72819c6b2af792a08ff.sam@gentoo
1 commit: 42e3175414b379991925f72819c6b2af792a08ff
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 7 03:01:15 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 7 03:57:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e31754
7
8 sys-fs/btrfs-progs: drop 5.18.1-r1, 5.19.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-fs/btrfs-progs/Manifest | 2 -
13 sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild | 152 ------------------------
14 sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild | 150 -----------------------
15 3 files changed, 304 deletions(-)
16
17 diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
18 index cf77816302f7..e2c2343e7d7b 100644
19 --- a/sys-fs/btrfs-progs/Manifest
20 +++ b/sys-fs/btrfs-progs/Manifest
21 @@ -1,5 +1,3 @@
22 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
23 -DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
24 -DIST btrfs-progs-v5.19.1.tar.xz 2315036 BLAKE2B f1ae6901ddc8236f440d46a950923727c3f6168a220ec2c782102355fabcc2217e9617691550db203391279775d53676a2a7ad1920bfde07f39b3744b7f5fff5 SHA512 17fded8583b7392202b1bb408cbb5d42024623ac15415f95e8e56e27b43be79da6d4e6c191d39db4e5a8948390a7c216c0ea520171b0ab95438cc330084c8398
25 DIST btrfs-progs-v6.0.1.tar.xz 2318988 BLAKE2B a69dfcfe6c9aa057f118d5bfee2904b14a87facb08380146d35ba427a44f2ca3ed8dd323ddc3bc7eeb31deb5d7e6f8f8f6de4155ccac14457bf17c7fa63a288c SHA512 5ae2d05658719bd983374c62f8bf45f9a4cd5d1e86c8b0bc7df2194e7c308a64b5a7c5ef38cc5b359a84d4e3e8318d363ab831e3956088fd3ef5b66b7b7e6ea5
26 DIST btrfs-progs-v6.0.tar.xz 2317272 BLAKE2B 0d81aefadafaaaf0e535bdb727a376c8476686f3b99b97061fdde75861272474bcc6d6dba3227ba23de621ef5c6afcb38fc8cd9fce32ee0fcb0de046f5dd07d8 SHA512 3ec532c7c96783da11d1c77619bfef87d9d52bf2f6df7bd89c200157052936a2bfd6c961c7e3519e7a12ec611e7b17fb4d6c3f192086bb1b4ebbf87c22cfe24a
27
28 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
29 deleted file mode 100644
30 index 11d5b820c544..000000000000
31 --- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
32 +++ /dev/null
33 @@ -1,152 +0,0 @@
34 -# Copyright 2008-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{8..10} )
40 -
41 -inherit bash-completion-r1 python-single-r1 udev
42 -
43 -libbtrfs_soname=0
44 -
45 -if [[ ${PV} != 9999 ]]; then
46 - MY_PV="v${PV/_/-}"
47 - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
48 -
49 - if [[ ${PV} != *_rc* ]] ; then
50 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
51 - fi
52 -
53 - S="${WORKDIR}"/${PN}-${MY_PV}
54 -else
55 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
56 - EGIT_BRANCH="devel"
57 - WANT_LIBTOOL="none"
58 - inherit autotools git-r3
59 -fi
60 -
61 -DESCRIPTION="Btrfs filesystem utilities"
62 -HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
63 -
64 -LICENSE="GPL-2"
65 -SLOT="0/${libbtrfs_soname}"
66 -IUSE="+convert python +man reiserfs static static-libs udev +zstd"
67 -# Could support it with just !systemd => eudev, see mdadm, but let's
68 -# see if someone asks for it first.
69 -REQUIRED_USE="static? ( !udev )"
70 -
71 -# Tries to mount repaired filesystems
72 -RESTRICT="test"
73 -
74 -RDEPEND="
75 - dev-libs/lzo:2=
76 - sys-apps/util-linux:=[static-libs(+)?]
77 - sys-libs/zlib:=
78 - convert? (
79 - sys-fs/e2fsprogs:=
80 - reiserfs? (
81 - >=sys-fs/reiserfsprogs-3.6.27
82 - )
83 - )
84 - python? ( ${PYTHON_DEPS} )
85 - udev? ( virtual/libudev:= )
86 - zstd? ( app-arch/zstd:= )
87 -"
88 -DEPEND="${RDEPEND}
89 - >=sys-kernel/linux-headers-5.10
90 - convert? ( sys-apps/acl )
91 - python? (
92 - $(python_gen_cond_dep '
93 - dev-python/setuptools[${PYTHON_USEDEP}]
94 - ')
95 - )
96 - static? (
97 - dev-libs/lzo:2[static-libs(+)]
98 - sys-apps/util-linux:0[static-libs(+)]
99 - sys-libs/zlib:0[static-libs(+)]
100 - convert? (
101 - sys-fs/e2fsprogs[static-libs(+)]
102 - reiserfs? (
103 - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
104 - )
105 - )
106 - zstd? ( app-arch/zstd[static-libs(+)] )
107 - )
108 -"
109 -BDEPEND="virtual/pkgconfig
110 - man? ( dev-python/sphinx )"
111 -
112 -if [[ ${PV} == 9999 ]]; then
113 - BDEPEND+=" sys-devel/gnuconfig"
114 -fi
115 -
116 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
117 -
118 -pkg_setup() {
119 - use python && python-single-r1_pkg_setup
120 -}
121 -
122 -src_prepare() {
123 - local PATCHES=(
124 - "${FILESDIR}/btrfs-progs-5.18.1-glibc-2.36.patch"
125 - )
126 - default
127 - if [[ ${PV} == 9999 ]]; then
128 - AT_M4DIR="m4" eautoreconf
129 -
130 - mkdir config || die
131 - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
132 - [[ -e ${automakedir} ]] || die "Could not locate automake directory"
133 -
134 - ln -s "${automakedir}"/install-sh config/install-sh || die
135 - ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
136 - ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
137 - fi
138 -}
139 -
140 -src_configure() {
141 - local myeconfargs=(
142 - --bindir="${EPREFIX}"/sbin
143 -
144 - --enable-lzo
145 - --disable-experimental
146 - $(use_enable convert)
147 - $(use_enable man documentation)
148 - $(use_enable elibc_glibc backtrace)
149 - $(use_enable python)
150 - $(use_enable static-libs static)
151 - $(use_enable udev libudev)
152 - $(use_enable zstd)
153 -
154 - # Could support libgcrypt, libsodium, libkcapi
155 - --with-crypto=builtin
156 - --with-convert=ext2$(usex reiserfs ',reiserfs' '')
157 - )
158 -
159 - econf "${myeconfargs[@]}"
160 -}
161 -
162 -src_compile() {
163 - emake V=1 all $(usev static)
164 -}
165 -
166 -src_install() {
167 - local makeargs=(
168 - $(usex python install_python '')
169 - $(usex static install-static '')
170 - )
171 -
172 - emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
173 -
174 - newbashcomp btrfs-completion btrfs
175 -
176 - use python && python_optimize
177 -}
178 -
179 -pkg_postinst() {
180 - udev_reload
181 -}
182 -
183 -pkg_postrm() {
184 - udev_reload
185 -}
186
187 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
188 deleted file mode 100644
189 index 73fcf46caa45..000000000000
190 --- a/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
191 +++ /dev/null
192 @@ -1,150 +0,0 @@
193 -# Copyright 2008-2022 Gentoo Authors
194 -# Distributed under the terms of the GNU General Public License v2
195 -
196 -EAPI=8
197 -
198 -PYTHON_COMPAT=( python3_{8..10} )
199 -
200 -inherit bash-completion-r1 python-single-r1 udev
201 -
202 -libbtrfs_soname=0
203 -
204 -if [[ ${PV} != 9999 ]]; then
205 - MY_PV="v${PV/_/-}"
206 - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
207 -
208 - if [[ ${PV} != *_rc* ]] ; then
209 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
210 - fi
211 -
212 - S="${WORKDIR}"/${PN}-${MY_PV}
213 -else
214 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
215 - EGIT_BRANCH="devel"
216 - WANT_LIBTOOL="none"
217 - inherit autotools git-r3
218 -fi
219 -
220 -DESCRIPTION="Btrfs filesystem utilities"
221 -HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
222 -
223 -LICENSE="GPL-2"
224 -SLOT="0/${libbtrfs_soname}"
225 -IUSE="+convert python +man reiserfs static static-libs udev +zstd"
226 -# Could support it with just !systemd => eudev, see mdadm, but let's
227 -# see if someone asks for it first.
228 -REQUIRED_USE="static? ( !udev )"
229 -
230 -# Tries to mount repaired filesystems
231 -RESTRICT="test"
232 -
233 -RDEPEND="
234 - dev-libs/lzo:2=
235 - sys-apps/util-linux:=[static-libs(+)?]
236 - sys-libs/zlib:=
237 - convert? (
238 - sys-fs/e2fsprogs:=
239 - reiserfs? (
240 - >=sys-fs/reiserfsprogs-3.6.27
241 - )
242 - )
243 - python? ( ${PYTHON_DEPS} )
244 - udev? ( virtual/libudev:= )
245 - zstd? ( app-arch/zstd:= )
246 -"
247 -DEPEND="${RDEPEND}
248 - >=sys-kernel/linux-headers-5.10
249 - convert? ( sys-apps/acl )
250 - python? (
251 - $(python_gen_cond_dep '
252 - dev-python/setuptools[${PYTHON_USEDEP}]
253 - ')
254 - )
255 - static? (
256 - dev-libs/lzo:2[static-libs(+)]
257 - sys-apps/util-linux:0[static-libs(+)]
258 - sys-libs/zlib:0[static-libs(+)]
259 - convert? (
260 - sys-fs/e2fsprogs[static-libs(+)]
261 - reiserfs? (
262 - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
263 - )
264 - )
265 - zstd? ( app-arch/zstd[static-libs(+)] )
266 - )
267 -"
268 -BDEPEND="virtual/pkgconfig
269 - man? ( dev-python/sphinx )"
270 -
271 -if [[ ${PV} == 9999 ]]; then
272 - BDEPEND+=" sys-devel/gnuconfig"
273 -fi
274 -
275 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
276 -
277 -pkg_setup() {
278 - use python && python-single-r1_pkg_setup
279 -}
280 -
281 -src_prepare() {
282 - default
283 -
284 - if [[ ${PV} == 9999 ]]; then
285 - AT_M4DIR="m4" eautoreconf
286 -
287 - mkdir config || die
288 - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
289 - [[ -e ${automakedir} ]] || die "Could not locate automake directory"
290 -
291 - ln -s "${automakedir}"/install-sh config/install-sh || die
292 - ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
293 - ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
294 - fi
295 -}
296 -
297 -src_configure() {
298 - local myeconfargs=(
299 - --bindir="${EPREFIX}"/sbin
300 -
301 - --enable-lzo
302 - --disable-experimental
303 - $(use_enable convert)
304 - $(use_enable man documentation)
305 - $(use_enable elibc_glibc backtrace)
306 - $(use_enable python)
307 - $(use_enable static-libs static)
308 - $(use_enable udev libudev)
309 - $(use_enable zstd)
310 -
311 - # Could support libgcrypt, libsodium, libkcapi
312 - --with-crypto=builtin
313 - --with-convert=ext2$(usex reiserfs ',reiserfs' '')
314 - )
315 -
316 - econf "${myeconfargs[@]}"
317 -}
318 -
319 -src_compile() {
320 - emake V=1 all $(usev static)
321 -}
322 -
323 -src_install() {
324 - local makeargs=(
325 - $(usex python install_python '')
326 - $(usex static install-static '')
327 - )
328 -
329 - emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
330 -
331 - newbashcomp btrfs-completion btrfs
332 -
333 - use python && python_optimize
334 -}
335 -
336 -pkg_postinst() {
337 - udev_reload
338 -}
339 -
340 -pkg_postrm() {
341 - udev_reload
342 -}