Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/
Date: Tue, 13 Jul 2021 15:44:02
Message-Id: 1626191030.dd971d5058a03581a9c0746224a7af0a465f9a81.polynomial-c@gentoo
1 commit: dd971d5058a03581a9c0746224a7af0a465f9a81
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 13 15:43:01 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 13 15:43:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd971d50
7
8 sys-fs/btrfs-progs: Removed old
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 sys-fs/btrfs-progs/Manifest | 2 -
13 sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild | 129 --------------------------
14 sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild | 130 ---------------------------
15 3 files changed, 261 deletions(-)
16
17 diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
18 index b9590e9e2ec..8530848c265 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.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
23 -DIST btrfs-progs-v5.11.1.tar.xz 2213548 BLAKE2B f428e8ffb62f60e6772102f4623b9965edc5d18fa60aa8cb60fd92b4867ee29e3067a6b9d0935c738acce5f0abfc4b88c900121ee233aa881857ed4690e38e3b SHA512 f93a54bd2256851a74fc8e52b26f697bd7bf788cb2481512c92ebf1b9a2f2968b62d680f9f000d6162bd6f22b5d632b2149a88adad8c489e1332f810b439da90
24 DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
25 -DIST btrfs-progs-v5.12.tar.xz 2220396 BLAKE2B be3eaadca7386ab1348c4bef6cf10270a42ac34c8e7e1cb54b9db600fde6a5958cff9453e6c287fba23f928116eeccca5d90f78f9c042b972a3ac66a31566e3b SHA512 af9ab8bf232e0c62cc093d848b95991924cc3a84020fb9c85765a63a1cc132403e784bf18f81b71b2af9daa0038a7b11e578ee7b50d90481a888f7a967a5b197
26 DIST btrfs-progs-v5.13.tar.xz 2234256 BLAKE2B dd6dc6977c2a21471b59573c3ae6f7853d5ec4434549873174a6bde6b3ed4c5ed03c5adaed896538cb74699f538ec13403c193f132fcc8a2ba1b4f6bbdbac67e SHA512 7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd
27
28 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
29 deleted file mode 100644
30 index e7da9aa59cf..00000000000
31 --- a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
32 +++ /dev/null
33 @@ -1,129 +0,0 @@
34 -# Copyright 2008-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{7..9} )
40 -
41 -inherit bash-completion-r1 python-single-r1
42 -
43 -libbtrfs_soname=0
44 -
45 -if [[ ${PV} != 9999 ]]; then
46 - MY_PV="v${PV/_/-}"
47 - [[ "${PV}" = *_rc* ]] || \
48 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
49 - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
50 - S="${WORKDIR}/${PN}-${MY_PV}"
51 -else
52 - WANT_LIBTOOL=none
53 - inherit autotools git-r3
54 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
55 - EGIT_BRANCH="devel"
56 -fi
57 -
58 -DESCRIPTION="Btrfs filesystem utilities"
59 -HOMEPAGE="https://btrfs.wiki.kernel.org"
60 -
61 -LICENSE="GPL-2"
62 -SLOT="0/${libbtrfs_soname}"
63 -IUSE="+convert doc python reiserfs static static-libs +zstd"
64 -
65 -RESTRICT=test # tries to mount repared filesystems
66 -
67 -RDEPEND="
68 - dev-libs/lzo:2=
69 - sys-apps/util-linux:0=[static-libs(+)?]
70 - sys-libs/zlib:0=
71 - convert? (
72 - sys-fs/e2fsprogs:0=
73 - sys-libs/e2fsprogs-libs:0=
74 - reiserfs? (
75 - >=sys-fs/reiserfsprogs-3.6.27
76 - )
77 - )
78 - python? ( ${PYTHON_DEPS} )
79 - zstd? ( app-arch/zstd:0= )
80 -"
81 -DEPEND="${RDEPEND}
82 - convert? ( sys-apps/acl )
83 - python? (
84 - $(python_gen_cond_dep '
85 - dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
86 - ')
87 - )
88 - static? (
89 - dev-libs/lzo:2[static-libs(+)]
90 - sys-apps/util-linux:0[static-libs(+)]
91 - sys-libs/zlib:0[static-libs(+)]
92 - convert? (
93 - sys-fs/e2fsprogs:0[static-libs(+)]
94 - sys-libs/e2fsprogs-libs:0[static-libs(+)]
95 - reiserfs? (
96 - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
97 - )
98 - )
99 - zstd? ( app-arch/zstd:0[static-libs(+)] )
100 - )
101 -"
102 -BDEPEND="
103 - doc? (
104 - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
105 - app-text/docbook-xml-dtd:4.5
106 - app-text/xmlto
107 - )
108 -"
109 -
110 -if [[ ${PV} == 9999 ]]; then
111 - DEPEND+=" sys-devel/gnuconfig"
112 -fi
113 -
114 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
115 -
116 -pkg_setup() {
117 - use python && python-single-r1_pkg_setup
118 -}
119 -
120 -src_prepare() {
121 - default
122 - if [[ ${PV} == 9999 ]]; then
123 - AT_M4DIR=m4 eautoreconf
124 - mkdir config || die
125 - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
126 - [[ -e ${automakedir} ]] || die "Could not locate automake directory"
127 - ln -s "${automakedir}"/install-sh config/install-sh || die
128 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
129 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
130 - fi
131 -}
132 -
133 -src_configure() {
134 - local myeconfargs=(
135 - --bindir="${EPREFIX}"/sbin
136 - $(use_enable convert)
137 - $(use_enable doc documentation)
138 - $(use_enable elibc_glibc backtrace)
139 - $(use_enable python)
140 - $(use_enable static-libs static)
141 - $(use_enable zstd)
142 - --with-convert=ext2$(usex reiserfs ',reiserfs' '')
143 - )
144 - econf "${myeconfargs[@]}"
145 -}
146 -
147 -src_compile() {
148 - emake V=1 all $(usev static)
149 -}
150 -
151 -src_install() {
152 - local makeargs=(
153 - $(usex python install_python '')
154 - $(usex static install-static '')
155 - )
156 - emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
157 - newbashcomp btrfs-completion btrfs
158 - use python && python_optimize
159 -
160 - # install prebuilt subset of manuals
161 - use doc || doman Documentation/*.[58]
162 -}
163
164 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
165 deleted file mode 100644
166 index 90b1aa08f67..00000000000
167 --- a/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
168 +++ /dev/null
169 @@ -1,130 +0,0 @@
170 -# Copyright 2008-2021 Gentoo Authors
171 -# Distributed under the terms of the GNU General Public License v2
172 -
173 -EAPI=7
174 -
175 -PYTHON_COMPAT=( python3_{7..9} )
176 -
177 -inherit bash-completion-r1 python-single-r1
178 -
179 -libbtrfs_soname=0
180 -
181 -if [[ ${PV} != 9999 ]]; then
182 - MY_PV="v${PV/_/-}"
183 - [[ "${PV}" = *_rc* ]] || \
184 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
185 - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
186 - S="${WORKDIR}/${PN}-${MY_PV}"
187 -else
188 - WANT_LIBTOOL=none
189 - inherit autotools git-r3
190 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
191 - EGIT_BRANCH="devel"
192 -fi
193 -
194 -DESCRIPTION="Btrfs filesystem utilities"
195 -HOMEPAGE="https://btrfs.wiki.kernel.org"
196 -
197 -LICENSE="GPL-2"
198 -SLOT="0/${libbtrfs_soname}"
199 -IUSE="+convert doc python reiserfs static static-libs +zstd"
200 -
201 -RESTRICT=test # tries to mount repared filesystems
202 -
203 -RDEPEND="
204 - dev-libs/lzo:2=
205 - sys-apps/util-linux:0=[static-libs(+)?]
206 - sys-libs/zlib:0=
207 - convert? (
208 - sys-fs/e2fsprogs:0=
209 - sys-libs/e2fsprogs-libs:0=
210 - reiserfs? (
211 - >=sys-fs/reiserfsprogs-3.6.27
212 - )
213 - )
214 - python? ( ${PYTHON_DEPS} )
215 - zstd? ( app-arch/zstd:0= )
216 -"
217 -DEPEND="${RDEPEND}
218 - >=sys-kernel/linux-headers-5.10
219 - convert? ( sys-apps/acl )
220 - python? (
221 - $(python_gen_cond_dep '
222 - dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
223 - ')
224 - )
225 - static? (
226 - dev-libs/lzo:2[static-libs(+)]
227 - sys-apps/util-linux:0[static-libs(+)]
228 - sys-libs/zlib:0[static-libs(+)]
229 - convert? (
230 - sys-fs/e2fsprogs:0[static-libs(+)]
231 - sys-libs/e2fsprogs-libs:0[static-libs(+)]
232 - reiserfs? (
233 - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
234 - )
235 - )
236 - zstd? ( app-arch/zstd:0[static-libs(+)] )
237 - )
238 -"
239 -BDEPEND="
240 - doc? (
241 - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
242 - app-text/docbook-xml-dtd:4.5
243 - app-text/xmlto
244 - )
245 -"
246 -
247 -if [[ ${PV} == 9999 ]]; then
248 - DEPEND+=" sys-devel/gnuconfig"
249 -fi
250 -
251 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
252 -
253 -pkg_setup() {
254 - use python && python-single-r1_pkg_setup
255 -}
256 -
257 -src_prepare() {
258 - default
259 - if [[ ${PV} == 9999 ]]; then
260 - AT_M4DIR=m4 eautoreconf
261 - mkdir config || die
262 - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
263 - [[ -e ${automakedir} ]] || die "Could not locate automake directory"
264 - ln -s "${automakedir}"/install-sh config/install-sh || die
265 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
266 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
267 - fi
268 -}
269 -
270 -src_configure() {
271 - local myeconfargs=(
272 - --bindir="${EPREFIX}"/sbin
273 - $(use_enable convert)
274 - $(use_enable doc documentation)
275 - $(use_enable elibc_glibc backtrace)
276 - $(use_enable python)
277 - $(use_enable static-libs static)
278 - $(use_enable zstd)
279 - --with-convert=ext2$(usex reiserfs ',reiserfs' '')
280 - )
281 - econf "${myeconfargs[@]}"
282 -}
283 -
284 -src_compile() {
285 - emake V=1 all $(usev static)
286 -}
287 -
288 -src_install() {
289 - local makeargs=(
290 - $(usex python install_python '')
291 - $(usex static install-static '')
292 - )
293 - emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
294 - newbashcomp btrfs-completion btrfs
295 - use python && python_optimize
296 -
297 - # install prebuilt subset of manuals
298 - use doc || doman Documentation/*.[58]
299 -}