gentoo resync : 01.10.2021

3 files changed, 3 insertions, 137 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index b6e483499baf..cd0b8420bbcb 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,7 +1,5 @@
-DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
-DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
 DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
-EBUILD udisks-2.9.1-r2.ebuild 3529 BLAKE2B 45aa4d904dd309b528754dd7077a1c0c23b94c6f6f2aa3413af4ff793536aafc46947c360274ed38999538838e63accbb34d01d2e846040268df8f24853c0193 SHA512 2d20c606cd8e05f50da1e0020b58f8790f9ae25fbd98de2e4280a1dc55826ae44e15a2d8ceef3c2d6c4fea5da4622c8d29ba71eb86245fcc8583f70728d8dd36
-EBUILD udisks-2.9.2-r2.ebuild 3652 BLAKE2B b7e3809e57ab006d4652152287941e08c902d1cdc950a9dbbd187fb62be7f7dcdfd01bd840157aa62b6612d56bdf11f24dbc048dc01073010c33ac005c39e52c SHA512 83b736c253aedda99a8376e3bcd341a73430d18ccbd056314573af5d7fe29fa7b51fd593c0a260ae22e4fcd7dff04aad35cd4cfffa58e111bd6118f5e6e4a753
+DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
 EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
+EBUILD udisks-2.9.4.ebuild 3652 BLAKE2B 255dff40822adf438c750c3b53da385d9adaa55e8cb2e75910b185ebe2f8471a33142f26697f5369dd8088910e0ec4d2b234016d7d04bd31b1e23183809f3831 SHA512 549a74771ddb6a89b3794ac3e51e6a0b6e5ef2635a9aa22759deb662f1e0e5865bda28813fd94600f0a7a37fb145d4b0a371054addd655361303e8cd57c75115
 MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671
diff --git a/sys-fs/udisks/udisks-2.9.1-r2.ebuild b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
deleted file mode 100644
index 57047f60efec..000000000000
--- a/sys-fs/udisks/udisks-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit 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 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-	zram? ( systemd )
-"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
-	virtual/udev
-	acl? ( virtual/acl )
-	daemon? (
-		>=dev-libs/glib-2.50: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 )
-	zram? ( >=sys-libs/libblockdev-2.24[kbd] )
-"
-# 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 )
-"
-# 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
-}
-
-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="/usr/lib/tmpfiles.d"
-		--with-udevdir="$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable daemon)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable lvm lvmcache)
-		$(use_enable nls)
-		$(use_enable vdo)
-		$(use_enable zram)
-	)
-	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() {
-	# 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
-}
diff --git a/sys-fs/udisks/udisks-2.9.2-r2.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild
index 480609ab96ff..b15fdab52bd3 100644
--- a/sys-fs/udisks/udisks-2.9.2-r2.ebuild
+++ b/sys-fs/udisks/udisks-2.9.4.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
 BLOCKDEV_MIN_VER="2.25"
 
 COMMON_DEPEND="
-	>=sys-auth/polkit-0.110
+	>=sys-auth/polkit-0.114
 	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )