gentoo Easter resync : 12.04.2020

8 files changed, 3 insertions, 245 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 20b1d04a462e..1eeed1ebe303 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,9 +1,3 @@
-AUX udisks-1.0.2-ntfs-3g.patch 198 BLAKE2B 3b5818ce4866826e3f09e7d0ec0f5ee87a53aa7dc653a73900ad8a8fed095b9cef740a1c846cec5ddc18635bf96db011c5830843317af9c8e01df72ebb8113df SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716
-AUX udisks-1.0.4-revert-floppy.patch 688 BLAKE2B 6af71c88eec724cb4e61f45c82a288ffb1955ce2007cb9c53d6d92eb4a0521dc968852128aef99f59f92d0c8dded5e473d4bbb9fc469813d277f85f68da4b870 SHA512 044f40313ef5c8eeaac512d428e97b420507cd24cf25074768376733cf308676fbb1a429f462e4b06313344de1b7012b43ad4e6607d096758f0dd0e3effafbba
-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.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
-EBUILD udisks-1.0.5-r3.ebuild 2805 BLAKE2B e19758839ec841356200e0897fa21ccc02d44091bbff432229d93783f586e9359ee4830a291f443f6cbea9b12a99400564d50d13f6c65c76de1c80ec800072a9 SHA512 92ff43605d4bba50caac2815190955eab961d33b5b7f8de4ca56607440a74452ec1bd89c4c33333f44ccba4251fbc5e971a40450e7657ebc75224feef4967ea1
-EBUILD udisks-2.8.4.ebuild 3278 BLAKE2B b2c3e0268e4b71a6a4d4fe17b5ca7fcf457bc4933346f069d814e2e0a22b01bc51e44b45b633c65dbee781176d873a6ab0eb52e29ac97a210f907d52f83970d2 SHA512 38c6956de5bd3e0212a41a8bafd9de6eb499c553e5b4d0abe34e1ec5dd9c383c62901a879bd0614bccaa682699105dc2ad64899fdbf9c37316c483ea2741bad5
-MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
+EBUILD udisks-2.8.4.ebuild 3279 BLAKE2B d3a35670627a2cfa8f211efd0e38439ebb9b5aebf968d8dbdf3670f501d9ffac3a0665ffa85e894fb9eb31bf20240822d1650676ba2aef0a97fb873afa7bfa27 SHA512 bc3664b7a2e18c537ce33cbaf2931c113387bcf110b524b77f5ca2346c54e4d3e998accdb1cc075ae990becc09238ec7efd6543c5a2bff457710491ef2f150af
+MISC metadata.xml 562 BLAKE2B cb4420b855989175ed12f77be26d3e9c42375d64abf397ae7a5ec9da49383d6e45d43ead2057070c09d6849e16f0cbdaba6a863c2d3760ec39f251224371387c SHA512 bec0d8698846724ea9f8cec0a4745af6e0723265248ae1953c19dfd0df9904b37554fe8cd5c5dac554e03d6c822b1324bd6d787a56f92006e189f7940c98d54d
diff --git a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch b/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch
deleted file mode 100644
index b6ba4a4849a8..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Support ntfs-3g by default without entry in /etc/filesystems for write access.
-
---- src/device.c
-+++ src/device.c
-@@ -5909,6 +5909,7 @@
-   "vfat",
-   "exfat",
-   "ntfs",
-+  "ntfs-3g",
-   NULL,
- };
- 
\ No newline at end of file
diff --git a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch b/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch
deleted file mode 100644
index 0f13a6aba833..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This change was done upstream to prevent UDisks1 from polling for floppy drive so often but broke
-mounting floppies while at it.
-
-http://bugs.freedesktop.org/show_bug.cgi?id=30283
-http://bugs.gentoo.org/show_bug.cgi?id=338185
-
---- src/device.c
-+++ src/device.c
-@@ -4485,7 +4485,8 @@ update_info (Device *device)
-         }
-       else
-         {
--          if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA"))
-+          if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA") ||
-+              g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY"))
-             {
-               media_available = TRUE;
-             }
diff --git a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch b/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch
deleted file mode 100644
index 85ef5208049d..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 29 May 2015 21:09:39 -0400
-Subject: [PATCH] Bug 90778 - fix build with newer glibc versions
-
-https://bugs.freedesktop.org/show_bug.cgi?id=90778
----
- src/helpers/job-drive-detach.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
-index eeafcab..d122a1f 100644
---- a/src/helpers/job-drive-detach.c
-+++ b/src/helpers/job-drive-detach.c
-@@ -18,6 +18,7 @@
-  *
-  */
- 
-+#include <sys/stat.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
--- 
-2.4.2
-
diff --git a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
deleted file mode 100644
index 96ce943d385c..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/580230
-https://bugs.freedesktop.org/95028
-
-From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 23:04:32 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-Linux C libraries are moving away from implicit includes of
-sys/sysmacros.h, so pull in this header directly in the files
-that use these funcs.
-
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -38,6 +38,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
---- a/src/device.c
-+++ b/src/device.c
-@@ -28,6 +28,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
---- a/src/mount-monitor.c
-+++ b/src/mount-monitor.c
-@@ -27,6 +27,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <mntent.h>
---- a/src/probers/part-id.c
-+++ b/src/probers/part-id.c
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
---- a/tools/udisks.c
-+++ b/tools/udisks.c
-@@ -28,6 +28,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
---- a/tools/umount-udisks.c
-+++ b/tools/umount-udisks.c
-@@ -28,6 +28,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index a62a8bcadb90..b4357b2df5b0 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -7,7 +7,6 @@
 	<use>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
-		<flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 		<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
 	</use>
diff --git a/sys-fs/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
deleted file mode 100644
index f1eec45d006d..000000000000
--- a/sys-fs/udisks/udisks-1.0.5-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils bash-completion-r1 linux-info ltprune udev systemd
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-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"
-IUSE="debug +lvm nls remote-access selinux"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libatasmart-0.19
-	dev-libs/libgudev:=
-	>=sys-auth/polkit-0.110
-	>=sys-apps/dbus-1.6
-	>=sys-apps/sg3_utils-1.27.20090411
-	>=sys-block/parted-3
-	lvm? (
-		>=sys-fs/lvm2-2.02.66
-		<sys-fs/lvm2-2.02.183
-	)
-	virtual/libudev:=
-	virtual/udev
-	selinux? ( sec-policy/selinux-devicekit )"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-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+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
-		"${FILESDIR}"/${PN}-1.0.4-revert-floppy.patch \
-		"${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \
-		"${FILESDIR}"/${PN}-1.0.5-sysmacros.patch
-
-	sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die
-
-	epatch_user
-}
-
-src_configure() {
-	# device-mapper -> lvm2 -> mandatory depend -> force enabled
-	econf \
-		--libexecdir=/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		$(use_enable lvm lvm2) \
-		--enable-dmmp \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/deprecated \
-		"$(systemd_with_unitdir)"
-}
-
-src_test() {
-	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
-	ewarn "in favour of sys-fs/udisks:2."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		slashsbindir=/usr/sbin \
-		slashlibdir=/usr/lib \
-		udevhelperdir="$(get_udevdir)" \
-		udevrulesdir="$(get_udevdir)"/rules.d \
-		install #398081
-
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	newbashcomp tools/udisks-bash-completion.sh ${PN}
-
-	prune_libtool_files --all
-
-	keepdir /media
-	keepdir /var/lib/udisks #383091
-
-	rm -rf "${ED}"/deprecated
-}
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index 66975093ce5a..357af8aca47a 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+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 )"