gentoo auto-resync : 19:08:2023 - 21:39:30

7 files changed, 9 insertions, 272 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1f18ae7e1560..1e7381ff5c30 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 3c6494bd41cb..27ae730df488 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,11 +1,8 @@
 AUX libblockdev-2.28-sh_tests.patch 1552 BLAKE2B 3b26cf271a0cb2a0f51ecffe51c9caf9a0ac1c65aecb5adc845a2721f3ac7178df7c994b7647b4fa1bbfd27baf072325bffedf723555c39e164f7d7645163090 SHA512 11fc498db4ed1d3a9e5a9288e1137d64f7581cc7b2d265292f7a3899ef5cfc6d63138fef7f87695abd9d518fa1c74a8bd98ebb54038211eeb0afe7964d85c6c4
 AUX libblockdev-3.0.1-sh_tests.patch 1811 BLAKE2B 07d63b3833f333f02e870fa454b2f5ea5c3300422ebe6c32f383c1cf1117a645c0e213573185266d37cedeb8ba7dfa26b94796f306f95e7ec4083393b6772921 SHA512 e2fbae0a5c510e26d2ac81e5b38dfa0157936628e7ec1cafa748b3e8bb363513c5105075779bfe4b00a4e8d4a84d480d52583bffec36cd618d7020ab46f0b93a
 DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392
-DIST libblockdev-3.0.1.tar.gz 1066201 BLAKE2B bc213683fcfe78fcbeb494be90a5974911603f301152095b7aa6e0f14c0acfcaf946e8ef175b201d04d47de9d7743d9feaff5a31b23086b0253b5cab9cab24ee SHA512 b45e2f26691fe4016c8a161e1300f1edfca7a810e7535dd1eb787ad88a0d3110f75e0da289027eaed16bad275bfbb709b29b946e5fc3750a56e86c6453aa3a6d
 DIST libblockdev-3.0.2.tar.gz 1067300 BLAKE2B 97170434d98a66b90ff3da3d094ce6cbf29b338967e9b2dbc9edee9bdd730a63678efbd15c94c4c6604b1499956d744c102d26c116794c4e44fcfb871afd252d SHA512 5285aaa4a8e66aacc70461b2c0b0ffe57121ee6136bfa7c46c3ebbd1da517278f8760207f983d69707096c8293e6f7a1d59caf03e742c3d8009ceed25b8c3e89
 EBUILD libblockdev-2.28-r1.ebuild 3025 BLAKE2B 7f74654f050b758ba445aff5964a1933b128d578f43f4ecf89b1fcb4c6ec933d0fee28d7fdc660896760886d658bc66f74f58a8ff9a0dcf0220d6d8138d088a8 SHA512 503f8d3410241d0f24bfb9708f8262ad5fca2ac982829c07c35f76fb3c2fcb1055cb46d0c207b3019e7fe226109f01e08830686d66adb6f8abdaf75592408857
