[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Andreas K. Hüttel]

commit:     88baf5b6fe33648858e7a2a8c00aae1c4a990f12
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 12:20:19 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 12:21:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88baf5b6

sys-fs/btrfs-progs: backport musl-1.2.5 basename patch

Closes: https://bugs.gentoo.org/926288
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild          |   3 +
 .../files/btrfs-progs-6.8-musl-1.2.5.patch         | 209 +++++++++++++++++++++
 2 files changed, 212 insertions(+)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
index c9770f5998ae..1f531bde0013 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
@@ -122,6 +122,9 @@ src_unpack() {
 src_prepare() {
 	default
 
+	# bug 926288
+	use elibc_musl && eapply "${FILESDIR}/${P}-musl-1.2.5.patch"
+
 	if [[ ${PV} == 9999 ]]; then
 		AT_M4DIR="m4" eautoreconf
 

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch
new file mode 100644
index 000000000000..19737515b616
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch
@@ -0,0 +1,209 @@
+From 45ca77f9e4cfe5fd5814d553502ef99877c9e972 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Thu, 18 Apr 2024 18:57:08 +0200
+Subject: [PATCH] btrfs-progs: add basename wrappers for unified semantics
+
+What basename(3) does with the argument depends on _GNU_SOURCE and
+inclusion of libgen.h. This is problematic on Musl (1.2.5) as reported.
+
+We want the GNU semantics that does not modify the argument. Common way
+to make it portable is to add own helper. This is now implemented in
+path_basename() that does not use the libc provided basename but preserves
+the semantics. The path_dirname() is just for parity, otherwise same as
+dirname().
+
+Sources:
+- https://bugs.gentoo.org/926288
+- https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+
+Issue: #778
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ cmds/subvolume.c      | 26 +++++++++++++-------------
+ common/device-utils.c |  4 ++--
+ common/path-utils.c   | 28 ++++++++++++++++++++++++++++
+ common/path-utils.h   |  2 ++
+ 4 files changed, 45 insertions(+), 15 deletions(-)
+
+diff --git a/cmds/subvolume.c b/cmds/subvolume.c
+index 5d53efe6f..869d7077d 100644
+--- a/cmds/subvolume.c
++++ b/cmds/subvolume.c
+@@ -24,7 +24,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <libgen.h>
+ #include <getopt.h>
+ #include <dirent.h>
+ #include <stdbool.h>
+@@ -149,7 +148,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
+ 	int	fddst = -1;
+ 	char	*dupname = NULL;
+ 	char	*dupdir = NULL;
+-	char	*newname;
++	const char *newname;
+ 	char	*dstdir;
+ 
+ 	ret = path_is_dir(dst);
+@@ -170,7 +169,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+-	newname = basename(dupname);
++	newname = path_basename(dupname);
+ 
+ 	dupdir = strdup(dst);
+ 	if (!dupdir) {
+@@ -178,7 +177,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+-	dstdir = dirname(dupdir);
++	dstdir = path_dirname(dupdir);
+ 
+ 	if (!test_issubvolname(newname)) {
+ 		error("invalid subvolume name: %s", newname);
+@@ -364,7 +363,8 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
+ 	int res, ret = 0;
+ 	int cnt;
+ 	int fd = -1;
+-	char	*dname, *vname, *cpath;
++	char	*dname, *cpath;
++	const char *vname;
+ 	char	*dupdname = NULL;
+ 	char	*dupvname = NULL;
+ 	char	*path = NULL;
+@@ -482,9 +482,9 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
+ 		goto out;
+ 	}
+ 	dupdname = strdup(cpath);
+-	dname = dirname(dupdname);
++	dname = path_dirname(dupdname);
+ 	dupvname = strdup(cpath);
+-	vname = basename(dupvname);
++	vname = path_basename(dupvname);
+ 	free(cpath);
+ 
+ 	/* When subvolid is passed, <path> will point to the mount point */
+@@ -670,7 +670,7 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char *
+ 	bool readonly = false;
+ 	char	*dupname = NULL;
+ 	char	*dupdir = NULL;
+-	char	*newname;
++	const char *newname;
+ 	char	*dstdir;
+ 	enum btrfs_util_error err;
+ 	struct btrfs_ioctl_vol_args_v2	args;
+@@ -727,13 +727,13 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char *
+ 
+ 	if (res > 0) {
+ 		dupname = strdup(subvol);
+-		newname = basename(dupname);
++		newname = path_basename(dupname);
+ 		dstdir = dst;
+ 	} else {
+ 		dupname = strdup(dst);
+-		newname = basename(dupname);
++		newname = path_basename(dupname);
+ 		dupdir = strdup(dst);
+-		dstdir = dirname(dupdir);
++		dstdir = path_dirname(dupdir);
+ 	}
+ 
+ 	if (!test_issubvolname(newname)) {
+@@ -1557,7 +1557,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
+ 	struct btrfs_util_subvolume_iterator *iter;
+ 	struct btrfs_util_subvolume_info subvol;
+ 	char *subvol_path = NULL;
+-	char *subvol_name = NULL;
++	const char *subvol_name = NULL;
+ 	enum btrfs_util_error err;
+ 	struct btrfs_qgroup_stats stats;
+ 	unsigned int unit_mode;
+@@ -1669,7 +1669,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
+ 		subvol_path = strdup("/");
+ 		subvol_name = "<FS_TREE>";
+ 	} else {
+-		subvol_name = basename(subvol_path);
++		subvol_name = path_basename(subvol_path);
+ 	}
+ 
+ 	if (bconf.output_format == CMD_FORMAT_JSON) {
+diff --git a/common/device-utils.c b/common/device-utils.c
+index 36108ec4e..d086e9ea2 100644
+--- a/common/device-utils.c
++++ b/common/device-utils.c
+@@ -343,14 +343,14 @@ static u64 device_get_partition_size_sysfs(const char *dev)
+ 	char path[PATH_MAX] = {};
+ 	char sysfs[PATH_MAX] = {};
+ 	char sizebuf[128] = {};
+-	char *name = NULL;
++	const char *name = NULL;
+ 	int sysfd;
+ 	unsigned long long size = 0;
+ 
+ 	name = realpath(dev, path);
+ 	if (!name)
+ 		return 0;
+-	name = basename(path);
++	name = path_basename(path);
+ 
+ 	ret = path_cat3_out(sysfs, "/sys/class/block", name, "size");
+ 	if (ret < 0)
+diff --git a/common/path-utils.c b/common/path-utils.c
+index 181737c4d..929e5c8fa 100644
+--- a/common/path-utils.c
++++ b/common/path-utils.c
+@@ -28,6 +28,11 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <ctype.h>
++/*
++ * For dirname() and basename(), but never use basename directly, there's
++ * path_basename() with unified GNU behaviour regardless of the includes and
++ * conditional defines. See basename(3) for more.
++ */
+ #include <libgen.h>
+ #include <limits.h>
+ #include "common/path-utils.h"
+@@ -482,3 +487,26 @@ int test_issubvolname(const char *name)
+ 		strcmp(name, ".") && strcmp(name, "..");
+ }
+ 
++/*
++ * Unified GNU semantics basename helper, never changing the argument. Always
++ * use this instead of basename().
++ */
++const char *path_basename(const char *path)
++{
++	const char *tmp = strrchr(path, '/');
++
++	/* Special case when the whole path is just "/". */
++	if (path[0] == '/' && path[1] == 0)
++		return path;
++
++	return tmp ? tmp + 1 : path;
++}
++
++/*
++ * Return dirname component of path, may change the argument.
++ * Own helper for parity with path_basename().
++ */
++char *path_dirname(char *path)
++{
++	return dirname(path);
++}
+diff --git a/common/path-utils.h b/common/path-utils.h
+index 08ae0ff10..697fa6b48 100644
+--- a/common/path-utils.h
++++ b/common/path-utils.h
+@@ -39,6 +39,8 @@ int path_is_dir(const char *path);
+ int is_same_loop_file(const char *a, const char *b);
+ int path_is_reg_or_block_device(const char *filename);
+ int path_is_in_dir(const char *parent, const char *path);
++const char *path_basename(const char *path);
++char *path_dirname(char *path);
+ 
+ int test_issubvolname(const char *name);
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sam James]

commit:     f2c874268c13e6a1894c5b41577238ebf8df33ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 07:28:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 07:29:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c87426

sys-fs/btrfs-progs: drop 6.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/Manifest                        |   2 -
 sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild          | 201 --------------------
 .../files/btrfs-progs-6.8-musl-1.2.5.patch         | 209 ---------------------
 3 files changed, 412 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index a418eaa25df9..de5680b70193 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -4,5 +4,3 @@ DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24
 DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 SHA512 8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc
 DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09
 DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46
-DIST btrfs-progs-v6.8.tar.sign 566 BLAKE2B 2f063015b515980a88980d02ac359363506d8445bf6ebffccd0f224b09b457b9d859ec7ae1371d3dcb04cfcb29ceee75ec8f73c2adee4765ca8287a79929234c SHA512 d858033046af03d9f7bedb492eadaaae92c8d3dde451e52fc78a8a1c4dbf57078e8d907dbd3344f1414b4dad9646aef616ddec0c0fefaf65340411e84c36c96f
-DIST btrfs-progs-v6.8.tar.xz 2587804 BLAKE2B 0f4cc83fa896bc932fdcd34fffae72b0fad44424ac0b5e2b7bde44dd91fcef33f2fa2ef36eb77299de753e4d4b47794cabad5d84760b9d34a9b6765a834d15b7 SHA512 adce7c15ef5a19c4fc513f1743b4f65f2c72aa4490703d36c93230abb305c576bd69a32c4bcf19c2b58aee5b5755e0d54fb82fe649a5fe021366eb0d89af4261

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
deleted file mode 100644
index 1f531bde0013..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
-		verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
-	"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if in_iuse verify-sig && use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# bug 926288
-	use elibc_musl && eapply "${FILESDIR}/${P}-musl-1.2.5.patch"
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch
deleted file mode 100644
index 19737515b616..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 45ca77f9e4cfe5fd5814d553502ef99877c9e972 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Thu, 18 Apr 2024 18:57:08 +0200
-Subject: [PATCH] btrfs-progs: add basename wrappers for unified semantics
-
-What basename(3) does with the argument depends on _GNU_SOURCE and
-inclusion of libgen.h. This is problematic on Musl (1.2.5) as reported.
-
-We want the GNU semantics that does not modify the argument. Common way
-to make it portable is to add own helper. This is now implemented in
-path_basename() that does not use the libc provided basename but preserves
-the semantics. The path_dirname() is just for parity, otherwise same as
-dirname().
-
-Sources:
-- https://bugs.gentoo.org/926288
-- https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Issue: #778
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- cmds/subvolume.c      | 26 +++++++++++++-------------
- common/device-utils.c |  4 ++--
- common/path-utils.c   | 28 ++++++++++++++++++++++++++++
- common/path-utils.h   |  2 ++
- 4 files changed, 45 insertions(+), 15 deletions(-)
-
-diff --git a/cmds/subvolume.c b/cmds/subvolume.c
-index 5d53efe6f..869d7077d 100644
---- a/cmds/subvolume.c
-+++ b/cmds/subvolume.c
-@@ -24,7 +24,6 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
--#include <libgen.h>
- #include <getopt.h>
- #include <dirent.h>
- #include <stdbool.h>
-@@ -149,7 +148,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
- 	int	fddst = -1;
- 	char	*dupname = NULL;
- 	char	*dupdir = NULL;
--	char	*newname;
-+	const char *newname;
- 	char	*dstdir;
- 
- 	ret = path_is_dir(dst);
-@@ -170,7 +169,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
- 		ret = -ENOMEM;
- 		goto out;
- 	}
--	newname = basename(dupname);
-+	newname = path_basename(dupname);
- 
- 	dupdir = strdup(dst);
- 	if (!dupdir) {
-@@ -178,7 +177,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in
- 		ret = -ENOMEM;
- 		goto out;
- 	}
--	dstdir = dirname(dupdir);
-+	dstdir = path_dirname(dupdir);
- 
- 	if (!test_issubvolname(newname)) {
- 		error("invalid subvolume name: %s", newname);
-@@ -364,7 +363,8 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
- 	int res, ret = 0;
- 	int cnt;
- 	int fd = -1;
--	char	*dname, *vname, *cpath;
-+	char	*dname, *cpath;
-+	const char *vname;
- 	char	*dupdname = NULL;
- 	char	*dupvname = NULL;
- 	char	*path = NULL;
-@@ -482,9 +482,9 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
- 		goto out;
- 	}
- 	dupdname = strdup(cpath);
--	dname = dirname(dupdname);
-+	dname = path_dirname(dupdname);
- 	dupvname = strdup(cpath);
--	vname = basename(dupvname);
-+	vname = path_basename(dupvname);
- 	free(cpath);
- 
- 	/* When subvolid is passed, <path> will point to the mount point */
-@@ -670,7 +670,7 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char *
- 	bool readonly = false;
- 	char	*dupname = NULL;
- 	char	*dupdir = NULL;
--	char	*newname;
-+	const char *newname;
- 	char	*dstdir;
- 	enum btrfs_util_error err;
- 	struct btrfs_ioctl_vol_args_v2	args;
-@@ -727,13 +727,13 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char *
- 
- 	if (res > 0) {
- 		dupname = strdup(subvol);
--		newname = basename(dupname);
-+		newname = path_basename(dupname);
- 		dstdir = dst;
- 	} else {
- 		dupname = strdup(dst);
--		newname = basename(dupname);
-+		newname = path_basename(dupname);
- 		dupdir = strdup(dst);
--		dstdir = dirname(dupdir);
-+		dstdir = path_dirname(dupdir);
- 	}
- 
- 	if (!test_issubvolname(newname)) {
-@@ -1557,7 +1557,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
- 	struct btrfs_util_subvolume_iterator *iter;
- 	struct btrfs_util_subvolume_info subvol;
- 	char *subvol_path = NULL;
--	char *subvol_name = NULL;
-+	const char *subvol_name = NULL;
- 	enum btrfs_util_error err;
- 	struct btrfs_qgroup_stats stats;
- 	unsigned int unit_mode;
-@@ -1669,7 +1669,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg
- 		subvol_path = strdup("/");
- 		subvol_name = "<FS_TREE>";
- 	} else {
--		subvol_name = basename(subvol_path);
-+		subvol_name = path_basename(subvol_path);
- 	}
- 
- 	if (bconf.output_format == CMD_FORMAT_JSON) {
-diff --git a/common/device-utils.c b/common/device-utils.c
-index 36108ec4e..d086e9ea2 100644
---- a/common/device-utils.c
-+++ b/common/device-utils.c
-@@ -343,14 +343,14 @@ static u64 device_get_partition_size_sysfs(const char *dev)
- 	char path[PATH_MAX] = {};
- 	char sysfs[PATH_MAX] = {};
- 	char sizebuf[128] = {};
--	char *name = NULL;
-+	const char *name = NULL;
- 	int sysfd;
- 	unsigned long long size = 0;
- 
- 	name = realpath(dev, path);
- 	if (!name)
- 		return 0;
--	name = basename(path);
-+	name = path_basename(path);
- 
- 	ret = path_cat3_out(sysfs, "/sys/class/block", name, "size");
- 	if (ret < 0)
-diff --git a/common/path-utils.c b/common/path-utils.c
-index 181737c4d..929e5c8fa 100644
---- a/common/path-utils.c
-+++ b/common/path-utils.c
-@@ -28,6 +28,11 @@
- #include <string.h>
- #include <errno.h>
- #include <ctype.h>
-+/*
-+ * For dirname() and basename(), but never use basename directly, there's
-+ * path_basename() with unified GNU behaviour regardless of the includes and
-+ * conditional defines. See basename(3) for more.
-+ */
- #include <libgen.h>
- #include <limits.h>
- #include "common/path-utils.h"
-@@ -482,3 +487,26 @@ int test_issubvolname(const char *name)
- 		strcmp(name, ".") && strcmp(name, "..");
- }
- 
-+/*
-+ * Unified GNU semantics basename helper, never changing the argument. Always
-+ * use this instead of basename().
-+ */
-+const char *path_basename(const char *path)
-+{
-+	const char *tmp = strrchr(path, '/');
-+
-+	/* Special case when the whole path is just "/". */
-+	if (path[0] == '/' && path[1] == 0)
-+		return path;
-+
-+	return tmp ? tmp + 1 : path;
-+}
-+
-+/*
-+ * Return dirname component of path, may change the argument.
-+ * Own helper for parity with path_basename().
-+ */
-+char *path_dirname(char *path)
-+{
-+	return dirname(path);
-+}
-diff --git a/common/path-utils.h b/common/path-utils.h
-index 08ae0ff10..697fa6b48 100644
---- a/common/path-utils.h
-+++ b/common/path-utils.h
-@@ -39,6 +39,8 @@ int path_is_dir(const char *path);
- int is_same_loop_file(const char *a, const char *b);
- int path_is_reg_or_block_device(const char *filename);
- int path_is_in_dir(const char *parent, const char *path);
-+const char *path_basename(const char *path);
-+char *path_dirname(char *path);
- 
- int test_issubvolname(const char *name);
- 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sam James]

