Version bump.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 165 insertions, 9 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/Manifest b/sys-fs/udisks/Manifest
index ac8041ae34b7..2a73f00eb0fe 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -4,24 +4,27 @@ Hash: SHA256
 AUX udisks-1.0.2-ntfs-3g.patch 198 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716 WHIRLPOOL 365a00e248d6fe4ac7e5ce18a92b6f76611461ffe5c186e29eda521809381e3ec2c1bcc71b34f35513befdfcc99bec09fd741246a62e1b6feb48e95c31f841cc
 AUX udisks-1.0.4-drop-pci-db.patch 1003 SHA256 f6e735063c492e9bb319762ff92639212b9c2ca9235be0c0758c734218cd591f SHA512 ec0b1fa0dc6b186c1fff0f2101d1216b7b10123b57e6bf008e4c5092d120f15d3ee0a7379b21c85e567756cb165947c3a46669e882c69162903b72f8ae0dcbb8 WHIRLPOOL 8472b2377ba87760c3c10218867d70498f9ec7bf3bc4c67691a2438ee79bd43dcca465fde343e799e721a181335bbab07150bc4fe90deb11e1092743140b67a2
 AUX udisks-1.0.4-kernel-2.6.36-compat.patch 1441 SHA256 6b9ebe47adde63876b890f90b22979dd53c26ffb7e38171e9bd0e152f22f48aa SHA512 da57b1f431606d04a0b4d0590ad58b8caa6a317c301dcb650bd08a9aca292cc983711ba27fd6a8f6e4d0cd4d05198f08a99bb3913eec6079cf73a5fa893f3e01 WHIRLPOOL 4c9a5df9a11841d20945d625510a495c23571d2568c0e2e71851dd6f9d6c044021be268c706931dc7895cbb7a36b9b8a8e8fe9d0a92b0407986e704f2264bbaf
+AUX udisks-2.0.1-pragma.patch 1640 SHA256 816f47179013c7f46e429a8d24d4f9e6ab5aa1fe95e8cda216bb198ef3f1ed8a SHA512 1bb8cc292ae9491aafb3162690c4bbfab9c4cea26380a219d2bff118e0853820ca3bd70b6318d7bfdf1549d689093074101b09f0e5279fefc0e932a3ea4df1ab WHIRLPOOL c15db7878d0aac18d39520e3994c751289b2fc3c02ab8b5f5cfe370effb3afe67f49cb49f22386e37b7eecb7d7c7a35e78cb9c2b1ef9102e642613dba4caa14b
 AUX udisks-2.x-ntfs-3g.patch 374 SHA256 3d3964bc7ea65aff3720e5afa6d98584a48b03c3a47aff11d888ac6e103b6aeb SHA512 572708d4386c3b90cf77f19cc54d38a2f588e4aec044caf4c74e6cfde8f2118f11a4aef5b63225163cf650b59b9c0a01eb77d679b0b398fa17b70fa1cdeb5013 WHIRLPOOL 962182b4f4c79acc8fa183d430e675346f56075724b3cabec49a3cf2511f85036a6cfe9234b9455f6dda97f739aab14f1f1b2893c0b2a1edd09351950ecafe5c
 AUX udisks-2.x-pragma.patch 988 SHA256 d260b28ccde0b55f548a62989e326acdf18241c93b4822688fc768f16757c1b9 SHA512 0dbce04d26f3a863356dbd88ebc33864321361ef7f35a622dc53ed06c403d177d779cbefce168301d52308a095e3548c3007200d23e60f5f804a582057e2961c WHIRLPOOL 95f8a33fec4a972d446e0a992f964b6c56dccad0b5540ce559a0cce82cd98d9e3c94108ce80a2fc97bd7f55332f2074b7be0a1c11df46df4141e20658041fb2a
 DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-2.0.0.tar.bz2 747405 SHA256 aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb SHA512 87522f5998ff7b67ad157700803441f7179f23a43e29e804f5e152501c7fc88a08d2633175004449378dd34f5d7fed8138398110c1441eb6bb904cd0284b4e9b WHIRLPOOL 7d8221301c206bb91802d54d97d71c7e96c1ef1c0c9ca37078a98b3a08d0cf0bac1027b15af98c21bc20645155c8425991392c2296c853ab6cc6163f47074df1
