Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 247 insertions, 5 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 6b4ce18d1dfe..35d5c0a872a7 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.101 2010/06/04 21:14:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.102 2010/06/13 17:25:24 pacho Exp $
+
+*gvfs-1.6.2 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gvfs-1.6.2.ebuild,
+  +files/gvfs-1.6.2-afc-depend.patch, +files/gvfs-1.6.2-afc-semicolon.patch:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gvfs-1.4.3-r1.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index cb3f9e7bff6a..a4c9cf9e0096 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,16 +3,20 @@ Hash: SHA1
 
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
+AUX gvfs-1.6.2-afc-depend.patch 3175 RMD160 e26e95e68a52e4ce374d8a4cd92a5d026e55fa09 SHA1 8ea2e28ab75734ad86501aa747cc4743e2b2987a SHA256 0973da936ec8c44d7bd6ca5e98aa70c43b49f4440da0d4d56ecc3accc72dbbf7
+AUX gvfs-1.6.2-afc-semicolon.patch 622 RMD160 82ebb960211121f945c173ad7c1f779ca1d2fb51 SHA1 c9a568055859a8cdcdfff6488dd680cf7da7a641 SHA256 c46d0a13d733557b931694428cfb117431e4a045c17a05829c92d45acc1062e4
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
 DIST gvfs-1.4.3.tar.bz2 1263024 RMD160 da1458101257f5496b4469acb7bc7c646fd9c652 SHA1 3c28516893d6829b3bbae1768fb44e8a405c44e7 SHA256 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
+DIST gvfs-1.6.2.tar.bz2 1330089 RMD160 779c26d39e7bae51628131805a4734be440d711b SHA1 b4ee3cb560d36d6ac7fe7bb1dded6b595c94fc81 SHA256 3a422a16b6758ec405b79d8021e115fddf6a88a0278a5d35dd6bcd022cea7248
 EBUILD gvfs-1.2.3.ebuild 2196 RMD160 3e91f2df2a75b28f528bc907812aad7a43e97d67 SHA1 b38ce67504f22e129fe3c751dc464d20383aab1f SHA256 618733ea882b30cb8e28e33f6d8087e09ddcff700372c7c2832ed0895e1638f6
 EBUILD gvfs-1.4.3-r1.ebuild 3017 RMD160 d98951a42916689a11f1d6771fcc23b2bf89887f SHA1 8102b1af03bc43e4a71278a6fddd6067e5c97aa2 SHA256 8a7534018906ea570e223bf746dbe0ca24661ddddd9a2ffd804ec577cc1648a4
-MISC ChangeLog 14316 RMD160 3bef3429fcd05b2e9739f4dc79b2964190a92ab6 SHA1 8c1784dd36916bc949fa6164c465a3027f1d79a4 SHA256 b5e6e2186a707aa979adb36089fbaa6a9e004478d74e493ac6b8c8580a22f3e5
+EBUILD gvfs-1.6.2.ebuild 3185 RMD160 4d6834999d8cfb35e2ad5203dc8db5f346d7f25a SHA1 8b8a6c3cba83159c07647d2eb8d88b0682e5686d SHA256 3219652e79ed631fafe0253170a0fa423a879aa464f9a1e5bb1e9b3508b583cc
+MISC ChangeLog 14520 RMD160 ce477fd09710fbc81e1a91e7f898c618b823a785 SHA1 93c645d3f3f24e19e36fb37de536b5e2c2583b90 SHA256 253b022088975069262e72ae5118fbfcde2daf07e9526f6aac3d55ac4c26d84c
 MISC metadata.xml 1026 RMD160 9f60ad05b950ee45d8500c8640f26021f397ab5f SHA1 dd73b18963c0beb12f4ea099833c1376952f0c3b SHA256 b5aa8baad5d63d30113e894a8630e80fb5350dbd91903949e336bd604925fd38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJbDcACgkQkKaRLQcq0GJBWgCeN2uAXJowq1Y4/Cp7iry196S8
