9 files changed, 215 insertions, 385 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1967b14b25bc..389df4d6d958 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 189b8296247e..f6f12e4a290d 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,14 +1,17 @@
 AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719
 AUX btrfs-progs-6.1.1-ioctl-fix.patch 3232 BLAKE2B 3c026b66b6289b03c8839a00232b1caa530fc88a165130e04a6fab0d0188927c0061712ff5b37deaf723201f1c5472bc96d09f11c1d85d693c337ad86ae9a6e4 SHA512 58cb8d2f03320d732ae2d2341eccefa1ddac856793ce9fbb138fc9a5f20fcb3016d1ad2a5fffb07caf41b7e190f49a1f64874ec464604f8caea302c4c116aabb
+AUX btrfs-progs-6.2.1-blake2-simd.patch 1056 BLAKE2B 3a5d967cb5a362cdd5abe993b3f1006b68898b14f0915c567bceb0de6ebf37d76f9fd323461ba9bbf4e61158b8bc1d176b2cf204c31958d420b9e94812b50936 SHA512 257035a4282138a5b32d99f07b50017983052a77c661ef5519b833652362c4c015aff8043062f09f87ebc71f09b616c851b66b905a3aa8c490e1dd5080bf496c
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624c3f122149af640bc0ca73abfc85ca7bd076976d47ce2d4eab64fb3b9b1309e3446acdd78ba77e5cb583b939710f8b6c SHA512 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3
 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
 EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B a879f998fffa1ba80c42f8423416ff05cc23a7cf2bc797d450d2379bb61360ce2333c41d7035dad1219365194b3dd33aa1988b06de845c9d7bef1334a4618d32 SHA512 ef12dacb70e2986e3d974ad150f9d9b2b450f1fffaddb303967195c7a0f95199225fecd74f729b98adca19cffc51ed261c88dbc88ed0bfdfafe4e8b0597078b9
 EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
 EBUILD btrfs-progs-6.1.1-r1.ebuild 3371 BLAKE2B 6d1dec5724837eed26ba50d9a4c0bf7f97d4783a07fd6f2ad51e8d83790acd4fce210daa846336d52bf459dfc7485ec90feff9e7005e9f46235c2faebcfcf8bd SHA512 455bc0717e4720ae7b99add5bbdf961258b8d0bd43585f8c68003bad8ee6fbcb9df666a999194c530a3c3d40abe33c39c449449874b32adaf85c69f562c00a30
 EBUILD btrfs-progs-6.1.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
 EBUILD btrfs-progs-6.1.3.ebuild 3528 BLAKE2B f8cc1b0065bb23eb24227577593c0546a842a6c46b91b69d4c9b7a0aa80bce6fd4f48d9a353996be4ce2d0a7cbef9c4fac161107b4c0f7475a3f8956db865859 SHA512 5a7bbfc026045c6b0de1bfbd2dc10d4fa690d2fad85d3cb1a1927576944ee8283a776e748b82cb362587fcf418e9c135fa7fb044e6676e51b2280ce81f3f57a1
