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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 89 insertions, 24 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/Manifest b/kde-base/kdelibs/Manifest
index ea43a863131d..926ab59c7746 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -17,6 +17,7 @@ AUX kdelibs-4.3.3-plasma-pixmap-cache.patch 656 RMD160 9b8173f035ab3cb1867c21f3d
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 RMD160 c7f53343cb8713bb2c7d195563d5fe399adb9939 SHA1 03e60a01c7665e9074ddc412c90f157a044ce9ba SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a
 AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925a371bbc41da SHA1 efa963a74c60dcc23c3f925a479cf753b6247ccf SHA256 06fedf486f3a459cb3366fe1865583863924b48f78f0d5f6b327a42438c83976
 AUX kdelibs-4.4.2-hang.patch 2328 RMD160 776f7485b67ee3b851b060040676c366dc23db4a SHA1 6d6ac98f2ae5b566cbbfc91418ab265bb8793863 SHA256 da18313fe70d7afd69f871c51363c8b412f081815c0cbd6c5c5073fc4999b1d8
+AUX kdelibs-4.4.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d
 AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d
 DIST kdelibs-4.3.3.tar.bz2 10516364 RMD160 3d6a2c971cef12fb2cb9ba64a10200b2cf098043 SHA1 89b55982e007c44835a9da0f540dd57fa096df45 SHA256 bec0b11b9db010fb14e1bc438ef77dd417a429168eb7d14dc5dee50ea23b5fb3
 DIST kdelibs-4.3.5.tar.bz2 10524879 RMD160 6b8e060854d637072fe94f0e3397ff1dd9b86583 SHA1 35dcbc06b468451cb4e839aa5771b4e6bc512188 SHA256 65823e34e2b4f6579251f3dddb23774f381c3576cca420417964027b8fe4b40e
@@ -24,7 +25,7 @@ DIST kdelibs-4.4.2.tar.bz2 14082099 RMD160 7506f87bc098aedb84b3b50707065a4f8060a
 DIST kdelibs-4.4.3.tar.bz2 14082821 RMD160 787aaf748e866ac6c78aba33386f090b934d9925 SHA1 9801303f359083415988fb2529a1c342752ad326 SHA256 93f20f145f9f66e62a25a925d3ca25e76aed10dff73caf92002f00ea1e4f0428
 EBUILD kdelibs-4.3.3-r1.ebuild 6360 RMD160 74599b01edfe7ecfa15391eb1146dc65a69bc670 SHA1 a68ed7e934cb4ce5b826435f15a422f251c598a8 SHA256 a351ee2a8ea006b85bdcb953a86e4b552ea68362206f5fef15b2aa492e4e6347
 EBUILD kdelibs-4.3.5.ebuild 8922 RMD160 18f86c78e08b119febf3c2d4ef04afd49458bac2 SHA1 e3eb70b800112aa525bdb824ea03c7cde78147ce SHA256 8f3bd9f2be65a59c854a72c21809e36655e24060c7c74440d03f9bd03776ef3a
-EBUILD kdelibs-4.4.2.ebuild 9284 RMD160 63b4ee84537a5379ccf210c5c753d55cfa7d502a SHA1 9eea90c81e41a0f355593af4420b6f7e49369754 SHA256 bd87cfa276b57e532bc80a85f804032a4d1ca1288418290e68dd9e82f0a8dc70
-EBUILD kdelibs-4.4.3.ebuild 9253 RMD160 284536dae817c6d73c6f3a58fb2385407cbe46f3 SHA1 25cc2a6b92170763fcb563763d485a0fa55459ab SHA256 ccc783c772d1ae2b814693276b0cc0f3791f89a16e61e1106932b06ae6829722
-MISC ChangeLog 114135 RMD160 535183fce65579dc022daf0f7a6a570e0e137164 SHA1 f11ad83505e6efd0261ea138dc415a04c4dd22a9 SHA256 9ecca21c07290362d0ace977c0911b557a159a53c784b7c0a9725b6718e00e22
+EBUILD kdelibs-4.4.2.ebuild 9291 RMD160 ee3b64b59be353bc2e6ab767e1066528f52091de SHA1 83c04fe655e61afe82f6903a4bc0171f1a6ccb47 SHA256 405bcf492cb67d7be08eae6c1f80fe035a75a530228a946e47080c8dfb8e053e
+EBUILD kdelibs-4.4.3.ebuild 9303 RMD160 452e4e17643168567e27f59e5b0c39e5c429150d SHA1 d14d435122176c8ac6f4f65befbaae8d34899b11 SHA256 4528bfffb1903241269b68c6db012d8c373b4625a848d09d3243b2e0c12ee4a2
+MISC ChangeLog 114353 RMD160 c43b3c8f8188c8bac72be013784221857dab1128 SHA1 b2c18a83e85b2c59c99c6cab4efeda56159a854b SHA256 f22803b2ac5ce07ffa75ff6da2dd145b2734c69c029cd86b913602f9475b1bf6
 MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
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() {