| 1 |
commit: ae038c9d7e80da938784a6880b4d9d5bc878bece |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 31 09:14:45 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 31 09:15:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae038c9d |
| 7 |
|
| 8 |
sys-fs/btrfs-progs: Removed old. |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
sys-fs/btrfs-progs/Manifest | 2 - |
| 14 |
sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild | 121 --------------------- |
| 15 |
sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild | 121 --------------------- |
| 16 |
.../files/btrfs-progs-4.16-static-linkage.patch | 27 ----- |
| 17 |
4 files changed, 271 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest |
| 20 |
index 972584f2e74..23c0db057d8 100644 |
| 21 |
--- a/sys-fs/btrfs-progs/Manifest |
| 22 |
+++ b/sys-fs/btrfs-progs/Manifest |
| 23 |
@@ -5,9 +5,7 @@ DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae17 |
| 24 |
DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6 |
| 25 |
DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88 |
| 26 |
DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e |
| 27 |
-DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc SHA512 3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e |
| 28 |
DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538 |
| 29 |
-DIST btrfs-progs-v4.17.tar.xz 2002792 BLAKE2B beb63b0dcbd7f84b9ec95338d50c13e410fd967dcee56449328eb40d0ed89def4136675ffc86fc693d961175e74f11bf89f725e101e5cf35e7cbf2e228887d77 SHA512 1d238ea6c75f2493f0c5f3995bcfd592e945e20e407a71d962a8ce534fe829f5aa139c0e2d2cb497435de6ddf5c29f0e9dfb900419cc0c9d91cac3ae8154ee75 |
| 30 |
DIST btrfs-progs-v4.19-rc1.tar.xz 2000332 BLAKE2B a0721d6d4541a31b8f483e7faea342b8f7e74d6b2a6e0e5da6f8c1f2dea9b713ce5e9517382af76079c523d880b9673e669eb6513ed03d947daa95798a109470 SHA512 2f849a72b321be7e37e309dfa758b1d7b0da29a803bb0060100e3169415318a554eb089725e275154ad2bf1105216f874106d20541311302b9f72d9d41b4c2a0 |
| 31 |
DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a |
| 32 |
DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 |
| 33 |
|
| 34 |
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild |
| 35 |
deleted file mode 100644 |
| 36 |
index 8d3f9db2dd2..00000000000 |
| 37 |
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,121 +0,0 @@ |
| 40 |
-# Copyright 1999-2018 Gentoo Foundation |
| 41 |
-# Distributed under the terms of the GNU General Public License v2 |
| 42 |
- |
| 43 |
-EAPI=6 |
| 44 |
- |
| 45 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
| 46 |
- |
| 47 |
-inherit bash-completion-r1 python-single-r1 |
| 48 |
- |
| 49 |
-libbtrfs_soname=0 |
| 50 |
- |
| 51 |
-if [[ ${PV} != 9999 ]]; then |
| 52 |
- MY_PV="v${PV/_/-}" |
| 53 |
- [[ "${PV}" = *_rc* ]] || \ |
| 54 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 55 |
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" |
| 56 |
- S="${WORKDIR}"/${PN}-${MY_PV} |
| 57 |
-else |
| 58 |
- WANT_LIBTOOL=none |
| 59 |
- inherit autotools git-r3 |
| 60 |
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" |
| 61 |
- EGIT_BRANCH="devel" |
| 62 |
-fi |
| 63 |
- |
| 64 |
-DESCRIPTION="Btrfs filesystem utilities" |
| 65 |
-HOMEPAGE="https://btrfs.wiki.kernel.org" |
| 66 |
- |
| 67 |
-LICENSE="GPL-2" |
| 68 |
-SLOT="0/${libbtrfs_soname}" |
| 69 |
-IUSE="+convert python reiserfs static static-libs +zstd" |
| 70 |
- |
| 71 |
-RESTRICT=test # tries to mount repared filesystems |
| 72 |
- |
| 73 |
-RDEPEND=" |
| 74 |
- dev-libs/lzo:2= |
| 75 |
- sys-apps/util-linux:0=[static-libs(+)?] |
| 76 |
- sys-libs/zlib:0= |
| 77 |
- convert? ( |
| 78 |
- sys-fs/e2fsprogs:0= |
| 79 |
- sys-libs/e2fsprogs-libs:0= |
| 80 |
- reiserfs? ( |
| 81 |
- >=sys-fs/reiserfsprogs-3.6.27 |
| 82 |
- ) |
| 83 |
- ) |
| 84 |
- python? ( ${PYTHON_DEPS} ) |
| 85 |
- zstd? ( app-arch/zstd:0= ) |
| 86 |
-" |
| 87 |
-DEPEND="${RDEPEND} |
| 88 |
- convert? ( sys-apps/acl ) |
| 89 |
- >=app-text/asciidoc-8.6.0 |
| 90 |
- app-text/docbook-xml-dtd:4.5 |
| 91 |
- app-text/xmlto |
| 92 |
- python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) |
| 93 |
- static? ( |
| 94 |
- dev-libs/lzo:2[static-libs(+)] |
| 95 |
- sys-apps/util-linux:0[static-libs(+)] |
| 96 |
- sys-libs/zlib:0[static-libs(+)] |
| 97 |
- convert? ( |
| 98 |
- sys-fs/e2fsprogs:0[static-libs(+)] |
| 99 |
- sys-libs/e2fsprogs-libs:0[static-libs(+)] |
| 100 |
- reiserfs? ( |
| 101 |
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] |
| 102 |
- ) |
| 103 |
- ) |
| 104 |
- zstd? ( app-arch/zstd:0[static-libs(+)] ) |
| 105 |
- ) |
| 106 |
-" |
| 107 |
- |
| 108 |
-if [[ ${PV} == 9999 ]]; then |
| 109 |
- DEPEND+=" sys-devel/gnuconfig" |
| 110 |
-fi |
| 111 |
- |
| 112 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 113 |
- |
| 114 |
-PATCHES=( |
| 115 |
- "${FILESDIR}"/${P}-static-linkage.patch |
| 116 |
-) |
| 117 |
- |
| 118 |
-pkg_setup() { |
| 119 |
- use python && python-single-r1_pkg_setup |
| 120 |
-} |
| 121 |
- |
| 122 |
-src_prepare() { |
| 123 |
- default |
| 124 |
- if [[ ${PV} == 9999 ]]; then |
| 125 |
- AT_M4DIR=m4 eautoreconf |
| 126 |
- mkdir config || die |
| 127 |
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" |
| 128 |
- [[ -e ${automakedir} ]] || die "Could not locate automake directory" |
| 129 |
- ln -s "${automakedir}"/install-sh config/install-sh || die |
| 130 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die |
| 131 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die |
| 132 |
- fi |
| 133 |
-} |
| 134 |
- |
| 135 |
-src_configure() { |
| 136 |
- local myeconfargs=( |
| 137 |
- --bindir="${EPREFIX}"/sbin |
| 138 |
- $(use_enable convert) |
| 139 |
- $(use_enable elibc_glibc backtrace) |
| 140 |
- $(use_enable python) |
| 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-libs '' 'libs_static=') |
| 155 |
- $(usex static install-static '') |
| 156 |
- ) |
| 157 |
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}" |
| 158 |
- newbashcomp btrfs-completion btrfs |
| 159 |
- use python && python_optimize |
| 160 |
-} |
| 161 |
|
| 162 |
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild |
| 163 |
deleted file mode 100644 |
| 164 |
index b11eba1014a..00000000000 |
| 165 |
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild |
| 166 |
+++ /dev/null |
| 167 |
@@ -1,121 +0,0 @@ |
| 168 |
-# Copyright 1999-2018 Gentoo Foundation |
| 169 |
-# Distributed under the terms of the GNU General Public License v2 |
| 170 |
- |
| 171 |
-EAPI=6 |
| 172 |
- |
| 173 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
| 174 |
- |
| 175 |
-inherit bash-completion-r1 python-single-r1 |
| 176 |
- |
| 177 |
-libbtrfs_soname=0 |
| 178 |
- |
| 179 |
-if [[ ${PV} != 9999 ]]; then |
| 180 |
- MY_PV="v${PV/_/-}" |
| 181 |
- [[ "${PV}" = *_rc* ]] || \ |
| 182 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 183 |
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" |
| 184 |
- S="${WORKDIR}"/${PN}-${MY_PV} |
| 185 |
-else |
| 186 |
- WANT_LIBTOOL=none |
| 187 |
- inherit autotools git-r3 |
| 188 |
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" |
| 189 |
- EGIT_BRANCH="devel" |
| 190 |
-fi |
| 191 |
- |
| 192 |
-DESCRIPTION="Btrfs filesystem utilities" |
| 193 |
-HOMEPAGE="https://btrfs.wiki.kernel.org" |
| 194 |
- |
| 195 |
-LICENSE="GPL-2" |
| 196 |
-SLOT="0/${libbtrfs_soname}" |
| 197 |
-IUSE="+convert python reiserfs static static-libs +zstd" |
| 198 |
- |
| 199 |
-RESTRICT=test # tries to mount repared filesystems |
| 200 |
- |
| 201 |
-RDEPEND=" |
| 202 |
- dev-libs/lzo:2= |
| 203 |
- sys-apps/util-linux:0=[static-libs(+)?] |
| 204 |
- sys-libs/zlib:0= |
| 205 |
- convert? ( |
| 206 |
- sys-fs/e2fsprogs:0= |
| 207 |
- sys-libs/e2fsprogs-libs:0= |
| 208 |
- reiserfs? ( |
| 209 |
- >=sys-fs/reiserfsprogs-3.6.27 |
| 210 |
- ) |
| 211 |
- ) |
| 212 |
- python? ( ${PYTHON_DEPS} ) |
| 213 |
- zstd? ( app-arch/zstd:0= ) |
| 214 |
-" |
| 215 |
-DEPEND="${RDEPEND} |
| 216 |
- convert? ( sys-apps/acl ) |
| 217 |
- >=app-text/asciidoc-8.6.0 |
| 218 |
- app-text/docbook-xml-dtd:4.5 |
| 219 |
- app-text/xmlto |
| 220 |
- python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) |
| 221 |
- static? ( |
| 222 |
- dev-libs/lzo:2[static-libs(+)] |
| 223 |
- sys-apps/util-linux:0[static-libs(+)] |
| 224 |
- sys-libs/zlib:0[static-libs(+)] |
| 225 |
- convert? ( |
| 226 |
- sys-fs/e2fsprogs:0[static-libs(+)] |
| 227 |
- sys-libs/e2fsprogs-libs:0[static-libs(+)] |
| 228 |
- reiserfs? ( |
| 229 |
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] |
| 230 |
- ) |
| 231 |
- ) |
| 232 |
- zstd? ( app-arch/zstd:0[static-libs(+)] ) |
| 233 |
- ) |
| 234 |
-" |
| 235 |
- |
| 236 |
-if [[ ${PV} == 9999 ]]; then |
| 237 |
- DEPEND+=" sys-devel/gnuconfig" |
| 238 |
-fi |
| 239 |
- |
| 240 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 241 |
- |
| 242 |
-PATCHES=( |
| 243 |
- "${FILESDIR}"/btrfs-progs-man-no-gz.patch |
| 244 |
-) |
| 245 |
- |
| 246 |
-pkg_setup() { |
| 247 |
- use python && python-single-r1_pkg_setup |
| 248 |
-} |
| 249 |
- |
| 250 |
-src_prepare() { |
| 251 |
- default |
| 252 |
- if [[ ${PV} == 9999 ]]; then |
| 253 |
- AT_M4DIR=m4 eautoreconf |
| 254 |
- mkdir config || die |
| 255 |
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" |
| 256 |
- [[ -e ${automakedir} ]] || die "Could not locate automake directory" |
| 257 |
- ln -s "${automakedir}"/install-sh config/install-sh || die |
| 258 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die |
| 259 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die |
| 260 |
- fi |
| 261 |
-} |
| 262 |
- |
| 263 |
-src_configure() { |
| 264 |
- local myeconfargs=( |
| 265 |
- --bindir="${EPREFIX}"/sbin |
| 266 |
- $(use_enable convert) |
| 267 |
- $(use_enable elibc_glibc backtrace) |
| 268 |
- $(use_enable python) |
| 269 |
- $(use_enable zstd) |
| 270 |
- --with-convert=ext2$(usex reiserfs ',reiserfs' '') |
| 271 |
- ) |
| 272 |
- econf "${myeconfargs[@]}" |
| 273 |
-} |
| 274 |
- |
| 275 |
-src_compile() { |
| 276 |
- emake V=1 all $(usev static) |
| 277 |
-} |
| 278 |
- |
| 279 |
-src_install() { |
| 280 |
- local makeargs=( |
| 281 |
- $(usex python install_python '') |
| 282 |
- $(usex static-libs '' 'libs_static=') |
| 283 |
- $(usex static install-static '') |
| 284 |
- ) |
| 285 |
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}" |
| 286 |
- newbashcomp btrfs-completion btrfs |
| 287 |
- use python && python_optimize |
| 288 |
-} |
| 289 |
|
| 290 |
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch |
| 291 |
deleted file mode 100644 |
| 292 |
index b8a7d8b79f0..00000000000 |
| 293 |
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch |
| 294 |
+++ /dev/null |
| 295 |
@@ -1,27 +0,0 @@ |
| 296 |
-https://www.spinics.net/lists/linux-btrfs/msg76763.html |
| 297 |
-Reported-by: Attila Tóth |
| 298 |
-Bug: https://bugs.gentoo.org/652966 |
| 299 |
-diff --git a/Makefile b/Makefile |
| 300 |
-index 5ba76d2..dc3a31a 100644 |
| 301 |
---- a/Makefile |
| 302 |
-+++ b/Makefile |
| 303 |
-@@ -264,6 +264,7 @@ static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects)) |
| 304 |
- static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects)) |
| 305 |
- static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects)) |
| 306 |
- static_image_objects = $(patsubst %.o, %.static.o, $(image_objects)) |
| 307 |
-+static_libbtrfsutil_objects = $(patsubst %.o, %.static.o, $(libbtrfsutil_objects)) |
| 308 |
- |
| 309 |
- libs_shared = libbtrfs.so.0.1 libbtrfsutil.so.$(libbtrfsutil_version) |
| 310 |
- libs_static = libbtrfs.a libbtrfsutil.a |
| 311 |
-@@ -453,7 +454,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static) |
| 312 |
- @echo " [LD] $@" |
| 313 |
- $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) |
| 314 |
- |
| 315 |
--btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) |
| 316 |
-+btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects) |
| 317 |
- @echo " [LD] $@" |
| 318 |
- $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) |
| 319 |
- |
| 320 |
--- |
| 321 |
-2.17.0 |
| 322 |
- |
Archives