commit:     74e7e577af04c7277f00c6a486c1be61cb2df3df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 17:48:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 17:48:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e7e577

sys-fs/btrfs-progs: drop 6.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/Manifest                        |   1 -
 sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild          | 165 ---------------------
 ...6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch |  44 ------
 3 files changed, 210 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index a7e186edc5e8..8a002ef9f1bc 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -2,5 +2,4 @@ DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d
 DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449e91db198fa6a12bcbb6bb48246d7b5b84a8fd5dc3b943246732fa40c3b575855c966f8ca135b32aa926e0709549cb99 SHA512 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb
 DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B 74010ed51e211d28ce161db9f6e005bb1c73d8726c9a74446520a46bfa8d6f25d267f747e392f82a8ebeb0b9dd25b3681e9617048e33b9244047089a36fc34c6 SHA512 40b5a2f4d4dcf1810eeb0808e6cb72081ef5743a5072b75e2535420b6acb3a3ead61b01da3217c2bc3fb6ec700f141d4646389cc7a6476ce8af51a424a732672
 DIST btrfs-progs-v6.5.3.tar.xz 2542416 BLAKE2B 83a39e1a991ad253a8733235c01fed32c23bde033b7ddc647347dba54a9ba5755d8508e6df817a627d59cefbed6a5696ec485093509ab007374d27c739dabfb1 SHA512 6bec6c0da0b61eb4dce6dc3128fe34fdc68b18cbbb7917c3cd13a558cee9464e6b4c1fcda2cab342d1b506767fab4eee5d03d2fb284a5c7249eec5a75407034a
