Update libattica deps - bug 314539, add mimetypes patch - bug 261446 (no revbump as it's less relevant)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 85 insertions, 21 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e8e22a6e1b89..fe0d52d22931 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.684 2010/05/15 14:06:43 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.685 2010/05/28 22:53:16 reavertm Exp $
+
+  28 May 2010; Maciej Mrozowski <reavertm@gentoo.org> kdelibs-4.4.2.ebuild,
+  kdelibs-4.4.3.ebuild, +files/kdelibs-4.4.3-mimetypes.patch:
+  Update libattica deps - bug 314539, add mimetypes patch - bug 261446 (no
+  revbump as it's less relevant)
 
   15 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   kdelibs-4.3.3-r1.ebuild, kdelibs-4.3.5.ebuild, kdelibs-4.4.2.ebuild,
@@ -957,7 +962,7 @@
 
 *kdelibs-3.5.8-r1 (03 Nov 2007)
 
-  03 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> 
+  03 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +kdelibs-3.5.8-r1.ebuild:
   Added several upstream patches:
   - Un-break editable controls like zoom selectors.
@@ -2735,7 +2740,7 @@
 
   30 Sep 2003; Luca Barbato <lu_zero@gentoo.org> files/kdelibs-3.1.2-*:
   recovered the patches needed by kdelibs-3.1.2-r1
-  
+
   27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-2.2.2a-r2.ebuild,
   kdelibs-2.2.2a-r2.ebuild, kdelibs-3.0.5b.ebuild, kdelibs-3.0.5b.ebuild,
   kdelibs-3.1.1a.ebuild, kdelibs-3.1.1a.ebuild, kdelibs-3.1.2.ebuild,
@@ -2842,7 +2847,7 @@
   Also includes misc other fixes.
 
   27 Mar 2003; Dan Armak <danarmak@gentoo.org> all 3.x ebuilds:
-  
+
   Added explicit dep on sys-devel/gettext, since it will soon be removed
   from the sysem profiles and apps will have to depend on it directly.
 
@@ -2858,16 +2863,16 @@
   Changed ~sparc keyword to sparc.
 
   20 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1.1-r1.ebuild:
-  
+
   Add patch that fixes kde bug #55571 (https authentication through proxy).
 
   14 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.0.5a-r1.ebuild:
-  
+
   Add fix for #16329 to this version as well. Added the other part of the fix
   to arts-1.0.5a. No new revisions.
 
   14 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1-r3.ebuild:
-  
+
   Actually add the fix for #16329, as described two entries below. I guess I
   somehow forgot it before. Sorry...
 
@@ -2904,7 +2909,7 @@
   Changed ~sparc keyword to sparc.
 
   28 Feb 2003; Will Woods <wwoods@gentoo.org> kdelibs-3.1-r2.ebuild:
-  Added workaround for gcc3 optimization bug on alpha, removed 
+  Added workaround for gcc3 optimization bug on alpha, removed
   -mieee flag (old attempt to fix this bug), and added ~alpha keyword.
 
   13 Feb 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1-r1.ebuild:
@@ -2992,7 +2997,7 @@
   Added sparc keyword
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
   05 Dec 2002; Dan Armak <danarmak@gentoo.org> kdelibs-2.2.2-r4.ebuild  :
 
   Ditto for this older ebuild.
@@ -3122,23 +3127,23 @@
 *kdelibs-3.0-r2 (11 May 2002)
 
   11 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
-  
+
   Make ${KDEDIR}/lib/kde3/plugins (where all style plugins live) a symlink to
   /usr/qt/3/plugins. That way qt-only apps can use kde styles with the default qtconfig
   setup. Closes bug #2118, too.
 
   2 May 2002; Dan Armak <danarmak@gentoo.org> changelog:
-  
+
   Add ghostscript dep (needed for printing to pdf).
 
   6 Apr 2002; Dan Armak <danarmak@gentoo.org> changelog:
-  
+
   Change cups dep to >=1.1.14.
 
 *kdelibs-3.0-r1 (5 Apr 2002)
 
   5 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
-  
+
   Add --with-fast-malloc=full configure option for a considerable speed improvement.
 
 *kdelibs-3.0 (4 Apr 2002)
@@ -3151,7 +3156,7 @@
 *kdelibs-2.2.2-r4 (24 Mar 2002)
 
   24 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
-  
+
   Split the env.d file into two, so that when both ked2 and kde3 are installed,
   the KDEDIR of kde3 gets exported (was the other way around till now).
 
@@ -3164,11 +3169,11 @@
 *kdelibs-2.2.2-r3 (22 Feb 2002)
 
   1 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  
+
   Added KDEDIRS export to env.d file - will come in handy when several KDEs are
   installed side-by-side. If you're not into that kind of thing, you don't care
   about it and needn't upgrade.
-  
+
   Added support for customizing kde install locations. You probably don't need it,
   in which case you don't want to hear about it. Note: untested support for now,
   but doesn't break anything else.
@@ -3176,7 +3181,7 @@
 *kdelibs-2.2.2-r2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch
new file mode 100644
index 000000000000..687f24032826
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch
@@ -0,0 +1,58 @@
+diff -r -u kdelibs-4.4.3.orig/mimetypes/kde.xml kdelibs-4.4.3/mimetypes/kde.xml
+--- kdelibs-4.4.3.orig/mimetypes/kde.xml	2009-10-06 23:37:48.000000000 +0200
++++ kdelibs-4.4.3/mimetypes/kde.xml	2010-05-28 22:48:51.000000000 +0200
+@@ -180,41 +180,6 @@
+     <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/>
+   </mime-type>
+ 
+-  <!-- all/ fake mime types -->
+-  <mime-type type="all/all">
+-    <comment>all files and folders</comment>
+-  </mime-type>
+-  <mime-type type="all/allfiles">
+-    <comment>all files</comment>
+-  </mime-type>
+-
+-  <!-- uri/ fake mime types -->
+-  <mime-type type="uri/mms">
+-    <comment>mms: URIs</comment>
+-  </mime-type>
+-  <mime-type type="uri/mmst">
+-    <comment>mmst: URIs</comment>
+-  </mime-type>
+-  <mime-type type="uri/mmsu">
+-    <comment>mmsu: URIs</comment>
+-  </mime-type>
+-  <mime-type type="uri/pnm">
+-    <comment>pnm: URIs</comment>
+-  </mime-type>
+-  <mime-type type="uri/rtspt">
+-    <comment>rtspt: URIs</comment>
+-  </mime-type>
+-  <mime-type type="uri/rtspu">
+-    <comment>rtspu: URIs</comment>
+-  </mime-type>
+-
+-  <!-- fonts/ fake mime types -->
+-  <mime-type type="fonts/package">
+-    <sub-class-of type="application/zip"/>
+-    <comment>fonts package</comment>
+-    <glob pattern="*.fonts.zip"/>
+-  </mime-type>
+-
+   <mime-type type="application/x-konsole">
+     <comment>file to open a shell</comment>
+     <glob pattern="*.shell"/>
+@@ -349,12 +314,6 @@
+     <glob pattern="*.icq"/>
+   </mime-type>
+ 
+-  <mime-type type="interface/x-winamp-skin">
+-    <sub-class-of type="application/zip"/>
+-    <comment>compressed Winamp skin</comment>
+-    <glob pattern="*.wsz"/>
+-  </mime-type>
+-
+   <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" -->
+     <comment>Microsoft Media Format</comment>
+     <sub-class-of type="video/x-ms-wmv"/>
diff --git a/kde-base/kdelibs/kdelibs-4.4.2.ebuild b/kde-base/kdelibs/kdelibs-4.4.2.ebuild
index 3a5dcfd4de34..dc446804d557 100644
--- a/kde-base/kdelibs/kdelibs-4.4.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild,v 1.6 2010/05/15 14:06:43 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild,v 1.7 2010/05/28 22:53:17 reavertm Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ RESTRICT="test"
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.6.3
-	dev-libs/libattica
+	~dev-libs/libattica-0.1.2
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
 	dev-libs/libxslt
diff --git a/kde-base/kdelibs/kdelibs-4.4.3.ebuild b/kde-base/kdelibs/kdelibs-4.4.3.ebuild
index 677ca76c3912..5809a155f4eb 100644
--- a/kde-base/kdelibs/kdelibs-4.4.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.3.ebuild,v 1.3 2010/05/15 14:06:43 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.3.ebuild,v 1.4 2010/05/28 22:53:16 reavertm Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ RESTRICT="test"
 COMMONDEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.6.3
-	dev-libs/libattica
+	~dev-libs/libattica-0.1.2
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -128,6 +128,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
 	"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
+	"${FILESDIR}/${PN}-4.4.3-mimetypes.patch"
 )
 
 src_prepare() {