[gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

commit:     882228301b0d74335398a963bfd942ecf298a386
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 22 08:12:19 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Jan 22 08:12:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=88222830

gnome-base/gvfs: sync with gx86

---
 gnome-base/gvfs/gvfs-9999.ebuild |   13 ++++++++++---
 gnome-base/gvfs/metadata.xml     |    2 --
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index f8516fa..b5765fa 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -60,9 +60,9 @@ RDEPEND=">=dev-libs/glib-2.33.12:2
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	systemd? ( sys-apps/systemd )
 	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 		virtual/udev[gudev] )
-	udisks? ( >=sys-fs/udisks-1.97:2[systemd?] )"
+	udisks? ( >=sys-fs/udisks-1.97:2 )"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40
@@ -74,6 +74,13 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="cdda? ( udev )"
 
 src_prepare() {
+	# Replace me with correct patch, see #452400
+	if has_version dev-libs/libcdio-paranoia; then
+	sed -i \
+		-e '/#include/s:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+		daemon/gvfsbackendcdda.c || die
+	fi
+
 	if use archive; then
 		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
 		echo mount-archive.desktop.in >> po/POTFILES.in

diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 46acb9c..5bdb749 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -19,8 +19,6 @@ applications not using gio to access the gvfs filesystems.
 		application access</flag>
 	<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>
 	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
-	<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> seat information
-		for tracking owners of removable volumes</flag>
 	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 	<flag name="udisks">Enable volume monitoring using <pkg>sys-fs/udisks</pkg></flag>
 </use>