Revision bump. Add patch to fix regression that causes zip-based files (such as opendocument) to open as zip files instead of correct file types.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 48 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index adea85187335..77a2adb95dac 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.880 2012/12/05 16:58:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.881 2012/12/08 00:37:15 creffett Exp $
+
+*kdelibs-4.9.4-r1 (08 Dec 2012)
+
+  08 Dec 2012; Chris Reffett <creffett@gentoo.org>
+  +files/kdelibs-4.9.4-zipfiles.patch, +kdelibs-4.9.4-r1.ebuild,
+  -kdelibs-4.9.4.ebuild:
+  Revision bump. Add patch to fix regression that causes zip-based files (such
+  as opendocument) to open as zip files instead of correct file types.
 
 *kdelibs-4.9.4 (05 Dec 2012)
 
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch b/kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch
new file mode 100644
index 000000000000..c7e5a48b712e
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch
@@ -0,0 +1,37 @@
+diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
+index 3f1cadd..502a3e6 100644
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -47,7 +47,6 @@
+ #include <ksharedconfig.h>
+ #include <kstandarddirs.h>
+ #include <kurl.h>
+-#include <kmimetype.h>
+ #include <kmimetypetrader.h>
+ #include <kprotocolinfofactory.h>
+ 
+@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
+             }
+         }
+     }
+-    const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+-    if (!prot.isEmpty())
+-        return prot;
+-
+-    // Check parent mimetypes
+-    KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+-    if (mime) {
+-        const QStringList parentMimeTypes = mime->allParentMimeTypes();
+-        Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+-            const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
+-            if (!res.isEmpty()) {
+-                return res;
+-            }
+-        }
+-    }
+-
+-    return QString();
++    return d->protocolForArchiveMimetypes.value(mimeType);
+ }
+ 
+ #undef PRIVATE_DATA
diff --git a/kde-base/kdelibs/kdelibs-4.9.4.ebuild b/kde-base/kdelibs/kdelibs-4.9.4-r1.ebuild
index 6e2d79e60f5c..230f36131063 100644
--- a/kde-base/kdelibs/kdelibs-4.9.4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.9.4.ebuild,v 1.1 2012/12/05 16:58:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.9.4-r1.ebuild,v 1.1 2012/12/08 00:37:15 creffett Exp $
 
 EAPI=4
 
@@ -142,6 +142,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.9.4-zipfiles.patch"
 )
 
 pkg_pretend() {