gentoo auto-resync : 09:07:2023 - 04:23:59

6 files changed, 172 insertions, 16 deletions

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index c218869c9b55..04f86fc124ce 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,6 +1,9 @@
 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
-EBUILD libblockdev-2.28-r1.ebuild 3000 BLAKE2B 3aa70b52c0e0ff70de8b7f471d5fcaf8c7f99bc6a18a32ef0b714eb249c83186e0f85bce6c70c48bab906a6e62e76ca94293459042aea54dbfe6887b1371d765 SHA512 834a2bc93c7d9818132d4da6607e5259e79d2fe29e01dfd14881815a11d3ca116596d0d2e788af99a9ccb955731c4b9fb8c4f9ea51e17b81d20f0e3666036625
-EBUILD libblockdev-2.28-r2.ebuild 2939 BLAKE2B b0018832c9365f95fde574fb705cbfd57ff0f1cea167b096557d7ff0a78ef18175f0f592ecbdee92c2e1a9d6f10517154609a3ed70d43d3fe0ccfb697ccad3a5 SHA512 47df44ffd1a59704d04a43835c700e6751b2e5d6777d3f147defeb439f050430597e9e22041fddab14bf2b321d29e3095b3bf02e46549ad13ae6862bfd6d9270
-EBUILD libblockdev-9999.ebuild 2733 BLAKE2B b7dd95006279e4717687664c9fa6cff563cb0ff1b8500c0b962742c9b8a440ba51f2e4550cf251a3608c77c17d5bc7f8343372a89052d034b1801e91988044fe SHA512 e0b750ff1819f6de9500855ee87ca55287b7fff6266eda78f9f3c5cc35bb2ea10d2b1d894a8fad90003669144ae10ef533207a3af175aa456849696285792f94
+DIST libblockdev-3.0.1.tar.gz 1066201 BLAKE2B bc213683fcfe78fcbeb494be90a5974911603f301152095b7aa6e0f14c0acfcaf946e8ef175b201d04d47de9d7743d9feaff5a31b23086b0253b5cab9cab24ee SHA512 b45e2f26691fe4016c8a161e1300f1edfca7a810e7535dd1eb787ad88a0d3110f75e0da289027eaed16bad275bfbb709b29b946e5fc3750a56e86c6453aa3a6d
+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-9999.ebuild 2803 BLAKE2B 2f253de229e5d93466babc7ae69bcc121f7a2c8342f734b1fdc37f5e5f5243b609bb17ebe5d72d3d93885db662a9b6b55f7fa8188ac5f7d9ddf4421fb459f1f1 SHA512 8179778311125fed76869a7ef3a7658f77a71b368c84ee58441442f3b84587c64056ed2e4f7a57ab463eeefa230f42fee9e92cceee05e284e9c40e278bdf999d
 MISC metadata.xml 1233 BLAKE2B 68512209e8f458b5b52a9d82eb86c1c831837681b2976d5050c578c3b3fdb032640c4cc99da9621aae7c061ae8332825ea5010a8f1138fbbbc34e92fccbeddeb SHA512 eb47faef934a8eafe1beeea6f901ddd6b0e7202823f57b3848f6ef131b2a5ffc968740d980a68163696d3de34a98ebef8561e63d26ffe213a42e1022577a9270
diff --git a/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch b/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch
new file mode 100644
index 000000000000..c57464c39d86
--- /dev/null
+++ b/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch
@@ -0,0 +1,23 @@
+bash is fine with "test . == ." but e.g. dash fails on not having
+the two dots quoted as strings.
+
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ html-doc.stamp: ${srcdir}/libblockdev-docs.xml ${srcdir}/libblockdev-sections.txt ${srcdir}/3.0-api-changes.xml $(wildcard ${srcdir}/../src/plugins/*.[ch]) $(wildcard ${srcdir}/../src/lib/*.[ch]) $(wildcard ${srcdir}/../src/utils/*.[ch])
+ 	touch ${builddir}/html-doc.stamp
+-	test ${builddir} = ${srcdir} || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
++	test "${builddir}" = "${srcdir}" || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
+ 	gtkdoc-scan --rebuild-types --module=libblockdev --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --ignore-headers="${srcdir}/../src/plugins/check_deps.h ${srcdir}/../src/plugins/dm_logging.h ${srcdir}/../src/plugins/vdo_stats.h ${srcdir}/../src/plugins/fs/common.h"
+ 	gtkdoc-mkdb --module=libblockdev --output-format=xml --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --source-suffixes=c,h
+ 	test -d ${builddir}/html || mkdir ${builddir}/html
+@@ -13,7 +13,7 @@
+ 	-rm -rf ${builddir}/html
+ 	-rm -rf ${builddir}/xml
+ 	test ! -f ${builddir}/html-doc.stamp || rm ${builddir}/html-doc.stamp
+-	test ${builddir} = ${srcdir} || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml ${builddir}/3.0-api-changes.xml
++	test "${builddir}" = "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml ${builddir}/3.0-api-changes.xml
+ 
+ install-data-local:
+ 	test -d ${DESTDIR}${datadir}/gtk-doc/html/libblockdev || mkdir -p ${DESTDIR}${datadir}/gtk-doc/html/libblockdev
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
index 4d0836e9f708..16134d249951 100644
--- a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 LICENSE="LGPL-2+"
-SLOT="0"
+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.
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
index 1be0372d3a14..b0ea270cfb87 100644
--- a/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2+"
-SLOT="0"
+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.
diff --git a/sys-libs/libblockdev/libblockdev-3.0.1.ebuild b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild
new file mode 100644
index 000000000000..f5bc2e4fb5e5
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild
@@ -0,0 +1,129 @@
+# 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-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 73e19fc076a1..59bd04d7fe4e 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
@@ -20,8 +20,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd +nvme test +tools"
+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"
@@ -29,6 +29,7 @@ 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
@@ -37,13 +38,10 @@ RDEPEND="
 			>=dev-libs/nss-3.18.0
 			dev-libs/volume_key
 		)
-		>=sys-fs/cryptsetup-1.6.7:=
+		>=sys-apps/keyutils-1.5.0:=
+		>=sys-fs/cryptsetup-2.3.0:=
 	)
 	device-mapper? ( sys-fs/lvm2 )
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
 	lvm? (
 		sys-fs/lvm2
 		virtual/udev
@@ -60,6 +58,12 @@ 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}
@@ -90,13 +94,10 @@ src_configure() {
 		--without-nvdimm
 		$(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 nvme)