-EBUILD libblockdev-2.28-r2.ebuild 2964 BLAKE2B 18d3aa74f0fc4629c137d4d474ec40f5ad3e79233580ab155bba34c4a06a661b97d6c65d5d345618bd3eddd8303ed52af3169f3d69d8baecb223c2406994393b SHA512 ff6abdc78200277793d63bd8da90ff583c6c9e2fa8efaf1a96a2d4cb97d2e32c3753a6b97be987b94f3524e1f80ec1f0e40c83a22aced5eed9d57c42ae72c324
-EBUILD libblockdev-3.0.1.ebuild 2840 BLAKE2B d4b34cbf2bad4385c57ecbaaa87bc5631081c8fd3f63fef0758fa4538aaf330374b0959913aa67a13bf6033dbb962717f491b6d73a6f8a64b20f3e0564753100 SHA512 99a4418fbf1c6ab5c646fd6d7f4d697bf6c9ffe7c16c021f724d29c2af093c6942b094494551a3553809179e8b0eccb7162fa1fd33a426a42e4af01b0446f91d
-EBUILD libblockdev-3.0.2-r1.ebuild 2857 BLAKE2B e55a0e4e5fda9c40467e25289d1a9ee53d6bf79b423404f4b0920f4c9960bb6ac226b5ca109057ad3fcab013346825450a13f008f2845a5c6a2c64d165b02ce1 SHA512 f5df514a283c80b45f3b3d02c1ffa1c5530c4c908c0b82c138c016b6689777bfd9592e05db320504e00f36a91fde9bc07d9510b9b1f4a3490bc6240ddc87a23e
+EBUILD libblockdev-3.0.2-r1.ebuild 2934 BLAKE2B cdd1b66b674883427b57769ac6710285aa8df594f83366c680307cf230d76b32ae761abbed25531c100e099cdcbe716be78eb96648563b84998df7f128081143 SHA512 46735dadfa76446d570635a9552292dabc26fb86274884a6243c41eecade81420c617bb4d74617d686f79b6c2e0b0d222f761f3275c4a5c3dda864b3e8a995f5
 EBUILD libblockdev-9999.ebuild 2803 BLAKE2B 2f253de229e5d93466babc7ae69bcc121f7a2c8342f734b1fdc37f5e5f5243b609bb17ebe5d72d3d93885db662a9b6b55f7fa8188ac5f7d9ddf4421fb459f1f1 SHA512 8179778311125fed76869a7ef3a7658f77a71b368c84ee58441442f3b84587c64056ed2e4f7a57ab463eeefa230f42fee9e92cceee05e284e9c40e278bdf999d
 MISC metadata.xml 1120 BLAKE2B 1a323b7d5b61c6404578f58a880ff7825f818d1efcdf3f78954959cab3906be29651320aad097af181f988b537b8997412c24fec958207b22921462287e8a8cd SHA512 d531b6b1c0fc2e5996b11a16c211c29daa05da580e92ddf01e0ca672dba032a1ce8c5c66c44fa36e10397eec8379690a7299f3dfd811c2a2a8d464af69b3c649
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
deleted file mode 100644
index b0ea270cfb87..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-single-r1 xdg-utils
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/storaged-project/libblockdev"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
-	BDEPEND="
-		sys-devel/autoconf-archive
-	"
-else
-	MY_PV="${PV}-1"
-	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-LICENSE="LGPL-2+"
-SLOT="0/2"	# subslot is SOVERSION
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
-# Tests require root. In a future release, we may be able to run a smaller
-# subset with new run_tests.py arguments.
-RESTRICT="!test? ( test ) test"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	sys-apps/gptfdisk
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		escrow? (
-			>=dev-libs/nss-3.18.0
-			dev-libs/volume_key
-		)
-		>=sys-fs/cryptsetup-1.6.7:=
-	)
-	device-mapper? ( sys-fs/lvm2 )
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	vdo? ( dev-libs/libyaml )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND+="
-	dev-util/gtk-doc-am
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
-	test? (
-		$(python_gen_cond_dep '
-			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
-		')
-		sys-block/targetcli-fb
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		escrow? ( cryptsetup )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.28-sh_tests.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset #623992
-	default
-
-	# https://bugs.gentoo.org/744289
-	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
-		| xargs --null sed "s@ -Werror@@" -i || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--with-python3
-		--without-mpath
-		--without-nvdimm
-		--without-python2
-		$(use_enable introspection)
-		$(use_enable test tests)
-		$(use_with bcache)
-		$(use_with cryptsetup crypto)
-		$(use_with device-mapper dm)
-		$(use_with dmraid)
-		$(use_with escrow)
-		$(use_with gtk-doc)
-		$(use_with kbd)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with tools)
-		$(use_with vdo)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# See http://storaged.org/libblockdev/ch03.html
-	# The 'check' target just does Pylint.
-	# ... but it needs root.
-	emake test
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm ; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
-	python_optimize #718576
-}
diff --git a/sys-libs/libblockdev/libblockdev-3.0.1.ebuild b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild
deleted file mode 100644
index f5bc2e4fb5e5..000000000000
--- a/sys-libs/libblockdev/libblockdev-3.0.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools python-single-r1 xdg-utils
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/storaged-project/libblockdev"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
-	BDEPEND="
-		sys-devel/autoconf-archive
-	"
-else
-	MY_PV="${PV}-1"
-	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
-fi
-LICENSE="LGPL-2+"
-SLOT="0/3"	# subslot is SOVERSION
-IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools"
-# Tests require root. In a future release, we may be able to run a smaller
-# subset with new run_tests.py arguments.
-RESTRICT="!test? ( test ) test"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	sys-apps/gptfdisk
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		escrow? (
-			>=dev-libs/nss-3.18.0
-			dev-libs/volume_key
-		)
-		>=sys-apps/keyutils-1.5.0:=
-		>=sys-fs/cryptsetup-2.3.0:=
-	)
-	device-mapper? ( sys-fs/lvm2 )
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	nvme? ( sys-libs/libnvme )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND+="
-	dev-util/gtk-doc-am
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
-	test? (
-		$(python_gen_cond_dep '
-			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
-		')
-		sys-block/targetcli-fb
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		escrow? ( cryptsetup )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.1-sh_tests.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset #623992
-	default
-
-	# https://bugs.gentoo.org/744289
-	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
-		| xargs --null sed "s@ -Werror@@" -i || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--with-python3
-		--without-mpath
-		--without-nvdimm
-		$(use_enable introspection)
-		$(use_enable test tests)
-		$(use_with cryptsetup crypto)
-		$(use_with device-mapper dm)
-		$(use_with escrow)
-		$(use_with gtk-doc)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with nvme)
-		$(use_with tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# See http://storaged.org/libblockdev/ch03.html
-	# The 'check' target just does Pylint.
-	# ... but it needs root.
-	emake test
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm ; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
-	python_optimize #718576
-}
diff --git a/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild b/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild
index 3c1005c34b8a..c9c348b7e758 100644
--- a/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools python-single-r1 xdg-utils
+inherit autotools python-single-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
 HOMEPAGE="https://github.com/storaged-project/libblockdev"
@@ -88,6 +88,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug #910487
+	if tc-ld-is-lld; then
+		tc-ld-force-bfd
+	fi
+
 	local myeconfargs=(
 		--with-btrfs
 		--with-fs
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index eacbfe742569..f17a01ab0a65 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -6,5 +6,5 @@ DIST libnvme-1.5.tar.gz 566715 BLAKE2B 2111a6929bc17949f03c39fdb247420bba371641b
 EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971
 EBUILD libnvme-1.3-r1.ebuild 1351 BLAKE2B 571a22422960fd0a7f5c2a0e16e367cb5b9ad9fcd543698b7aa4f320d24c5bb7cb4918bd858d9ebd144e24ec15e4c4db0a546aa773bb4ed023539314b01da3ed SHA512 223e511a5699cdef31b1a22d7bdd1bf757442b652f3dcead4a08e481524f963eb243f70cafa732165783bb32a7ad2d33baf1f379e9c18252f338943c472096dc
 EBUILD libnvme-1.4.ebuild 1393 BLAKE2B 4d67d8f1c72859697e1983a609f3b55aaa62c4cd7bb8428318ae46a137fbddcb5afb46646d0b297807faea32e66fa545cff2d0d229f3b4de61b8480f1891a436 SHA512 01d338434a5bddaa21ca9d69ec362152252359660a0eb8ca16ae27b0f96389ae15c2cc78ba3eb1780deb9092e5d5fb514bafe74ab7122efe2a441fa1ad4a8877
-EBUILD libnvme-1.5.ebuild 1401 BLAKE2B b92f76661e8095e05c713f6fc51d690ff7578387bd705a32a1f9940ba883408b7779d2b620eb533aa329598754d729b6d02b8d3b2e89254ce5aad6a29b84b371 SHA512 89d209d7fdf3a63bbcb080ef0500e48732802cbadcee1bc48bfea33d19f88cb52f4efea6985bf00dfe9dbe61ec934cb65a273cf9a9328e357fcaffeceaf86138
+EBUILD libnvme-1.5.ebuild 1400 BLAKE2B 569f54e9c39509771ab22867a8a15bc1fab73943745f50a9fd330119ba2b5bfc70ba1ea53b8d90b79702b67cb3526d7de7c5ac9e5c8d46e2dfeb0e83ac242f09 SHA512 72252902a34c91bf861ecb64c7a7787321da70b3297dedfd5e232330131b5b4dc307a5122397c44e2d5183584aebfabc1c593ab039420f8b40b259ac8a8bbc3e
 MISC metadata.xml 585 BLAKE2B 6163419190adb903fdbdef99ad53f8b14ffbc08ac3c8b56f820049468010af2a58ac204ded1b53c767759e9ac864bf85dbc3b723cd7113cb919194dd9ceaaac3 SHA512 2f5268b41676d2a61d5415de3ec62149cda53613970a1af6aface937cc635d26866c88205a6d9fcf7efd7df0c7f45308ecf5b29b6cea937966b765a222edb8f7
diff --git a/sys-libs/libnvme/libnvme-1.5.ebuild b/sys-libs/libnvme/libnvme-1.5.ebuild
index 7b7ce106ab49..6c3ba4a6ae11 100644
--- a/sys-libs/libnvme/libnvme-1.5.ebuild
+++ b/sys-libs/libnvme/libnvme-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="dbus +json keyutils python ssl +uuid"
 
 REQUIRED_USE="