gentoo auto-resync : 10:09:2023 - 10:35:29

5 files changed, 143 insertions, 82 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 63e1e4e46031..25fd1ad48d78 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index e7d23efd3e07..d5aa239adcfe 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -2,11 +2,8 @@ AUX lxcfs-5.0.2.confd 249 BLAKE2B c29c8fceafe435d2e3b064ba0cd372f99b00c89d123d38
 AUX lxcfs-5.0.2.initd 576 BLAKE2B 5bda6d018dfb49d167d3fee09f3449e5aba6c0493aff5dec9dabd7a71f0267fb905daeea5734f3ebf2a3280c9f3ef14d046bac1586345de43da4460411e20048 SHA512 3467842276fc574695ca7c87666b6ba4c08a84e2287678e748494416f849646825cebedd5456bc6af9be3aea8e62806d6c135af6a116f089d2391f510c191e6b
 AUX lxcfs-5.0.2.service 428 BLAKE2B effef16bfac727f703b9adfdaa5faf2ce76ac7efef6127873730f2f6482f0b886d96ab9cd0a9589db5b98744ede6b0b89804ad99cd12e0a4b20510eb2d29a097 SHA512 f22242d41cea1f1ea111641e4120d58c321056a49222694d6a15019de3241384f132be114d62df15bc7b0b8ca9a54b4a0daa48a345f1c707dee734ebc59e3967
 AUX lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch 662 BLAKE2B 63ef53897cc254a58dea5eb4c892b1b6f8c49da04b45bf760acb82ca8dbcef9e8ccec54be98f1665ca9dac2d5dcb291c4c75f8a648243c82e8841e02c2eb4512 SHA512 6ecb89e94afc483ca628ca6c6e3e2d1afe0087bd14f917b29be1f60bd31df23e5f48169a9930020e4b8cf1e6366282995ec067ee930d7c0676b48adb45fb295b
-DIST lxcfs-5.0.3.tar.gz 103697 BLAKE2B bdea820f1a5b799309b3d5c8ea439477e6eeda2d9600a348a92b203f2f8a6e0e686d0bf56d8f6b5bbfeb4837dd5737626d7d0610157211f0f189711e9e45a048 SHA512 967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd
-DIST lxcfs-5.0.3.tar.gz.asc 833 BLAKE2B 2dc139639431d9430149369b0a28b6debef0de9f5f69854070d8f2e47718bcc130a869683dfa2b0002c6a54978b0550303adbd5a7fa5ef565eb6bc6bbfcde9e0 SHA512 0207c110553b9d62cf88ec70ed4472b9696d74b277af1e53df6d1145228b76d06695fd28bf20c8428bee5b6ff617c617fbf063c1c8ff0bcc44be2e3439c76a64
 DIST lxcfs-5.0.4.tar.gz 104249 BLAKE2B 83a7b861136c34da8a24dd525fd0767193f2bbd92b40e3b9fd5e42d7645465411792e65e95797ab13b33330299d12b19bdd5786352875ed88ac0097b72b711a9 SHA512 b404045dbabe23e1d1f1d74c1648d2596bb70aaa9f9e46f9f5635b0a02d0c451f68b2559920bbefc5b889e908cf1da0a33c148b26bdce3e45c3d0cbdff710604
 DIST lxcfs-5.0.4.tar.gz.asc 833 BLAKE2B aff883d24b374b296ea3678670e5e82c723fd0e35cfd7fed555aabbd811a104becc0b741331b4aa4a5129c9fff4dc88c6a86e7d64a89fe86aea81718f5d432dd SHA512 56b639597dbaf3008fe030147ea37192bd465c467a79e11ce139bcaa6bca1625b4bb9c4eda6ea1877446769f0fad9b4c5a3513d4f4415b841db96d5da8325ddc