+EBUILD btrfs-progs-6.2.1.ebuild 3586 BLAKE2B 024a9f9b6b60ed76c12279e3d0e60dd250729379902ba5e4961c049e6dec66e59aecd9e846af7ec7778c62934e93da8ce1a21b5728029539c25202a1db56c9e2 SHA512 ad3209b278ad5c5d5307c3fa28b872fe102edc64ed8162b02ab313b6c19a346eb312d7e29c424639bc51aebb9fcbb367751d9097b4a347039ed4c115b787189f
 EBUILD btrfs-progs-9999.ebuild 3528 BLAKE2B f8cc1b0065bb23eb24227577593c0546a842a6c46b91b69d4c9b7a0aa80bce6fd4f48d9a353996be4ce2d0a7cbef9c4fac161107b4c0f7475a3f8956db865859 SHA512 5a7bbfc026045c6b0de1bfbd2dc10d4fa690d2fad85d3cb1a1927576944ee8283a776e748b82cb362587fcf418e9c135fa7fb044e6676e51b2280ce81f3f57a1
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
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] =
+
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index fb2c197ba668..fafc7f53300c 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -21,7 +21,6 @@ AUX lvm2-2.03.17-locale-muck.patch 398 BLAKE2B adb1c2bcd216acb413733d9f3f3618cad
 AUX lvm2-2.03.17-musl-LOCK_EX.patch 537 BLAKE2B ab2045b3b13e71b8857fa122708ecd55a3341b8feceb6d9f8d16bb3b03f6b9b3519a158ecd4764c070a78b911d06b9dc15117a8aa450bcdbcfd0e96bb86b6647 SHA512 aa1dd5f6b88a2e358d381b6b31d19853f63bf3cae3d54c224aa096194fa07c6917f6a26d686d3ca52d6e83435135d88649afc76d73c586c65d7d19321ae4b9ec
 AUX lvm2-2.03.17-pthread-pkgconfig.patch 732 BLAKE2B 1c179420d8cc3efaff24f03a5356469222da360c407445e30c51cde3d055de0245bd2387e934ca6bbd8518d6cc4110fccecbf430d3ba580159ac300c8570e34a SHA512 d0a800017c00cc954567900331436f9ddf30f48c7eb14d1c5e181ec9e8485702d76ebb5e981b519b97bc91ac2f5ff182e4e9ad04363c20f759b6f221c8911486
 AUX lvm2-2.03.17-readelf.patch 1804 BLAKE2B 559eea74823b3d333e68ac9fddd1046617148fbf525afa03b587d242065fc441b0447ea49479b62906c1111d5a9b0ef0e0150c1d24f7ef96bb64892544dff668 SHA512 f3fdb9b54c41354c7144795a357ba898c65540f09ef974d441ffd6d84d6725bbf9293fab048a3b1155b8961af140335c0023a9085a7a4717f070270491a62f17
-AUX lvm2-2.03.18-freopen-musl.patch 1874 BLAKE2B 1b0043442776d48b658849ee6864b57532265ead2635f2fc06ee2279a277d35a98dd5daeb7a6fecb19dae8d44cb327cf431253fed08c5cf922f5aa6447390559 SHA512 a2363666927a17c66078b6ec7449bfb6e83ee0611e2c0c2dc144de530f1960b76789bca543d724486a2c23afa8353507de8db39d374c3fdc3e90a8108629dca3
 AUX lvm2-2.03.19-dm_lvm_rules_no_systemd.patch 673 BLAKE2B ac8eec01814bced1b172793207764536907a439b76d006c2e41486048edeecd6a780795a98f52584053923ae060de5b72df0cf9abf11052ba1b6a474d47cc83e SHA512 1a5dbbf3e2bb2bee4fa918a4553f0f99afd3606ddf05cfbaca5476faeb1ed727ab9aa2d2b3662e7c6e3c82b1b859e77f290e579320f158d1def8044804fb969c
 AUX lvm2-2.03.19-dmeventd-no-idle-exit.patch 2427 BLAKE2B 4dbe0a1d059cefe6f01571244bcf7a287c51cfe287c174e30ef3a1c684176b1385c2d43f5aeef8b2262c2309cfae8eef4eb1c323fb14d01dbf59474576ae72bd SHA512 c965a9ecb96b9a71392eb9d81acae797143b7614bf73de6cc1ee37bb5df921c764cd3e4163a0adf26aa8e9efee58953500d595133a45a4a4318cd5d09bb42a12
 AUX lvm2-2.03.19-dynamic-static-ldflags.patch 1548 BLAKE2B 43a36a628ae2a82139898da81bd70f1b1a45a88c81c3e18568fe6b6b6d300992719689bec2718e2a6eecfa6cde344b037d02d06c60702b54d350cc6c65b210ed SHA512 e2f99a9d4d45e2386e36353182d6e0b6c96c4e8978b65688bd6d0e2ed1c8bd488bb9f3986bc7aefaa0c023d107d4ce54756cc661704866c35ef1f4046fb4dd27
