From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE620159C9B for ; Wed, 14 Aug 2024 22:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFF492BC027; Wed, 14 Aug 2024 22:03:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 934BE2BC027 for ; Wed, 14 Aug 2024 22:03:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 968F2343005 for ; Wed, 14 Aug 2024 22:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED0501ECB for ; Wed, 14 Aug 2024 22:03:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1723672731.8898035855083a51e3e014287ea2a656cf2fe718.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/Manifest sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8898035855083a51e3e014287ea2a656cf2fe718 X-VCS-Branch: master Date: Wed, 14 Aug 2024 22:03:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3277fc0d-dd7e-463e-8c9e-e32fa8b75820 X-Archives-Hash: 6261e32adbd89430344b0bab4ce2901e commit: 8898035855083a51e3e014287ea2a656cf2fe718 Author: Sam James gentoo org> AuthorDate: Wed Aug 14 21:55:37 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 14 21:58:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88980358 sys-fs/btrfs-progs: add 6.10, sync live Sync live to pick up a429b970949c21e97dfc4e6b8cee01ed0bb4e2ff. Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/Manifest | 2 ++ .../{btrfs-progs-9999.ebuild => btrfs-progs-6.10.ebuild} | 9 +++++++-- sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 8b3b53c764f8..719a59ee8053 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,3 +1,5 @@ +DIST btrfs-progs-v6.10.tar.sign 566 BLAKE2B 493260b4854616eabce943135b4990de4a724ad00f8cba43e9d864e5c67e5896890831d17c742456d422ed15267a753c4eaf18ac30a4c7c3da0b254b01becf8b SHA512 62d9721702eec6eec2c0e51eee4624324c4604d3bc76016cde1ade0572c22b46ede71fcb3d9e4ca14ea0196e84116ce4ef9222b399f8bbdf8e5259c18f3a82e8 +DIST btrfs-progs-v6.10.tar.xz 2669760 BLAKE2B 24b66cc6f7118da817e9abca69e8de9a9496de1ec4eb6800fa8f6b13b677e37a553d90562a38618a63b68b71457ab10ff72541dd3e0c169a1fe05509fd62402c SHA512 aa5af67f3816dcd1a128b69bc6f4bd83423c6c2289e3dd3abe2a07bdccb6b7d5e49426a5a0ece643709c23cdcb0908ca52b271f058fee3a3d810cdfcb9c36639 DIST btrfs-progs-v6.6.3.tar.sign 566 BLAKE2B 9f8a14405f78c8eb5a92d59f9ca776cd15bfd43bc323a0f5a98cc2d9a6f782e999a792ddb266fef4dfe189e1cb8eebbd021a12b615e22bdd4097a74bf3b277a9 SHA512 07f062cf66c0e5f0bd833f0a1c9901ec06ac4eb258acec8e96ffbb0b85007a67bdc992492b25f6039fcf603352131fca8c57162fa61007e8ccf1f4edf71dab97 DIST btrfs-progs-v6.6.3.tar.xz 2557216 BLAKE2B 274fad52bcab45bd0f6496c1bc10e1736e7b766f53b712790996a8a38f74eedcc570783599bed62cd4f84e5629f2216340a66941d9fbe0c7890f1c56ed66df8a SHA512 93e1defacf0f280fc02e10a20fd2bc3775c52956a0339e30b829cc3bef85629d565cf3f6a9af126e38bbb73e8e9b9a0069abbe0e57957a56ca1a8826f5de624a DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24572e43fef2fdce79f0dbd892b1609876f681bf79de53e6473345f3de8b8fee6aac2d33673e0b080ab33fb935bd32d SHA512 8fad1c2c47356a04434e12621c526603bf651bdcb0a08deb4022d83953d8c501b8aaa2da05cbf94e0bde43b48a4135fff78a5746423466036ff4899dd79b9589 diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild similarity index 95% copy from sys-fs/btrfs-progs/btrfs-progs-9999.ebuild copy to sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild index de0166088752..3361fe4d3f1e 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.10.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/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index de0166088752..3361fe4d3f1e 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.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 }