-d6AAoKPHSdwBvzKzzp2x75BhI/YfBf/u
-=t/AT
+iEYEARECAAYFAkwVFI0ACgkQCaWpQKGI+9RePwCfeTTxot/MNJzLkX8qx+paudn0
+Z1oAnRu0CegbvQLWeoV+evXu+I+LqbQK
+=P8AK
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.6.2-afc-depend.patch b/gnome-base/gvfs/files/gvfs-1.6.2-afc-depend.patch
new file mode 100644
index 000000000000..a0b414cbc763
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.6.2-afc-depend.patch
@@ -0,0 +1,100 @@
+From fefbd88952ad9336d93143556b2349a833a1eb2d Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Sat, 29 May 2010 13:51:58 +0000
+Subject: AFC: remove com.apple.afc dependency from afc volume monitor
+
+We can get the required information via lockdown even if we are
+not a trusted host, e.g. when a passcode is set and the device has not
+been paired before.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=618019
+---
+diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
+index 10598cd..0adce77 100644
+--- a/monitor/afc/afcvolume.c
++++ b/monitor/afc/afcvolume.c
+@@ -11,12 +11,9 @@
+ 
+ #include <libimobiledevice/libimobiledevice.h>
+ #include <libimobiledevice/lockdown.h>
+-#include <libimobiledevice/afc.h>
+ 
+ #include "afcvolume.h"
+ 
+-#define DEFAULT_SERVICE "com.apple.afc"
+-
+ struct _GVfsAfcVolume {
+   GObject parent;
+ 
+@@ -72,12 +69,11 @@ static int
+ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+ {
+   idevice_t dev;
+-  afc_client_t afc_cli;
+   lockdownd_client_t lockdown_cli = NULL;
+   idevice_error_t err;
+-  guint retries;
++  guint retries
++  plist_t value;
+   char *model, *display_name;
+-  guint16 port;
+ 
+   retries = 0;
+   do {
+@@ -90,7 +86,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+   if (err != IDEVICE_E_SUCCESS)
+     return 0;
+ 
+-  if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
++  if (lockdownd_client_new (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
+     {
+       idevice_free (dev);
+       return 0;
+@@ -103,32 +99,24 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+       self->name = display_name;
+     }
+ 
+-  if (lockdownd_start_service (lockdown_cli, DEFAULT_SERVICE, &port) != LOCKDOWN_E_SUCCESS)
+-    {
+-      lockdownd_client_free (lockdown_cli);
+-      idevice_free (dev);
+-      return 0;
+-    }
+-
+-  if (afc_client_new (dev, port, &afc_cli) == AFC_E_SUCCESS)
++  value = NULL;
++  if (lockdownd_get_value (lockdown_cli, NULL, "DeviceClass", &value) == LOCKDOWN_E_SUCCESS)
+     {
+       /* set correct fd icon spec name depending on device model */
+       model = NULL;
+-      if (afc_get_device_info_key (afc_cli, "Model", &model) == AFC_E_SUCCESS)
++      plist_get_string_val(value, &model);
++      if (g_str_equal(model, "iPod") != FALSE)
++        {
++          g_free (self->icon);
++          self->icon = g_strdup ("multimedia-player-apple-ipod-touch");
++        }
++      else if (g_str_equal(model, "iPad") != FALSE)
+         {
+-          if (g_str_has_prefix(model, "iPod") != FALSE)
+-            {
+-              g_free (self->icon);
+-              self->icon = g_strdup ("multimedia-player-apple-ipod-touch");
+-            }
+-          else if (g_str_has_prefix(model, "iPad") != FALSE)
+-            {
+-              g_free (self->icon);
+-              self->icon = g_strdup ("computer-apple-ipad");
+-            }
+-          g_free (model);
++          g_free (self->icon);
++          self->icon = g_strdup ("computer-apple-ipad");
+         }
+-      afc_client_free(afc_cli);
++      g_free (model);
++      plist_free (value);
+     }
+ 
+   lockdownd_client_free (lockdown_cli);
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gvfs/files/gvfs-1.6.2-afc-semicolon.patch b/gnome-base/gvfs/files/gvfs-1.6.2-afc-semicolon.patch
new file mode 100644
index 000000000000..20cb3481488a
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.6.2-afc-semicolon.patch
@@ -0,0 +1,21 @@
+From b9badc5d0f570bbb8353f939146163bdf0bc65c1 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Mon, 31 May 2010 10:08:07 +0000
+Subject: Fix build error due to missing semicolon
+
+---
+diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
+index 0adce77..0784716 100644
+--- a/monitor/afc/afcvolume.c
++++ b/monitor/afc/afcvolume.c
+@@ -71,7 +71,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+   idevice_t dev;
+   lockdownd_client_t lockdown_cli = NULL;
+   idevice_error_t err;
+-  guint retries
++  guint retries;
+   plist_t value;
+   char *model, *display_name;
+ 
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gvfs/gvfs-1.6.2.ebuild b/gnome-base/gvfs/gvfs-1.6.2.ebuild
new file mode 100644
index 000000000000..ed08c609652c
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.6.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.2.ebuild,v 1.1 2010/06/13 17:25:24 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools bash-completion gnome2 eutils
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
++http samba +udev"
+
+RDEPEND=">=dev-libs/glib-2.23.4
+	>=sys-apps/dbus-1.0
+	dev-libs/libxml2
+	net-misc/openssh
+	>=sys-fs/udev-138
+	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 )
+	fuse? ( sys-fs/fuse )
+	gdu? ( >=sys-apps/gnome-disk-utility-2.28 )
+	gnome? ( >=gnome-base/gconf-2.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-fs/udev-145[extras] )
+	hal? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-apps/hal-0.5.10 )
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
+			<=net-fs/samba-3.3 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	if use cdda && ! use hal && ! use udev; then
+		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
+		ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
+	fi
+
+	G2CONF="${G2CONF}
+		--enable-udev
+		--disable-bash-completion
+		--with-dbus-service-dir=/usr/share/dbus-1/services
+		$(use_enable archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable cdda)
+		$(use_enable fuse)
+		$(use_enable gdu)
+		$(use_enable gnome gconf)
+		$(use_enable gphoto2)
+		$(use_enable udev gudev)
+		$(use_enable hal)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# AFC: remove com.apple.afc dependency from afc volume monitor; upstream bug 618019
+	epatch "${FILESDIR}/${P}-afc-depend.patch"
+
+	# Fix build error due to missing semicolon
+	epatch "${FILESDIR}/${P}-afc-semicolon.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
+
+	use gphoto2 || use archive && eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	use bash-completion && \
+		dobashcompletion programs/gvfs-bash-completion.sh ${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use bash-completion && bash-completion_pkg_postinst
+
+	ewarn "In order to use the new gvfs services, please reload dbus configuration"
+	ewarn "You may need to log out and log back in for some changes to take effect"
+}