Revision bump for upstream patch: Avoid sync mount option with USB storage wrt #289972.

(Portage version: 2.2_rc46/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 37 insertions, 62 deletions

diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog
index cc5c59eb50f8..d7a1a763e7eb 100644
--- a/xfce-base/exo/ChangeLog
+++ b/xfce-base/exo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/exo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.15 2009/10/20 23:01:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.16 2009/10/21 11:01:48 ssuominen Exp $
+
+*exo-0.3.105-r1 (21 Oct 2009)
+
+  21 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +exo-0.3.105-r1.ebuild, +files/exo-0.3.105-sync.patch:
+  Revision bump for upstream patch: Avoid sync mount option with USB storage
+  wrt #289972.
 
   20 Oct 2009; Christian Faulhammer <fauli@gentoo.org> exo-0.3.105.ebuild:
   stable x86, bug 289179
diff --git a/xfce-base/exo/exo-0.3.104.ebuild b/xfce-base/exo/exo-0.3.105-r1.ebuild
index 202fb31cf49a..eca2479b14b5 100644
--- a/xfce-base/exo/exo-0.3.104.ebuild
+++ b/xfce-base/exo/exo-0.3.105-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.104.ebuild,v 1.2 2009/10/17 00:58:57 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.105-r1.ebuild,v 1.1 2009/10/21 11:01:48 ssuominen Exp $
 
 EAPI=2
 inherit xfconf python multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/exo/0.3/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug hal libnotify python"
 
 RDEPEND=">=dev-lang/perl-5.6
@@ -32,7 +32,8 @@ pkg_setup() {
 		$(use_enable libnotify notifications)
 		$(use_enable python)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-	PATCHES=( "${FILESDIR}/${PN}-0.3.4-interix.patch" )
+	PATCHES=( "${FILESDIR}/${PN}-0.3.4-interix.patch"
+		"${FILESDIR}/${P}-sync.patch" )
 }
 
 src_prepare() {
diff --git a/xfce-base/exo/exo-0.3.105.ebuild b/xfce-base/exo/exo-0.3.105.ebuild
deleted file mode 100644
index 1884069fc281..000000000000
--- a/xfce-base/exo/exo-0.3.105.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.105.ebuild,v 1.2 2009/10/20 23:01:11 fauli Exp $
-
-EAPI=2
-inherit xfconf python multilib
-
-DESCRIPTION="Extensions, widgets and framework library with session management support"
-HOMEPAGE="http://www.xfce.org/projects/exo"
-SRC_URI="mirror://xfce/src/xfce/exo/0.3/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug hal libnotify python"
-
-RDEPEND=">=dev-lang/perl-5.6
-	dev-perl/URI
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-4.6.1
-	libnotify? ( x11-libs/libnotify )
-	hal? ( sys-apps/hal )
-	python? ( dev-python/pygtk )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	XFCONF="--disable-static
-		$(use_enable hal)
-		$(use_enable libnotify notifications)
-		$(use_enable python)"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-	PATCHES=( "${FILESDIR}/${PN}-0.3.4-interix.patch" )
-}
-
-src_prepare() {
-	xfconf_src_prepare
-	rm py-compile
-	touch py-compile
-	chmod +x py-compile
-
-	if [[ ${CHOST} == *-interix* ]] ; then
-		# configure detects getmntent, which is false!
-		export ac_cv_func_getmntent=no
-	fi
-}
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	python_mod_optimize "$(python_get_sitedir)"
-}
-
-pkg_postrm() {
-	xfconf_pkg_postrm
-	python_mod_cleanup "$(python_get_sitedir)"
-}
diff --git a/xfce-base/exo/files/exo-0.3.105-sync.patch b/xfce-base/exo/files/exo-0.3.105-sync.patch
new file mode 100644
index 000000000000..e961c711d162
--- /dev/null
+++ b/xfce-base/exo/files/exo-0.3.105-sync.patch
@@ -0,0 +1,25 @@
+From 7aad4f152380e1d2edffdc9a2eb15554f042fbad Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Sun, 18 Oct 2009 22:47:32 +0000
+Subject: Only sync devices with no volume.
+
+If the devices is pollable and we set the sync option, this
+will slowdown the transfer. I missed that when changing the
+code.
+---
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index bbf9ca3..d09d0db 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -741,7 +741,8 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+         {
+           option = NULL;
+ 
+-          if (strcmp (device->fsoptions[m], "sync") == 0)
++          if (strcmp (device->fsoptions[m], "sync") == 0
++              && device->volume == NULL)
+             {
+               /* non-pollable drive... */
+               option = g_strdup ("sync");
+--
+cgit v0.8.2.1