gentoo resync : 05.02.2020

4 files changed, 2 insertions, 245 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 527ad17dd488..e2b7b6e83bd9 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -3,11 +3,7 @@ AUX udisks-1.0.4-revert-floppy.patch 688 BLAKE2B 6af71c88eec724cb4e61f45c82a288f
 AUX udisks-1.0.5-stat-includes.patch 656 BLAKE2B 6deb3f7fbdce118480572ac50ac896f56123579c93f1d91165796a806cef1bbd07f301f8f085cc6ea801990206b06004b54815efc2c972309d17cf55ca5c29a0 SHA512 f399d3e242839a339412f03c174975834c2c6e6515ed50b6b87b33974ae091421b5179b12b78cc06d339b41046d3a70ab78767e194081467c2cbd4c8fdc61c02
 AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45595ba8cf6832f560e6fb314e47139104c981b332f0a6b0db3a3eb63b2b771525e3903ad67b3eeb9f1749bd6f86538d SHA512 9402c931dda2f415577f3b6d60cab03891e83cc804a0cbd790bb3bc71d160d8b6fa14d13829281ffb55a9032ac289798ee5f2d6e14348c96a4e9b1e922111bb2
 DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a
-DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
-DIST udisks-2.8.3.tar.bz2 1613373 BLAKE2B d2f5e145ee0fefaafab71ff2cfec40962d835c7df22fee47702bc8406760b2463cbe334404e8d27b21e0c05134c67d336d24a6de7b19c0dc5d16ea78553a2738 SHA512 6d1d9ed18cb1742de13aad48709356f3dd9b8324967fd47107bd0f1e16b697d0928bd722397062495bdea51190774a25309834d27a5160feb7915becb474468f
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
-EBUILD udisks-1.0.5-r3.ebuild 2796 BLAKE2B f0b07eb68d352b40101ad6c320b0ea93811c49e4cf36690881ccbe7b0dcb5f15a2810a43a0c722accc4549c68ecc17e0c79eea9f27114590da00e0b5200d3fbe SHA512 9095b305e94d48cbf9564ffc5dceaccc2ffc3108e3239d3cac59ef0defb16b4bf0fcdcd7638209865a816e9593e61d4a652c510e7b86daa8faa2b16130539dbc
-EBUILD udisks-2.8.2.ebuild 3232 BLAKE2B 9e10f4fc309e3b38e0277055cb9c98730b8ee5c67d79f8289e09e93033f73146b64757a7dc05a0303722ff7c3f399b8b09b825a8aafb22f366752939ea71b76d SHA512 8e8cfddf57fffc8dedc23dd3bb1f915e7322377c0bfd432e9c96de05821f2841bf6613b54f8f3c739acb8d91489510a10795790ee8dc7a51770268d09825c113
-EBUILD udisks-2.8.3.ebuild 3292 BLAKE2B ba199f539f63d699312ec5d4b556557d7c0d561c79f062f2905ca06f2be6bbf898205c9ec1c801f39d0565c93f9181bd19dae3ccf1c5904d8012c7d73e7f7619 SHA512 d514649cdb2610e19a45390d598ccfb8eaefc90afcf0ae448972dadb6746534351517fc4bbee51b55ecbb7f7253471fcb0c9baa5f6c7b007a0f373324e3fe82d
+EBUILD udisks-1.0.5-r3.ebuild 2797 BLAKE2B 5269e1aeb27a1f50c028bc04c3c7e7e59ff3e7e762320e6a153173e150db5b2cfc4f88e6ca6541d0564485f6ecc08bd6e32f33d3455c9ca850ce5df24fcdea33 SHA512 b63b5739a5cbdd58ccf7c0034e8034e020354b1ce79dc9009f7dd6d0a164cbf4dc794a5c1c19b6f1209bcc771dcfddf19416f691ef786d5827c766c3ab4680c2
 EBUILD udisks-2.8.4.ebuild 3284 BLAKE2B 59a74c88ce67b3d243c85cf6150b273c80a7b329d407eaad7fec71e345e462342dd46806dee9ebb6c14d2de63a8cffd19b541acd7e9781bc9a77512dbea7caff SHA512 7093d1e21ae620dbac252baabd657af62a4dc5df6cf68084f50f00b54844be4da93b8bf828a712c3c08be5820631f4bc45d47b52413304b6d4c8053f8213f4ed
 MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
index 9b9799bc30af..037338cc53c8 100644
--- a/sys-fs/udisks/udisks-1.0.5-r3.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="debug +lvm nls remote-access selinux"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/sys-fs/udisks/udisks-2.8.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild
deleted file mode 100644
index 134f857287de..000000000000
--- a/sys-fs/udisks/udisks-2.8.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 linux-info systemd 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 debug elogind +introspection lvm nls selinux systemd vdo"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libatasmart-0.19
-	>=dev-libs/libgudev-165:=
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
-	virtual/udev
-	acl? ( virtual/acl )
-	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-apps/util-linux-2.30
-	>=sys-block/parted-3
-	virtual/eject
-	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-udevdir="$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable lvm lvmcache)
-		$(use_enable nls)
-		$(use_enable vdo)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -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() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# 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.8.3.ebuild b/sys-fs/udisks/udisks-2.8.3.ebuild
deleted file mode 100644
index b49a758bd22f..000000000000
--- a/sys-fs/udisks/udisks-2.8.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 linux-info systemd 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 debug elogind +introspection lvm nls selinux systemd vdo"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libatasmart-0.19
-	>=dev-libs/libgudev-165:=
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
-	virtual/udev
-	acl? ( virtual/acl )
-	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-apps/util-linux-2.30
-	>=sys-block/parted-3
-	virtual/eject
-	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 debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable lvm lvmcache)
-		$(use_enable nls)
-		$(use_enable vdo)
-	)
-	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() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# 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
-}