gentoo resync : 10.11.2017

3 files changed, 4 insertions, 134 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 7d7f61c0a4f0..2ccb2ca4033a 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -5,16 +5,14 @@ AUX udisks-1.0.5-sysmacros.patch 1773 SHA256 eb02de05abea7280aed1dfdc6b6c23bff99
 AUX udisks-2.6.4-udisksdprivdir.patch 827 SHA256 f039db880fb62740042248eea65a1621a0e8d3e9df4516ec0608290ebcc1177f SHA512 43c4d01620c6d70a5ae46cbad03fc6d34012e0eed33abf29b8ee14ad2004c22b7c550c9ada11eb97f15195669baae1aefbe1ebf239a3bb97199e24add08a6f15 WHIRLPOOL 0f8bfec72e6a3f55cc73c1b2d741cb11d942dd9f9a85a806978db1ad4f4dc046894a1ceea329a38dd5551fa179f341f5512a0e1f5287af66f20e582c10f53df3
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
 DIST udisks-2.1.8.tar.bz2 931110 SHA256 da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb WHIRLPOOL 396465f32c9798495e4cd1ce541b619e5ed9d2693561da9a2630eeb27933deac8fa3959ee0c4f16d63bad297f4cadf8df9a4e5dd07b7dc06951cb84d12c64e64
-DIST udisks-2.6.4.tar.gz 1242262 SHA256 7c7889dbd8f910b8a8094841168c04d48e0bdaf946b22aa5f0742a460473c191 SHA512 8cd4fa1c2873f2150448bb81268feb38802959bb860fa41f9cc4f088327faf207011a3ea15c121f531dc0a8cd65a3fff14615b79bdaa5f59f52f4ede4d44532c WHIRLPOOL cc54fe2ca683d9adc61448a48e1a9be43c1bbc5b4c1902f8ea2fbf7561e8f798edca6e7e6cfce55ad6b902ffb40045d2ae2ec49784dd88fa9f680b69e021aa1c
 DIST udisks-2.6.5.tar.gz 1251008 SHA256 817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7 WHIRLPOOL 43f66f3410d68ef8b6db8050d30ada83307fe5236e011752f67d1f45c5c81c1f4714fe6fde8377544a3054192482731d58206bf8af94e50a9e713df7a78912b3
-DIST udisks-2.7.2.tar.gz 1269868 SHA256 34d834520efcfbb8cca33ccf703e45752b32772ae766673dab6360202c7838aa SHA512 5729ba5314db88a72d932865352c133afb5b515a4e15f7d729f9074a3fcbc4ce195c7e58e0c4a8eb2df9fe4d29ccffed4be50cc605f1c6d7cf26f9b941ef7edb WHIRLPOOL d23443ddc254050a92caee6e84f29d9e6af72b5f5b70590510930623f7ac959237b0e6fe640fd8d2f6822fde073d0fd6a966563779443891a2ca0862fc296ee8
 DIST udisks-2.7.3.tar.gz 1282215 SHA256 96e09e94083228a7af1025c4040b56c7eeca9687e60fecf7f88be88291dcb1f1 SHA512 27761e52527ecfd080711e39efb6669b2e85fe388e9f34b2f99294b2fefdd0da489b74ff3b3c2d53a239ff1bd818d73a1fd8d88eb7a7ef660d51f338ac2c82fe WHIRLPOOL be2d96b75e1dee8c905104fe0b88fb08f997524da7795f870412f392676baffc361303ca7a60f3734091c84c35fdad00c7c052c348539147f3b4b87d2e4de62c
+DIST udisks-2.7.4.tar.gz 1286465 SHA256 2ca70f67cdfb4bd5b630972f72fd29eb35eb1b644e161132488446776a1d70fc SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 WHIRLPOOL dd99c4287e8b0a3276573da092d8826d32c13ca6b99a6945ed731ca6443b0f74e21f4876ef84c89c7a665d9e1f96fb67c2455b46def60b905fd0cebf95821f93
 EBUILD udisks-1.0.5-r1.ebuild 2748 SHA256 c4356e3d712522e94a7ba111d824e66001501e03c04f684ba5626d6a06dcc865 SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee WHIRLPOOL 529f0b901b4f71bcc37fcc40eeee3e594275af1203d23580cb166bf587fe2469c7e703d21b442b46eec099a7b398efbe63312b1a5e02609aacd9193eedee8f30
 EBUILD udisks-2.1.8.ebuild 2997 SHA256 55f36ad8ec606bf08f47b5bf88bf8601546df61e254e11f5d52cd5192516224b SHA512 b035b304e9585c5cfced81a4700eede5de731f850e06eb76bd391ba7ab333c3acba8775c493ca83bde42679877e9ad8ce436fc202486c04db2a34cfca7485c25 WHIRLPOOL 2cc0bafbdd0e6eae2afe6c7e54b9f9e23cdd20523075496e0c0d470ad0c9542ce2b71dc7a46b485801519976babf37ec9aade008466053e47725c973a759c1b9
