Merge updates from master

27 files changed, 98 insertions, 114 deletions

diff --git a/app-emulation/qemu/qemu-6.0.0-r2.ebuild b/app-emulation/qemu/qemu-6.0.0-r3.ebuild
index 6b82204f2794..30b2df14de08 100644
--- a/app-emulation/qemu/qemu-6.0.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r3.ebuild
@@ -109,7 +109,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_riscv32? ( fdt )
 	qemu_softmmu_targets_riscv64? ( fdt )
 	sdl-image? ( sdl )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
+	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	vhost-user-fs? ( caps seccomp )
 	virgl? ( opengl )
@@ -202,7 +202,7 @@ SOFTMMU_TOOLS_DEPEND="
 		>=app-emulation/spice-0.12.0[static-libs(+)]
 	)
 	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev[static-libs(+)] )
+	udev? ( virtual/libudev:= )
 	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
 	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
diff --git a/app-emulation/qemu/qemu-6.0.0-r52.ebuild b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
index 43f93745ed87..7a0e85ac85a1 100644
--- a/app-emulation/qemu/qemu-6.0.0-r52.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
@@ -109,7 +109,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_riscv32? ( fdt )
 	qemu_softmmu_targets_riscv64? ( fdt )
 	sdl-image? ( sdl )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
+	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	vhost-user-fs? ( caps seccomp )
 	virgl? ( opengl )
@@ -202,7 +202,7 @@ SOFTMMU_TOOLS_DEPEND="
 		>=app-emulation/spice-0.12.0[static-libs(+)]
 	)
 	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev[static-libs(+)] )
+	udev? ( virtual/libudev:= )
 	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
 	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 3c10cc9beb9f..8aa463f41c8e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -109,7 +109,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_riscv32? ( fdt )
 	qemu_softmmu_targets_riscv64? ( fdt )
 	sdl-image? ( sdl )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
+	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	vhost-user-fs? ( caps seccomp )
 	virgl? ( opengl )
@@ -202,7 +202,7 @@ SOFTMMU_TOOLS_DEPEND="
 		>=app-emulation/spice-0.12.0[static-libs(+)]
 	)
 	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev[static-libs(+)] )
+	udev? ( virtual/libudev:= )
 	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
 	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234-r1.ebuild
index 0bfe45d3f9f5..fa61270e62e0 100644
--- a/dev-libs/libgudev/libgudev-234.ebuild
+++ b/dev-libs/libgudev/libgudev-234-r1.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="introspection static-libs"
+IUSE="introspection"
 
 DEPEND="
-	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 "
 RDEPEND="${DEPEND}
@@ -32,7 +32,7 @@ BDEPEND="
 multilib_src_configure() {
 	local myconf=(
 		$(multilib_native_use_enable introspection)
-		$(use_enable static-libs static)
+		--disable-static
 		--disable-umockdev # umockdev tests currently don't pass (might need extra setup)
 	)
 	local ECONF_SOURCE="${S}"
diff --git a/dev-libs/libgudev/libgudev-236-r1.ebuild b/dev-libs/libgudev/libgudev-236-r2.ebuild
index be272c06c6bd..84fcb3d13a8f 100644
--- a/dev-libs/libgudev/libgudev-236-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-236-r2.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="introspection static-libs test"
+IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 "
 DEPEND="${RDEPEND}
@@ -38,7 +38,6 @@ multilib_src_configure() {
 	local emesonargs=(
 		$(meson_native_use_feature introspection)
 		-Dgtk_doc=false
-		-Ddefault_library=$(usex static-libs both shared)
 		$(meson_feature test tests)
 		-Dvapi=disabled
 	)
diff --git a/dev-libs/libgudev/libgudev-236.ebuild b/dev-libs/libgudev/libgudev-236.ebuild
index 335ffc0b5cdd..6f66a6b523fa 100644
--- a/dev-libs/libgudev/libgudev-236.ebuild
+++ b/dev-libs/libgudev/libgudev-236.ebuild
@@ -12,11 +12,11 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="introspection static-libs"
+IUSE="introspection"
 
 DEPEND="
-	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 "
 RDEPEND="${DEPEND}
@@ -36,7 +36,6 @@ multilib_src_configure() {
 	local emesonargs=(
 		$(meson_native_use_feature introspection)
 		-Dgtk_doc=false
-		-Ddefault_library=$(usex static-libs both shared)
 		-Dtests=disabled # umockdev tests currently don't pass (might need extra setup)
 		-Dvapi=disabled
 	)
diff --git a/dev-libs/libgudev/libgudev-237.ebuild b/dev-libs/libgudev/libgudev-237-r1.ebuild
index 86c4bd72c192..29d5abcab2e9 100644
--- a/dev-libs/libgudev/libgudev-237.ebuild
+++ b/dev-libs/libgudev/libgudev-237-r1.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="introspection static-libs test"
+IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 "
 DEPEND="${RDEPEND}
@@ -37,7 +37,6 @@ multilib_src_configure() {
 	local emesonargs=(
 		$(meson_native_use_feature introspection)
 		-Dgtk_doc=false
-		-Ddefault_library=$(usex static-libs both shared)
 		$(meson_feature test tests)
 		-Dvapi=disabled
 	)
diff --git a/dev-libs/libusb/libusb-1.0.24-r1.ebuild b/dev-libs/libusb/libusb-1.0.24-r2.ebuild
index d12a5876b22b..2e1af019d6a1 100644
--- a/dev-libs/libusb/libusb-1.0.24-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.24-r2.ebuild
@@ -13,8 +13,9 @@ SLOT="1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="static-libs? ( !udev )"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	!udev? ( virtual/os-headers )"
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild
index b36f536b973e..972c471fece6 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild
@@ -13,15 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
 # our libpci.a depends on libz.a/etc... at runtime.
 LIB_DEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	kmod? ( sys-apps/kmod )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
 	static-libs? ( ${LIB_DEPEND} )
 	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
 "
diff --git a/sys-apps/systemd/systemd-249.2.ebuild b/sys-apps/systemd/systemd-249.2-r1.ebuild
index 209ea418da5d..1f0dd24720fb 100644
--- a/sys-apps/systemd/systemd-249.2.ebuild
+++ b/sys-apps/systemd/systemd-249.2-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -327,9 +327,6 @@ multilib_src_configure() {
 		$(meson_native_true timesyncd)
 		$(meson_native_true tmpfiles)
 		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
 	)
 
 	meson_src_configure "${myconf[@]}"
diff --git a/sys-apps/systemd/systemd-249.4.ebuild b/sys-apps/systemd/systemd-249.4-r1.ebuild
index 8862e4c0bf83..6c7937f4e0ed 100644
--- a/sys-apps/systemd/systemd-249.4.ebuild
+++ b/sys-apps/systemd/systemd-249.4-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -327,9 +327,6 @@ multilib_src_configure() {
 		$(meson_native_true timesyncd)
 		$(meson_native_true tmpfiles)
 		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
 	)
 
 	meson_src_configure "${myconf[@]}"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8785d676a9c1..aedda0284c15 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -326,9 +326,6 @@ multilib_src_configure() {
 		$(meson_native_true timesyncd)
 		$(meson_native_true tmpfiles)
 		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
 	)
 
 	meson_src_configure "${myconf[@]}"
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
index 3c4bf01a993c..205ef838d9bd 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
@@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # and it's missing ripemd160 support so it can't provide full backward compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
+	static? ( !gcrypt !udev )" #496612
 
 LIB_DEPEND="
 	dev-libs/json-c:=[static-libs(+)]
@@ -30,13 +30,13 @@ LIB_DEPEND="
 	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
 	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
+	sys-fs/lvm2[static-libs(+)]"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}
+	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 BDEPEND="
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
index 918f75984468..09141d7320f9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
@@ -18,7 +18,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # and it's missing ripemd160 support so it can't provide full backward compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
+	static? ( !gcrypt !udev )" #496612
 
 LIB_DEPEND="
 	dev-libs/json-c:=[static-libs(+)]
@@ -31,13 +31,13 @@ LIB_DEPEND="
 	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
 	ssh? ( net-libs/libssh[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
+	sys-fs/lvm2[static-libs(+)]"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}
+	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 BDEPEND="
diff --git a/sys-fs/lvm2/lvm2-2.02.188-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
index 2b7cb69fcdaf..a6c786adcc2d 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
-	static? ( !systemd )
+	static? ( !systemd !udev )
+	static-libs? ( !udev )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
@@ -24,7 +25,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
+	udev? ( >=virtual/libudev-208:= )"
 # /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.
@@ -41,7 +42,6 @@ DEPEND="${DEPEND_COMMON}
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
-		udev? ( >=virtual/libudev-208:=[static-libs] )
 	)"
 BDEPEND="
 	sys-devel/autoconf-archive
diff --git a/sys-fs/lvm2/lvm2-2.03.13-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
index 191e8880d547..f6c64e6f5d1b 100644
--- a/sys-fs/lvm2/lvm2-2.03.13-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
-	static? ( !systemd )
+	static? ( !systemd !udev )
+	static-libs? ( !udev )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
@@ -24,7 +25,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
+	udev? ( >=virtual/libudev-208:= )"
 # /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.
@@ -41,7 +42,6 @@ DEPEND="${DEPEND_COMMON}
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
-		udev? ( >=virtual/libudev-208:=[static-libs] )
 	)"
 BDEPEND="
 	sys-devel/autoconf-archive
diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r3.ebuild
index e12322d2e414..29891ba38bca 100644
--- a/sys-fs/udev/udev-249-r2.ebuild
+++ b/sys-fs/udev/udev-249-r3.ebuild
@@ -37,7 +37,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl +kmod selinux static-libs test"
+IUSE="acl +kmod selinux test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -131,7 +131,6 @@ multilib_src_configure() {
 		-Dlink-udev-shared=false
 		-Dsplit-usr=true
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		$(meson_use static-libs static-libudev)
 
 		# Prevent automagic deps
 		-Dgcrypt=false
@@ -172,9 +171,6 @@ multilib_src_compile() {
 		${libudev}
 		src/libudev/libudev.pc
 	)
-	if use static-libs; then
-		targets+=( libudev.a )
-	fi
 	if multilib_is_native_abi; then
 		targets+=(
 			udevadm
@@ -229,7 +225,6 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 162f55057995..f8e9422acdd2 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -37,7 +37,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl +kmod selinux static-libs test"
+IUSE="acl +kmod selinux test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -128,7 +128,6 @@ multilib_src_configure() {
 		-Dlink-udev-shared=false
 		-Dsplit-usr=true
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		$(meson_use static-libs static-libudev)
 
 		# Prevent automagic deps
 		-Dgcrypt=false
@@ -169,9 +168,6 @@ multilib_src_compile() {
 		${libudev}
 		src/libudev/libudev.pc
 	)
-	if use static-libs; then
-		targets+=( libudev.a )
-	fi
 	if multilib_is_native_abi; then
 		targets+=(
 			udevadm
@@ -226,7 +222,6 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index 68776243c4fb..e5b3df641c98 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -121,8 +121,12 @@ src_configure() {
 
 	filter-ldflags -Wl,*
 
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
 	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
@@ -139,7 +143,6 @@ src_compile() {
 	set_arch_to_kernel
 
 	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		V=1
 	)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
index 441c7831782d..74e838c5764e 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
@@ -122,8 +122,12 @@ src_configure() {
 
 	filter-ldflags -Wl,*
 
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
 	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
@@ -140,7 +144,6 @@ src_compile() {
 	set_arch_to_kernel
 
 	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		V=1
 	)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
index 894d7583448b..3aa1db85dc33 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
@@ -122,8 +122,12 @@ src_configure() {
 
 	filter-ldflags -Wl,*
 
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
 	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
@@ -140,7 +144,6 @@ src_compile() {
 	set_arch_to_kernel
 
 	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		V=1
 	)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 894d7583448b..3aa1db85dc33 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -122,8 +122,12 @@ src_configure() {
 
 	filter-ldflags -Wl,*
 
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
 	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
@@ -140,7 +144,6 @@ src_compile() {
 	set_arch_to_kernel
 
 	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
 		HOSTCC="$(tc-getBUILD_CC)"
 		V=1
 	)
diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
index b3237b143306..ac6c6017eaaf 100644
--- a/sys-fs/zfs/zfs-0.8.6.ebuild
+++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
@@ -22,15 +22,15 @@ fi
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
 
 DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
+	net-libs/libtirpc
+	sys-apps/util-linux
+	sys-libs/zlib
 	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	dev-libs/openssl:0=[static-libs?]
+	virtual/libudev:=
+	dev-libs/openssl:0=
 	!minimal? ( ${PYTHON_DEPS} )
 	python? (
 		virtual/python-cffi[${PYTHON_USEDEP}]
@@ -154,7 +154,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable nls)
 		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
+		--disable-static
 		$(usex minimal --without-python --with-python="${EPYTHON}")
 	)
 
@@ -177,9 +177,7 @@ src_install() {
 
 	use test-suite || rm -rf "${ED}/usr/share/zfs"
 
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
+	find "${ED}/" -name '*.la' -delete || die
 
 	dobashcomp contrib/bash_completion.d/zfs
 	bashcomp_alias zfs zpool
diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5-r1.ebuild
index 67d297759f10..6b91c6f5b816 100644
--- a/sys-fs/zfs/zfs-2.0.5.ebuild
+++ b/sys-fs/zfs/zfs-2.0.5-r1.ebuild
@@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT"
 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
 # see libsoversion_check() below as well
 SLOT="0/4"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
 
 DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/libudev[static-libs(-)?]
-	dev-libs/openssl:0=[static-libs?]
+	net-libs/libtirpc
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
 	!minimal? ( ${PYTHON_DEPS} )
 	pam? ( sys-libs/pam )
 	python? (
@@ -202,7 +202,7 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable pam)
 		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
+		--disable-static
 		$(usex minimal --without-python --with-python="${EPYTHON}")
 	)
 
@@ -227,9 +227,7 @@ src_install() {
 
 	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 
 	dobashcomp contrib/bash_completion.d/zfs
 	bashcomp_alias zfs zpool
diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
index 81159a7d8e25..9f8ac5af2207 100644
--- a/sys-fs/zfs/zfs-2.1.0.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
@@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT"
 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
 # see libsoversion_check() below as well
 SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
 
 DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/libudev[static-libs(-)?]
-	dev-libs/openssl:0=[static-libs?]
+	net-libs/libtirpc
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
 	!minimal? ( ${PYTHON_DEPS} )
 	pam? ( sys-libs/pam )
 	python? (
@@ -199,7 +199,7 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable pam)
 		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
+		--disable-static
 		$(usex minimal --without-python --with-python="${EPYTHON}")
 	)
 
@@ -224,9 +224,7 @@ src_install() {
 
 	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 
 	dobashcomp contrib/bash_completion.d/zfs
 	bashcomp_alias zfs zpool
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 22e4286a8654..c089c475f30c 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT"
 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
 # see libsoversion_check() below as well
 SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
 
 DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/libudev[static-libs(-)?]
-	dev-libs/openssl:0=[static-libs?]
+	net-libs/libtirpc
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
 	!minimal? ( ${PYTHON_DEPS} )
 	pam? ( sys-libs/pam )
 	python? (
@@ -201,7 +201,7 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable pam)
 		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
+		--disable-static
 		$(usex minimal --without-python --with-python="${EPYTHON}")
 	)
 
@@ -226,9 +226,7 @@ src_install() {
 
 	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 
 	dobashcomp contrib/bash_completion.d/zfs
 	bashcomp_alias zfs zpool
diff --git a/virtual/libudev/libudev-232-r4.ebuild b/virtual/libudev/libudev-232-r5.ebuild
index 817668f12fcc..c835fa223cee 100644
--- a/virtual/libudev/libudev-232-r4.ebuild
+++ b/virtual/libudev/libudev-232-r5.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Virtual for libudev providers"
 
 SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs systemd"
+IUSE="systemd"
 
 RDEPEND="
 	!systemd? ( || (
-		>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP},static-libs(-)?]
-		>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+		>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP}]
+		>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP}]
 	) )
-	systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP},static-libs(-)?] )
+	systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP}] )
 "