gentoo resync : 02.08.2019

5 files changed, 15 insertions, 145 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 56e5db2c9612..c6939dac6aa5 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -3,13 +3,11 @@ 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.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
-DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea9c966e75b70754ed9491e3d4bfa9693718ab735c61ec110c480037064d610d238df92a839b4b4222dd624397bf SHA512 a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b
 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 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d
-EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
-EBUILD udisks-2.8.1.ebuild 3233 BLAKE2B 2e6032785c926aec9cd36a2e12e7984825a44190b72d0c76edf60abf9903d04f005a94b258eaac299fa310ba7f801de45ca1cd194e5cf194cf7752cfdbd21f02 SHA512 00a2ad198df800bcc4e2faa99d98d80a3cbccd8d9b63071ec07d49dcf0e85d5e5bc14a36de73ac20ff20cddab21c82f38ee4f422f0d0f6e500d6bc51f4e9aee6
-EBUILD udisks-2.8.2.ebuild 3235 BLAKE2B fa8624bc87962f3bf2ed0da9ebecb01dc680fdaf97aaba7eee752d0e482ac90ed8913528da88aa765c88c364b7c1213f6e99a9ff6df23561a76cba770e25c581 SHA512 2d2dc6333efa601fa8348763dd347e1f41950233d5fb037bafeb8e70ad1cbe9968bd276eaf15fc1574bcac75d9745a3f1af492eb687fa7c377a04fab62681148
+EBUILD udisks-2.8.2.ebuild 3231 BLAKE2B 671706422d94397c4d211acf03518dc83b63e11f67f40a616df99913b34ea4c8e31a990d36a2db709367a04d9b065a55d7d67dee295e70fcb995812610cc93c9 SHA512 5dce9091a7a57365258d2c26e03f484133817ae428a3489dac15a1fda2fcb66a33a16318d6b4c224e81bd35838f596ebfd2aa6395c095c31e0779aa647eb6475
 EBUILD udisks-2.8.3.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd
-MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5
+EBUILD udisks-2.8.4.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd
+MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 521f6870035c..a62a8bcadb90 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -5,9 +5,7 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
-		<flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</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>
diff --git a/sys-fs/udisks/udisks-2.7.4-r1.ebuild b/sys-fs/udisks/udisks-2.7.4-r1.ebuild
deleted file mode 100644
index 3a51cabba1d7..000000000000
--- a/sys-fs/udisks/udisks-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils 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/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 x86"
-IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
-	>=virtual/libgudev-165:=
-	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 )
-"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-	)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-1.3
-	gnome-base/gnome-common:3
-	sys-devel/autoconf-archive
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-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
-
-	eautoreconf
-
-	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)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	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.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild
index a68c0e67661f..61965b270ccd 100644
--- a/sys-fs/udisks/udisks-2.8.2.ebuild
+++ b/sys-fs/udisks/udisks-2.8.2.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 )"
diff --git a/sys-fs/udisks/udisks-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index 39172881d7dc..2db934f25193 100644
--- a/sys-fs/udisks/udisks-2.8.1.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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="GPL-2"
+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 )"
@@ -36,16 +36,17 @@ RDEPEND="${COMMON_DEPEND}
 	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
-	>=sys-kernel/linux-headers-3.1
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )
+	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 # If adding a eautoreconf, then these might be needed at buildtime:
 # dev-libs/gobject-introspection-common
-# gnome-base/gnome-common:3
 # sys-devel/autoconf-archive
 
 DOCS=( AUTHORS HACKING NEWS README.md )
@@ -63,7 +64,6 @@ pkg_setup() {
 
 src_prepare() {
 	xdg_environment_reset
-
 	default
 
 	if ! use systemd ; then
@@ -80,6 +80,7 @@ src_configure() {
 		--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)
@@ -94,10 +95,10 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 	keepdir /var/lib/udisks2 #383091
 
-	rm -rf "${ED%/}"/usr/share/bash-completion
+	rm -rf "${ED}"/usr/share/bash-completion
 	dobashcomp data/completions/udisksctl
 }