Added patch to be able to run pumount successfully, so to unbreak handling of unmount...

Package-Manager: portage-2.0.52-r1

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e5b1929d17c7ab048af229d092b6b311d307d58c..17b2df7ccc389e03543163ea23d171007e8e3421 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.273 2005/09/21 17:18:55 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.274 2005/09/26 08:30:55 flameeyes Exp $
+
+*kdelibs-3.5_beta1-r1 (26 Sep 2005)
+
+  26 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kioslave-pumount-devname.patch, -kdelibs-3.5_beta1.ebuild,
+  +kdelibs-3.5_beta1-r1.ebuild:
+  Added patch to be able to run pumount successfully, so to unbreak handling
+  of unmount action for users.
 
 *kdelibs-3.5_beta1 (21 Sep 2005)
 

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index ed6f433972f66a4cd107fad63f235a388a4abff7..8c3dfb6f1dd8c303c283dc98fd17d7ba750c5a63 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,33 +1,44 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
-MD5 88097278bbb6cbd438ecc20542d46b35 kdelibs-3.5_beta1.ebuild 3634
-MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
-MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363
-MD5 8d47d2d277da56556e6259efe061cc54 ChangeLog 44016
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 2c3feefcb9434725dedeef7d9c400d02 kdelibs-3.4.1-r2.ebuild 3357
 MD5 a2754ea94836037eda37593282978e6c kdelibs-3.2.3-r9.ebuild 3831
-MD5 06b75ddcec5d5e38f703654a2d50030c kdelibs-3.4.2-r1.ebuild 3333
+MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
+MD5 a549fb6a15fa07eb9ff9e8edcec1cbaf ChangeLog 44318
+MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
 MD5 97766212645b832cda19843b15698607 kdelibs-3.2.3-r7.ebuild 3566
-MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
-MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
-MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
-MD5 99b6a0719a376a17b6edea6555e3e5ae files/digest-kdelibs-3.2.3-r9 601
-MD5 b93484486086ff60f9633f48ed311877 files/post-3.2.3-kdelibs-kimgio.diff 39789
-MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
-MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+MD5 06b75ddcec5d5e38f703654a2d50030c kdelibs-3.4.2-r1.ebuild 3333
+MD5 05a09bc0f0f7710f7b2fd1a5602a19eb kdelibs-3.5_beta1-r1.ebuild 3751
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363
 MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724
-MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2-r1 68
+MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
 MD5 02c4482bb15fc1a504621c2627a4deee files/digest-kdelibs-3.2.3-r7 529
+MD5 1faf357303566f52581151bc68a6d245 files/kioslave-pumount-devname.patch 461
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
 MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
+MD5 99b6a0719a376a17b6edea6555e3e5ae files/digest-kdelibs-3.2.3-r9 601
+MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
+MD5 481aadcb2e3cd311fce3a29b12c86b83 files/digest-kdelibs-3.5_beta1-r1 69
+MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
 MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
-MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
-MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
-MD5 3c54378872cb0af555c68a12dddf156d files/kdelibs-3.5_beta1-configure-acl.patch 1457
 MD5 b174d4e6ed2d0fd78fa43a40654f9ea4 files/post-3.2.3-kdelibs-idn.patch 2337
 MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
 MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2 68
-MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
 MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
-MD5 481aadcb2e3cd311fce3a29b12c86b83 files/digest-kdelibs-3.5_beta1 69
-MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
+MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
+MD5 3c54378872cb0af555c68a12dddf156d files/kdelibs-3.5_beta1-configure-acl.patch 1457
+MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2-r1 68
+MD5 b93484486086ff60f9633f48ed311877 files/post-3.2.3-kdelibs-kimgio.diff 39789
+MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDN7Hgj5H05b2HAEkRAtyMAKCimSE/FcNDsn1HPRMexW24bYE+sACfVMzx
+Za2HJbJBxhUrSKAI2GN3nH0=
+=fIvX
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5_beta1 b/kde-base/kdelibs/files/digest-kdelibs-3.5_beta1-r1
similarity index 100%
rename from kde-base/kdelibs/files/digest-kdelibs-3.5_beta1
rename to kde-base/kdelibs/files/digest-kdelibs-3.5_beta1-r1

diff --git a/kde-base/kdelibs/files/kioslave-pumount-devname.patch b/kde-base/kdelibs/files/kioslave-pumount-devname.patch
new file mode 100644 (file)
index 0000000..6281301
--- /dev/null
+++ b/kde-base/kdelibs/files/kioslave-pumount-devname.patch
@@ -0,0 +1,12 @@
+Index: kdelibs-3.4.91/kioslave/file/file.cc
+===================================================================
+--- kdelibs-3.4.91/kioslave/file/file.cc.orig
++++ kdelibs-3.4.91/kioslave/file/file.cc
+@@ -1621,6 +1621,7 @@ bool FileProtocol::pumount(const QString
+     }
+ 
+     if (dev.isEmpty()) return false;
++    if (dev.endsWith("/")) dev.truncate(dev.length()-1);
+ 
+     QString epath = getenv("PATH");
+     QString path = QString::fromLatin1("/sbin:/bin");

diff --git a/kde-base/kdelibs/kdelibs-3.5_beta1.ebuild b/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild
similarity index 95%
rename from kde-base/kdelibs/kdelibs-3.5_beta1.ebuild
rename to kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild
index 68e2d08507d86b77968b0b9ded81be751abc9397..bcda871e3d4722027c485d8a9994ea29f0ea1589 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.5_beta1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5_beta1.ebuild,v 1.1 2005/09/21 17:18:55 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild,v 1.1 2005/09/26 08:30:55 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -56,6 +56,9 @@ src_unpack() {
        # Configure check for ACLs.
        epatch "${FILESDIR}/${P}-configure-acl.patch"
 
+       # Fix for pumount that was passed the wrong device name
+       epatch "${FILESDIR}/kioslave-pumount-devname.patch"
+
        # For the configure check.
        make -f admin/Makefile.common || die
 }