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

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 40 insertions, 76 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/Manifest b/xfce-base/exo/Manifest
index fc5f29b6d894..fe7690fb6514 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX exo-0.3.101-iocharset.patch 2052 RMD160 aad5f5b78fa01b9bf13cad9013ee99fb468f8bee SHA1 8b9c68550e090f91a653ef3f4b4a4931f8e92469 SHA256 d3e2b5fb2d012d6f9dddf3da5f350fc81a3d61c1a66eca7638d7c14a9b282769
 AUX exo-0.3.102-eject.patch 6770 RMD160 1e6fb5f55e01b4c0319a1c1a35919806b3caf817 SHA1 adefb1e320a9b56eff699d9f23b202d78cc2750f SHA256 84e2f7d3f796cb6596c3b88d6e05c286afc70ae3b326756ba8d86895521fe044
+AUX exo-0.3.105-sync.patch 871 RMD160 1e75a279b28e75ab07895507ef51a764838e69a5 SHA1 a9846ac4dd088b855157afa79df2486b72fe9cda SHA256 8b97b49781786cb98a231b474cb55fce781c720d547573d3d1e6781ebc3b2e00
 AUX exo-0.3.4-interix.patch 2766 RMD160 876452cf6009fb1530cf0f296104ba4105dc10de SHA1 8ad881d9cca3811fba0b1a7080caed024e37381b SHA256 e7a5864241cbae1ac1442af31aea2b3365e9936740954e06a45e4da7e810e471
 DIST exo-0.3.102.tar.bz2 1801655 RMD160 a932173cb916ea18e62fdc8f0254452ab09ac320 SHA1 ef85488a713911d1afeea5ddd8d70943f2c5a323 SHA256 deab87326a455fc47eea44a124268fa64b154750a55ae5158a1119cddc497800
-DIST exo-0.3.104.tar.bz2 1706606 RMD160 b35382e24333e88fe861675988cbb4698f2e2362 SHA1 ddd49dc4efd32697c195f2790c8459b5f2b7e624 SHA256 3cb2f23bd313be45ae2cfc2d05c931a18d9be0e591e0fbd38e0da35a74b53b13
 DIST exo-0.3.105.tar.bz2 1738813 RMD160 3744e3fe37fbc425f209ec5580de437c2be3578a SHA1 2f424cf473ff834b2208a436061af75c6c6b80a9 SHA256 278f702d890c89bd3923ce1bdaf29bd9f2c800c2e4cfd9e902d99663bba337e5
 EBUILD exo-0.3.102-r1.ebuild 1653 RMD160 0dcf1a0f9aaf8a3dfd32b744345e3d1385b1513f SHA1 71b4c25dd36add139c0a9b7c2a3cd77bcab573cc SHA256 cb6cde6ce12499be4e9e073c43e2f3b8c7df9a72cf6b59bbdb8665e5a1f5c5ba
-EBUILD exo-0.3.104.ebuild 1552 RMD160 63ddcae00fa05d056e4a7c0840eedf28d32bdd05 SHA1 d49171b4b7b00b0fe2eff549680da8ac6608e770 SHA256 a17a0529e41d0889b4e84ad6637544e11d01af175a3f71c788e7307b50e5d0d1
-EBUILD exo-0.3.105.ebuild 1552 RMD160 2ba6935e970ceb352e6e9aeb28619111905ec9e5 SHA1 de4ebcc1c2317db436a943c5ae0a3f455cf9d54e SHA256 f64271a884efba5da38b03c4f992bebdeaceb4863f494164b50948e83e1062aa
-MISC ChangeLog 2525 RMD160 c5eaed68cfc934982af9f031ae508c9ad869b855 SHA1 b0d4873ee5f4e2dba32a696d88d627695a793d59 SHA256 ed2cf9b11bbe482d38ba2b32ec5d158cd20a6fcdc6075547c9194b028ade1f44
+EBUILD exo-0.3.105-r1.ebuild 1590 RMD160 cbfe6ca334cb79329b1e47535dee1acf18d07ce0 SHA1 94695032e0742031a4d0acf638eb7f271ef9f71b SHA256 61d0825eacf01229dc4a45c459078c321dd33919d1fcc508e8eb8eb6618625bd
+MISC ChangeLog 2764 RMD160 bc53372eb9a352bcecbce1b776636fd3fbdbe017 SHA1 a176ea40191440eddc3480c83d3604b224fcf777 SHA256 7242330f26332676282581acd047ad8ca84370e3131fdb484a56e24f450ebdd0
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkreQVMACgkQNQqtfCuFneN3egCfSc3vwP9KMxjaBPFbKP6KToKa
-mDkAn2axeIzWnfnl6IMtdq9Mft26pwL4
-=j7PO
------END PGP SIGNATURE-----
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