-EBUILD udisks-2.6.4.ebuild 3324 SHA256 c9f2e3531ea2359c738ecf8402b9cce1139c6ba8971746acb74121e227e24d36 SHA512 10444e0682ee6c7d5a4f88d471bf4e4a7468a62e15d754e559079e6660e5076ecd1d98256c60f2885415c312c859470a2a929f97313f24f2763a50bde929b06d WHIRLPOOL a2290e25c96d3e16cf0154975faa4a2d828d6eb1b4782e2e23104344e097acedffddce02d7ef626c41d4147488d77e135e9fd2546fbc88c0962cef262f0ca882
 EBUILD udisks-2.6.5.ebuild 3348 SHA256 465e0c41d05a37074a2c38abc9330d6261ee7f1cdd0672b1759760fa12967634 SHA512 ed5146d860532c61b6cda0f4dcffd8ad3ce4907b671369f4032b58070a3252f65959f5fe33bc44914b3f872d0f40d5bc1f7b9fe2e1345fb7ef04019fb3554cbc WHIRLPOOL c9318560b6675e28d73a885ab2c3a311b226195e4f323bf10ed8c749921db4a593990331678b3cf7e4fa7ae64e1bcf8e1c7e98514c6cc7bf247816003782db8d
-EBUILD udisks-2.7.2.ebuild 3406 SHA256 b7dc34d52df782dbc386d89c6fbd243cf8dfea68340076d389c136a552231bef SHA512 4d24e779a21d5749131375ef493188594a938796fadf1f5dfba51a6d445d78ec052aecc8cded8ebc016b4643881bf2744662d6c6672cacfe4b27db393a2c3db3 WHIRLPOOL caa101eab7330f932f616b233303ed2987f3a416586c485013f7cf6509076e058c0d009928d5c11782ba664c56791efef7108ca8f2635ebf49cb1ab7dda8603f
 EBUILD udisks-2.7.3.ebuild 3406 SHA256 b7dc34d52df782dbc386d89c6fbd243cf8dfea68340076d389c136a552231bef SHA512 4d24e779a21d5749131375ef493188594a938796fadf1f5dfba51a6d445d78ec052aecc8cded8ebc016b4643881bf2744662d6c6672cacfe4b27db393a2c3db3 WHIRLPOOL caa101eab7330f932f616b233303ed2987f3a416586c485013f7cf6509076e058c0d009928d5c11782ba664c56791efef7108ca8f2635ebf49cb1ab7dda8603f
+EBUILD udisks-2.7.4.ebuild 3415 SHA256 5741d52ea3ffffd34040dc3cabb1ed1ee8f0986e4f0874c7b2a5ae236bd0e48a SHA512 f600d62ad352a751bc8034bb5ad304d9cbd8800ece45ede63930ec832e65c404c737d3902a82174454554bb82004f01b2d635ec29117ed1d57483b28df1a5eec WHIRLPOOL 58f2ed9e19e83b2003d43ff81876db93d23512b30b53b551d8b21646db550da6397e5b74ebbf32206eda183190aab59cfde63602e268a6425fd2a6bf12668870
 MISC ChangeLog 7173 SHA256 0be9ec0ca31628c2c57021397fa5b720aa4df817b00958f1f0820e7b2a0626a2 SHA512 316a9483dc1d859f056ae01b40c880b2a3bec76c71e6d8a2684bc2d4eaac29ac33932900526cde7b4d682342574ae3e89271530fdb8f8bcf599b997e3f670944 WHIRLPOOL 2dde76763a3ccdea8957b05822b52611a15c18e2f136ec370db9d7f2d3db8d68b27b62fcb456ddb743fd3bb0381574f94e8a32fe1ff703cf23dbffa8b1b953cf
 MISC ChangeLog-2015 26587 SHA256 893173bc27a1be910af8c400ac6acf905f3b03017189066b678e27dba667fd60 SHA512 651db8e37b19c5ee353f6fc5f6fb0528e039c97ef1bc2167f0e3742dadd6e39480ff1976a59635b0e4501fabdfe7319a4ebdca1d10f0be19f5bed1610268e621 WHIRLPOOL f6354286056b35099ef3d5848a26da135680211d35f023d313c162e33d72c72996dd47fa78fc231c6ca6ad4ac728c321f7dc20e5f1197fcdabec7af54998f9e0
 MISC metadata.xml 803 SHA256 8191b039989d93bc8efca49c2d3ffdd57a6c4681ab4c14a56c95f2003325e6d6 SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e WHIRLPOOL 24223570208cef48f5924b44689a01660214dd892edc73056e9dd1839c5251df81047fc0f1ed6449a6fd615509bb59d67280cde112196fe6587d0063f3cbe8eb
diff --git a/sys-fs/udisks/udisks-2.6.4.ebuild b/sys-fs/udisks/udisks-2.6.4.ebuild
deleted file mode 100644
index 75aea2ebc411..000000000000
--- a/sys-fs/udisks/udisks-2.6.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="acl cryptsetup debug +gptfdisk +introspection lvm nls 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:= )
-	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}"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-udisksdprivdir.patch"
-)
-
-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+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
-		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=(
-		--disable-gtk-doc
-		--disable-static
-		--localstatedir="${EPREFIX}"/var
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		--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.7.2.ebuild b/sys-fs/udisks/udisks-2.7.4.ebuild
index 0ddf5e552c13..da67c255bedb 100644
--- a/sys-fs/udisks/udisks-2.7.2.ebuild
+++ b/sys-fs/udisks/udisks-2.7.4.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libatasmart-0.19
 	>=sys-auth/polkit-0.110
-	sys-libs/libblockdev[crypt,lvm?]
+	>=sys-libs/libblockdev-2.14[crypt,lvm?]
 	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
@@ -108,7 +108,7 @@ src_install() {
 	prune_libtool_files
 	keepdir /var/lib/udisks2 #383091
 
-	rm -rf "${ED}"/usr/share/bash-completion
+	rm -rf "${ED%/}"/usr/share/bash-completion
 	dobashcomp data/completions/udisksctl
 }