-EBUILD lxcfs-5.0.3.ebuild 1888 BLAKE2B 43db5456d78b318aed8c2b7ba5c43c546db0e88e06c76c67a4fc5ce4a86023f0bc6654b814c501adcfc211de8d0442cdd337931d83d6215bc27e03789b242c3d SHA512 e62ccd706013a0abdcc2cc434d8a44f08928e75c981187876ee8657966b6815de7aa7cbb4dd50745ab13507777dc08a1c63c0f10e89d93fb2ecf03aa098be7e5
 EBUILD lxcfs-5.0.4-r1.ebuild 1991 BLAKE2B 48456c8732007fc2968ad806b5b9dee3fb653af6315c01914c300b01019cc8dddd7a4a431f215ff37a8c515d4f9da7218a6bae4cbe6abf78cd5b90a6cc15d750 SHA512 a1e34677def0dad373ce6ece7400e8de8dcd77a2e7ade0ad1f457ecc289dbf9fd2e2abc159eff6d70293959fc78280654e5156583bd092172d3385e79ff40c90
 EBUILD lxcfs-5.0.4.ebuild 1907 BLAKE2B f23b2c9a9d9d3e59aef24e99f5b6ba7d72c8fd0166ca468de4c1d0fbc80c594fb8a293e3df5d8fbfdc25e7afa71700c6c0321ee630e25e4befcc3dbdf58fc89a SHA512 d9e5abde77b561707b442eb002017f08cfac40688e644b7a1e6a53c5122ebaaf6711d36424e8b5c529fd36b552406adaf7b282c4836516aac05cb1cb8bdc3f43
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-5.0.3.ebuild b/sys-fs/lxcfs/lxcfs-5.0.3.ebuild
deleted file mode 100644
index 81d150efcb9b..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')
-	doc? ( sys-apps/help2man )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-python_check_deps() {
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix python shebangs for python-exec[-native-symlinks], #851480
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		$(meson_use doc docs)
-		$(meson_use test tests)
-
-		-Dfuse-version=3
-		-Dinit-script=""
-		-Dwith-init-script=""
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
-	./main.sh || die
-}
-
-src_install() {
-	meson_src_install
-
-	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
-
-	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# #728470
-	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
-}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index dd9509ce1325..72b59e9f50d1 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,6 +1,8 @@
 AUX udisks-2.9.4-undefined.patch 6251 BLAKE2B 1c2eb5b5448686dcd343fd582e5e79ecb38bbfae4108a56c5b27de9c446a49b7ec1e22f7f55778f7ace7f309b4d2bb7bae99932411917abbefbc58b62fd7dae0 SHA512 103cf151084dd239baa40554cfc2396281e478d8ca9e73c848cd4af42716d7677a50a7dd1b18d8a84a3f97210c695f392ea3556104ed03b50640d0cca96303cd
 DIST udisks-2.10.0.tar.bz2 1784010 BLAKE2B a3923433408ab87448ea0b6dcafcf329b1392f5810ca6d1bcb52da90aad02578f9e533041a5ad62258c485e43b834a60b28fc66ade0aa241c1cdfafdb130bf65 SHA512 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed
+DIST udisks-2.10.1.tar.bz2 1896207 BLAKE2B 41282e4dbbd93e6bda2a10a6ff2f2fb82bfc83b3ccbed9450cca7888c634cde9300fcd0b7d055e0d8e4c8fc0b431a75d5612a24132ea9b2677d194529732178d SHA512 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a
 DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
 EBUILD udisks-2.10.0.ebuild 3675 BLAKE2B 42ff1bda6fc256e2e29bbe49b5ef4bce0ee94f7529d7757d8aa3a752f3af04c6ba3e16cde8355dc13098bc6adadc0bb020d276461c0b912a03da450c80e9a5b0 SHA512 86a18d5d8f7bca8c51439c144ce1e9528c2f9af495054c81c1d4c1d7cc2e8340b4b002cd8569c561d87d0f69eea5809632b88aeb3b94a61f7cf983067549b290
+EBUILD udisks-2.10.1.ebuild 3675 BLAKE2B 42ff1bda6fc256e2e29bbe49b5ef4bce0ee94f7529d7757d8aa3a752f3af04c6ba3e16cde8355dc13098bc6adadc0bb020d276461c0b912a03da450c80e9a5b0 SHA512 86a18d5d8f7bca8c51439c144ce1e9528c2f9af495054c81c1d4c1d7cc2e8340b4b002cd8569c561d87d0f69eea5809632b88aeb3b94a61f7cf983067549b290
 EBUILD udisks-2.9.4-r3.ebuild 3953 BLAKE2B 3412b2ef36590314f4e52ac99509bbb48ced853dc96d60241beacc921a0426c2798d54a9b04b96d2f7526762098888da05fc4b374d70c12a29d9d4cb39e6ea0a SHA512 0f89f6457e62cb74ffe6e7d59fb46844595f1ad4289d26ea11c0a6f03ad0cc0df27b0ac2ba4c65a78443e0432ff1c68d45d881408dc9dcded332cd65e4298c75
 MISC metadata.xml 817 BLAKE2B 8de63b889a0237db873c61e20fd4c03e0b3cba0e76af124ccc6ce8240557c6cb60b15e566918a358714a7c9c981fba2581c155a22fc8ca81bfc363012426b000 SHA512 26df20e075b5f6f23d78ee21c52908c54bd499502208570b575227464f4105044d08421c01e025cbd15fb5d003190f72ded2ea905bc037746b3df452a50999df
diff --git a/sys-fs/udisks/udisks-2.10.1.ebuild b/sys-fs/udisks/udisks-2.10.1.ebuild
new file mode 100644
index 000000000000..fe76f3d7cce0
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.10.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+"
+
+# See configure.ac file for the required min version
+BLOCKDEV_MIN_VER="3.0"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.114[daemon]
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme]
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.68:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	>=sys-apps/util-linux-2.30
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+	dev-libs/gobject-introspection-common
+	sys-devel/autoconf-archive
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+
+	# Added for bug # 782061
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-udevdir="${EPREFIX}$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# TODO: obsolete with tmpfiles_process?
+	# mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}