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

[Alexandre Rostovtsev]

commit:     7ef5c7cad9b8000a00f23dc84434e57b043a52bf
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 23:02:28 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 23:02:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7ef5c7ca

gnome-base/gvfs: sync with gx86, add metadata.xml

---
 gnome-base/gvfs/gvfs-9999.ebuild |   65 ++++++++++++++++++++------------------
 gnome-base/gvfs/metadata.xml     |   28 ++++++++++++++++
 2 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 7a6a42e..f8516fa 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -36,8 +36,8 @@ RDEPEND=">=dev-libs/glib-2.33.12:2
 	sys-apps/dbus
 	dev-libs/libxml2:2
 	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2 )
-	archive? ( app-arch/libarchive )
+	afp? ( >=dev-libs/libgcrypt-1.2.2:= )
+	archive? ( app-arch/libarchive:= )
 	avahi? ( >=net-dns/avahi-0.6 )
 	bluetooth? (
 		>=app-mobilephone/obex-data-server-0.4.5
@@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.33.12:2
 		=sys-apps/gnome-disk-utility-3.0.2-r300
 		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
 	gnome-keyring? ( app-crypt/libsecret )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
 	http? ( >=net-libs/libsoup-gnome-2.26.0 )
 	ios? (
@@ -60,24 +60,48 @@ RDEPEND=">=dev-libs/glib-2.33.12:2
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	systemd? ( sys-apps/systemd )
 	udev? (
-		virtual/udev[gudev]
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) )
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		virtual/udev[gudev] )
 	udisks? ( >=sys-fs/udisks-1.97:2[systemd?] )"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
+	dev-util/gdbus-codegen
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 REQUIRED_USE="cdda? ( udev )"
 
-pkg_setup() {
+src_prepare() {
+	if use archive; then
+		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
+		echo mount-archive.desktop.in >> po/POTFILES.in
+		echo mount-archive.desktop.in.in >> po/POTFILES.in
+	fi
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+	fi
+
+	if use archive || ! use udev; then
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+
+		[[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	# --enable-documentation installs man pages
 	G2CONF="${G2CONF}
 		--disable-bash-completion
 		--disable-hal
-		--disable-schemas-compile
 		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
 		--enable-documentation
 		$(use_enable afp)
@@ -86,6 +110,7 @@ pkg_setup() {
 		$(use_enable bluetooth obexftp)
 		$(use_enable bluray)
 		$(use_enable cdda)
+		$(use_enable doc gtk-doc)
 		$(use_enable fuse)
 		$(use_enable gdu)
 		$(use_enable gphoto2)
@@ -98,29 +123,7 @@ pkg_setup() {
 		$(use_enable samba)
 		$(use_enable systemd libsystemd-login)
 		$(use_enable udisks udisks2)"
-}
-
-src_prepare() {
-	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
-		echo mount-archive.desktop.in >> po/POTFILES.in
-		echo mount-archive.desktop.in.in >> po/POTFILES.in
-	fi
-
-	if ! use udev; then
-		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
-	fi
-
-	if use archive || ! use udev; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		[[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
+	gnome2_src_configure
 }
 
 src_install() {

diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
new file mode 100644
index 0000000..46acb9c
--- /dev/null
+++ b/gnome-base/gvfs/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<longdescription lang="en">
+gvfs is a userspace virtual filesystem designed to work with the i/o
+abstractions of gio (a library availible in glib >= 2.15.1). It
+installs several modules that are automatically used by applications
+using the APIs of libgio. There is also fuse support that allows
+applications not using gio to access the gvfs filesystems.
+</longdescription>
+<use>
+	<flag name='afp'>Enables support for accessing AFP (Apple Filing Protocol)
+		network shares</flag>
+	<flag name='archive'>Enables support for accessing files in archives
+		transparently via <pkg>app-arch/libarchive</pkg></flag>
+	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
+	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
+		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>
+</pkgmetadata>
+