+DIST udisks-2.0.1.tar.bz2 748998 SHA256 7a6728942d3cd1adc8cd5ee770e8865b293694e9663487861b7b8bf7b495bbbf SHA512 c8baadd9fd182a52e93eb4a182f6de42f59f429518236c00819f28ee726334c5dddb7366f874381b56211ffb41e3c915c63a482195443fc0b3dc95d513b4555a WHIRLPOOL 0cb4c52c0fc8952b9ab663cb32482c6e0047407f0fcd0de79ddf8e23adafa82c22881f7d68b24eb01cf413c3451f723068d7df6547da8f0f1a64a1237d2da1b6
 EBUILD udisks-1.0.4-r2.ebuild 2359 SHA256 4ba023701e1a5c12d0dd0e58afdd63bb24dd3e323e3002ec9b102fd7a50e361b SHA512 64d95d89544fae58e57ae24f6483782377ab98deb8e0cd1b636697c9e0da30b04a89c811ba40f72fba0cea2f7c684bdd457176bf9c77b53c430b9e6756c187c9 WHIRLPOOL 9917d22798d023581445ac171c1acc6311f8ee5c3ac50fbbe07e418a617354853fcab5d64a17dfa225077efd1dec6f25875679e09e4d72b60f87aa356bdf8090
 EBUILD udisks-1.0.4-r3.ebuild 2607 SHA256 06999c144cd22a45e86d9b38b2f8e1d0b96da5db229e009e89e7072ada4d664b SHA512 99adcf58794eaccba0be35864e3686dc0899e4aeb69c66390f887ba13ddc2307268d6de6ffef0c2bd950265522ddf3da5b7655fd37d46f9425b56cf77f86c459 WHIRLPOOL eb57ce44b75f63e9798bc92e0d3a17cb76080cb8b4252c3431e4c39c87c97b08ad3ed4682917178a7aebff174331a10dca5fde29f2c48ebb3499ea33f4e5f2a0
 EBUILD udisks-1.0.4-r4.ebuild 2658 SHA256 1ac1659efd33b296a28a52457186c9fc2698974b64895f971b38776c75f2f6f0 SHA512 cbc999429acd029b75aeeb25286ccddd09ae09c48d3d0dcfd22457cf194bacf7e99f5485db5c1df12783ce7c620b4335f48df3e992f46079159d597dd794179a WHIRLPOOL cb82eb52228a4959393df7c71fbab8dc2060c575a1d090f712201ffbd229440757304fe64191492b6dfd435c009213a34d3b723ed0fd575a59a0d40da90f7ab4
 EBUILD udisks-2.0.0.ebuild 2924 SHA256 4305fda540f7f80f55c68d638ed1789a80b72cf0eaba3ea333b5a8534452603d SHA512 e9b64b94fa5a77188d5bc7fcae131e5ee0a5769a2dd79859cc3123ef65742a3736cf7b3481a0b9c16b05ad8b9d72659eefba59f137f2e737331c6643663669cc WHIRLPOOL 125bd1cb2b3ddc6d7ed652014266fdce3b0779d8f997f3ee70ed63ea35d90d02de7301601c865d82e804b4b0eb706bc9339e50ef7dc169138babfb230fbb2bc3
