commit:     a429b970949c21e97dfc4e6b8cee01ed0bb4e2ff
Author:     Mark Harmstone <mark <AT> harmstone <DOT> com>
AuthorDate: Thu Aug  1 15:55:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 10:56:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a429b970

sys-fs/btrfs-progs: add experimental USE flag

Add experimental USE flag to btrfs-progs, which sets the
--enable-experimental configure option and installs btrfs-corrupt-block,
which is otherwise ignored. Both of these changes are required for
xfstests to function correctly.

Closes: https://bugs.gentoo.org/937458
Signed-off-by: Mark Harmstone <mark <AT> harmstone.com>
Closes: https://github.com/gentoo/gentoo/pull/37918
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild | 9 +++++++--
 sys-fs/btrfs-progs/metadata.xml             | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild
index 0fe0ac94b99c..432b2b58e34d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild
@@ -35,7 +35,7 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/";
 
 LICENSE="GPL-2"
 SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man reiserfs static static-libs udev +zstd"
+IUSE="+convert +man experimental 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 )"
@@ -131,7 +131,7 @@ src_configure() {
                --bindir="${EPREFIX}"/sbin
 
                --enable-lzo
-               --disable-experimental
+               $(use_enable experimental)
                --disable-python
                $(use_enable convert)
                $(use_enable man documentation)
@@ -171,6 +171,11 @@ src_install() {
 
        emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 
+       if use experimental; then
+               exeinto /sbin
+               doexe btrfs-corrupt-block
+       fi
+
        newbashcomp btrfs-completion btrfs
 }
 

diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index e0d9388ce73c..9bd0c43c582b 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
+    <flag name="experimental">Enable unstable and experimental features and 
install btrfs-corrupt-block, as needed by xfstests</flag>
     <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag>
     <flag name="static">Build static binaries in addition to the dynamic 
ones</flag>
   </use>

Reply via email to