gentoo resync : 14.07.2018

3 files changed, 9 insertions, 143 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index e4338d16e35b..e91977d27ae2 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -4,14 +4,12 @@ AUX udisks-1.0.5-stat-includes.patch 656 BLAKE2B 6deb3f7fbdce118480572ac50ac896f
 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.6.5.tar.gz 1251008 BLAKE2B 0d94b35ba7bb4cf6f07951d46679da52f6510a5ddf8c070a9da67915637ab4fa13a898b561670fecda37fcf3db540faa85df3b611467d455b9cfe5d8b746a984 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
-DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e2b28e825c55e8da2263f1f7f09845403a2f3434a060ff2d7fefe7d0277c22eaa25650c71393016a620edc0d041 SHA512 3af72b87acb8e540b229e58e2176ac87de831ef402f4825b6e9ee163a8d34e921a38909f45e685cd2a9931d08aaa22285ba2f6a811cb8265237201f0b5e36310
 DIST udisks-2.7.6.tar.bz2 1315047 BLAKE2B 48ad99512068a1ea863f2c4474cd77953c9c69b9d03cae2905f8e07589a3822e666938f9eaa5b291c55589c10b676644627f678491edc06af60e55b6df15f024 SHA512 29df238c6648700e8a18659ecb099baf4cdd811540856a5298439a88cffeee40ae8deb2fc312375913333dbe92fbc55131389f958a8b80efd5b2fdb5b3f11ec7
+DIST udisks-2.7.7.tar.bz2 1330588 BLAKE2B 18e4ddeb474a12a22493fcb91361df9f9fec1192723730dfe187217f84bc193b675d3079e7478bb38cfbbcc85151bf8bd2ac28847f829428400c4750d00368c0 SHA512 f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e
 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.6.5.ebuild 3271 BLAKE2B 3541f6e93c01380fd9617cffc9c829cad537fb085eccf222ad012aefc2c577bd83c197137b782aed6c358e9d089e476e325e964af1a3815df5de17c6c2db4ec0 SHA512 236af3f68f0767b409dd8a8033c80c74ed66f321761f77bbb199c3158de65dedbd52eedaa44dd2378734cdddb265b5337db63ffc2c8f7c23d9563ca947da383e
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
-EBUILD udisks-2.7.5-r1.ebuild 3381 BLAKE2B 93a8fbcf187c13d3a4be00d109e4accd7c24f7ed90c16fcb5a82c94af624e8dfe51823b17d53fe7917c75a95d97587c7357403a726349484d158ff182489c92c SHA512 d4e4d51e50ba07a55bb2ad05ce44c9d91c25903c614407c5141cc67e3638dd78ac37753f0b300becf23696a0981b16ec5e4cf639d3a52c7fc00282315fb2abe9
 EBUILD udisks-2.7.6.ebuild 3179 BLAKE2B 36d1dd022087907f0d20f6392114ef5d2abab8da12316eb0a8c7b46956340f192c20dda5218f3ce62ef73462edc6e99691fc1cb8ef541b13c41c2867037e84af SHA512 fc25fa2b3f2fd4b85832d020bfca48fa339b8bec7c4b7b88916e791464da830311eff5b5cd052eeca0163208d823de8c0176fc004d3c0b51ba6c914389d38daa
+EBUILD udisks-2.7.7.ebuild 3193 BLAKE2B f466518a4373e7792eab39ccb21c669114715f0a47b1fdaef483aa7305747c5d869ea49914a02c9662a0570aa5fed54c7f7be2cca00718cd89fe7ae0978b60f3 SHA512 bd4ffc4d9b9b19c9527daa46757feacc553da660865a41fdbd670a0287cfc36ae8022e671a3b61dbf9eb471c7890b87852b263c4a5d4f560c0f89ea75574a163
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.6.5.ebuild b/sys-fs/udisks/udisks-2.6.5.ebuild
deleted file mode 100644
index 5e8db1bcdac9..000000000000
--- a/sys-fs/udisks/udisks-2.6.5.ebuild
+++ /dev/null
@@ -1,126 +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 ~mips ~ppc ~ppc64 ~sh ~sparc ~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
-	>=virtual/libgudev-165:=
-	virtual/udev
-	acl? ( virtual/acl )
-	elogind? ( sys-auth/elogind )
-	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 )
-
-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=(
-		--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.5-r1.ebuild b/sys-fs/udisks/udisks-2.7.7.ebuild
index e7466089c864..e19ad37d8cbb 100644
--- a/sys-fs/udisks/udisks-2.7.5-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.7.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit bash-completion-r1 eutils linux-info systemd udev xdg-utils
+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"
@@ -10,16 +10,16 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
+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.36:2
+	>=dev-libs/glib-2.50:2
 	>=dev-libs/libatasmart-0.19
 	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
+	>=sys-libs/libblockdev-2.18[cryptsetup,lvm?]
 	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
@@ -28,17 +28,11 @@ COMMON_DEPEND="
 	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-apps/util-linux-2.30
 	>=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}
@@ -99,7 +93,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 	keepdir /var/lib/udisks2 #383091
 
 	rm -rf "${ED%/}"/usr/share/bash-completion