@@ -30,9 +29,7 @@ AUX lvm2-2.03.19-static-pkgconfig-libs.patch 4574 BLAKE2B 193cdcef1b0744a176bf22
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9
-DIST LVM2.2.03.18.tgz 2728113 BLAKE2B 59df1a6ece11473d3f15a8b81701faa363be556f7668a34d2cbbf9221a014f268c230f08d3bd873bbebee89480c787a6f358b2edf8777c990c62e7c6a36aecad SHA512 58043bdcad882065f15d772401d29fc7fb2d0a6b6b75063915dc38bb11cd847517dd18ae7e2acb3935e6c32ef620a275c2b2b9c307434f7457ea3203b87254c1
 DIST LVM2.2.03.19.tgz 2732219 BLAKE2B 7a5bd024312f149d95361ea24a282c8c68e371687fe8f7c853fa0748ce854bc991cdade999835666a5ece569e80dd9be85d4fae7fc5cc75b912de00f170cf66e SHA512 a40691f6f4c9300c95784be0fcb055a2b8e07bfdc87f000f2357ccb54fdb814a679fb79f5c9790a7440ef538e9997e46d56e539814bfdf138b4e76603aeb2994
 EBUILD lvm2-2.03.17-r2.ebuild 9952 BLAKE2B 875bc183ee4e0e9f81c57e3b5faab740dd71ae421713f15497e94fb249d09200be653c8121ecd7c80e9c15a7ad1492ce33538b3b083c19c5164d8867f303e829 SHA512 4891ac05e9f3418b3f5c11f8a9d75d33842316e1be980a9cf6cb42222e34199541b6c6c929c213fa9c4c4f6b89a2b5c9c53dbb586f55c09ec8105902289fa944