-MISC ChangeLog 15813 SHA256 99ba021449c63b1b977625e45f8691d1dcf1080fc366e0d58e5e6370b5a9ccc1 SHA512 8ce5cf0e2f981b5af54ed7ff95985664b216849a3f3febe769bfb1deae55033ba0352a11e2580913c165208b75825ebb38f70c933944688c7029ccdf1d5ef040 WHIRLPOOL fd67aeea263dc973a26d995a78d136257a7658e27920fd2ec88772e1928c7dc8ea8a7f922e7e0b41dac9e91a44b03fc3700aab0101356ce2bb09073fd1936d51
+EBUILD udisks-2.0.1.ebuild 2853 SHA256 58cbad0c6b1766f57f1738dfa665630f7d0d4132fb8e45bfe84348b3d380ea04 SHA512 8b5bb739a4b08630e6afa6a65ca3cf3d03eeb228c69a8f9c9867cd3008920a86dace3311ca0e716359d53fcedf4f92f93a871fbc7400858c77c7775af0a2c58e WHIRLPOOL 97f7700c4ba1aacf0feb7f2a64e9c5607231b2b7662e7f8e6f4614e518b7a5b0568f126375e4d50cdc0fb481998ffcf2c42f56eec75f6b66506911ecd588a550
+MISC ChangeLog 15971 SHA256 d7ae1fd8e11c2379f6bbaf465e164f5ebd89e58972c87a49defc480d06f74f8e SHA512 f3d660b2d29d55b0b59490bca7eb4e6086e68f5b3363e383c3a18808096be0c58b287be29585a8b442b71910df6664ab3a2adf689efe3c6b892c40834060811d WHIRLPOOL 994eca347e2c01b47a5bea98da803a0dd03a8d56c09e0b1419f07e20f3c9e8d401157949944fa374a6a9e1b6021c142c54c2e5e36986d949f1adcdf4bb01025c
 MISC metadata.xml 673 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c SHA512 f5004914ab449164d2cc9146a18215bbbffbf1fe09ed5078ea4cacc02ce83f0ce25b49a9e0e67c0cce6f7e0f0ff0099a0c3f66b59c36407ace837285525054bd WHIRLPOOL ed7342b97f9efcc5e5b88c543f34aa4b2228110685550ce7dfe8e3e0f1a3ce13a0aa0d36d49313156130578e78db030a5db03c603a9b1c2f78d097e6c54ba3dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQzOXPAAoJEEdUh39IaPFN1EIH/AiDXH2i69S8Nzq8GbhucefA
-IZImoVDC2czqZXfMp4PuvaSdCvOpy/y6Pywjg262uDOXCQThHWDgNw9otJdpLN2S
-YCDu44e5wMb0lqWkTOoh/VvtXUbanRHi9dZn6tRe1tF2juwbrLwr/BNUKAtL/Q1L
-tyzu/uZ3pt/FKL3w1kc/4EWRjaRDym//AQSVCj7v3AuQt+yLTKYJY0/1Wlh+vH4Q
-yRDG/Q40+96UiFgPXvVDWvLL8tcSTBy6tOssGIP0txf1+bdjDdJzz22vjveh8uQQ
-aXMPhEnZNAuNdwStCL5BgthHtnH0ElKPTlbG9j9qV5vcVUs/Cc5GjDj4BrZjlWw=
-=fEGD
+iQEcBAEBCAAGBQJQz6crAAoJEEdUh39IaPFNpvUIAJoBGfu2tXIXIGAXRLfAVX2I
+Z59/x+FoN/j58WhtSzWdOQXfpkDDAj6/uIsFPgdBE9UWxpgbCRjYcVbWITBvfSjA
+Xbsd/Wq431XeOF3PLztW0ZmUzNmzznrwAtAqkVyxdWaZnv3Wc0N4QqNhBiXwTUgt
+TsEs0gDWeo5NCN18+KPWuBzy3tOwzEiwB0JfteQPBHv0SizuJ4GV72hOEoYJk0Fs
+rrDfiv3YnMoA632/FPB10NlMktMk6QytdwkAhvxs1oVuKWvWtMdRpza+p8Im5MRu
+lXqrz/90Ek7y56Ihewqe06nPIuytDL4GKVYW38MYaIAk4wRHFsM3ILE7LJI15xg=
+=3yl8
 -----END PGP SIGNATURE-----
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
+}