sys-fs/{bcachefs-tools,bcachefs-kmod}: bump v1.31.2

Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>

sys-fs/bcachefs-kmod/Manifest

@@ -0,0 +1,2 @@
+DIST bcachefs-tools-1.31.2.tar.sign 833 BLAKE2B ab9f9d775b9aafebc695df289beda280e0d156c0cf7f89585e0a5d1610c9e9f1b4121de5fa94a4c9ccffe9781e10a6574b8817244d5a210f157a166691df2663 SHA512 3f46ae3a5cf912d171b4e6371fb4962a9579c7158b5aef6a6dc226dd773512bbd0f6cce6d86f18eb300dc50831f8b284b9353022193e4d2c4c428ee2b390b474
+DIST bcachefs-tools-1.31.2.tar.zst 1327582 BLAKE2B 7bada32952ff61408288cc269cb4601f71fa6ef84c7ed1cfd917c7a2578391c638a2abf31277cafdc96e8d8fd30421e88f66e26a539b99f4f37c7e773a8cb827 SHA512 18ec29ef13e97d7fc7069deab0d6851645978bf702c63370c9932a9866c5d2c4eba5e14a1a001830a220ddaf9ebe12a09076b08dbe37c199ac0772aa95844a58

sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.2.ebuild

@@ -0,0 +1,108 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_KERNEL_MIN=6.16
+MODULES_INITRAMFS_IUSE=+initramfs
+MODULE_S="module/src/${PN%-*}-${PV}"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
+
+inherit flag-o-matic linux-mod-r1 toolchain-funcs unpacker verify-sig
+
+DESCRIPTION="Linux bcachefs kernel module for sys-fs/bcachefs-tools"
+HOMEPAGE="https://bcachefs.org/"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
+else
+	SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst"
+	SRC_URI+=" verify-sig? ( https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="GPL-2"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
+SLOT="0"
+IUSE="debug +rootfs verify-sig"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	~sys-fs/bcachefs-tools-${PV}"
+
+BDEPEND="
+	verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 )
+"
+
+pkg_pretend() {
+        use rootfs || return 0
+}
+
+pkg_setup() {
+    local CONFIG_CHECK="
+            EFI_PARTITION
+            CRC_OPTIMIZATIONS
+    "
+    use debug && CONFIG_CHECK+="
+            DEBUG_INFO
+            FRAME_POINTER
+            !DEBUG_INFO_REDUCED
+    "
+    use rootfs && CONFIG_CHECK+="
+            BLK_DEV_INITRD
+            DEVTMPFS
+    "
+	linux-mod-r1_pkg_setup
+}
+
+src_unpack() {
+	# Upstream signs the uncompressed tarball
+	if use verify-sig; then
+		einfo "Unpacking ${P}.tar.zst ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+			< <(zstd -fdc "${DISTDIR}"/${P}.tar.zst | tee >(tar -xf -))
+		assert "Unpack failed"
+	fi
+
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpacker ${P}.tar.zst
+	fi
+
+}
+
+src_prepare() {
+	default
+	tc-export CC
+
+	sed -i s/^VERSION=.*$/VERSION=${PV}/ Makefile || die
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-i Makefile || die
+	append-lfs-flags
+
+	emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms && \
+	sed -i 's/^        /\t/g' "${WORKDIR}/${MODULE_S}/Makefile" || die
+}
+
+src_compile() {
+	local modlist=( "bcachefs=kernel/drivers/fs:../${MODULE_S}" )
+	local modargs=(
+	        KDIR=${KV_OUT_DIR}
+	)
+
+	use modules && linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+}

sys-fs/bcachefs-tools/Manifest

@@ -5,8 +5,8 @@ DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9
 DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
 DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anyhow-1.0.89.crate 47078 BLAKE2B fc824e72891bff0cc7aa3b538adfb9af7dc843ab6ed12b8b04eb70e62d32aae1decb9090621d3245dbe89841e73080d2d86973b4aee50873e798956da9b3faa6 SHA512 3c09317089ed78601a56c626700d12c0b49396e25fed9a9f05a2dbfbd6f91ad426c430633006a4043decd1f70a85c161c4f8dd7de0e4c00b82a169b89dda8da0
