Version bump. Optionalize sys-apps/gptfdisk wrt #412801, Comment #1 since it might not work for every arch.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 101 insertions, 3 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 88a3b6997b97..df8b1bcb94f3 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.73 2012/04/20 18:49:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.74 2012/05/01 16:49:07 ssuominen Exp $
+
+*udisks-1.96.0 (01 May 2012)
+
+  01 May 2012; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.96.0.ebuild,
+  metadata.xml:
+  Version bump. Optionalize sys-apps/gptfdisk wrt #412801, Comment #1 since it
+  might not work for every arch.
 
   20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.93.0.ebuild:
   old
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 69f8a9dc2e2a..b3e9582453ce 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -6,7 +6,9 @@
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <use>
-  	<flag name='remote-access'>Control whether connections from other clients over LAN are allowed</flag>
-	<flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name='gptfdisk'>Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</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>
 </pkgmetadata>
diff --git a/sys-fs/udisks/udisks-1.96.0.ebuild b/sys-fs/udisks/udisks-1.96.0.ebuild
new file mode 100644
index 000000000000..6b7b6189ba2c
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.96.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.96.0.ebuild,v 1.1 2012/05/01 16:49:07 ssuominen Exp $
+
+EAPI=4
+inherit eutils bash-completion-r1 linux-info systemd
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc crypt +gptfdisk +introspection systemd"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32
+	>=sys-auth/polkit-0.104-r1
+	>=dev-libs/libatasmart-0.18
+	|| ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] )
+	virtual/acl
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+	systemd? ( >=sys-apps/systemd-44 )"
+# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
+# util-linux -> mount, umount, swapon, swapoff
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20.1-r2
+	>=sys-block/parted-3
+	virtual/eject
+	crypt? ( sys-fs/cryptsetup )
+	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.32
+	dev-util/intltool
+	dev-util/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+
+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+=" ~USB_SUSPEND" #331065
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.x-ntfs-3g.patch
+
+	if ! use systemd; then
+		sed -i -e 's:libsystemd-login:&sSuOmInEnWaShErE:' configure || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	default
+
+	local htmldir=udisks2
+	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
+	fi
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	dobashcomp tools/udisksctl-bash-completion.sh
+
+	find "${ED}" -type f -name '*.la' -exec rm -f {} +
+
+	keepdir /media
+	keepdir /var/lib/udisks2 #383091
+}