sys-fs/udisks: Bump to version 2.6.4 (bug #612814).

This bump introduces lvm support but yet lacks btrfs, bcache, zram and
iscsi support due to missing libblockdev package.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

4 files changed, 150 insertions, 0 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index f5c49c2b90e0..8eeb7e090006 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
new file mode 100644
index 000000000000..8564e2b83342
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
@@ -0,0 +1,22 @@
+From 283e9093d541b8de0ecca324fde8fd38b560dc8e Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 24 Apr 2017 09:14:05 +0200
+Subject: [PATCH] Fix typo in data/Makefile.am
+
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index af0cce2..83af330 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -6,7 +6,7 @@ dbusservice_in_files = org.freedesktop.UDisks2.service.in
+ dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
+ 
+ $(dbusservice_DATA): $(dbusservice_in_files) Makefile
+-	@sed -e "s|\@udisksprivdir\@|$(libexecdir)/udisks2|" $< > $@
++	@sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@
+ 
+ dbusconfdir = $(sysconfdir)/dbus-1/system.d
+ dbusconf_in_files = org.freedesktop.UDisks2.conf.in
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index b9596e187b94..4b0d5ddb8c16 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -7,6 +7,7 @@
 	<use>
 		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</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>
 	</use>
diff --git a/sys-fs/udisks/udisks-2.6.4.ebuild b/sys-fs/udisks/udisks-2.6.4.ebuild
new file mode 100644
index 000000000000..bfd173772ad3
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.6.4.ebuild
@@ -0,0 +1,126 @@
+# 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
+	>=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
+}