-DIST bcachefs-tools-1.31.0.tar.sign 833 BLAKE2B d25ec3443a1aa7066b733e4372f602deacab1073b477718d584e68b82e2b195ba63e300973f3b42b27c9a720651fe885dd1b66148897bd247ca9c40737b0f7e6 SHA512 e310a44944b36e80aa498acfb5dbd218bb530d2c9e2ea26e0cca9ecc4f19764220fabfed410c8a705830d9f48022aa01b287811ef44f3e8d9fc5358f2eade4c2
+DIST bcachefs-tools-1.31.2.tar.sign 833 BLAKE2B ab9f9d775b9aafebc695df289beda280e0d156c0cf7f89585e0a5d1610c9e9f1b4121de5fa94a4c9ccffe9781e10a6574b8817244d5a210f157a166691df2663 SHA512 3f46ae3a5cf912d171b4e6371fb4962a9579c7158b5aef6a6dc226dd773512bbd0f6cce6d86f18eb300dc50831f8b284b9353022193e4d2c4c428ee2b390b474
-DIST bcachefs-tools-1.31.0.tar.zst 1321440 BLAKE2B 8728ff3f94abb47b74a49ce2475ac2a8f62f952211899189d7649d02dfa9697888d220178f99e6e6f19075b0d5c91a69d0308aa42ac058dd9268f35a3c30bee5 SHA512 aa882c6b37563fe4007cc41a8589c6623d5c626185f4fa285292b4712fbf51ccf8c4eff434763bdc39e6ebb8ad0a0d0c13a91c2afa704bca760f92b5d334cf66
+DIST bcachefs-tools-1.31.2.tar.zst 1327582 BLAKE2B 7bada32952ff61408288cc269cb4601f71fa6ef84c7ed1cfd917c7a2578391c638a2abf31277cafdc96e8d8fd30421e88f66e26a539b99f4f37c7e773a8cb827 SHA512 18ec29ef13e97d7fc7069deab0d6851645978bf702c63370c9932a9866c5d2c4eba5e14a1a001830a220ddaf9ebe12a09076b08dbe37c199ac0772aa95844a58
 DIST bindgen-0.69.5.crate 221128 BLAKE2B b89edbf883e1bc11a074c2f37f84bb966749823a6408b9765d6a61ee1179451d67dadde41d27838e8ddc6172dee9c342429f42fbe6959ff9fd7dcbc73d7506ea SHA512 b232b906af7535f8b87198f0a4037a0f09af367e0c913575f3d16453a2c272e7d76033cb3fd12d4223ebda4a0f8130629e67c5883e026a2422db3e0659ed3c3f
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62

sys-fs/bcachefs-tools/bcachefs-tools-1.31.2.ebuild

@@ -86,15 +86,13 @@ CRATES="
 	zeroize@1.8.1
 	zeroize_derive@1.4.2
 "
-MODULES_KERNEL_MIN=6.16
+
-MODULES_OPTIONAL_IUSE="modules"
-MODULE_S="module/src/${PN%-*}-${PV}"
 LLVM_COMPAT=( {17..20} )
 PYTHON_COMPAT=( python3_{11..14} )
 RUST_MIN_VER="1.77.0"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
 
-inherit cargo flag-o-matic linux-mod-r1 llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker verify-sig
+inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker verify-sig
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"
@@ -157,7 +155,6 @@ pkg_setup() {
 	rust_pkg_setup
 	llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
-	use modules && linux-mod-r1_pkg_setup
 }
 
 src_unpack() {
@@ -189,9 +186,6 @@ src_prepare() {
 		-e '/^CFLAGS/s:-g::' \
 		-i Makefile || die
 	append-lfs-flags
-
-	use modules && emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms && \
-	sed -i 's/^        /\t/g' "${WORKDIR}/${MODULE_S}/Makefile" || die
 }
 
 src_compile() {
@@ -210,13 +204,6 @@ src_compile() {
 	for shell in bash fish zsh; do
 		./bcachefs completions ${shell} > ${shell}.completion || die
 	done
-
-	local modlist=( "bcachefs=kernel/drivers/fs:../${MODULE_S}" )
-	local modargs=(
-	        KDIR=${KV_OUT_DIR}
-	)
-
-	use modules && linux-mod-r1_src_compile
 }
 
 src_install() {
@@ -233,8 +220,6 @@ src_install() {
 		dosym bcachefs /sbin/mount.fuse.bcachefs
 	fi
 
-	use modules && linux-mod-r1_src_install
-
 	newbashcomp bash.completion bcachefs
 	newfishcomp fish.completion bcachefs.fish
 	newzshcomp zsh.completion _bcachefs
@@ -248,6 +233,4 @@ pkg_postinst() {
 		ewarn "Please only use it for development purposes at the risk of losing your data."
 		ewarn "You have been warned."
 	fi
-
-	use modules && linux-mod-r1_pkg_postinst
 }