-DIST btrfs-progs-v6.5.tar.xz 3178048 BLAKE2B 502d8cebab1d35d8d69eb76212476e323d9f19a9d32eb304acaeb1fc27bfff3ca801fcebc4c19ce7db16ed0114b3c794814157075872c2fd1d8b1d32d740e346 SHA512 7e1578b1f82549f77b55341c20a973da52018b1539da46f92e4a9d9804906ce5e00312c8a02a6047373e4435e661b2e5fc18f5dfbf2d0563cdf62c40de6a4436
 DIST btrfs-progs-v6.6.tar.xz 2547332 BLAKE2B ade670578958867bc9686a6b6d9665bd609b0335665224a2880811784debb74a820746ae95a7558ca249c8b8afc3ca2664221ef9c5afb6fc1091dd23bbd45067 SHA512 5292c5bbf8fce74fe9529ee99f2340565b1d0c2c9fe48700ddccf7f7165be7cf4467bb9f3f3d70571dfccee6be669235e7ef88b0d248064b78f0c54abf9f7db4

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild
deleted file mode 100644
index d34aeab794b1..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? ( dev-python/sphinx )
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake -j1 -C tests V=1 test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch
deleted file mode 100644
index 40a9bbeff8f6..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-See https://github.com/kdave/btrfs-progs/commit/992be8b50a65974e52a484911e72bc5a5e1b412c.
-
-With binutils-2.41[hardened], one gets:
-```
-/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: crypto/crc32c-pcl-intel-asm_64.o: warning: relocation in read-only section `.rodata'
-/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: read-only segment has dynamic relocations
-collect2: error: ld returned 1 exit status
-make: *** [Makefile:660: btrfs-map-logical] Error 1
-```
-
-But it's a textrel and a warning anyway even without hardened.
-
-Disable it for now until it gets fixed properly upstream.
---- a/Makefile
-+++ b/Makefile
-@@ -387,7 +387,7 @@ endif
- 
- ifeq ($(TARGET_CPU),x86_64)
- # FIXME: linkage is broken on musl for some reason
--ifeq ($(HAVE_GLIBC),1)
-+ifeq (0,1)
- CRYPTO_OBJECTS += crypto/crc32c-pcl-intel-asm_64.o
- ASFLAGS += -fPIC
- endif
---- a/crypto/crc32c.c
-+++ b/crypto/crc32c.c
-@@ -18,7 +18,7 @@ static uint32_t (*crc_function)(uint32_t crc, unsigned char const *data, uint32_
- 
- #ifdef __x86_64__
- 
--#ifdef __GLIBC__
-+#if 0
- 
- /* asmlinkage */ unsigned int crc_pcl(const unsigned char *buffer, int len, unsigned int crc_init);
- static unsigned int crc32c_pcl(uint32_t crc, unsigned char const *data, uint32_t len) {
-@@ -95,7 +95,7 @@ void crc32c_init_accel(void)
- 	 * now.
- 	 */
- 	if (0) {
--#ifdef __GLIBC__
-+#if 0
- 	} else if (cpu_has_feature(CPU_FLAG_SSE42)) {
- 		/* printf("CRC32C: pcl\n"); */
- 		crc_function = crc32c_pcl;

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sam James]

commit:     0a59613d76d1e5b108cfeab9813b71519a41763a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 13:25:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 13:52:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a59613d

sys-fs/btrfs-progs: drop 6.2.1, 6.2.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/Manifest                        |   2 -
 sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild        | 165 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild        | 164 --------------------
 .../files/btrfs-progs-6.2.1-blake2-simd.patch      |  44 ------
 4 files changed, 375 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 63fc0f1ca006..a4356ae1f86b 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,4 +1,2 @@
-DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169
-DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52 SHA512 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
 DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 5f8ec51f11d705bb4ada2e000143933484bae2f3a5dedb5c1abac37950de44fa0fa762cc09012ca6702b96591264027b28c17392303db414a5651657cb086c7c SHA512 a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65
 DIST btrfs-progs-v6.3.2.tar.xz 3160148 BLAKE2B e6815eeb90c1dbf9a6c4a5aa72262c18b2031a9305efc9024b1fe7b770a256e1d4cb3b01646a0a523f0e26af2d499382bf42420385c56593ace515a6c225f54d SHA512 d8580250994b3e399babec4478515686f1e3cc2e4fc01ccbc7b00a51b6131452d209cb7f43dbbac5375286546d182fcdf7884bbc1a8ad6889c3f15d85ba8f8d5

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
deleted file mode 100644
index bb42954a60bb..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="virtual/pkgconfig
-	man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.1-blake2-simd.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	default
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
deleted file mode 100644
index e2a1bc6c20a1..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? ( dev-python/sphinx )
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake -j1 -C tests V=1 test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch
deleted file mode 100644
index f2531135c5c4..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/kdave/btrfs-progs/issues/589
-https://github.com/kdave/btrfs-progs/pull/591
-
-From c7e7e2568b073b6a501eef515f3a4b6402a71211 Mon Sep 17 00:00:00 2001
-From: Tino Mai <mai.tino@gmail.com>
-Date: Sun, 5 Mar 2023 18:15:52 +0100
-Subject: [PATCH] btrfs-progs: crypto: fix SSE2/SSE4.1 implementation of BLAKE2
-
---- a/crypto/blake2b-round.h
-+++ b/crypto/blake2b-round.h
-@@ -136,12 +136,6 @@
- 
- #endif
- 
--#if defined(HAVE_SSE41)
--#include "blake2b-load-sse41.h"
--#else
--#include "blake2b-load-sse2.h"
--#endif
--
- #define ROUND(r) \
-   LOAD_MSG_ ##r ##_1(b0, b1); \
-   G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
---- a/crypto/blake2b-sse2.c
-+++ b/crypto/blake2b-sse2.c
-@@ -30,6 +30,7 @@
- #include <x86intrin.h>
- #endif
- 
-+#include "blake2b-load-sse2.h"
- #include "blake2b-round.h"
- 
- static const uint64_t blake2b_IV[8] =
---- a/crypto/blake2b-sse41.c
-+++ b/crypto/blake2b-sse41.c
-@@ -34,6 +34,7 @@
- #include <x86intrin.h>
- #endif
- 
-+#include "blake2b-load-sse41.h"
- #include "blake2b-round.h"
- 
- static const uint64_t blake2b_IV[8] =
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sam James]

commit:     de2ae2e9c4a1525ddf806a24e081e075655e5be7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 15:43:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 15:43:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2ae2e9

sys-fs/btrfs-progs: add 6.2.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/Manifest                        |   1 +
 sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild        | 165 +++++++++++++++++++++
 .../files/btrfs-progs-6.2.1-blake2-simd.patch      |  44 ++++++
 3 files changed, 210 insertions(+)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 7fcf3715e6cb..14940f3e52ec 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -3,3 +3,4 @@ DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624
 DIST btrfs-progs-v6.1.1.tar.xz 2329864 BLAKE2B f3f15829af88f83cdabca30b61dd0e53fc0913615028eac9501204adec5a5beb8654b037617a73bac96c901835a83e8c08d478b8b496518512fea3714e604cfc SHA512 996045bebc441eba269eb5159d6d13c7b1471ba88039389ef221f57d03c535647a5716e23e7a17a20efb4012003f58b4b768f66af633abbdc1fe481192ca1ace
 DIST btrfs-progs-v6.1.2.tar.xz 2329940 BLAKE2B d2c86b0077e0269353ac70d948b948dd2984beec0e4225529adb0099a9cfe5d778a893bedc822168141ce29679f66500e32bdf3af8973bef5696657685ebf712 SHA512 0b02502f9f0902b7db04817fcfbaa4f6155035d47dd908c4c1faa86e4677e302d069756bb0935db7c88f0859c0f9ef87975b2777be7ad7f4d2389d2e95c1ff82
 DIST btrfs-progs-v6.1.3.tar.xz 2333984 BLAKE2B 71543f5be282a289fbc92f78b89b25e4162c3cbd2d3cf2e8564791f86c6f933f61c03ba93aeca029689be6284988ff35a47f25a6523f15be47f3e7ce9b5c0c4b SHA512 7c40d8bc3fcef0b2a7bf4be7d52923015b5b11c3f14bfc550ffa95a47d673f640b7deb840fee22fb7cc2743b6098fb12b5caea586fbf0972a1bc9a7606f3f375
+DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
new file mode 100644
index 000000000000..f89547b3aa45
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 python-single-r1 udev
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+	WANT_LIBTOOL="none"
+	inherit autotools git-r3
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:=[static-libs(+)?]
+	sys-libs/zlib:=
+	convert? (
+		sys-fs/e2fsprogs:=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	udev? ( virtual/libudev:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd[static-libs(+)] )
+	)
+"
+BDEPEND="virtual/pkgconfig
+	man? ( dev-python/sphinx )"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-blake2-simd.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR="m4" eautoreconf
+
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+
+		--enable-lzo
+		--disable-experimental
+		$(use_enable convert)
+		$(use_enable man documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable udev libudev)
+		$(use_enable zstd)
+
+		# Could support libgcrypt, libsodium, libkcapi
+		--with-crypto=builtin
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_test() {
+	default
+
+	if use python ; then
+		cd libbtrfsutil/python || die
+
+		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
+		${EPYTHON} -m unittest tests/test_*.py || die
+	fi
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+	newbashcomp btrfs-completion btrfs
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch
new file mode 100644
index 000000000000..f2531135c5c4
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch
@@ -0,0 +1,44 @@
+https://github.com/kdave/btrfs-progs/issues/589
+https://github.com/kdave/btrfs-progs/pull/591
+
+From c7e7e2568b073b6a501eef515f3a4b6402a71211 Mon Sep 17 00:00:00 2001
+From: Tino Mai <mai.tino@gmail.com>
+Date: Sun, 5 Mar 2023 18:15:52 +0100
+Subject: [PATCH] btrfs-progs: crypto: fix SSE2/SSE4.1 implementation of BLAKE2
+
+--- a/crypto/blake2b-round.h
++++ b/crypto/blake2b-round.h
+@@ -136,12 +136,6 @@
+ 
+ #endif
+ 
+-#if defined(HAVE_SSE41)
+-#include "blake2b-load-sse41.h"
+-#else
+-#include "blake2b-load-sse2.h"
+-#endif
+-
+ #define ROUND(r) \
+   LOAD_MSG_ ##r ##_1(b0, b1); \
+   G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+--- a/crypto/blake2b-sse2.c
++++ b/crypto/blake2b-sse2.c
+@@ -30,6 +30,7 @@
+ #include <x86intrin.h>
+ #endif
+ 
++#include "blake2b-load-sse2.h"
+ #include "blake2b-round.h"
+ 
+ static const uint64_t blake2b_IV[8] =
+--- a/crypto/blake2b-sse41.c
++++ b/crypto/blake2b-sse41.c
+@@ -34,6 +34,7 @@
+ #include <x86intrin.h>
+ #endif
+ 
++#include "blake2b-load-sse41.h"
+ #include "blake2b-round.h"
+ 
+ static const uint64_t blake2b_IV[8] =
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Mike Gilbert]

commit:     bd4e049b8809027727fc0f34f6ae30206d40781b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 17:55:05 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 17:55:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4e049b

sys-fs/btrfs-progs: fix build with glibc-2.36

Closes: https://bugs.gentoo.org/863638
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild    |  3 +++
 .../files/btrfs-progs-5.18.1-glibc-2.36.patch      | 31 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

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
index 76f2afe1fe01..0ba3477e685f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
@@ -87,6 +87,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/btrfs-progs-5.18.1-glibc-2.36.patch"
+	)
 	default
 	if [[ ${PV} == 9999 ]]; then
 		AT_M4DIR="m4" eautoreconf

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
new file mode 100644
index 000000000000..52671ea6c357
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
@@ -0,0 +1,31 @@
+https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63
+
+From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Jul 2022 11:58:35 -0700
+Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h
+
+This file includes linux/fs.h which includes linux/mount.h and with
+glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
+therefore try to avoid including both headers
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ common/device-utils.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/common/device-utils.c b/common/device-utils.c
+index 617b67462..25a4fb8c4 100644
+--- a/common/device-utils.c
++++ b/common/device-utils.c
+@@ -15,7 +15,6 @@
+  */
+ 
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/statfs.h>
+ #include <sys/types.h>
+ #include <stdio.h>

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sam James]

commit:     067256ef4a116f738c502fd21a560445acbfd2a6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 23:18:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 23:18:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067256ef

sys-fs/btrfs-progs: allow older linux-headers too w/ upstream patch

Bug: https://bugs.gentoo.org/831817
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild         |  6 +++-
 .../files/5.16-linux-headers-before-5.11.patch     | 40 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
index bfedcff31bd3..015b81367170 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	zstd? ( app-arch/zstd:0= )
 "
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.11
+	>=sys-kernel/linux-headers-5.10
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
@@ -79,6 +79,10 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/5.16-linux-headers-before-5.11.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }

diff --git a/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch
new file mode 100644
index 000000000000..184656d96d22
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch
@@ -0,0 +1,40 @@
+https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58.patch
+https://bugs.gentoo.org/831817
+
+From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Thu, 13 Jan 2022 14:47:08 +0100
+Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment
+ macros
+
+There's still problem left with compilation on musl and kernel < 5.11,
+because __ALIGN_KERNEL is not defined anymore:
+
+../bin/ld: kernel-shared/volumes.o: in function `create_chunk':
+volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL'
+
+Due to the entangled includes and unconditional definition of
+__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it
+eventually (as kerncompat.h is the first include). Instead add local
+definitions of the macros and rename them to avoid name clashes.
+
+Pull-request: #433
+Signed-off-by: David Sterba <dsterba@suse.com>
+--- a/kerncompat.h
++++ b/kerncompat.h
+@@ -359,7 +359,14 @@ do {					\
+ 
+ /* Alignment check */
+ #define IS_ALIGNED(x, a)                (((x) & ((typeof(x))(a) - 1)) == 0)
+-#define ALIGN(x, a)		__ALIGN_KERNEL((x), (a))
++
++/*
++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around
++ * issues caused by moving the definition in 5.12
++ */
++#define __ALIGN_KERNEL__(x, a)		__ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1)
++#define __ALIGN_KERNEL_MASK__(x, mask)	(((x) + (mask)) & ~(mask))
++#define ALIGN(x, a)		__ALIGN_KERNEL__((x), (a))
+ 
+ static inline int is_power_of_2(unsigned long n)
+ {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sam James]

commit:     f3b533bb1984665fe0864dfba62eb1d933caf3c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 09:40:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 09:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b533bb

sys-fs/btrfs-progs: fix build on musl

Closes: https://bugs.gentoo.org/830277
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild       |  8 +++--
 .../files/5.15-musl-const.h-include.patch          | 34 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
index 1669da04cd9e..01b66383b662 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -29,7 +29,7 @@ LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
 IUSE="+convert doc python reiserfs static static-libs +zstd"
 
-RESTRICT=test # tries to mount repared filesystems
+RESTRICT="test" # tries to mount repaired filesystems
 
 RDEPEND="
 	dev-libs/lzo:2=
@@ -74,11 +74,15 @@ BDEPEND="
 "
 
 if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
+	BDEPEND+=" sys-devel/gnuconfig"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/5.15-musl-const.h-include.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }

