From f5754ccad0b1d407791c7565165d75530e752597 Mon Sep 17 00:00:00 2001
From: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
Date: Thu, 15 Jan 2026 23:21:25 +0100
Subject: [PATCH] Revert "sys-fs/bcachefs-kmod: add erasure coding and quota
 support"

This reverts commit 313e307513cd231f0f6e6a45e67b25ff5b77835f.

This was premture.
* The erasure coding compile-time switch will be removed.
* Quota support is deemed buggy by upstream.

Signed-off-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
---
 profiles/package.use.mask                       |  4 ----
 .../bcachefs-kmod/bcachefs-kmod-1.35.0.ebuild   | 17 ++++-------------
 sys-fs/bcachefs-kmod/metadata.xml               |  4 ----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 389a894235..bd42ed334c 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -3,10 +3,6 @@
 
 # New entries go on top.
 
-# Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com> (2026-01-15)
-# Experimental; enable for testing only
-sys-fs/bcachefs-kmod erasure-coding
-
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2025-11-06)
 # Depends on treecleaned media-libs/raspberrypi-userland
 games-emulation/RetroArch dispmanx
diff --git a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.35.0.ebuild b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.35.0.ebuild
index 1415cf63fe..a665ed359d 100644
--- a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.35.0.ebuild
+++ b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.35.0.ebuild
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="debug erasure-coding quota verify-sig"
+IUSE="debug verify-sig"
 
 BDEPEND="
 	>=sys-kernel/linux-headers-6.16
@@ -63,7 +63,6 @@ pkg_setup() {
 		FRAME_POINTER
 		!DEBUG_INFO_REDUCED
 	"
-	use quota && CONFIG_CHECK+=" QUOTACTL"
 	linux-mod-r1_pkg_setup
 }
 
@@ -87,23 +86,15 @@ src_unpack() {
 src_prepare() {
 	default
 
-	# Upstream PR: https://github.com/koverstreet/bcachefs/pull/1038
-	cat <<-EOF >> libbcachefs/Makefile || die
-	ifdef BCACHEFS_DKMS
-		subdir-ccflags-\$(CONFIG_BCACHEFS_QUOTA) += -DCONFIG_BCACHEFS_QUOTA=1
-		subdir-ccflags-\$(CONFIG_BCACHEFS_ERASURE_CODING) += -DCONFIG_BCACHEFS_ERASURE_CODING=1
-	endif
-	EOF
-
 	sed -i s/^VERSION=.*$/VERSION=${PV}/ Makefile || die
 	emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms
 }
 
 src_compile() {
 	local modlist=( "bcachefs=:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" )
-	local modargs=( KDIR=${KV_OUT_DIR} )
-	use erasure-coding && modargs+=( CONFIG_BCACHEFS_ERASURE_CODING=y )
-	use quota && modargs+=( CONFIG_BCACHEFS_QUOTA=y )
+	local modargs=(
+		KDIR=${KV_OUT_DIR}
+	)
 
 	linux-mod-r1_src_compile
 }
diff --git a/sys-fs/bcachefs-kmod/metadata.xml b/sys-fs/bcachefs-kmod/metadata.xml
index ee2660a640..87ff414109 100644
--- a/sys-fs/bcachefs-kmod/metadata.xml
+++ b/sys-fs/bcachefs-kmod/metadata.xml
@@ -12,8 +12,4 @@
 	<upstream>
 		<remote-id type="github">koverstreet/bcachefs-tools</remote-id>
 	</upstream>
-	<use>
-		<flag name="erasure-coding">Enable bcachefs erasure coding (RAID5/6) support (EXPERIMENTAL)</flag>
-		<flag name="quota">Enable bcachefs quota support</flag>
-	</use>
 </pkgmetadata>