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: Fri, 03 Jul 2020 06:13:29
Message-Id: 1593756798.96a585ff9ed1e05b45fe9505f49fc7b6399b966e.polynomial-c@gentoo
1 commit: 96a585ff9ed1e05b45fe9505f49fc7b6399b966e
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 3 06:09:17 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 3 06:13:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a585ff
7
8 sys-fs/btrfs-progs: Removed old
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/btrfs-progs/Manifest | 2 -
14 sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild | 93 --------------------
15 sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild | 129 ----------------------------
16 3 files changed, 224 deletions(-)
17
18 diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
19 index 9daeca41464..39858f1dec6 100644
20 --- a/sys-fs/btrfs-progs/Manifest
21 +++ b/sys-fs/btrfs-progs/Manifest
22 @@ -1,6 +1,4 @@
23 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
24 -DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
25 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
26 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
27 -DIST btrfs-progs-v5.6.tar.xz 2114336 BLAKE2B 24c0a2ae17bdfa7075c026427ddc3945533a8a3f2608f339b5560e91b71b23d754e2c9ae7d847b21bb73ce0894cf21ccef441fbfb28cfe40a9ce316664102f57 SHA512 4eb39da2a583fc2dfa2f5f161a44c1f107dc6ad1e789a8746cb89eecdd288718e279041bebcb85473da4780eecb8e4c297d2b0163262a941cf88b99c07951cc4
28 DIST btrfs-progs-v5.7-rc1.tar.xz 2182924 BLAKE2B 11690a5376e073cf3ffa7699258734c2d319630d5ede31ba85642a8013c35b5ba46f16c46ac53ee8eeb19e77832d3f3ebc0f4ae83c820ee35f1a41f76d2b0861 SHA512 9b3376bf0f1ff94b787de6fdd4086957d222657cdb83d1e418ceae1d99e71fa03f2943eee207cacab59005ae87d8e71bf4bb345876d6029054a87cc238280ac0
29
30 diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
31 deleted file mode 100644
32 index 66404e352aa..00000000000
33 --- a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
34 +++ /dev/null
35 @@ -1,93 +0,0 @@
36 -# Copyright 2008-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -
41 -inherit bash-completion-r1 eutils multilib toolchain-funcs
42 -
43 -libbtrfs_soname=0
44 -
45 -if [[ ${PV} != 9999 ]]; then
46 - MY_PV=v${PV}
47 - KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86"
48 - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
49 - S="${WORKDIR}"/${PN}-${MY_PV}
50 -else
51 - WANT_LIBTOOL=none
52 - inherit autotools git-r3
53 - EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
54 - EGIT_BRANCH="devel"
55 -fi
56 -
57 -DESCRIPTION="Btrfs filesystem utilities"
58 -HOMEPAGE="https://btrfs.wiki.kernel.org"
59 -
60 -LICENSE="GPL-2"
61 -SLOT="0/${libbtrfs_soname}"
62 -IUSE="+convert static static-libs"
63 -
64 -RESTRICT=test # tries to mount repared filesystems
65 -
66 -RDEPEND="
67 - dev-libs/lzo:2=
68 - sys-apps/util-linux:0=[static-libs(+)?]
69 - sys-libs/zlib:0=
70 - convert? (
71 - sys-fs/e2fsprogs:0=
72 - sys-libs/e2fsprogs-libs:0=
73 - )
74 -"
75 -DEPEND="${RDEPEND}
76 - convert? ( sys-apps/acl )
77 - >=app-text/asciidoc-8.6.0
78 - app-text/docbook-xml-dtd:4.5
79 - app-text/xmlto
80 - static? (
81 - dev-libs/lzo:2[static-libs(+)]
82 - sys-apps/util-linux:0[static-libs(+)]
83 - sys-libs/zlib:0[static-libs(+)]
84 - convert? (
85 - sys-fs/e2fsprogs:0[static-libs(+)]
86 - sys-libs/e2fsprogs-libs:0[static-libs(+)]
87 - )
88 - )
89 -"
90 -
91 -if [[ ${PV} == 9999 ]]; then
92 - DEPEND+=" sys-devel/gnuconfig"
93 -fi
94 -
95 -src_prepare() {
96 - epatch_user
97 - if [[ ${PV} == 9999 ]]; then
98 - eautoreconf
99 - mkdir config || die
100 - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
101 - [[ -e ${automakedir} ]] || die "Could not locate automake directory"
102 - ln -s "${automakedir}"/install-sh config/install-sh || die
103 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
104 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
105 - fi
106 -}
107 -
108 -src_configure() {
109 - local myeconfargs=(
110 - --bindir="${EPREFIX}"/sbin
111 - $(use_enable convert)
112 - $(use_enable elibc_glibc backtrace)
113 - )
114 - econf "${myeconfargs[@]}"
115 -}
116 -
117 -src_compile() {
118 - emake V=1 all $(usev static)
119 -}
120 -
121 -src_install() {
122 - local makeargs=(
123 - $(usex static-libs '' 'libs_static=')
124 - $(usex static install-static '')
125 - )
126 - emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
127 - newbashcomp btrfs-completion btrfs
128 -}
129
130 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild
131 deleted file mode 100644
132 index e8b44f1ff9b..00000000000
133 --- a/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild
134 +++ /dev/null
135 @@ -1,129 +0,0 @@
136 -# Copyright 2008-2020 Gentoo Authors
137 -# Distributed under the terms of the GNU General Public License v2
138 -
139 -EAPI=7
140 -
141 -PYTHON_COMPAT=( python3_{6,7,8} )
142 -
143 -inherit bash-completion-r1 python-single-r1
144 -
145 -libbtrfs_soname=0
146 -
147 -if [[ ${PV} != 9999 ]]; then
148 - MY_PV="v${PV/_/-}"
149 - [[ "${PV}" = *_rc* ]] || \
150 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
151 - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
152 - S="${WORKDIR}/${PN}-${MY_PV}"
153 -else
154 - WANT_LIBTOOL=none
155 - inherit autotools git-r3
156 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
157 - EGIT_BRANCH="devel"
158 -fi
159 -
160 -DESCRIPTION="Btrfs filesystem utilities"
161 -HOMEPAGE="https://btrfs.wiki.kernel.org"
162 -
163 -LICENSE="GPL-2"
164 -SLOT="0/${libbtrfs_soname}"
165 -IUSE="+convert doc python reiserfs static static-libs +zstd"
166 -
167 -RESTRICT=test # tries to mount repared filesystems
168 -
169 -RDEPEND="
170 - dev-libs/lzo:2=
171 - sys-apps/util-linux:0=[static-libs(+)?]
172 - sys-libs/zlib:0=
173 - convert? (
174 - sys-fs/e2fsprogs:0=
175 - sys-libs/e2fsprogs-libs:0=
176 - reiserfs? (
177 - >=sys-fs/reiserfsprogs-3.6.27
178 - )
179 - )
180 - python? ( ${PYTHON_DEPS} )
181 - zstd? ( app-arch/zstd:0= )
182 -"
183 -DEPEND="${RDEPEND}
184 - convert? ( sys-apps/acl )
185 - python? (
186 - $(python_gen_cond_dep '
187 - dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
188 - ')
189 - )
190 - static? (
191 - dev-libs/lzo:2[static-libs(+)]
192 - sys-apps/util-linux:0[static-libs(+)]
193 - sys-libs/zlib:0[static-libs(+)]
194 - convert? (
195 - sys-fs/e2fsprogs:0[static-libs(+)]
196 - sys-libs/e2fsprogs-libs:0[static-libs(+)]
197 - reiserfs? (
198 - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
199 - )
200 - )
201 - zstd? ( app-arch/zstd:0[static-libs(+)] )
202 - )
203 -"
204 -BDEPEND="
205 - doc? (
206 - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
207 - app-text/docbook-xml-dtd:4.5
208 - app-text/xmlto
209 - )
210 -"
211 -
212 -if [[ ${PV} == 9999 ]]; then
213 - DEPEND+=" sys-devel/gnuconfig"
214 -fi
215 -
216 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
217 -
218 -pkg_setup() {
219 - use python && python-single-r1_pkg_setup
220 -}
221 -
222 -src_prepare() {
223 - default
224 - if [[ ${PV} == 9999 ]]; then
225 - AT_M4DIR=m4 eautoreconf
226 - mkdir config || die
227 - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
228 - [[ -e ${automakedir} ]] || die "Could not locate automake directory"
229 - ln -s "${automakedir}"/install-sh config/install-sh || die
230 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
231 - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
232 - fi
233 -}
234 -
235 -src_configure() {
236 - local myeconfargs=(
237 - --bindir="${EPREFIX}"/sbin
238 - $(use_enable convert)
239 - $(use_enable doc documentation)
240 - $(use_enable elibc_glibc backtrace)
241 - $(use_enable python)
242 - $(use_enable static-libs static)
243 - $(use_enable zstd)
244 - --with-convert=ext2$(usex reiserfs ',reiserfs' '')
245 - )
246 - econf "${myeconfargs[@]}"
247 -}
248 -
249 -src_compile() {
250 - emake V=1 all $(usev static)
251 -}
252 -
253 -src_install() {
254 - local makeargs=(
255 - $(usex python install_python '')
256 - $(usex static install-static '')
257 - )
258 - emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
259 - newbashcomp btrfs-completion btrfs
260 - use python && python_optimize
261 -
262 - # install prebuilt subset of manuals
263 - use doc || doman Documentation/*.[58]
264 -}