diff --git a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch b/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch
new file mode 100644
index 000000000000..a9156ade4b79
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch
@@ -0,0 +1,34 @@
+https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch?id=fd8989db25c674ca65389a2d41bf5b447e8794be
+
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Fri, 18 Jun 2021 11:10:36 -0400
+Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+
+ headers
+
+btrfs-tools compile fails with mips, musl and 5.12+ headers.
+
+The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we
+add an explicit include of const.h to pickup the macro:
+
+  | make: *** [Makefile:595: mkfs.btrfs] Error 1
+  | make: *** Waiting for unfinished jobs....
+  | libbtrfs.a(volumes.o): in function `dev_extent_search_start':
+  | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL'
+  | collect2: error: ld returned 1 exit status
+
+This is safe for older kernel's as well, since the header still
+exists, and is valid to include.
+
+Upstream-status: OE Specific [mips64 + musl + libc-headers]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+--- a/kerncompat.h
++++ b/kerncompat.h
+@@ -30,6 +30,7 @@
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <stdint.h>
++#include <linux/const.h>
+ 
+ #include <features.h>
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Georgy Yakovlev]

commit:     8de265d8c68cf991be31317d45ea657275319868
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 19:43:07 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 19:44:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de265d8

sys-fs/btrfs-progs: revbump 5.15, add (meta)data calculation patches

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...rogs-5.15.ebuild => btrfs-progs-5.15-r1.ebuild} |  6 ++
 .../files/5.15-filesystem-usage-chunks.patch       | 94 ++++++++++++++++++++++
 .../files/5.15-filesystem-usage-data.patch         | 37 +++++++++
 3 files changed, 137 insertions(+)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild
similarity index 94%
rename from sys-fs/btrfs-progs/btrfs-progs-5.15.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild
index 36548f98db8a..ec22d07e7854 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild
@@ -79,6 +79,12 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+# https://github.com/kdave/btrfs-progs/issues/422
+PATCHES=(
+	"${FILESDIR}/${PV}-filesystem-usage-data.patch"
+	"${FILESDIR}/${PV}-filesystem-usage-chunks.patch"
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }

diff --git a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch
new file mode 100644
index 000000000000..be58afc8712c
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch
@@ -0,0 +1,94 @@
+From:   Nikolay Borisov <nborisov@suse.com>
+To:     linux-btrfs@vger.kernel.org
+Cc:     Nikolay Borisov <nborisov@suse.com>
+Subject: [PATCH] Fix calculation of chunk size for RAID1/DUP profiles
+Date:   Tue, 16 Nov 2021 16:02:06 +0200
+Message-Id: <20211116140206.291252-1-nborisov@suse.com>
+List-ID: <linux-btrfs.vger.kernel.org>
+
+Current formula calculates the stripe size, however that's not what we want
+in the case of RAID1/DUP profiles. In those cases since chunkc are mirrored
+across devices we want the full size of the chunk. Without this patch the
+'btrfs fi usage' output from an fs which is using RAID1 is:
+
+	<snip>
+
+	Data,RAID1: Size:2.00GiB, Used:1.00GiB (50.03%)
+	   /dev/vdc	   1.00GiB
+	   /dev/vdf	   1.00GiB
+
+	Metadata,RAID1: Size:256.00MiB, Used:1.34MiB (0.52%)
+	   /dev/vdc	 128.00MiB
+	   /dev/vdf	 128.00MiB
+
+	System,RAID1: Size:8.00MiB, Used:16.00KiB (0.20%)
+	   /dev/vdc	   4.00MiB
+	   /dev/vdf	   4.00MiB
+
+	Unallocated:
+	   /dev/vdc	   8.87GiB
+	   /dev/vdf	   8.87GiB
+
+
+So a 2 gigabyte RAID1 chunk actually will take up 4 gigabytes on the actual disks
+2 each. In this case this is being miscalculated as taking up 1gb on each device.
+
+This also leads to erroneously calculated unallocated space. The correct output
+in this case is:
+
+	<snip>
+
+	Data,RAID1: Size:2.00GiB, Used:1.00GiB (50.03%)
+	   /dev/vdc	   2.00GiB
+	   /dev/vdf	   2.00GiB
+
+	Metadata,RAID1: Size:256.00MiB, Used:1.34MiB (0.52%)
+	   /dev/vdc	 256.00MiB
+	   /dev/vdf	 256.00MiB
+
+	System,RAID1: Size:8.00MiB, Used:16.00KiB (0.20%)
+	   /dev/vdc	   8.00MiB
+	   /dev/vdf	   8.00MiB
+
+	Unallocated:
+	   /dev/vdc	   7.74GiB
+	   /dev/vdf	   7.74GiB
+
+
+Fix it by only utilising the chunk formula for profiles which are not RAID1/DUP.
+
+Signed-off-by: Nikolay Borisov <nborisov@suse.com>
+---
+ cmds/filesystem-usage.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
+index 6195f633da44..5f2289a9b40d 100644
+--- a/cmds/filesystem-usage.c
++++ b/cmds/filesystem-usage.c
+@@ -805,11 +805,17 @@ int load_chunk_and_device_info(int fd, struct chunk_info **chunkinfo,
+  */
+ static u64 calc_chunk_size(struct chunk_info *ci)
+ {
+-	u32 div;
++	u32 div = 1;
+
+-	/* No parity + sub_stripes, so order of "-" and "/" does not matter */
+-	div = (ci->num_stripes - btrfs_bg_type_to_nparity(ci->type)) /
+-	      btrfs_bg_type_to_sub_stripes(ci->type);
++	/*
++	 * The formula doesn't work for RAID1/DUP types, we should just return the
++	 * chunk size
++	 */
++	if (!(ci->type & (BTRFS_BLOCK_GROUP_RAID1_MASK|BTRFS_BLOCK_GROUP_DUP))) {
++		/* No parity + sub_stripes, so order of "-" and "/" does not matter */
++		div = (ci->num_stripes - btrfs_bg_type_to_nparity(ci->type)) /
++			btrfs_bg_type_to_sub_stripes(ci->type);
++	}
+
+ 	return ci->size / div;
+ }
+--
+2.17.1
+
+

diff --git a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch
new file mode 100644
index 000000000000..f3b43d5c594d
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch
@@ -0,0 +1,37 @@
+From 2f3950c8304fec2aed9bf11b52d073683b137330 Mon Sep 17 00:00:00 2001
+From: Nikolay Borisov <nborisov@suse.com>
+Date: Mon, 15 Nov 2021 11:15:42 +0200
+Subject: [PATCH] btrfs-progs: fi usage: don't reset ratio to 1 if we don't
+ have RAID56 profile
+
+Commit 80714610f36e ("btrfs-progs: use raid table for ncopies")
+slightly broke how raid ratio are being calculated since the resulting
+code would always reset ratio to be 1 in case we didn't have RAID56
+profile. The correct behavior is to simply set it to 0 if we have RAID56
+as the calculation is different in this case and leave it intact
+otherwise.
+
+This bug manifests by doing all size-related calculation for 'btrfs
+filesystem usage' command as if all block groups are of type SINGLE. Fix
+this by only resetting ratio 0 in case of RAID56.
+
+Issue: #422
+Signed-off-by: Nikolay Borisov <nborisov@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ cmds/filesystem-usage.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
+index e22efe3a4..bac0f0fd5 100644
+--- a/cmds/filesystem-usage.c
++++ b/cmds/filesystem-usage.c
+@@ -508,8 +508,6 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
+ 		 */
+ 		if (flags & BTRFS_BLOCK_GROUP_RAID56_MASK)
+ 			ratio = 0;
+-		else
+-			ratio = 1;
+ 
+ 		if (ratio > max_data_ratio)
+ 			max_data_ratio = ratio;

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Lars Wendler]

commit:     ed7c540e253521a1e5bea9e471bc20c46d3678d0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 08:34:26 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 08:34:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7c540e

sys-fs/btrfs-progs: Removed old.

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/btrfs-progs/Manifest                        |   1 -
 sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild       | 129 ---------------------
 .../files/btrfs-progs-5.1-LDFLAGS.patch            |  37 ------
 3 files changed, 167 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 0224fefa314..49c78a4d2ca 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -7,5 +7,4 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
 DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
-DIST btrfs-progs-v5.1.tar.xz 2042196 BLAKE2B 1a0ccc04dc55f66c639a64e4c6c4f8683376fa2e273217ea2fd544d7e3b666e95bbaaf35809e25bdc84e92b1430af698d8bb57ab2c5f8ce4899920e1e71b7c05 SHA512 45a42b2c64b8120eb4ce6fe9e37571e197bd142403223e96af758adb00c116086d6790c9ab7f9707b4784f7b67af18b50ccf990b0d8d79571e04b81b11859154
 DIST btrfs-progs-v5.2-rc1.tar.xz 2045772 BLAKE2B 5b5510fab39bb3c6c33f8c3af2f443fe2f7fdb681ae04f13821b099422a9f60736956f2463769d9129c9178680444e6e4c951622b8cdede8c7f8e8bdda330d32 SHA512 b78fb8461af81e9bd2aa2fb4f900d09eb77733bcb83c12d5b4b817188710b7b49dfb27a521136319c26cdde940e48b409a5a0f9f69be4213d11df3ffa8fc0de1

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
deleted file mode 100644
index 033e0ad66d1..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1-LDFLAGS.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
deleted file mode 100644
index fa1fe7a5ede..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/kdave/btrfs-progs/pull/172
-https://bugs.gentoo.org/686284
-
-From 7cdb5de31e954416e740886d46809e4883c31ddc Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 May 2019 08:51:28 +0100
-Subject: [PATCH] Makefile: apply LDFLAGS to libbtrfsutil.so
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libbtrfs.so already has user's LDFLAGS applied.
-The change also applies those to libbtrfsutil.so.
-
-Reported-by: Michał Górny
-Bug: https://bugs.gentoo.org/686284
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index e25e256f..4c67d187 100644
---- a/Makefile
-+++ b/Makefile
-@@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
- 
- libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
-+	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) $(LDFLAGS) \
- 		-shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
- 
- libbtrfsutil.a: $(libbtrfsutil_objects)
--- 
-2.21.0
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sergei Trofimovich]

commit:     9fe2eda37e4c0a15e68dd3ad316a438018c4fd03
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 07:57:26 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 19 07:57:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe2eda3

sys-fs/btrfs-progs: apply LDFLAGS to libbtrfsutil.so, bug #686284

libbtrfs.so already has user's LDFLAGS applied.
The change also applies those to libbtrfsutil.so.

Reported-by: Michał Górny
Bug: https://bugs.gentoo.org/686284
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 ...-progs-5.1.ebuild => btrfs-progs-5.1-r1.ebuild} |  4 +++
 .../files/btrfs-progs-5.1-LDFLAGS.patch            | 37 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
similarity index 98%
rename from sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
index 4076d30d238..d8977bdf6b9 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
@@ -74,6 +74,10 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1-LDFLAGS.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
new file mode 100644
index 00000000000..fa1fe7a5ede
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
@@ -0,0 +1,37 @@
+https://github.com/kdave/btrfs-progs/pull/172
+https://bugs.gentoo.org/686284
+
+From 7cdb5de31e954416e740886d46809e4883c31ddc Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 19 May 2019 08:51:28 +0100
+Subject: [PATCH] Makefile: apply LDFLAGS to libbtrfsutil.so
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libbtrfs.so already has user's LDFLAGS applied.
+The change also applies those to libbtrfsutil.so.
+
+Reported-by: Michał Górny
+Bug: https://bugs.gentoo.org/686284
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index e25e256f..4c67d187 100644
+--- a/Makefile
++++ b/Makefile
+@@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
+ 
+ libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
+ 	@echo "    [LD]     $@"
+-	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
++	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) $(LDFLAGS) \
+ 		-shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
+ 
+ libbtrfsutil.a: $(libbtrfsutil_objects)
+-- 
+2.21.0
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Lars Wendler]

commit:     18fd4cdd04b46fa8b1d3d694e9086dc61b82c68d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 12:00:38 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 12:02:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fd4cdd

sys-fs/btrfs-progs: Removed old.

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/btrfs-progs/Manifest                        |   3 -
 sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild       | 108 ------------------
 sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild       | 117 --------------------
 sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild       | 121 ---------------------
 .../btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch      |  34 ------
 .../btrfs-progs/files/btrfs-progs-man-no-gz.patch  |  64 -----------
 6 files changed, 447 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index c5488e594e6..b0cd5ad5d8e 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -3,9 +3,6 @@ DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7c
 DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae1794641d81db066ffab57a8f8cc9f6671c3bc01df5efc6309967e88af418e62eed61b7837863bc222bf371ce24b7d63cea SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
-DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
-DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
-DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
 DIST btrfs-progs-v4.19.1.tar.xz 2007160 BLAKE2B fda89842f5117e77a00794054b1a11a7233d33c2135492b4a382cfdbcbbe58624447178cbeba7c44fabd5a5848fb4d47665dffbd838ff1b88432e1d98deb0666 SHA512 834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v4.20-rc1.tar.xz 2027492 BLAKE2B a964d3fe9c3d729b7dd9e927c21b96862201f0453cd79c77502d134752f05134b4883c28b50dbda475bd987eb0f13fc63487aa83b9cb8221a12a42d26eb284cf SHA512 c014500d25555bff8b856bac56360bb1096ee6b8dc66fb213d0503d233a144aa4bc002171c3a0b053e230ab0a77aa46d9b8065c26ff8d46b29d9a018c20fb257

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
deleted file mode 100644
index ceeea58afa0..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.15.1-e2fsprogs-1.44.0.patch"
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild
deleted file mode 100644
index 0936ade7591..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
deleted file mode 100644
index 5f71a58e642..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
deleted file mode 100644
index 8aa05a54ed6..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 33e9f2bd47a17bd0798a664718b6bfcfc4d044a1 Mon Sep 17 00:00:00 2001
-From: Qu Wenruo <wqu@suse.com>
-Date: Wed, 14 Mar 2018 08:56:57 +0800
-Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
- ext2_ext_attr_entry->e_value_block
-
-In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
-removed member e_value_block, as currently ext* doesn't support it set
-anyway.
-
-So remove such check so that we can pass compile.
-
-Issue: #110
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- convert/source-ext2.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/convert/source-ext2.c b/convert/source-ext2.c
-index b1492c786..070126ec3 100644
---- a/convert/source-ext2.c
-+++ b/convert/source-ext2.c
-@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
- {
- 	size_t value_size = entry->e_value_size;
- 
--	if (entry->e_value_block != 0 || value_size > size ||
--	    entry->e_value_offs + value_size > size)
-+	if (value_size > size || entry->e_value_offs + value_size > size)
- 		return -EIO;
- 	return 0;
- }

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
deleted file mode 100644
index aeb187baaf4..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 6 Aug 2018 11:26:54 -0400
-Subject: [PATCH] Install uncompressed man pages
-
-Bug: https://bugs.gentoo.org/662920
----
- Documentation/Makefile.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
-index 184647c4..c4c843cb 100644
---- a/Documentation/Makefile.in
-+++ b/Documentation/Makefile.in
-@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc
- MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
- MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
- MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
--GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
--GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
--GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
-+MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
-+MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
-+MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
- 
- mandir ?= $(prefix)/share/man
- man3dir = $(mandir)/man3
-@@ -86,9 +86,9 @@ endif
- 
- all: man
- man: man3 man5 man8
--man3: $(GZ_MAN3)
--man5: $(GZ_MAN5)
--man8: $(GZ_MAN8)
-+man3: $(MAN3)
-+man5: $(MAN5)
-+man8: $(MAN8)
- html: $(MAN_HTML)
- 
- install: install-man
-@@ -96,15 +96,15 @@ install: install-man
- install-man: man
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
--	$(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
-+	$(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir)
- 	# the source file name of btrfs.5 clashes with section 8 page, but we
- 	# want to keep the code generic
--	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
--	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
--	$(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
-+	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
-+	$(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir)
-+	$(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
- 
- uninstall:
--	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
-+	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8)
- 	$(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
- 
- clean:
--- 
-2.18.0
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Lars Wendler]

commit:     ae038c9d7e80da938784a6880b4d9d5bc878bece
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 09:14:45 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 09:15:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae038c9d

sys-fs/btrfs-progs: Removed old.

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-fs/btrfs-progs/Manifest                        |   2 -
 sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild         | 121 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild      | 121 ---------------------
 .../files/btrfs-progs-4.16-static-linkage.patch    |  27 -----
 4 files changed, 271 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 972584f2e74..23c0db057d8 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -5,9 +5,7 @@ DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae17
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
-DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc SHA512 3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e
 DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
-DIST btrfs-progs-v4.17.tar.xz 2002792 BLAKE2B beb63b0dcbd7f84b9ec95338d50c13e410fd967dcee56449328eb40d0ed89def4136675ffc86fc693d961175e74f11bf89f725e101e5cf35e7cbf2e228887d77 SHA512 1d238ea6c75f2493f0c5f3995bcfd592e945e20e407a71d962a8ce534fe829f5aa139c0e2d2cb497435de6ddf5c29f0e9dfb900419cc0c9d91cac3ae8154ee75
 DIST btrfs-progs-v4.19-rc1.tar.xz 2000332 BLAKE2B a0721d6d4541a31b8f483e7faea342b8f7e74d6b2a6e0e5da6f8c1f2dea9b713ce5e9517382af76079c523d880b9673e669eb6513ed03d947daa95798a109470 SHA512 2f849a72b321be7e37e309dfa758b1d7b0da29a803bb0060100e3169415318a554eb089725e275154ad2bf1105216f874106d20541311302b9f72d9d41b4c2a0
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
deleted file mode 100644
index 8d3f9db2dd2..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-static-linkage.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
deleted file mode 100644
index b11eba1014a..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}

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
deleted file mode 100644
index b8a7d8b79f0..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://www.spinics.net/lists/linux-btrfs/msg76763.html
-Reported-by: Attila Tóth
-Bug: https://bugs.gentoo.org/652966
-diff --git a/Makefile b/Makefile
-index 5ba76d2..dc3a31a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -264,6 +264,7 @@ static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects))
- static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects))
- static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects))
- static_image_objects = $(patsubst %.o, %.static.o, $(image_objects))
-+static_libbtrfsutil_objects = $(patsubst %.o, %.static.o, $(libbtrfsutil_objects))
- 
- libs_shared = libbtrfs.so.0.1 libbtrfsutil.so.$(libbtrfsutil_version)
- libs_static = libbtrfs.a libbtrfsutil.a
-@@ -453,7 +454,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
- 	@echo "    [LD]     $@"
- 	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
- 
--btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects)
-+btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects)
- 	@echo "    [LD]     $@"
- 	$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
- 
--- 
-2.17.0
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Lars Wendler]

commit:     e1b1f7d8f35398f39c72ec26c731bddfa32c5495
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 13:36:26 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 13:36:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b1f7d8

sys-fs/btrfs-progs: Fixed compilation with >=sys-fs/e2fsprogs-1.44.0

Closes: https://bugs.gentoo.org/650032
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild       |  4 +++
 .../btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch      | 34 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
index 1a8e2474dfb..ceeea58afa0 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
@@ -66,6 +66,10 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+=" sys-devel/gnuconfig"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.15.1-e2fsprogs-1.44.0.patch"
+)
+
 src_prepare() {
 	default
 	if [[ ${PV} == 9999 ]]; then

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
new file mode 100644
index 00000000000..8aa05a54ed6
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
@@ -0,0 +1,34 @@
+From 33e9f2bd47a17bd0798a664718b6bfcfc4d044a1 Mon Sep 17 00:00:00 2001
+From: Qu Wenruo <wqu@suse.com>
+Date: Wed, 14 Mar 2018 08:56:57 +0800
+Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
+ ext2_ext_attr_entry->e_value_block
+
+In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
+removed member e_value_block, as currently ext* doesn't support it set
+anyway.
+
+So remove such check so that we can pass compile.
+
+Issue: #110
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071
+Signed-off-by: Qu Wenruo <wqu@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ convert/source-ext2.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/convert/source-ext2.c b/convert/source-ext2.c
+index b1492c786..070126ec3 100644
+--- a/convert/source-ext2.c
++++ b/convert/source-ext2.c
+@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
+ {
+ 	size_t value_size = entry->e_value_size;
+ 
+-	if (entry->e_value_block != 0 || value_size > size ||
+-	    entry->e_value_offs + value_size > size)
++	if (value_size > size || entry->e_value_offs + value_size > size)
+ 		return -EIO;
+ 	return 0;
+ }

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Mike Gilbert]

commit:     782a966c9180423af03692f1d4e27ffb6e6221b2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 20:56:55 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 20:57:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782a966c

sys-fs/btrfs-progs: cleanup old ebuilds

Keeping versions corresponding to longterm kernels.

Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99

 sys-fs/btrfs-progs/Manifest                        |  13 ---
 sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild       |  61 -------------
 sys-fs/btrfs-progs/btrfs-progs-3.17.3.ebuild       |  62 -------------
 sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild       |  79 ----------------
 sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild        |  79 ----------------
 sys-fs/btrfs-progs/btrfs-progs-4.11.ebuild         |  93 -------------------
 sys-fs/btrfs-progs/btrfs-progs-4.12.ebuild         |  93 -------------------
 sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild       | 100 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild        |  80 -----------------
 sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild        |  96 --------------------
 sys-fs/btrfs-progs/btrfs-progs-4.5.3.ebuild        |  93 -------------------
 sys-fs/btrfs-progs/btrfs-progs-4.6.1.ebuild        |  93 -------------------
 sys-fs/btrfs-progs/btrfs-progs-4.7.3.ebuild        |  93 -------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.5.ebuild        |  93 -------------------
 .../files/btrfs-progs-3.14.2-install-man.patch     |  13 ---
 15 files changed, 1141 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e9d4eb10e7e..4c4d2fb226f 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,22 +1,9 @@
-DIST btrfs-progs-v3.14.2.tar.xz 275372 BLAKE2B 1df7ec4aa29ba52c0af1428e879210dd6476a6c8e4b2a5947b00fddc6e7b5048d74ed0c2b82281152fd3a762d4bf1a17351b356d32e2593e848639946e2bd31f SHA512 02f0cf7581b41143707769e53debecfdd3f5a1dd717530c33d4a657b09feafd73bb43408516a58fb6d2754365803018673321c7c1898b81bb36194f05a0d8955
 DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b
-DIST btrfs-progs-v3.17.3.tar.xz 588424 BLAKE2B ffc753e9b782eeeb30b75a83265ae31201144deceac3d7b6267cffeca9fbbebadecea9eda3418072b6d8a60ba6d00564735a6b759a5a943f78b851a5b4524d87 SHA512 faa9b0d5281f72777d4b64b96774dcb1d6f579fd84e3bac3c256e779bf6fd67ee17aaf8f904dd29a8a8592f504e3e8af0caf1ab261689457a30467d3c1fb6a71
 DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4
-DIST btrfs-progs-v3.19.1.tar.xz 1101168 BLAKE2B 237ad9b85e622dcc2f841476293dfb67e4740f5aadba9803ae9a6b3d416705719a5560a3d5f8a0975b8e0f21684faaa8e6c82eb385eed00ef8d7f7659af6801a SHA512 c8b1c348afe3e32f54a72fcf361700bd63c12272e34ab34774936a2eca338dbea568d452f494d6ddd3c7be75b37a6d400fec33500548ed9b6df008212613d7f5
-DIST btrfs-progs-v4.0.1.tar.xz 1104340 BLAKE2B 980e20222c787648fe3faf206a83fc430ecf1843d2f1145f8def2d9c68c4a5977d4ff58e7663859613b2b92ef81b97c2521497eb5c900e34de40400b73a05a8c SHA512 52e5165f2fdd0f27f9c2f099b774523c36ab442948a13ede03736297a139903af4c0c444c77abc14b05f3cf633b006eb9dbc29f2b127858698ee1b6ad517a53f
 DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae1794641d81db066ffab57a8f8cc9f6671c3bc01df5efc6309967e88af418e62eed61b7837863bc222bf371ce24b7d63cea SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f
-DIST btrfs-progs-v4.11.tar.xz 1508580 BLAKE2B ff7fb9888193853883f230c884869aef074695f075005116b0ed3b6e344b5c1438bcc894966c99d6c8064fe63bfbac0acf5691a5c16475eff53c5a6a09e82828 SHA512 914fb415f7ddec4d3ee203b67cde135dcc4c62d3e25e76e920b9a0ee5099d1cf75d21611795ce5aee78908ed466dc74b0b7ab2e036224b7e357e421f13e4f6c8
-DIST btrfs-progs-v4.12.tar.xz 1587604 BLAKE2B da75d89c34c6500c32dc4deee1e77ef61dd3287842154f34cc9f8aca3dd53dc08c24ed30c2307f01cbd8d457317466c118fe111b4ad4def4261021ef76336935 SHA512 6a9b13241edda68c866249874189aafb121f73515bf71e46f1f574eff858405d9ce22a251a07c6437f0dc21ca6ee55b4b57c15b431ce63faa3c16d1c8112616e
-DIST btrfs-progs-v4.13.3.tar.xz 1674084 BLAKE2B 1ce0747e776253a8e93613705e4aa3bc704367b54939e010e2dc69a114760041b5d85b6a7370f6919010f694792dda280a1891c9f6193ad95c98317b5730784b SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.15.tar.xz 1928788 BLAKE2B 54bbf65f18d182ffa8cd6fc1437e243fe9c6aac6467c038bc32d925ca6070d2c56949d65cd3d26bbdff1995d211633a9791bf790f49eb8a9c081684b6a32dab3 SHA512 7c80fb44c9747e51db89a1d1487e15a1163061b0e85e50a07f28368c1e9e1b32ee2a4f2b769514e1581d1410b7ae5cca8ccd44b5a4e95c32b95e10198aa4f13c
-DIST btrfs-progs-v4.2.2.tar.xz 1143760 BLAKE2B 4a4aa9c55e03548e361308682dd24da96d98f32a5867fb1f15112f91f9911d59a7d5b4386f7585a1ade59b95a45bc149c0566746dbd7c4503c25bd55983dac3d SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76
-DIST btrfs-progs-v4.3.1.tar.xz 1184416 BLAKE2B 395fd772a757f9f8de96ff0f3df991678b560c88f120b51d612fcaef79f760a347c94c66d0156724d79e2aaad0312119d3cdece22c4f50a89566e664ea5b9d01 SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
-DIST btrfs-progs-v4.5.3.tar.xz 1207344 BLAKE2B ecef7048b2bdb26af6c95974072bd2c03e7e97d2960cbf8535e06732307b1c3908663ad523319d3cc433f3e20024ade058f13df2bfc9ced7117d552bbe0dcdd4 SHA512 7bb15728577cdc56773e87583196ed36e15a4c417f03816e8a101506070e667b8e51f66fcf98095ddc20c9ce10da0b78de1171e9c8a6cb20a4811fd35d508961
-DIST btrfs-progs-v4.6.1.tar.xz 1281240 BLAKE2B 6292ce01da6d505ac514be357414b50233afef60d32683fd99946c976f83a193f1ce622e15af82945fc08857781169c9cdd0dce831ca99c1e27b0cfc972dbc6f SHA512 7bdf350a3051326f495e1694e11b27b830dce219ddbb0a805f1916f5deecdbd5332c3cd8abe36296832e196eee45e4cdc4695e99e186a51b85ec8b9f6ff5381d
-DIST btrfs-progs-v4.7.3.tar.xz 1341512 BLAKE2B 0407dcf65f2672cd1e1a9d58122cdb05c3429ce93c1c2c8cf66d0858ec18ec81634925e93e4868519e38d7e82e9f7cc78620ef7daad26e7e5735916b26486da6 SHA512 2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a
-DIST btrfs-progs-v4.8.5.tar.xz 1466688 BLAKE2B 619e4fb76c112eb8b7bb44937c92d62390ef1a77c85f88d2d03fadae57ef1ca384609426df464433a7fc83af71b488bf8fc935a54d41f7b597aca30b08b0da40 SHA512 497c221fe329febc7cca777e347e8ab6ebb368070d35cb5122214bcf928eb2e7e854f7b0af5bc846f0d34ad84dfb33b372d24bf947ca0b15cb83291c390c664b
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5

diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
deleted file mode 100644
index c92d22cfc56..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	sys-fs/e2fsprogs:0=
-"
-DEPEND="${RDEPEND}
-	sys-apps/acl
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.2-install-man.patch"
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.17.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.17.3.ebuild
deleted file mode 100644
index b4a859e551d..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.17.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	sys-fs/e2fsprogs:0=
-"
-DEPEND="${RDEPEND}
-	sys-apps/acl
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild
deleted file mode 100644
index 1fadf24a61e..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	epatch_user
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild
deleted file mode 100644
index 62bff36c8f0..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	epatch_user
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.11.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.11.ebuild
deleted file mode 100644
index 397d271d38c..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.11.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.12.ebuild
deleted file mode 100644
index 397d271d38c..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.12.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
deleted file mode 100644
index 75f377d2505..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild
deleted file mode 100644
index 0f9295456a1..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.2.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	epatch_user
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild
deleted file mode 100644
index 670da034806..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	epatch_user
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-
-	# Bug 572512
-	dodir /sbin
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.5.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.5.3.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.5.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.6.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.6.1.ebuild
deleted file mode 100644
index a5b593962fa..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.7.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.7.3.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.7.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.5.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.5.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-3.14.2-install-man.patch b/sys-fs/btrfs-progs/files/btrfs-progs-3.14.2-install-man.patch
deleted file mode 100644
index 69e36aaadeb..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-3.14.2-install-man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 034559e..f461bf2 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -75,7 +75,7 @@ install: install-man
- install-man: man
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
- 	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
--	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
-+	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
- 
- clean:
- 	$(RM) *.xml *.xml+ *.8 *.8.gz

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Lars Wendler]

commit:     5d79fb1ed24a944946edfeff245699f743060208
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 08:22:30 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 08:25:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d79fb1e

sys-fs/btrfs-progs: Removed old.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sys-fs/btrfs-progs/Manifest                        |  5 --
 sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild       | 93 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild     | 95 ----------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild        | 95 ----------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild        | 93 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild          | 93 ---------------------
 .../files/btrfs-progs-4.8.1-fix-ioctl.h            | 36 --------
 .../files/btrfs-progs-4.8.3-fix-ioctl-again.patch  |  9 --
 8 files changed, 519 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 23e3fdee6c2..77446d15741 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -8,7 +8,6 @@ DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c75687
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 SHA256 ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f WHIRLPOOL 621f1af0273ca3b27e63e20b8a6ec9a3f6519f67fb669f1295be7f742b68362f3c7295be5e4d12ce48e9bc5753d1099b03e52b71fdf878d02664cf1e59720de6
 DIST btrfs-progs-v4.11.tar.xz 1508580 SHA256 e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e SHA512 914fb415f7ddec4d3ee203b67cde135dcc4c62d3e25e76e920b9a0ee5099d1cf75d21611795ce5aee78908ed466dc74b0b7ab2e036224b7e357e421f13e4f6c8 WHIRLPOOL 54b8d129ab0bd931dd7dab3c00c0b33cfeabaeaa9f9526d6a48adefc2b58537e8e8302538a7072820d21646360979f3b7fe78049f0244068f46cf6f7eeb6d18e
 DIST btrfs-progs-v4.12.tar.xz 1587604 SHA256 917710c84a9d529c92038390ddf8ace19ad409f61cdcf93c38ccaf2678472ece SHA512 6a9b13241edda68c866249874189aafb121f73515bf71e46f1f574eff858405d9ce22a251a07c6437f0dc21ca6ee55b4b57c15b431ce63faa3c16d1c8112616e WHIRLPOOL c929a5f453af005004b858873b3f5c78c8d51372644b3611cf2fc4900c45fee7a6153cf2f09fdf16336928b2427160c4393697751429dc4f1a405721f9ea70e5
-DIST btrfs-progs-v4.13.1.tar.xz 1672248 SHA256 e04f80fe55429a8a2541ab01951bb29a12c071d7ce8baa318b8feb49f3de8ab2 SHA512 4fabfaa36b67afcc21a3917bd1faae106a82a2bc97a3670dd054a33490ae60e63512a28af5fe27b016de1e7213809f89e096c39a082f0a5d4e48f8e377eba7ba WHIRLPOOL 0adda0f7fa4bd45c433ae988dbeb64774cd0af6e690c9895fea54aca5a71e7d93b2d314f6e09e827b26cbe441e44ea428cb41eac2a6345f04008351d7404c8e9
 DIST btrfs-progs-v4.13.2.tar.xz 1673732 SHA256 75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd SHA512 50db13868ed43433ec9b655825767e6e76036f407edc0caffecd4b371baf7d817575c2f25c77fe3d5e741bb52d57757c6c762de0c00cbefede615358a803d80a WHIRLPOOL c3dd7b8ee7c3e1b62885b2e1ad8f0bc4e72b24fd55090f43c7e95eaa2517c51c71d299c4f2450267721d41f1fa792ed48896b8e17215b65d50e61c6a1583cd98
 DIST btrfs-progs-v4.13.3.tar.xz 1674084 SHA256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833 WHIRLPOOL e54a739862f26f2648def2fa0e8fc1d49f7a70f2dd498d29e47b0d74fa826db961ade323cb5039728b42d28a383a0949494aea584a4d53f4abfce449bf6f10cd
 DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188
@@ -17,9 +16,5 @@ DIST btrfs-progs-v4.4.1.tar.xz 1173248 SHA256 9964e3ae4fb64692e109ddd733de4554e7
 DIST btrfs-progs-v4.5.3.tar.xz 1207344 SHA256 e6e79608d81ccda62ad877c20e4d0868dc68e570ba42f4c94e66bf5e8ee0ebd3 SHA512 7bb15728577cdc56773e87583196ed36e15a4c417f03816e8a101506070e667b8e51f66fcf98095ddc20c9ce10da0b78de1171e9c8a6cb20a4811fd35d508961 WHIRLPOOL c938f35d4ec74beeb41e8ab56632bb33c7500f283cef3d59ff97494ab957be9f2e309feb80e383c29417ba78d7e2a89704faf6fe2558a06852944790f434172c
 DIST btrfs-progs-v4.6.1.tar.xz 1281240 SHA256 4ed15ccd0fa730c13e52fb930141a0d3f300f2bb34cb1366b32d093eaaa18919 SHA512 7bdf350a3051326f495e1694e11b27b830dce219ddbb0a805f1916f5deecdbd5332c3cd8abe36296832e196eee45e4cdc4695e99e186a51b85ec8b9f6ff5381d WHIRLPOOL d7c06549947278002c4de91f47b2b85d93a714bf1e984ce2b4d7321bcb8b0a11dd60cd84e070c382f61e67e919d3cbc88a723aaa5ab42806ecbe65ae01c4ae34
 DIST btrfs-progs-v4.7.3.tar.xz 1341512 SHA256 90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c SHA512 2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a WHIRLPOOL 819879310484ba70d96f5492aca5463e5ba0c646dbd5e4b4ca797b76c754a352753641ef4d0f4ffe0109d07c72d99be5a2b1c749b1f03225cd582a83c9cf0d5a
-DIST btrfs-progs-v4.8.1.tar.xz 1348472 SHA256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 SHA512 43738c21b7c066fc13af742f61aad54572d5c293acb98915a2aa0ba6ec0e32022bf663155d77435d1179f05fb75b97bd0aba28da2ade04b596ef5348e8b5415c WHIRLPOOL d4b1e4c5ca0c826394b5d95ea92e27f0c625a0f5c940bdd88e310a7328f4ad77b4060f5f61d4b05ef03705fe605591dc7ae6c9368f37aa73b69fedee0ed0d448
-DIST btrfs-progs-v4.8.3.tar.xz 1396920 SHA256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 SHA512 bf6ed0269823bfe385659f652bcc18c76c3cac3ca6f04f76f1ebe1fd5e2212884edeed7f5649979f8d83745256e9555c038eb6713b262759ee424bb9f6f0f4ac WHIRLPOOL 4a4b20308e08ed85f73d70e95f0f971965a7e8abae35e12769a4c697f0f1502cc070240b5319579adf3f8565cf669acdf4b5aa32dfca77148b8f23bd97349f76
-DIST btrfs-progs-v4.8.4.tar.xz 1466164 SHA256 bf26ead666c337a62a74bc9ec7f8dd9ee200e60e5fe5289967d53328eff261c5 SHA512 f53a0bfcbeaa43b00e09b811b1e6eb5159cd8a4c78ddb26a5ce87975d203794cf6d0a026d4a646bed0266fbc2bec1833fe48a3ff3850ea27bc7a19d7aa7ad54b WHIRLPOOL caf015a1ab9411ef5ddfab50a32d11b678b6b931cf871a9bca88925a500612cb5718e8cd411cf39b6e94b2544e222545d24c89470b04545501d87b986ebf3e84
 DIST btrfs-progs-v4.8.5.tar.xz 1466688 SHA256 d247b1c022aca5def3415bfa51e00c566cce36660a3ee517d4b6a1af911a08ef SHA512 497c221fe329febc7cca777e347e8ab6ebb368070d35cb5122214bcf928eb2e7e854f7b0af5bc846f0d34ad84dfb33b372d24bf947ca0b15cb83291c390c664b WHIRLPOOL 3786ddbac699a22359911e89c989e58da7d7b6700f5380560645b6abc0cd46703bf512f8077c64b84fd5552915de1b620c7fe9aa0d96def025e7a3432bdfcd2e
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 SHA256 464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 WHIRLPOOL 34aa6010ad38b2bd88f22e4308dca587305a9f4c7c0053b60a2cb5d4a7fddcb92ca384152fcffe9c8bfe476de046dae0ab88093f9c9c4a805ebba07d3d8837e2
-DIST btrfs-progs-v4.9.tar.xz 1475844 SHA256 e227baeb4652e83aab33135ec29b30339e2c99bba67d56fb589cd8a6b642c8a3 SHA512 e39abf3808dd8b7ac2424cbf240cec5da12fb3e5d2eeaa2ed6a0e4b7d8bdc28a4c92891236feff70b801ce1e78b65370e05aed252890a076c0b1b9bbfd020f46 WHIRLPOOL 1dc2c98d2aec9dd41a661c6f03d5b0ca4d8e80f53f5951c5071a3fde67ebb72f97ecf89ee3448185d2c33c65f60a6de61e983169fabdf6284a6ef40c770573e6

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild
deleted file mode 100644
index 397d271d38c..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
deleted file mode 100644
index 2d14380ad90..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=("${FILESDIR}"/${P}-fix-ioctl.h)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
deleted file mode 100644
index 8a75a9fca11..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=("${FILESDIR}"/${P}-fix-ioctl-again.patch)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
deleted file mode 100644
index 61b60c78faa..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 3ddbf895db678fb40f7513bac9dbc36fd4095693
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Oct 24 09:08:53 2016 +0100
-
-    ioctl.h: add missing kernel compatibility header for BUILD_ASSERT
-    
-    Header breakage noticed by cynede. Reproducible as:
-    
-        $ gcc -c /usr/include/btrfs/ioctl.h -o /tmp/a.o
-            /usr/include/btrfs/ioctl.h:42:14: error: expected declaration specifiers or '...' before 'sizeof'
-         BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
-                      ^~~~~~
-    
-    Basically gcc tries to say us BUILD_ASSERT is not visible.
-    
-    BUILD_ASSERT lives in kerncompat.h which this change adds.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/ioctl.h b/ioctl.h
-index a7235c0..abea7ed 100644
---- a/ioctl.h
-+++ b/ioctl.h
-@@ -26,6 +26,12 @@ extern "C" {
- #include <asm/types.h>
- #include <linux/ioctl.h>
- 
-+#if BTRFS_FLAT_INCLUDES
-+#include "kerncompat.h"
-+#else
-+#include <btrfs/kerncompat.h>
-+#endif /* BTRFS_FLAT_INCLUDES */
-+
- #ifndef __user
- #define __user
- #endif

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
deleted file mode 100644
index 9c894900e4a..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/ioctl.h b/ioctl.h
-index cdfb888..ad4372c 100644
---- a/ioctl.h
-+++ b/ioctl.h
-@@ -710,3 +710,3 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
- 		default:
--			return NULL;
-+			return 0;
- 	}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sergei Trofimovich]

commit:     a061e9c01024a2b9890cacb0a159e646463553bb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 20:44:55 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 20:45:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a061e9c0

sys-fs/btrfs-progs: fix libbtrfs library, bug #613890

Two fixes are here:
- fixed undefined symbols in libbtrfs.so.0 (__error symbol)
- added missing 'sizes.h' kernel compatibility header.

Reported-by: Denis Descheneaux
Bug: https://bugs.gentoo.org/613890
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 ...rogs-4.10.ebuild => btrfs-progs-4.10-r1.ebuild} |  5 ++++
 .../files/btrfs-progs-4.10-fix-headers.patch       | 32 ++++++++++++++++++++
 .../files/btrfs-progs-4.10-messages.patch          | 34 ++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.10.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild
similarity index 96%
rename from sys-fs/btrfs-progs/btrfs-progs-4.10.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild
index 397d271d38c..663141c9409 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.10.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.10-r1.ebuild
@@ -53,6 +53,11 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-messages.patch
+	"${FILESDIR}"/${P}-fix-headers.patch
+)
+
 if [[ ${PV} == 9999 ]]; then
 	DEPEND+=" sys-devel/gnuconfig"
 fi

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch
new file mode 100644
index 00000000000..414c0995e41
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.10-fix-headers.patch
@@ -0,0 +1,32 @@
+Add missing 'sizes.h' header install.
+
+Noticed on snapper build failure:
+  In file included from btrfs/send-utils.h:28:0,
+    from BtrfsUtils.cc:36:
+  btrfs/ctree.h:37:25: fatal error: linux/sizes.h: No such file or directory
+diff --git a/Makefile b/Makefile
+index 05a5d06..fb1cfd6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -108,7 +108,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
+ 		   uuid-tree.o utils-lib.o rbtree-utils.o
+ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
+ 	       kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
+-	       kernel-lib/radix-tree.h extent-cache.h \
++	       kernel-lib/radix-tree.h kernel-lib/sizes.h extent-cache.h \
+ 	       extent_io.h ioctl.h ctree.h btrfsck.h version.h
+ convert_objects = convert/main.o convert/common.o convert/source-fs.o \
+ 		  convert/source-ext2.o
+diff --git a/ctree.h b/ctree.h
+index 1d0622d..c8f771b 100644
+--- a/ctree.h
++++ b/ctree.h
+@@ -34,7 +34,7 @@
+ #include <btrfs/extent-cache.h>
+ #include <btrfs/extent_io.h>
+ #include <btrfs/ioctl.h>
+-#include <linux/sizes.h>
++#include <btrfs/sizes.h>
+ #endif /* BTRFS_FLAT_INCLUDES */
+ 
+ struct btrfs_root;

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch
new file mode 100644
index 00000000000..afcc27896f6
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.10-messages.patch
@@ -0,0 +1,34 @@
+Fix missing __error symbol in libbtrfs.so.0.
+
+The easiest way to reproduce it is to try to build
+btrfs-progs with LDFLAGS=-Wl,--no-undefined :
+
+btrfs-list.o: In function `lookup_ino_path':
+btrfs-list.c:(.text+0x7d2): undefined reference to `__error'
+
+Reported-by: Denis Descheneaux
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=613890
+diff --git a/Makefile b/Makefile
+index 67fbc48..05a5d06 100644
+--- a/Makefile
++++ b/Makefile
+@@ -97,3 +97,3 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
+ 	  inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \
+-	  fsfeatures.o messages.o
++	  fsfeatures.o
+ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
+@@ -106,3 +106,3 @@ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
+ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
+-		   kernel-lib/crc32c.o \
++		   kernel-lib/crc32c.o messages.o \
+ 		   uuid-tree.o utils-lib.o rbtree-utils.o
+@@ -448,3 +448,3 @@ test-ioctl: ioctl-test ioctl-test-32 ioctl-test-64
+ 
+-library-test: library-test.o messages.o $(libs_shared)
++library-test: library-test.o $(libs_shared)
+ 	@echo "    [LD]     $@"
+@@ -454,3 +454,3 @@ library-test: library-test.o messages.o $(libs_shared)
+ 
+-library-test.static: library-test.static.o messages.static.o $(libs_static)
++library-test.static: library-test.static.o $(libs_static)
+ 	@echo "    [LD]     $@"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Sergei Trofimovich]

commit:     509eea34f1c8c957cb21d34df0588ea0ca13e2eb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 22:09:28 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 22:09:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509eea34

sys-fs/btrfs-progs: bump up to 4.8.3

Package-Manager: portage-2.3.2

 sys-fs/btrfs-progs/Manifest                        |  1 +
 sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild        | 96 ++++++++++++++++++++++
 .../files/btrfs-progs-4.8.3-fix-ioctl-again.patch  |  9 ++
 3 files changed, 106 insertions(+)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index a26efc7..bfff8dc 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -12,3 +12,4 @@ DIST btrfs-progs-v4.5.3.tar.xz 1207344 SHA256 e6e79608d81ccda62ad877c20e4d0868dc
 DIST btrfs-progs-v4.6.1.tar.xz 1281240 SHA256 4ed15ccd0fa730c13e52fb930141a0d3f300f2bb34cb1366b32d093eaaa18919 SHA512 7bdf350a3051326f495e1694e11b27b830dce219ddbb0a805f1916f5deecdbd5332c3cd8abe36296832e196eee45e4cdc4695e99e186a51b85ec8b9f6ff5381d WHIRLPOOL d7c06549947278002c4de91f47b2b85d93a714bf1e984ce2b4d7321bcb8b0a11dd60cd84e070c382f61e67e919d3cbc88a723aaa5ab42806ecbe65ae01c4ae34
 DIST btrfs-progs-v4.7.3.tar.xz 1341512 SHA256 90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c SHA512 2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a WHIRLPOOL 819879310484ba70d96f5492aca5463e5ba0c646dbd5e4b4ca797b76c754a352753641ef4d0f4ffe0109d07c72d99be5a2b1c749b1f03225cd582a83c9cf0d5a
 DIST btrfs-progs-v4.8.1.tar.xz 1348472 SHA256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 SHA512 43738c21b7c066fc13af742f61aad54572d5c293acb98915a2aa0ba6ec0e32022bf663155d77435d1179f05fb75b97bd0aba28da2ade04b596ef5348e8b5415c WHIRLPOOL d4b1e4c5ca0c826394b5d95ea92e27f0c625a0f5c940bdd88e310a7328f4ad77b4060f5f61d4b05ef03705fe605591dc7ae6c9368f37aa73b69fedee0ed0d448
+DIST btrfs-progs-v4.8.3.tar.xz 1396920 SHA256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 SHA512 bf6ed0269823bfe385659f652bcc18c76c3cac3ca6f04f76f1ebe1fd5e2212884edeed7f5649979f8d83745256e9555c038eb6713b262759ee424bb9f6f0f4ac WHIRLPOOL 4a4b20308e08ed85f73d70e95f0f971965a7e8abae35e12769a4c697f0f1502cc070240b5319579adf3f8565cf669acdf4b5aa32dfca77148b8f23bd97349f76

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
new file mode 100644
index 00000000..821602d
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV=v${PV}
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert static static-libs"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+	)
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	>=app-text/asciidoc-8.6.0
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+		)
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+PATCHES=("${FILESDIR}"/${P}-fix-ioctl-again.patch)
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex static-libs '' 'libs_static=')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+}

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
new file mode 100644
index 00000000..9c89490
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
@@ -0,0 +1,9 @@
+diff --git a/ioctl.h b/ioctl.h
+index cdfb888..ad4372c 100644
+--- a/ioctl.h
++++ b/ioctl.h
+@@ -710,3 +710,3 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
+ 		default:
+-			return NULL;
++			return 0;
+ 	}