Clean up old revisions.
authorGilles Dartiguelongue <eva@gentoo.org>
Wed, 24 Feb 2010 23:26:48 +0000 (23:26 +0000)
committerGilles Dartiguelongue <eva@gentoo.org>
Wed, 24 Feb 2010 23:26:48 +0000 (23:26 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

gnome-base/gvfs/ChangeLog
gnome-base/gvfs/Manifest
gnome-base/gvfs/files/gvfs-1.0.3-bluez4-debug.patch [deleted file]
gnome-base/gvfs/files/gvfs-1.0.3-bluez4.patch [deleted file]
gnome-base/gvfs/files/gvfs-1.0.3-gmountspec-SIGSEGV.patch [deleted file]
gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch [deleted file]
gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch [deleted file]
gnome-base/gvfs/files/gvfs-1.0.3-posixtest.patch [deleted file]
gnome-base/gvfs/gvfs-1.0.3-r13.ebuild [deleted file]
gnome-base/gvfs/gvfs-1.0.3-r2.ebuild [deleted file]
gnome-base/gvfs/gvfs-1.4.2.ebuild [deleted file]

index 127c5980ee9da2e4c7ca14df48a19a8a5883c93c..38b82e4a8ea8e2fd596c3b2ad5b2c43b476d6a0b 100644 (file)
@@ -1,6 +1,14 @@
 # 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.93 2010/02/19 17:15:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.94 2010/02/24 23:26:47 eva Exp $
+
+  24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.0.3-r2.ebuild,
+  -gvfs-1.0.3-r13.ebuild, -files/gvfs-1.0.3-bluez4-debug.patch,
+  -files/gvfs-1.0.3-bluez4.patch,
+  -files/gvfs-1.0.3-gmountspec-SIGSEGV.patch,
+  -files/gvfs-1.0.3-http-leak.patch, -files/gvfs-1.0.3-obexftp-icon.patch,
+  -files/gvfs-1.0.3-posixtest.patch, -gvfs-1.4.2.ebuild:
+  Clean up old revisions.
 
   19 Feb 2010; Pacho Ramos <pacho@gentoo.org> gvfs-1.4.2.ebuild,
   gvfs-1.4.3.ebuild:
index 66f4f60f0ecdbf38fec0958935b338ea575a5c55..6f25e1809a21ca875cf0ddc00a44bddc2ad357c8 100644 (file)
@@ -1,29 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gvfs-1.0.3-bluez4-debug.patch 813 RMD160 17173a9a2a1dff295b7ab97ce9eb3910eebd781d SHA1 71790ed4385978188baa78fdb9b496de3ab64057 SHA256 0aec6ed9395f3ebf598613ddc80fab86ff14db1a8f2256fc1355ea864ac4943b
-AUX gvfs-1.0.3-bluez4.patch 15992 RMD160 ce019597f52e3f58bea23e098ffab70ac1f1ed83 SHA1 3734c27032184c956013c46b3915e05d84dd5009 SHA256 e9eb881f06b1b404e0c362c6e66975cdef2e5956b103720364a8fd6db7c9a4ce
-AUX gvfs-1.0.3-gmountspec-SIGSEGV.patch 467 RMD160 17131acfdbe080d283cf4290b338554192c71ea1 SHA1 f4e898d755463f55280ae712935bafb19891c30f SHA256 c93f11cc77de7e8b5e40c61cd7e2edaad7adb30c816087d67370ce49f518be10
-AUX gvfs-1.0.3-http-leak.patch 1550 RMD160 7ba63537fec4368f317e94f9b4bb6d33aef08c09 SHA1 f750d6a48b2cf691cd7cb7a59e6167a59f6c59fa SHA256 7ed10185e18d49db231910a3e629992308ed6d7997c8f2875578e6ed3463f842
-AUX gvfs-1.0.3-obexftp-icon.patch 1007 RMD160 354048e4b1a263e1cb3a9fa3b20cba006cc203dc SHA1 e0ba373437f2a6eb5739fc0410b459236804ca89 SHA256 97cf921786c0af4f57ec0cb31b3f5161843535a985bc3bb560198a44d9269ce3
-AUX gvfs-1.0.3-posixtest.patch 3368 RMD160 75f3d776550b49169066037a8f77489e9dff3389 SHA1 a95f01f041dc51fb3b73f6e920e29507ccfdbc79 SHA256 9f7aaf14305b88f11ebf223cf5212c7a9494c58277031a728dfd210ec7b98325
 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
-DIST gvfs-1.0.3.tar.bz2 920742 RMD160 2d12e1f6690773e3aad5d59c826c509fa40a9443 SHA1 2beb736acc7b38e99c9fcb0585de6918fad5e7b7 SHA256 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
-DIST gvfs-1.4.2.tar.bz2 1262592 RMD160 a57f67d733f132f179ce5df295fc3d5988becf3b SHA1 d2d93e3de6213b96f3a5102964ed6f61955ce6f9 SHA256 611f4fce793696fdae2e4f17ee761f7bf89afe6a919fba7d0e1500fd9d368b9e
 DIST gvfs-1.4.3.tar.bz2 1263024 RMD160 da1458101257f5496b4469acb7bc7c646fd9c652 SHA1 3c28516893d6829b3bbae1768fb44e8a405c44e7 SHA256 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
-EBUILD gvfs-1.0.3-r13.ebuild 2828 RMD160 29f6a5ca7311f4eccf1aefaa1635fddc2b9c8fc0 SHA1 9ff03f436eee307987ddd7186f54778a319821ea SHA256 94a3c28f8ee70dd4d37c75dd37b202729435aeca8b6c7f2aa8000ca155c3c9ef
-EBUILD gvfs-1.0.3-r2.ebuild 2549 RMD160 f2cdecd0ecef907b0ea6edf7541724c8cee41822 SHA1 40169e794fee6710a0900d297bb8125f92568ade SHA256 0d3d94d668fa3d9750fc486d017f08f89281906d9fa54bf0fba282dc1ae5fc4e
 EBUILD gvfs-1.2.3.ebuild 2196 RMD160 3e91f2df2a75b28f528bc907812aad7a43e97d67 SHA1 b38ce67504f22e129fe3c751dc464d20383aab1f SHA256 618733ea882b30cb8e28e33f6d8087e09ddcff700372c7c2832ed0895e1638f6
-EBUILD gvfs-1.4.2.ebuild 2749 RMD160 7c88c98b0b9aba5e58befd7dd2663b50a5a922cf SHA1 515d2ba9b75cc0c5f99a2c4e2ad88328524415d0 SHA256 a5d192230becb0d98c506720c54e71d959365493481d8e5fcdc22787827ba986
 EBUILD gvfs-1.4.3.ebuild 2830 RMD160 e2e2895722ec34dd7c38b2a483c4ba2a40562980 SHA1 478ed31607d83048235d6fc0498416f13a6277d7 SHA256 5fba3b2356836da9c185a23cb077ff9762e2f958aebbea959f4ff9e42bc2a486
-MISC ChangeLog 12976 RMD160 b18214b32d78d22779213f64a4c7bcccfc7b7021 SHA1 94c51c0abd847bff72ee2b1d71b28e9bb8cd5f55 SHA256 e40a8b48b77c4c0ca84d6accfb34c64c33b1c80c6f0ee7941350fe66b27f2a35
+MISC ChangeLog 13354 RMD160 960bbf9f458cf1ff09b7d2915b53d30972a277a4 SHA1 30fa0acaf6e6791f9f2a85c881d5a610a0873d7a SHA256 244971901020ce96186a4815055f59a67f6de256efb5565febb84fbf6c52448f
 MISC metadata.xml 932 RMD160 0a9dfc77656b6f035d833003d00a34fc7bc51213 SHA1 4a200aa26ceba493d6eb59feb269668619c092a5 SHA256 196c4a5412f54bfb81959c1fb1a12c3a7dbcb020045c9f11ecad473026a2b32e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt+x0UACgkQCaWpQKGI+9TokACdE2iPZdaR6OMxBmw9l9NDjOfs
-9xEAnj2HAVYGl1B2//Z0sfTSuQUsJHdg
-=znZ4
------END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-bluez4-debug.patch b/gnome-base/gvfs/files/gvfs-1.0.3-bluez4-debug.patch
deleted file mode 100644 (file)
index 5537963..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5874fbdae7d3dbc332a151441547ff7401579327 Mon Sep 17 00:00:00 2001
-From: Mike Lundy <mike@fluffypenguin.org>
-Date: Sat, 14 Mar 2009 19:30:22 -0700
-Subject: [PATCH] remove debug code that turns warnings into crashes
-
-https://bugs.gentoo.org/show_bug.cgi?id=262502
----
- daemon/daemon-main.c |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
-index 0a77036..b3b2b47 100644
---- a/daemon/daemon-main.c
-+++ b/daemon/daemon-main.c
-@@ -65,12 +65,6 @@ daemon_init (void)
-       dbus_error_free (&derror);
-       exit (1);
-     }
--
--  GLogLevelFlags fatal_mask;
--
--  fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
--  fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
--  g_log_set_always_fatal (fatal_mask);
- }
- 
- void
--- 
-1.6.1.2
-
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-bluez4.patch b/gnome-base/gvfs/files/gvfs-1.0.3-bluez4.patch
deleted file mode 100644 (file)
index 6e9ca84..0000000
+++ /dev/null
@@ -1,475 +0,0 @@
----
- daemon-main.c        |    6 +
- gvfsbackendobexftp.c |  292 ++++++++++++++++++++++-----------------------------
- obexftp-marshal.list |    2 
- 3 files changed, 138 insertions(+), 162 deletions(-)
-Index: b/daemon/obexftp-marshal.list
-===================================================================
---- a/daemon/obexftp-marshal.list      (revision 2022)
-+++ b/daemon/obexftp-marshal.list      (working copy)
-@@ -1,2 +1,4 @@
-+VOID:STRING
- VOID:STRING,STRING
-+VOID:STRING,STRING,STRING
- VOID:STRING,STRING,UINT64
-Index: b/daemon/daemon-main.c
-===================================================================
---- a/daemon/daemon-main.c     (revision 2022)
-+++ b/daemon/daemon-main.c     (working copy)
-@@ -65,6 +65,12 @@
-       dbus_error_free (&derror);
-       exit (1);
-     }
-+
-+  GLogLevelFlags fatal_mask;
-+
-+  fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
-+  fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
-+  g_log_set_always_fatal (fatal_mask);
- }
- 
- void
-Index: b/daemon/gvfsbackendobexftp.c
-===================================================================
---- a/daemon/gvfsbackendobexftp.c      (revision 2022)
-+++ b/daemon/gvfsbackendobexftp.c      (working copy)
-@@ -69,7 +69,7 @@
- 
-   char *display_name;
-   char *bdaddr;
--  guint type;
-+  char *icon_name;
- 
-   DBusGConnection *connection;
-   DBusGProxy *manager_proxy;
-@@ -96,177 +96,106 @@
- 
- G_DEFINE_TYPE (GVfsBackendObexftp, g_vfs_backend_obexftp, G_VFS_TYPE_BACKEND);
- 
--/* This should all live in bluez-gnome, and we
-- * should depend on it */
--enum {
--    BLUETOOTH_TYPE_ANY        = 1,
--    BLUETOOTH_TYPE_PHONE      = 1 << 1,
--    BLUETOOTH_TYPE_MODEM      = 1 << 2,
--    BLUETOOTH_TYPE_COMPUTER   = 1 << 3,
--    BLUETOOTH_TYPE_NETWORK    = 1 << 4,
--    BLUETOOTH_TYPE_HEADSET    = 1 << 5,
--    BLUETOOTH_TYPE_KEYBOARD   = 1 << 6,
--    BLUETOOTH_TYPE_MOUSE      = 1 << 7,
--    BLUETOOTH_TYPE_CAMERA     = 1 << 8,
--    BLUETOOTH_TYPE_PRINTER    = 1 << 9 
--};
-+static void session_connect_error_cb (DBusGProxy *proxy,
-+                                      const char *session_object,
-+                                      const gchar *error_name,
-+                                      const gchar *error_message,
-+                                      gpointer user_data);
-+static void session_connected_cb (DBusGProxy *proxy,
-+                                  const char *session_object,
-+                                  gpointer user_data);
- 
--static const char *
--_get_icon_from_type (guint type)
-+/* Used to detect broken listings from
-+ * old Nokia 3650s */
-+static gboolean
-+_is_nokia_3650 (const char *bdaddr)
- {
--  switch (type)
--    {
--    case BLUETOOTH_TYPE_PHONE:
--      return "phone";
--      break;
--    case BLUETOOTH_TYPE_MODEM:
--      return "modem";
--      break;
--    case BLUETOOTH_TYPE_COMPUTER:
--      return "network-server";
--      break;
--    case BLUETOOTH_TYPE_NETWORK:
--      return "network-wireless";
--      break;
--    case BLUETOOTH_TYPE_HEADSET:
--      return "stock_headphones";
--      break;
--    case BLUETOOTH_TYPE_KEYBOARD:
--      return "input-keyboard";
--      break;
--    case BLUETOOTH_TYPE_MOUSE:
--      return "input-mouse";
--      break;
--    case BLUETOOTH_TYPE_CAMERA:
--      return "camera-photo";
--      break;
--    case BLUETOOTH_TYPE_PRINTER:
--      return "printer";
--      break;
--    default:
--      return "bluetooth";
--      break;
--    }
-+  /* Don't ask, Nokia seem to use a Bluetooth
-+   * HCI from Murata */
-+  return g_str_has_prefix(bdaddr, "00:60:57");
- }
- 
--static int
--_get_type_from_class (guint class)
-+static char *
-+get_name_and_icon (DBusGProxy *device, char **icon_name)
- {
--  switch ((class & 0x1f00) >> 8)
-+  GHashTable *hash;
-+
-+  if (dbus_g_proxy_call (device, "GetProperties", NULL,
-+                         G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
-+                         &hash, G_TYPE_INVALID) != FALSE)
-     {
--    case 0x01:
--      return BLUETOOTH_TYPE_COMPUTER;
--    case 0x02:
--      switch ((class & 0xfc) >> 2)
-+      GValue *value;
-+      char *name;
-+
-+      value = g_hash_table_lookup (hash, "Name");
-+      name = value ? g_value_dup_string(value) : NULL;
-+
-+      value = g_hash_table_lookup (hash, "Icon");
-+      if (value)
-         {
--        case 0x01:
--        case 0x02:
--        case 0x03:
--        case 0x05:
--          return BLUETOOTH_TYPE_PHONE;
--        case 0x04:
--          return BLUETOOTH_TYPE_MODEM;
-+          *icon_name = g_value_dup_string (value);
-         }
--      break;
--    case 0x03:
--      return BLUETOOTH_TYPE_NETWORK;
--    case 0x04:
--      switch ((class & 0xfc) >> 2)
-+      else
-         {
--        case 0x01:
--          return BLUETOOTH_TYPE_HEADSET;
-+          *icon_name = g_strdup ("bluetooth");
-         }
--      break;
--    case 0x05:
--      switch ((class & 0xc0) >> 6)
--        {
--        case 0x01:
--          return BLUETOOTH_TYPE_KEYBOARD;
--        case 0x02:
--          return BLUETOOTH_TYPE_MOUSE;
--        }
--      break;
--    case 0x06:
--      if (class & 0x80)
--            return BLUETOOTH_TYPE_PRINTER;
--      if (class & 0x20)
--            return BLUETOOTH_TYPE_CAMERA;
--      break;
-+      g_hash_table_destroy (hash);
-+      return name;
-     }
- 
--  return BLUETOOTH_TYPE_ANY;
-+  return NULL;
- }
- 
--/* Used to detect broken listings from
-- * old Nokia 3650s */
--static gboolean
--_is_nokia_3650 (const char *bdaddr)
--{
--  /* Don't ask, Nokia seem to use a Bluetooth
--   * HCI from Murata */
--  return g_str_has_prefix(bdaddr, "00:60:57");
--}
--
- static gchar *
--_get_device_properties (const char *bdaddr, guint32 *type)
-+_get_device_properties (const char *bdaddr, char **icon_name)
- {
-   DBusGConnection *connection;
-   DBusGProxy *manager;
--  gchar *name, **adapters;
-+  GPtrArray *adapters;
-+  gchar *name;
-   guint i;
- 
-   name = NULL;
- 
-   connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
-   if (connection == NULL)
--        return NULL;
-+        return name;
- 
-   manager = dbus_g_proxy_new_for_name (connection, "org.bluez",
--                                       "/org/bluez", "org.bluez.Manager");
-+                                       "/", "org.bluez.Manager");
-   if (manager == NULL)
-     {
-       dbus_g_connection_unref (connection);
--      return NULL;
-+      return name;
-     }
- 
--  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE)
-+  if (dbus_g_proxy_call (manager, "ListAdapters", NULL, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE)
-     {
-       g_object_unref (manager);
-       dbus_g_connection_unref (connection);
--      return NULL;
-+      return name;
-     }
- 
--  for (i = 0; adapters[i] != NULL; i++)
-+  for (i = 0; i < adapters->len && name == NULL; i++)
-     {
-       DBusGProxy *adapter;
-+      char *device_path;
- 
-       adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
--                                           adapters[i], "org.bluez.Adapter");
--      if (dbus_g_proxy_call (adapter, "GetRemoteName", NULL,
-+                                           g_ptr_array_index (adapters, i), "org.bluez.Adapter");
-+      if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
-                              G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
--                             G_TYPE_STRING, &name, G_TYPE_INVALID) != FALSE)
-+                             DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) != FALSE)
-         {
--          if (name != NULL && name[0] != '\0')
--            {
--              guint32 class;
--
--              if (dbus_g_proxy_call(adapter, "GetRemoteClass", NULL,
--                                    G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
--                                    G_TYPE_UINT, &class, G_TYPE_INVALID) != FALSE)
--                {
--                  *type = _get_type_from_class (class);
--                }
--              else
--                {
--                  *type = BLUETOOTH_TYPE_ANY;
--                }
--              g_object_unref (adapter);
--              break;
--            }
-+          DBusGProxy *device;
-+          device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device");
-+          name = get_name_and_icon (device, icon_name);
-+          g_object_unref (device);
-         }
-       g_object_unref (adapter);
-     }
- 
-+  g_ptr_array_free (adapters, TRUE);
-   g_object_unref (manager);
-   dbus_g_connection_unref (connection);
- 
-@@ -282,6 +211,7 @@
- 
-   g_free (backend->display_name);
-   g_free (backend->bdaddr);
-+  g_free (backend->icon_name);
-   g_free (backend->files_listing);
-   g_free (backend->directory);
- 
-@@ -312,6 +242,15 @@
-                                                       "org.openobex",
-                                                       "/org/openobex",
-                                                       "org.openobex.Manager");
-+
-+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnectError",
-+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnectError",
-+                              G_CALLBACK(session_connect_error_cb), backend, NULL);
-+  dbus_g_proxy_add_signal(backend->manager_proxy, "SessionConnected",
-+                          DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
-+  dbus_g_proxy_connect_signal(backend->manager_proxy, "SessionConnected",
-+                              G_CALLBACK(session_connected_cb), backend, NULL);
- }
- 
- static gboolean
-@@ -437,8 +376,7 @@
-       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
-       g_file_info_set_content_type (info, "inode/directory");
-       g_file_info_set_name (info, "/");
--      g_vfs_backend_set_icon_name (backend,
--                                   _get_icon_from_type (op_backend->type));
-+      g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
-       display = g_strdup_printf (_("%s on %s"), "/", op_backend->display_name);
-       g_file_info_set_display_name (info, display);
-       g_free (display);
-@@ -531,6 +469,37 @@
- }
- 
- static void
-+session_connect_error_cb (DBusGProxy *proxy,
-+                          const char *session_object,
-+                          const gchar *error_name,
-+                          const gchar *error_message,
-+                          gpointer user_data)
-+{
-+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
-+
-+  g_mutex_lock (op_backend->mutex);
-+  op_backend->status = ASYNC_ERROR;
-+  op_backend->error = g_error_new_literal (DBUS_GERROR,
-+                                           DBUS_GERROR_REMOTE_EXCEPTION,
-+                                           error_message);
-+  g_cond_signal (op_backend->cond);
-+  g_mutex_unlock (op_backend->mutex);
-+}
-+
-+static void
-+session_connected_cb (DBusGProxy *proxy,
-+                      const char *session_object,
-+                      gpointer user_data)
-+{
-+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
-+
-+  g_mutex_lock (op_backend->mutex);
-+  op_backend->status = ASYNC_SUCCESS;
-+  g_cond_signal (op_backend->cond);
-+  g_mutex_unlock (op_backend->mutex);
-+}
-+
-+static void
- cancelled_cb (DBusGProxy *proxy, gpointer user_data)
- {
-   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
-@@ -559,24 +528,6 @@
-   _exit (1);
- }
- 
--static int
--is_connected (DBusGProxy *session_proxy, GVfsJob *job)
--{
--  GError *error = NULL;
--  gboolean connected;
--
--  if (dbus_g_proxy_call (session_proxy, "IsConnected", &error,
--                         G_TYPE_INVALID,
--                         G_TYPE_BOOLEAN, &connected, G_TYPE_INVALID) == FALSE)
--    {
--      g_vfs_job_failed_from_error (job, error);
--      g_error_free (error);
--      return -1;
--    }
--
--  return connected;
--}
--
- static void
- do_mount (GVfsBackend *backend,
-           GVfsJobMount *job,
-@@ -590,7 +541,7 @@
-   const gchar *path = NULL;
-   char *server;
-   GMountSpec *obexftp_mount_spec;
--  gboolean connected;
-+  guint count;
- 
-   g_print ("+ do_mount\n");
- 
-@@ -616,10 +567,11 @@
-     }
- 
-   /* FIXME, Have a way for the mount to be cancelled, see:
--   * http://bugs.muiline.com/view.php?id=51 */
-+   * Use CancelSessionConnect */
-+  op_backend->status = ASYNC_PENDING;
- 
-   if (dbus_g_proxy_call (op_backend->manager_proxy, "CreateBluetoothSession", &error,
--                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "ftp", G_TYPE_INVALID,
-+                         G_TYPE_STRING, op_backend->bdaddr, G_TYPE_STRING, "00:00:00:00:00:00", G_TYPE_STRING, "ftp", G_TYPE_INVALID,
-                          DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE)
-     {
-       g_free (op_backend->bdaddr);
-@@ -636,14 +588,13 @@
-                                                          path,
-                                                          "org.openobex.Session");
- 
--  op_backend->display_name = _get_device_properties (op_backend->bdaddr, &op_backend->type);
-+  op_backend->display_name = _get_device_properties (op_backend->bdaddr, &op_backend->icon_name);
-   if (!op_backend->display_name)
-         op_backend->display_name = g_strdup (op_backend->bdaddr);
- 
-   g_vfs_backend_set_display_name (G_VFS_BACKEND  (op_backend),
-                                   op_backend->display_name);
--  g_vfs_backend_set_icon_name (G_VFS_BACKEND (op_backend),
--                               _get_icon_from_type (op_backend->type));
-+  g_vfs_backend_set_icon_name (G_VFS_BACKEND (op_backend), op_backend->icon_name);
- 
-   obexftp_mount_spec = g_mount_spec_new ("obex");
-   server = g_strdup_printf ("[%s]", op_backend->bdaddr);
-@@ -676,14 +627,20 @@
-                           G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
- 
-   /* Now wait until the device is connected */
--  connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
--  while (connected == FALSE)
--    {
--      g_usleep (G_USEC_PER_SEC / 100);
--      connected = is_connected (op_backend->session_proxy, G_VFS_JOB (job));
--    }
-+  count = 0;
-+  g_mutex_lock (op_backend->mutex);
- 
--  if (connected < 0)
-+  while (op_backend->status == ASYNC_PENDING && count < 100) {
-+      GTimeVal val;
-+      g_get_current_time (&val);
-+      g_time_val_add (&val, 100000);
-+      count++;
-+      if (g_cond_timed_wait (op_backend->cond, op_backend->mutex, &val) != FALSE)
-+            break;
-+  }
-+  g_mutex_unlock (op_backend->mutex);
-+
-+  if (op_backend->status == ASYNC_ERROR || op_backend->status == ASYNC_PENDING)
-     {
-       g_message ("mount failed, didn't connect");
- 
-@@ -694,12 +651,17 @@
-       g_object_unref (op_backend->session_proxy);
-       op_backend->session_proxy = NULL;
- 
--      g_vfs_job_failed (G_VFS_JOB (job),
--                        G_IO_ERROR, G_IO_ERROR_BUSY,
--                        _("Connection to the device lost"));
-+      if (op_backend->status != ASYNC_PENDING)
-+            g_vfs_job_failed_from_error (G_VFS_JOB (job), op_backend->error);
-+      else
-+            g_vfs_job_failed (G_VFS_JOB (job),
-+                              G_IO_ERROR, G_IO_ERROR_BUSY,
-+                              _("Connection to the device lost"));
-       return;
-     }
- 
-+  op_backend->status = ASYNC_PENDING;
-+
-   g_vfs_job_succeeded (G_VFS_JOB (job));
- 
-   g_print ("- do_mount\n");
-@@ -1482,6 +1444,12 @@
-   /* TransferStarted */
-   dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING_STRING_UINT64,
-                                     G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
-+  /* SessionConnected */
-+  dbus_g_object_register_marshaller(obexftp_marshal_VOID__STRING,
-+                                    G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
-+  /* SessionConnectError */
-+  dbus_g_object_register_marshaller (obexftp_marshal_VOID__STRING_STRING_STRING,
-+                                     G_TYPE_NONE, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- }
- 
- /*
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-gmountspec-SIGSEGV.patch b/gnome-base/gvfs/files/gvfs-1.0.3-gmountspec-SIGSEGV.patch
deleted file mode 100644 (file)
index 4a351bf..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../gvfs-1.0.3_orig/common/gmountspec.c     2008-09-14 14:05:05.000000000 +0200
-+++ common/gmountspec.c        2009-03-05 20:58:57.486331890 +0100
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- 
- #include <glib/gi18n-lib.h>
-+#include <glib/gmessages.h>
- 
- #include "gdbusutils.h"
- #include "gmountspec.h"
-@@ -478,6 +479,8 @@
- {
-   char *canon, *start, *p, *q;
- 
-+  g_return_val_if_fail(path != NULL, path);
-+
-   if (*path != '/')
-     canon = g_strconcat ("/", path, NULL);
-   else
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch b/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch
deleted file mode 100644 (file)
index 93adf5b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: daemon/gvfsbackendhttp.c
-===================================================================
---- daemon/gvfsbackendhttp.c   (revision 2129)
-+++ daemon/gvfsbackendhttp.c   (revision 2130)
-@@ -346,6 +346,7 @@
-                                 error->message);
- 
-       g_error_free (error);
-+      g_object_unref (stream);
-       return;
-     }
- 
-@@ -371,6 +372,8 @@
-   msg = soup_message_new_from_uri (SOUP_METHOD_GET, uri);
-   soup_uri_free (uri);
- 
-+  soup_message_body_set_accumulate (msg->response_body, FALSE);
-+
-   stream = soup_input_stream_new (op_backend->session_async, msg);
-   g_object_unref (msg);
- 
-Index: daemon/soup-input-stream.c
-===================================================================
---- daemon/soup-input-stream.c (revision 2129)
-+++ daemon/soup-input-stream.c (revision 2130)
-@@ -714,6 +714,7 @@
-   soup_input_stream_done_io (stream);
- 
-   g_simple_async_result_complete (result);
-+  g_object_unref (result);
- }
- 
- static void
-@@ -748,6 +749,7 @@
-     {
-       g_simple_async_result_set_op_res_gssize (result, 0);
-       g_simple_async_result_complete_in_idle (result);
-+      g_object_unref (result);
-       return;
-     }
- 
-@@ -756,6 +758,7 @@
-       gsize nread = read_from_leftover (priv, buffer, count);
-       g_simple_async_result_set_op_res_gssize (result, nread);
-       g_simple_async_result_complete_in_idle (result);
-+      g_object_unref (result);
-       return;
-     }
- 
-@@ -804,6 +807,7 @@
-     }
- 
-   g_simple_async_result_complete_in_idle (result);
-+  g_object_unref (result);
- }
- 
- static gboolean
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch b/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch
deleted file mode 100644 (file)
index 6ae45e9..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=256890
-# https://bugzilla.gnome.org/show_bug.cgi?id=542687
-Index: b/daemon/gvfsbackendobexftp.c
-===================================================================
---- a/daemon/gvfsbackendobexftp.c      (revision 2125)
-+++ b/daemon/gvfsbackendobexftp.c      (working copy)
-@@ -376,7 +376,14 @@
-       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
-       g_file_info_set_content_type (info, "inode/directory");
-       g_file_info_set_name (info, "/");
--      g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
-+      if (op_backend->icon_name) {
-+          GIcon *icon;
-+
-+          g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
-+          icon = g_themed_icon_new (op_backend->icon_name);
-+          g_file_info_set_icon (info, icon);
-+          g_object_unref (icon);
-+      }
-       display = g_strdup_printf (_("%s on %s"), "/", op_backend->display_name);
-       g_file_info_set_display_name (info, display);
-       g_free (display);
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-posixtest.patch b/gnome-base/gvfs/files/gvfs-1.0.3-posixtest.patch
deleted file mode 100644 (file)
index 8504b53..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,7 +127,7 @@ HTTP_LIBS=
- if test "x$enable_http" != "xno"; then
-   PKG_CHECK_EXISTS(libsoup-2.4 >= 2.23.91, msg_http=yes)
- 
--  if test "x$msg_http" == "xyes"; then
-+  if test "x$msg_http" = "xyes"; then
-     PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0)
-     AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built])
-   fi
-@@ -165,7 +165,7 @@ FUSE_CFLAGS=
- if test "x$enable_fuse" != "xno"; then
-   PKG_CHECK_EXISTS(fuse, msg_fuse=yes)
- 
--  if test "x$msg_fuse" == "xyes"; then
-+  if test "x$msg_fuse" = "xyes"; then
-     PKG_CHECK_MODULES(FUSE, fuse)
-     AC_DEFINE(HAVE_FUSE, 1, [Define to 1 if FUSE is available])
-   fi
-@@ -187,7 +187,7 @@ GCONF_CFLAGS=
- if test "x$enable_gconf" != "xno"; then
-   PKG_CHECK_EXISTS(gconf-2.0, msg_gconf=yes)
- 
--  if test "x$msg_gconf" == "xyes"; then
-+  if test "x$msg_gconf" = "xyes"; then
-     PKG_CHECK_MODULES(GCONF, gconf-2.0)
-     AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if GConf is available])
-   fi
-@@ -211,13 +211,13 @@ HAL_REQUIRED=0.5.10
- if test "x$enable_hal" != "xno"; then
-   PKG_CHECK_EXISTS([hal >= $HAL_REQUIRED], msg_hal=yes)
- 
--  if test "x$msg_hal" == "xyes"; then
-+  if test "x$msg_hal" = "xyes"; then
-     PKG_CHECK_MODULES([HAL],[hal >= $HAL_REQUIRED])
-     AC_DEFINE(HAVE_HAL, 1, [Define to 1 if HAL is available])
-     save_libs="$LIBS"
-     LIBS="$HAL_LIBS"
-     AC_CHECK_LIB(hal, libhal_get_all_devices_with_properties, have_hal_fast_init=yes)
--    if test "x$have_hal_fast_init" == "xyes"; then
-+    if test "x$have_hal_fast_init" = "xyes"; then
-       AC_DEFINE(HAVE_HAL_FAST_INIT, 1, [Define to 1 if libhal_get_all_devices_with_properties is available])
-     fi
-     LIBS="$save_libs"
-@@ -240,7 +240,7 @@ CDDA_CFLAGS=
- if test "x$enable_cdda" != "xno"; then
-   PKG_CHECK_EXISTS(libcdio_paranoia >= 0.78.2 hal >= $HAL_REQUIRED, msg_cdda=yes)
- 
--  if test "x$msg_cdda" == "xyes"; then
-+  if test "x$msg_cdda" = "xyes"; then
-     PKG_CHECK_MODULES(CDDA, libcdio_paranoia hal >= $HAL_REQUIRED)
-     AC_DEFINE(HAVE_CDDA, 1, [Define to 1 if CDDA is going to be built])
-   fi
-@@ -267,7 +267,7 @@ if test "x$enable_obexftp" != "xno"; the
-                [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
-                have_expat=false)
- 
--  if test "x$msg_obexftp" == "xyes" -a "x$have_expat" == "xtrue"; then
-+  if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
-     PKG_CHECK_MODULES(OBEXFTP, dbus-glib-1 bluez >= 3.12)
-     AC_SUBST(OBEXFTP_LIBS)
-     AC_SUBST(OBEXFTP_CFLAGS)
-@@ -307,8 +307,8 @@ if test "x$enable_gphoto2" != "xno" -a "
-       ;;
-   esac
- 
--  if test "x$msg_gphoto2" == "xyes"; then
--    if test "x$use_gphoto2" == "xyes"; then
-+  if test "x$msg_gphoto2" = "xyes"; then
-+    if test "x$use_gphoto2" = "xyes"; then
-       PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
-       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-     else
-@@ -334,7 +334,7 @@ KEYRING_CFLAGS=
- if test "x$enable_keyring" != "xno"; then
-   PKG_CHECK_EXISTS(gnome-keyring-1, msg_keyring=yes)
- 
--  if test "x$msg_keyring" == "xyes"; then
-+  if test "x$msg_keyring" = "xyes"; then
-     PKG_CHECK_MODULES(KEYRING, gnome-keyring-1)
-     AC_DEFINE(HAVE_KEYRING, 1, [Define to 1 if GNOME Keyring is available])
-   fi
diff --git a/gnome-base/gvfs/gvfs-1.0.3-r13.ebuild b/gnome-base/gvfs/gvfs-1.0.3-r13.ebuild
deleted file mode 100644 (file)
index 027eaa3..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.0.3-r13.ebuild,v 1.6 2009/10/24 11:12:50 nixnut Exp $
-
-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 gnome gphoto2 hal gnome-keyring samba"
-
-RDEPEND=">=dev-libs/glib-2.17.6
-       >=sys-apps/dbus-1.0
-       >=net-libs/libsoup-2.23.91
-       dev-libs/libxml2
-       net-misc/openssh
-       archive? ( app-arch/libarchive )
-       avahi? ( >=net-dns/avahi-0.6 )
-       cdda?  (
-               >=sys-apps/hal-0.5.10
-               >=dev-libs/libcdio-0.78.2 )
-       fuse? ( sys-fs/fuse )
-       gnome? ( >=gnome-base/gconf-2.0 )
-       hal? ( >=sys-apps/hal-0.5.10 )
-       bluetooth? (
-               dev-libs/dbus-glib
-               net-wireless/bluez
-               dev-libs/expat )
-       gphoto2? ( >=media-libs/libgphoto2-2.4 )
-       gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-       samba? ( >=net-fs/samba-3 )"
-DEPEND="${RDEPEND}
-       >=dev-util/intltool-0.40
-       >=dev-util/pkgconfig-0.19
-       doc? ( >=dev-util/gtk-doc-1 )
-       dev-util/gtk-doc-am"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-       G2CONF="${G2CONF}
-               --enable-http
-               --disable-bash-completion
-               $(use_enable archive)
-               $(use_enable avahi)
-               $(use_enable bluetooth obexftp)
-               $(use_enable cdda)
-               $(use_enable fuse)
-               $(use_enable gnome gconf)
-               $(use_enable gphoto2)
-               $(use_enable hal)
-               $(use_enable gnome-keyring keyring)
-               $(use_enable samba)"
-
-       if use cdda && built_with_use dev-libs/libcdio minimal; then
-               ewarn
-               ewarn "CDDA support in gvfs requires dev-libs/libcdio to be built"
-               ewarn "without the minimal USE flag."
-               die "Please re-emerge dev-libs/libcdio without the minimal USE flag"
-       fi
-}
-
-src_unpack() {
-       gnome2_src_unpack
-
-       # Add support for bluez 4, bug #250615
-       epatch "${FILESDIR}/${P}-bluez4.patch"
-
-       # Remove debug code that turns warnings into crashes, bug #262502
-       epatch "${FILESDIR}/${P}-bluez4-debug.patch"
-
-       # Fix non posixy tests, bug #256305
-       epatch "${FILESDIR}/${P}-posixtest.patch"
-
-       # Fix themed icon for obexftp, bug #256890
-       epatch "${FILESDIR}/${P}-obexftp-icon.patch"
-
-       # Fix HTTP leaks, bug #256892
-       epatch "${FILESDIR}/${P}-http-leak.patch"
-
-       # Fix URL crash, bug #245204
-       epatch "${FILESDIR}/${P}-gmountspec-SIGSEGV.patch"
-
-       eautoreconf
-
-       # Fix "Function `g_volume_monitor_adopt_orphan_mount' implicitly converted to pointer at gdaemonvolumemonitor.c:155"
-       # bug 268788
-       sed -i -e 's:-DG_DISABLE_DEPRECATED::g' $(find . -name Makefile.in) || die
-}
-
-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
-}
diff --git a/gnome-base/gvfs/gvfs-1.0.3-r2.ebuild b/gnome-base/gvfs/gvfs-1.0.3-r2.ebuild
deleted file mode 100644 (file)
index f58f3c1..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.0.3-r2.ebuild,v 1.7 2009/05/08 00:52:29 loki_val Exp $
-
-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 gnome gphoto2 hal gnome-keyring samba"
-
-RDEPEND=">=dev-libs/glib-2.17.6
-       >=sys-apps/dbus-1.0
-       >=net-libs/libsoup-2.23.91
-       dev-libs/libxml2
-       net-misc/openssh
-       archive? ( app-arch/libarchive )
-       avahi? ( >=net-dns/avahi-0.6 )
-       cdda?  (
-               >=sys-apps/hal-0.5.10
-               >=dev-libs/libcdio-0.78.2 )
-       fuse? ( sys-fs/fuse )
-       gnome? ( >=gnome-base/gconf-2.0 )
-       hal? ( >=sys-apps/hal-0.5.10 )
-       bluetooth? (
-               dev-libs/dbus-glib
-               >=net-wireless/bluez-libs-3.12
-               dev-libs/expat )
-       gphoto2? ( >=media-libs/libgphoto2-2.4 )
-       gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-       samba? ( >=net-fs/samba-3 )"
-DEPEND="${RDEPEND}
-       >=dev-util/intltool-0.40
-       >=dev-util/pkgconfig-0.19
-       doc? ( >=dev-util/gtk-doc-1 )
-       dev-util/gtk-doc-am"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-       G2CONF="${G2CONF}
-               --enable-http
-               --disable-bash-completion
-               $(use_enable archive)
-               $(use_enable avahi)
-               $(use_enable bluetooth obexftp)
-               $(use_enable cdda)
-               $(use_enable fuse)
-               $(use_enable gnome gconf)
-               $(use_enable gphoto2)
-               $(use_enable hal)
-               $(use_enable gnome-keyring keyring)
-               $(use_enable samba)"
-
-       if use cdda && built_with_use dev-libs/libcdio minimal; then
-               ewarn
-               ewarn "CDDA support in gvfs requires dev-libs/libcdio to be built"
-               ewarn "without the minimal USE flag."
-               die "Please re-emerge dev-libs/libcdio without the minimal USE flag"
-       fi
-}
-
-src_unpack() {
-       gnome2_src_unpack
-
-       # Fix non posixy tests, bug #256305
-       epatch "${FILESDIR}/${P}-posixtest.patch"
-
-       # Fix HTTP leaks, bug #256892
-       epatch "${FILESDIR}/${P}-http-leak.patch"
-
-       # Fix URL crash; bug #245204
-       epatch "${FILESDIR}"/${P}-gmountspec-SIGSEGV.patch
-
-       eautoreconf
-
-       # Fix "Function `g_volume_monitor_adopt_orphan_mount' implicitly converted to pointer at gdaemonvolumemonitor.c:155"
-       # bug 268788
-       sed -i -e 's:-DG_DISABLE_DEPRECATED::g' $(find . -name Makefile.in) || die
-}
-
-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
-}
diff --git a/gnome-base/gvfs/gvfs-1.4.2.ebuild b/gnome-base/gvfs/gvfs-1.4.2.ebuild
deleted file mode 100644 (file)
index 68193b5..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.4.2.ebuild,v 1.3 2010/02/19 17:15:38 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="~amd64 ~x86"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal samba +udev"
-
-RDEPEND=">=dev-libs/glib-2.21.2
-       >=sys-apps/dbus-1.0
-       >=net-libs/libsoup-2.25.1[gnome]
-       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 )
-       samba? ( || ( net-fs/samba-libs[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
-               --enable-http
-               --disable-bash-completion
-               $(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 gnome-keyring keyring)
-               $(use_enable samba)"
-}
-
-src_prepare() {
-       gnome2_src_prepare
-
-       # 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"
-}