gentoo resync : 19.03.2019

4 files changed, 9 insertions, 240 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 753f47f4fe52..cc72fe6fbba3 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -3,15 +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.1.8.tar.bz2 931110 BLAKE2B f4aae539f3e4cd9548558eaeb417bf9c5ffd83df3cdce632d6269ebd1543e11be8e0e70143c82883e503fa6d5ce88e815e8a7e8d508a06e967868b4e3987d926 SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
-DIST udisks-2.7.7.tar.bz2 1330588 BLAKE2B 18e4ddeb474a12a22493fcb91361df9f9fec1192723730dfe187217f84bc193b675d3079e7478bb38cfbbcc85151bf8bd2ac28847f829428400c4750d00368c0 SHA512 f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e
-DIST udisks-2.8.0.tar.bz2 1351412 BLAKE2B 34a47176146a91dc7654f36cd1bfade720cb1e12c77ac5fa84562370bb8317cd4e30fe8ecb9d39de65ced072d94a5dff72b9a8f42e776e0b5811f9f186883aa2 SHA512 3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb
 DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea9c966e75b70754ed9491e3d4bfa9693718ab735c61ec110c480037064d610d238df92a839b4b4222dd624397bf SHA512 a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b
+DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
 EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
-EBUILD udisks-2.1.8.ebuild 2920 BLAKE2B 66910a00b8b01456188ca325218b048c2634ee5385d894d24c01361e52733553f73bdda35aaa0556a10579aea947994f45b3f6d2fd01b8818e75f196472cddbc SHA512 0ba34f7f3d951911da1f2904638ca98d10ea3203cb7766610a5e7c03c8dcb01c22157f9099878cdc3ada0193ba82bc73c37777a8b9336474a1a65f77250e1832
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
-EBUILD udisks-2.7.7.ebuild 3193 BLAKE2B f466518a4373e7792eab39ccb21c669114715f0a47b1fdaef483aa7305747c5d869ea49914a02c9662a0570aa5fed54c7f7be2cca00718cd89fe7ae0978b60f3 SHA512 bd4ffc4d9b9b19c9527daa46757feacc553da660865a41fdbd670a0287cfc36ae8022e671a3b61dbf9eb471c7890b87852b263c4a5d4f560c0f89ea75574a163
-EBUILD udisks-2.8.0.ebuild 3262 BLAKE2B 788d71bdb2b9bf0bcbd8e6f3037a31606bc8d04fe7f47f8dadbfe95e47a8217d32e46cf22ff8688567d2efab3f7a9fe1ca2cdbb30da5943a41a02935a823d31d SHA512 036110299de03fa0a287df79b7a5dbe7cc1024191dacf67a0170497f6ca07a5028f6603db4f1e4eb165338bcce672eea1bbc92528a999d2a5c776feed309ee50
 EBUILD udisks-2.8.1.ebuild 3234 BLAKE2B b0be42f25f2a9c3a5b3305bc9907f2b8fcd81470e25b0910f72f733dad6e6803f528bbfe2c450e97ab257cd42311ede04c5b9d65c37b13068729563c3a649f99 SHA512 cfe0d8c6b1b60f160b2eceac6eec64951a56aadd930cadd0c38a6c6b8a9d5fb9d74a13738a3d40dd1afe71373e8106143586126da9de62d57afe49f0e498cccf
+EBUILD udisks-2.8.2.ebuild 3250 BLAKE2B d6d03713258187074cbccf5b5b088bafe3ef0f7be9134051136a5855ceb858b00961a10cde4b098d24d9cdf933171eb780c0bcfff136b957cc8fbd7988488d22 SHA512 9509455b4b82c8c39ece13d6ede774bca9097a71954408f0a06f299409ce513ea75abfc7aef9de679ca63d974ef7e8d48ed508b2d392f6f99d131988862e8523
 MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5
diff --git a/sys-fs/udisks/udisks-2.1.8.ebuild b/sys-fs/udisks/udisks-2.1.8.ebuild
deleted file mode 100644
index 03f0795e312e..000000000000
--- a/sys-fs/udisks/udisks-2.1.8.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="acl debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=virtual/libgudev-165:=
-	virtual/udev
-	acl? ( virtual/acl )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	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-am-1.3
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-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
-
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-
-	default
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable acl) \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html \
-		--with-udevdir="$(get_udevdir)" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-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.7.7.ebuild b/sys-fs/udisks/udisks-2.7.7.ebuild
deleted file mode 100644
index e19ad37d8cbb..000000000000
--- a/sys-fs/udisks/udisks-2.7.7.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl debug elogind +introspection lvm nls selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.18[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 )
-"
-# 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}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=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 )
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# gnome-base/gnome-common:3
-# 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)
-	)
-	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.0.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild
index b98093cca7bb..b95599147fc8 100644
--- a/sys-fs/udisks/udisks-2.8.0.ebuild
+++ b/sys-fs/udisks/udisks-2.8.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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"
@@ -36,13 +36,14 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-devicekit )
 "
 DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
 	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	>=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 )
 "
 # If adding a eautoreconf, then these might be needed at buildtime:
 # dev-libs/gobject-introspection-common
@@ -64,7 +65,6 @@ pkg_setup() {
 
 src_prepare() {
 	xdg_environment_reset
-
 	default
 
 	if ! use systemd ; then
@@ -98,7 +98,7 @@ src_install() {
 	find "${ED}" -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
 }