Version bump.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 154 insertions, 1 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index ad5bb56aaf8a..18b84d64680d 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2012/12/15 21:04:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.110 2012/12/17 23:13:49 ssuominen Exp $
+
+*udisks-2.0.1 (17 Dec 2012)
+
+  17 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +udisks-2.0.1.ebuild,
+  +files/udisks-2.0.1-pragma.patch:
+  Version bump.
 
 *udisks-1.0.4-r4 (15 Dec 2012)
 
diff --git a/sys-fs/udisks/files/udisks-2.0.1-pragma.patch b/sys-fs/udisks/files/udisks-2.0.1-pragma.patch
new file mode 100644
index 000000000000..bebbb9f91b24
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.0.1-pragma.patch
@@ -0,0 +1,53 @@
+From 02c041674cbcbee75e7fe70095f37c35837f4901 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen@gmail.com>
+Date: Sat, 13 Oct 2012 09:58:48 +0000
+Subject: Only use #pragma GCC diagnostic on GCC >= 4.6
+
+https://bugs.freedesktop.org/show_bug.cgi?id=52614
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
+index 22c20b8..4a5a4b0 100644
+--- a/udisks/udisksclient.c
++++ b/udisks/udisksclient.c
+@@ -25,6 +25,11 @@
+ #include "udiskserror.h"
+ #include "udisks-generated.h"
+ 
++/* For __GNUC_PREREQ usage below */
++#ifdef __GNUC__
++# include <features.h>
++#endif
++
+ /**
+  * SECTION:udisksclient
+  * @title: UDisksClient
+@@ -1922,14 +1927,22 @@ udisks_client_get_id_for_display (UDisksClient *client,
+                    (g_strcmp0 (id_type[n].version, "*") == 0 && strlen (version) > 0))
+             {
+               /* we know better than the compiler here */
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++#ifdef __GNUC_PREREQ
++# if __GNUC_PREREQ(4,6)
++#  pragma GCC diagnostic push
++#  pragma GCC diagnostic ignored "-Wformat-nonliteral"
++# endif
++#endif
+               if (long_string)
+                 ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].long_name), version);
+               else
+                 ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].short_name), version);
+               goto out;
+-#pragma GCC diagnostic pop
++#ifdef __GNUC_PREREQ
++# if __GNUC_PREREQ(4,6)
++#  pragma GCC diagnostic pop
++# endif
++#endif
+             }
+         }
+     }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/udisks-2.0.1.ebuild b/sys-fs/udisks/udisks-2.0.1.ebuild
new file mode 100644
index 000000000000..5150d60253f4
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.0.1.ebuild
@@ -0,0 +1,94 @@
+# 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-2.0.1.ebuild,v 1.1 2012/12/17 23:13:49 ssuominen Exp $
+
+EAPI=5
+inherit bash-completion-r1 eutils 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 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug crypt +gptfdisk +introspection selinux systemd"
+
+UDEV_VERSION="196"
+COMMON_DEPEND=">=dev-libs/glib-2.32
+	>=dev-libs/libatasmart-0.19
+	>=sys-auth/polkit-0.108
+	virtual/acl
+	>=virtual/udev-${UDEV_VERSION}[gudev,hwdb]
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+	selinux? ( sec-policy/selinux-devicekit )
+	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
+# 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
+	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
+	>=sys-kernel/linux-headers-3.1
+	virtual/pkgconfig"
+
+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
+		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pragma.patch #428398
+	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug) \
+		--disable-gtk-doc \
+		$(use_enable introspection) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+
+	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
+}
+
+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
+}