Version bump.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C6085806)

7 files changed, 37 insertions, 425 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 4222753fb542..0761fd504715 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.192 2012/10/28 21:55:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.193 2012/11/22 23:09:01 eva Exp $
+
+*gvfs-1.14.2 (22 Nov 2012)
+
+  22 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.10.1.ebuild,
+  -files/gvfs-1.10.1-libimobiledevice-1.1.2.patch,
+  -files/gvfs-1.10.1-unneeded-include.patch, -gvfs-1.12.2-r1.ebuild,
+  -files/gvfs-1.12.2-afp-g_clear_object.patch, -gvfs-1.14.0.ebuild,
+  +gvfs-1.14.2.ebuild:
+  Version bump.
 
 *gvfs-1.14.1 (28 Oct 2012)
 
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch b/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
deleted file mode 100644
index ab6b82228b49..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 9668b2601e43a7a32471383c63cd3839aa721c51 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Apr 2012 03:15:30 -0400
-Subject: [PATCH] afc: Fix building against libimobiledevice-1.1.2
-
-In 1.1.2, the struct idevice_event_t uuid field was renamed to udid.
-Since libimobiledevice lacks a library version macro, we are forced
-to check for the pkgconfig version in configure.
----
- configure.ac                   |    3 +++
- daemon/gvfsbackendafc.c        |   10 +++++++++-
- monitor/afc/afcvolumemonitor.c |   11 +++++++++--
- 3 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e31fb50..081cc09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,6 +327,9 @@ if test "x$enable_afc" != "xno" ; then
-   if test "x$msg_afc" = "xyes"; then
-     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
-     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
-+    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
-+                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
-+                                [Define to 1 if libimobiledevice-1.1.2 found])])
-   fi
- fi
- 
-diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
-index ab7094f..a62a197 100644
---- a/daemon/gvfsbackendafc.c
-+++ b/daemon/gvfsbackendafc.c
-@@ -339,11 +339,19 @@ static void
- _idevice_event_cb (const idevice_event_t *event, void *user_data)
- {
-   GVfsBackendAfc *afc_backend = G_VFS_BACKEND_AFC (user_data);
-+  gchar *event_udid;
- 
-   g_return_if_fail (afc_backend->uuid != NULL);
-   if (event->event != IDEVICE_DEVICE_REMOVE)
-     return;
--  if (g_str_equal (event->uuid, afc_backend->uuid) == FALSE)
-+
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-+  event_udid = event->udid;
-+#else
-+  event_udid = event->uuid;
-+#endif
-+
-+  if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
-     return;
- 
-   g_print ("Shutting down AFC backend for device uuid %s\n", afc_backend->uuid);
-diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
-index dfc3fa5..9f24753 100644
---- a/monitor/afc/afcvolumemonitor.c
-+++ b/monitor/afc/afcvolumemonitor.c
-@@ -83,15 +83,22 @@ static void
- g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
- {
-   GVfsAfcVolumeMonitor *self;
-+  gchar *event_udid;
- 
-   g_return_if_fail (event != NULL);
- 
-   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
- 
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-+  event_udid = event->udid;
-+#else
-+  event_udid = event->uuid;
-+#endif
-+
-   if (event->event == IDEVICE_DEVICE_ADD)
--    g_vfs_afc_monitor_create_volume (self, event->uuid);
-+    g_vfs_afc_monitor_create_volume (self, event_udid);
-   else
--    g_vfs_afc_monitor_remove_volume (self, event->uuid);
-+    g_vfs_afc_monitor_remove_volume (self, event_udid);
- }
- 
- static GObject *
--- 
-1.7.8.5
-
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch b/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
deleted file mode 100644
index 96663e6b04f8..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 42d800f377dfa4e7338c516d286aef0b76bb1f72 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 13 Oct 2011 18:58:57 -0400
-Subject: [PATCH] Drop an unneeded include
-
-GLib recently became less forgiving about single includes
-like this.
----
- client/gvfsfusedaemon.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
-index b41e83b..a4ba32c 100644
---- a/client/gvfsfusedaemon.c
-+++ b/client/gvfsfusedaemon.c
-@@ -41,8 +41,6 @@
- #include <glib/gprintf.h>
- #include <gio/gio.h>
- 
--#include <glib/gurifuncs.h>
--
- /* stuff from common/ */
- #include <gdaemonmount.h>
- #include <gvfsdaemonprotocol.h>
--- 
-1.7.8.4
-
diff --git a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch b/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch
deleted file mode 100644
index 09e11d888545..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 30 Apr 2012 06:09:30 -0400
-Subject: [PATCH] afp: Use g_clear_object properly
-
-g_clear_object expects the address of a pointer. A recent
-change in its definition makes gcc complain about this.
-(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716)
----
- daemon/gvfsafpvolume.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c
-index 3fd33f2..5207459 100644
---- a/daemon/gvfsafpvolume.c
-+++ b/daemon/gvfsafpvolume.c
-@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res
-   return;
- 
- error:
--  g_clear_object (info);
-+  g_clear_object (&info);
-   g_simple_async_result_take_error (simple, err);
-   g_simple_async_result_complete (simple);
-   g_object_unref (simple);
-@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume  *volume,
-     *bytes_read = g_simple_async_result_get_op_res_gssize (simple);
-   
-   return TRUE;
--}
-\ No newline at end of file
-+}
--- 
-1.7.8.6
-
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
deleted file mode 100644
index 02b58562a5c6..000000000000
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.17 2012/09/25 11:46:48 tetromino Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-[[ ${PV} = 9999 ]] && inherit gnome2-live
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	DOCS=""
-else
-	KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-fi
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev"
-
-RDEPEND=">=dev-libs/glib-2.29.14
-	sys-apps/dbus
-	dev-libs/libxml2
-	net-misc/openssh
-	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
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gdu? ( || (
-		>=gnome-base/libgdu-3.0.2
-		=sys-apps/gnome-disk-utility-3.0.2-r300
-		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.0
-		>=app-pda/libplist-1 )
-	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
-	http? ( >=net-libs/libsoup-gnome-2.26.0 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-bash-completion
-		--disable-hal
-		--disable-schemas-compile
-		--with-dbus-service-dir=/usr/share/dbus-1/services
-		$(use_enable afp)
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable bluray)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gphoto2)
-		$(use_enable ios afc)
-		$(use_enable udev)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)"
-}
-
-src_prepare() {
-	# Patch from 1.11 for building against glib-2.31, bug #401539
-	epatch "${FILESDIR}/${P}-unneeded-include.patch"
-
-	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
-
-	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
-
-	# bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693
-	use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch"
-
-	if use gphoto2 || use archive || ! use udev || use ios; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	newbashcomp programs/gvfs-bash-completion.sh ${PN}
-}
diff --git a/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild b/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild
deleted file mode 100644
index e8a457335238..000000000000
--- a/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild,v 1.2 2012/09/25 11:46:48 tetromino Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-[[ ${PV} = 9999 ]] && inherit gnome2-live
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	DOCS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-fi
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
-
-RDEPEND=">=dev-libs/glib-2.31.0:2
-	sys-apps/dbus
-	dev-libs/libxml2
-	net-misc/openssh
-	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
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gdu? ( || (
-		>=gnome-base/libgdu-3.0.2
-		=sys-apps/gnome-disk-utility-3.0.2-r300
-		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.0
-		>=app-pda/libplist-1 )
-	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
-	udisks? ( >=sys-fs/udisks-1.90:2 )
-	http? ( >=net-libs/libsoup-gnome-2.26.0 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-bash-completion
-		--disable-hal
-		--disable-schemas-compile
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
-		$(use_enable afp)
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable bluray)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gphoto2)
-		$(use_enable ios afc)
-		$(use_enable udev)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)
-		$(use_enable udisks udisks2)"
-}
-
-src_prepare() {
-	# bug #414787; in next release
-	epatch "${FILESDIR}/${P}-afp-g_clear_object.patch"
-
-	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
-
-	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 gphoto2 || use archive || ! use udev; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	newbashcomp programs/gvfs-bash-completion.sh ${PN}
-}
diff --git a/gnome-base/gvfs/gvfs-1.14.0.ebuild b/gnome-base/gvfs/gvfs-1.14.2.ebuild
index 23577c2d3266..f440181638dd 100644
--- a/gnome-base/gvfs/gvfs-1.14.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.0.ebuild,v 1.1 2012/09/25 11:46:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.1 2012/11/22 23:09:01 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -72,12 +72,35 @@ DEPEND="${RDEPEND}
 
 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)
@@ -98,29 +121,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() {