-EBUILD lvm2-2.03.18-r1.ebuild 9772 BLAKE2B 78995e2b773cf0135ace59ff866346eb58c4c1212d1ac00304a91110f09e387511672fac4556ed0b74cd9697666ded3fe3e95629ea6789731fd594979b58da31 SHA512 30493e60de36c45c648d3e85835cc29b939960666a58245700d468d34bc21662955ee4b9973efdac0850fff7e05befc6b9ced56829fddee5252ca3d1736f2bc8
 EBUILD lvm2-2.03.19.ebuild 9249 BLAKE2B 64b923666f987adea1956fcb4f374456b7a87b4277fd05c16cf83150fdbc461c314ea653db4915fd97d04eb4a06df3af30dfa78b8921adad9b8bca7056b830c1 SHA512 d6340341d0b027b10baeaa0a7429f990d268310760b3229726830530a87a9e35886ad4dcfef62aebca3eefc9430bcf2a7bb8aa78fb498aebc114028739ab527e
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/files/lvm2-2.03.18-freopen-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.18-freopen-musl.patch
deleted file mode 100644
index 94fb99e04025..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.03.18-freopen-musl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From a2b9c9d2fe4d3f3869e8748dd44da44b67ba5a66 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 28 Jan 2023 14:22:42 +0100
-Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
-
-* ISO C does not guarantee that the standard streams are modifiable
-  lvalues. Glibc even calls out this behaviour as non-portable:
-    https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html
----
- lib/log/log.c      | 4 ++++
- tools/lvmcmdline.c | 6 +++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/lib/log/log.c b/lib/log/log.c
-index 118a3ba42..a94016d81 100644
---- a/lib/log/log.c
-+++ b/lib/log/log.c
-@@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
- 
- 	_check_and_replace_standard_log_streams(old_stream, new_stream);
- 
-+#ifdef __GLIBC__
- 	*stream = new_stream;
-+#else
-+	freopen(NULL, mode, *stream);
-+#endif
- 	return 1;
- }
- 
-diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index a5bb6a5c5..0ebfa375c 100644
---- a/tools/lvmcmdline.c
-+++ b/tools/lvmcmdline.c
-@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
- 	int err = is_valid_fd(STDERR_FILENO);
- 
- 	if (!is_valid_fd(STDIN_FILENO) &&
--	    !(stdin = fopen(_PATH_DEVNULL, "r"))) {
-+	    !freopen(_PATH_DEVNULL, "r", stdin)) {
- 		if (err)
- 			perror("stdin stream open");
- 		else
-@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
- 	}
- 
- 	if (!is_valid_fd(STDOUT_FILENO) &&
--	    !(stdout = fopen(_PATH_DEVNULL, "w"))) {
-+	    !freopen(_PATH_DEVNULL, "w", stdout)) {
- 		if (err)
- 			perror("stdout stream open");
- 		/* else no stdout */
-@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
- 	}
- 
- 	if (!is_valid_fd(STDERR_FILENO) &&
--	    !(stderr = fopen(_PATH_DEVNULL, "w"))) {
-+	    !freopen(_PATH_DEVNULL, "w", stderr)) {
- 		printf("stderr stream open: %s\n",
- 		       strerror(errno));
- 		return 0;
--- 
-2.39.1
-
diff --git a/sys-fs/lvm2/lvm2-2.03.18-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.18-r1.ebuild
deleted file mode 100644
index b93eea6a507f..000000000000
--- a/sys-fs/lvm2/lvm2-2.03.18-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TMPFILES_OPTIONAL=1
-inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
-S="${WORKDIR}/${PN^^}.${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev"
-REQUIRED_USE="
-	static? ( !systemd !udev )
-	static-libs? ( static !udev )
-	systemd? ( udev )
-	thin? ( lvm )"
-
-DEPEND_COMMON="
-	udev? ( virtual/libudev:= )
-	lvm? (
-		dev-libs/libaio
-		sys-apps/util-linux
-		readline? ( sys-libs/readline:= )
-		sanlock? ( sys-cluster/sanlock )
-		systemd? ( sys-apps/systemd:= )
-	)"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	lvm? (
-		virtual/tmpfiles
-		lvm2create-initrd? ( sys-apps/makedev )
-		thin? ( sys-block/thin-provisioning-tools )
-	)"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
-	static? (
-		lvm? (
-			dev-libs/libaio[static-libs]
-			sys-apps/util-linux[static-libs]
-			readline? ( sys-libs/readline[static-libs] )
-		)
-		selinux? ( sys-libs/libselinux[static-libs] )
-	)"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	"${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.03.17-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
-	"${FILESDIR}"/${PN}-2.03.17-pthread-pkgconfig.patch #492450
-	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
-	"${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch
-	"${FILESDIR}"/${PN}-2.03.18-freopen-musl.patch
-	"${FILESDIR}"/${PN}-2.03.17-musl-LOCK_EX.patch #887259
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Users without systemd get no auto-activation of any logical volume
-	if ! use systemd ; then
-		eapply "${FILESDIR}"/${PN}-2.03.16-dm_lvm_rules_no_systemd.patch
-		sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-
-	# Workaround for bug #822210
-	tc-ld-disable-gold
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	local myeconfargs=(
-		$(use_enable lvm dmfilemapd)
-		$(use_enable lvm dmeventd)
-		$(use_enable lvm cmdlib)
-		$(use_enable lvm fsadm)
-		$(use_enable lvm lvmpolld)
-		$(usev !lvm --disable-udev-systemd-background-jobs)
-
-		# This only causes the .static versions to become available
-		$(usev static --enable-static_link)
-
-		# dmeventd requires mirrors to be internal, and snapshot available
-		# so we cannot disable them
-		--with-mirrors="$(usex lvm internal none)"
-		--with-snapshots="$(usex lvm internal none)"
-	)
-
-	if use lvm && use thin; then
-		myeconfargs+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myeconfargs+=( --with-thin=none --with-cache=none )
-	fi
-
-	myeconfargs+=(
-		# musl doesn't do symbol versioning so can end up with
-		# runtime breakage.
-		--with-symvers=$(usex elibc_glibc 'gnu' 'no')
-		$(use_enable readline)
-		$(use_enable selinux)
-		--enable-pkgconfig
-		--with-confdir="${EPREFIX}"/etc
-		--exec-prefix="${EPREFIX}"
-		--sbindir="${EPREFIX}/sbin"
-		--with-staticdir="${EPREFIX}"/sbin
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-default-dm-run-dir=/run
-		--with-default-run-dir=/run/lvm
-		--with-default-locking-dir=/run/lock/lvm
-		--with-default-pid-dir=/run
-		$(use_enable udev udev_rules)
-		$(use_enable udev udev_sync)
-		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
-		# USE=sanlock requires USE=lvm
-		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
-		$(use_enable systemd udev-systemd-background-jobs)
-		$(use_enable systemd notify-dbus)
-		$(use_enable systemd app-machineid)
-		$(use_enable systemd systemd-journal)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		CLDFLAGS="${LDFLAGS}"
-	)
-
-	# Hard-wire this to bash as some shells (dash) don't know
-	# "-o pipefail" #682404
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 -C include
-
-	if use lvm ; then
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts
-	else
-		emake V=1 device-mapper
-		# https://bugs.gentoo.org/878131
-		emake V=1 -C libdm/dm-tools device-mapper
-	fi
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
-
-src_install() {
-	local INSTALL_TARGETS=(
-		# full LVM2
-		$(usev lvm "install install_tmpfiles_configuration")
-		# install systemd related files only when requested, bug #522430
-		$(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators")
-
-		# install dm unconditionally
-		install_device-mapper
-	)
-	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use lvm ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
-		if ! use udev ; then
-			# We keep the variable but remove udev from it.
-			sed -r -i \
-				-e '/^rc_need=/s/\<udev\>//g' \
-				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
-		fi
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
-
-		if use lvm2create-initrd; then
-			dosbin scripts/lvm2create_initrd/lvm2create_initrd
-			doman scripts/lvm2create_initrd/lvm2create_initrd.8
-			newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-		fi
-
-		if use sanlock; then
-			newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
-		fi
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		if use lvm; then
-			# depends on lvmetad
-			dolib.a libdaemon/client/libdaemonclient.a #462908
-			# depends on dmeventd
-			dolib.a daemons/dmeventd/libdevmapper-event.a
-		fi
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_preinst() {
-	HAD_LVM=0
-
-	if has_version 'sys-fs/lvm2[lvm(+)]' ; then
-		HAD_LVM=1
-	fi
-}
-
-pkg_postinst() {
-	use lvm && tmpfiles_process lvm2.conf
-	use udev && udev_reload
-
-	# This is a new installation
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if use lvm ; then
-			ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-			ewarn "# rc-update add lvm boot"
-			ewarn
-			ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want"
-			ewarn "to enable lvm autoactivation and metadata caching."
-		else
-			ewarn "Please enable USE=lvm if you need the LVM daemon and"
-			ewarn "tools like 'lvchange', 'vgchange', etc!"
-		fi
-	else
-		if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then
-			ewarn "LVM was previously enabled but is now disabled."
-			ewarn "Please enable USE=lvm if you need the LVM daemon and"
-			ewarn "tools like 'lvchange', 'vgchange', etc!"
-			ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details."
-		fi
-	fi
-
-	if use udev && [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to cause problems for udev-enabled LVM services."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		udev_reload
-	fi
-}
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 4f055b890122..c737f5dd3751 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,3 +1,3 @@
 DIST udiskie-2.4.2.tar.gz 95178 BLAKE2B eec6f4d2aed9ad86400ee8f3924a8b748cbb1e7ccc1aa2b681858065c18d172def5cc32763a7c2af0899fd719b53bf08d6fddbeb2611cfa74d5b968da0a756b9 SHA512 0881872c614f73b034835f6157eae7f944b6f4ea08a5dabaeb1e6a476a620720dfe950e538a03a3cbdd2a54e95f64a5349650decd554930d02086fdac2e45f23
-EBUILD udiskie-2.4.2.ebuild 1049 BLAKE2B 24fef092fb6130a218c9ecaf09503ebfd4ac251ba68b9e15b653205d1157963730d13ba5aca37da94ab7a53f2e634811a16a3f6603916d130d9a5a29b0a2125e SHA512 6fd2723cb2ae77b3aee9049c2c8ccc3fa12539a6a044c262c81bf993680f8e4916ec305f34876feab632103bb76396dd4cfaca7c4e16580bae0df4b25f6e26c0
+EBUILD udiskie-2.4.2.ebuild 1002 BLAKE2B a41b290b5a1e8020c6d3d5e0bb0bdfb7bfdf4e66b50ea5cde0b866c8572786bae0ea922d95d3a7acf9e7e91fae837315488a2e312c840b83c997f8d25af9e2f3 SHA512 1684679ab958c73eaea5b66edfcc641d22e69b9802abf77ad08c5e98f97b1b18e318c083a8df4815778d15ec7b50702a085132aea4acff96ffc0a4bec2411b99
 MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39
diff --git a/sys-fs/udiskie/udiskie-2.4.2.ebuild b/sys-fs/udiskie/udiskie-2.4.2.ebuild
index 0b4ca8482e39..58691d198e24 100644
--- a/sys-fs/udiskie/udiskie-2.4.2.ebuild
+++ b/sys-fs/udiskie/udiskie-2.4.2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 pypi xdg-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
 HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"