Revision bump: added untested security patch from upstream, CVE-2011-1168

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

6 files changed, 380 insertions, 15 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 6d8a49b164c4..cef673c0a9a8 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.730 2011/03/26 17:19:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.731 2011/03/27 13:44:12 dilfridge Exp $
+
+*kdelibs-4.4.5-r4 (27 Mar 2011)
+
+  27 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdelibs-4.4.5-r4.ebuild, +files/kdelibs-4.4.5-cve20111168.patch,
+  +files/kdelibs-4.5.5-cve20111168.patch,
+  +files/kdelibs-4.6.1-cve20111168.patch:
+  Revision bump: added untested security patch from upstream, CVE-2011-1168
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdelibs-4.4.5.ebuild, kdelibs-4.4.5-r1.ebuild, kdelibs-4.4.5-r2.ebuild,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 1a11f74f6783..0f9124d0db18 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -14,18 +14,21 @@ AUX kdelibs-4.3.3-klauncher_mac.patch 1126 RMD160 073d2ce7fc431257dec40617f7269f
 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.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d
+AUX kdelibs-4.4.5-cve20111168.patch 648 RMD160 66286ac58b26bcd672b54eab4f8d80a379eeabd1 SHA1 1ef220907be37d2f027fcab65d886795157fe8ef SHA256 0f79822447c6e240e6fef6c3dfc8aa7bc16b7e0a7be17dafd59df1f89737530f
 AUX kdelibs-4.4.5-formpainter.patch 727 RMD160 1c6613f5e5f6ede529b5988252c93fa7e22223c3 SHA1 9db99158c61afe6569c54e32833e22d7e047c625 SHA256 b2e48ad5256c749fc9de455696bbcdc0f67e9cbd0d6d57676c98840bba6e5c33
 AUX kdelibs-4.4.5-hostname.patch 2444 RMD160 2074eeaa83163f3fbd8762de2cf1912157f9a0d8 SHA1 048d48b26773a3d751b0a0bd07973d00319fa0a7 SHA256 c60a78cb2df9083694ec60d3ae9174edc8128b3d0132b9de78148ffbf877bbd2
 AUX kdelibs-4.4.5-qt471.patch 362 RMD160 54ea903b795f65ea21719c9e8bb30af342a783ab SHA1 14a189d9e95ea5c9feebb81c81544ba322a98116 SHA256 6ae79f4880dbf7aa86888d1eefb3e2868ef5eaa2a367696ad44d1566dcf70d41
 AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d
 AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0f SHA1 24faa51f5d3645858ca55c744b9b76952eb383c6 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b
 AUX kdelibs-4.5.2-open-https.patch 436 RMD160 4c4e45df7758d04f93e38071f3fc9839d4205693 SHA1 152353fbf9df9345788da4d58714e1481fdea07c SHA256 849a8e4480062e00255f5a8e0885bf47e8d3741cb1d68ebbdeef495ed1220cb0
+AUX kdelibs-4.5.5-cve20111168.patch 648 RMD160 9aee223b5f989783e4c63c22099a6494a493368d SHA1 3e660f7d75583c6122d0b99d3275b73829797c43 SHA256 0499d4acd1891f370e2721629a5b765212321b3b0798f890c467ee4b76ca0404
 AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9
 AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84
 AUX kdelibs-4.5.90-mimetypes.patch 1629 RMD160 46289674dd977b2b2289ba935d88c1b0c9de5916 SHA1 78c70127486231e24f464f5cce978e06293510e5 SHA256 0276732204ba9b7a9f119ce26a2b992b1d23c321606efc1a6957914329f33109
 AUX kdelibs-4.6.0-hostname.patch 2656 RMD160 e91749a66986927fa307473f0543fc56470fbf8e SHA1 f50ae8689abfd6df723cbaffd45afe0b061f5323 SHA256 c1bb30ce6d1cce217498acca585780cb97f514571cb72d35732a9751c7897a92
 AUX kdelibs-4.6.0-kateacc.patch 1639 RMD160 239e2fb92dc2efa1e66b669a6e6cf29f9937127a SHA1 aa21f3eaf1c75ba50ceca3dafde252672bb71935 SHA256 dc6c0617c76acc0fff15d82b0a44826022c69d1d7af5abf554c17be8eb49c9dd
 AUX kdelibs-4.6.0-logoutcrash.patch 769 RMD160 999f0adf323e0adbe6359c0533bfc8f7bd1b5a9f SHA1 270f24d9682c32c9f69b3e6e13696888724c5169 SHA256 0eb003283c6956c989bece7ff64a4e099b291916e674e6947a582b6a32fc2c46
+AUX kdelibs-4.6.1-cve20111168.patch 648 RMD160 e9ab4d57bf2c33761aaac2ac7527a69b5e0aae96 SHA1 730534a337c88ef2a7c716f5d118f445d06898e7 SHA256 eaf04067911121a141036c5f2e22a810a566e9eec8f982c3573c0a2a51cc3014
 AUX kdelibs-4.6.1-sslproxy.patch 867 RMD160 7d0abcf3a1e9736d210b270159c78ba9c25c590b SHA1 8de74e66f71f8ce379c5a9a64195333892918e0a SHA256 bb8407da2c02beaf09a102474932288ecf54201088998f7f3b5f8c07c392d953
 DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
 DIST kdelibs-4.5.5.tar.bz2 13876521 RMD160 7c33afa12379119fbf7d70e8895c3f2ada9a2eba SHA1 127a2b50fe31ff345e05660dd50f7c55ae78d854 SHA256 347c6d7034d9cffbb1b5c7d151f13998e64f62906fb6c5064d6eff540db6eaf9
@@ -34,27 +37,28 @@ DIST kdelibs-4.6.1.tar.bz2 12915228 RMD160 14e9c356d4d6991c1d65d3c0a9c04f5a89a0b
 EBUILD kdelibs-4.4.5-r1.ebuild 9305 RMD160 990c1fada960973aa385b17f33e7ae39af18bbdc SHA1 f2af2ce09d6a7fec81861b8cfb20bb2b85fd5680 SHA256 a1d3c4ee9e1c72b16e80833bdaa20e75444eea04892e874b76a89253c99003fa
 EBUILD kdelibs-4.4.5-r2.ebuild 9348 RMD160 c49aabc622b1bdb285bb1734dc54516f4a5bf6d2 SHA1 ab45cfce69564b4b4ae2787d4094f96978997cfd SHA256 45f72450061fd84c528f6abbceb3aa46a6ff3b3554acd3fd6030e501c1e2fcf3
 EBUILD kdelibs-4.4.5-r3.ebuild 9389 RMD160 623d5b887f84431bf568fc87cd69daa2e7cfcd28 SHA1 b9b4ffe449c7a73ae7b0a00acb2e0fb5d00a85d9 SHA256 49970c6e40ce296c329067244f42ac0746b57ea571ed96e9972f78197fe990fb
+EBUILD kdelibs-4.4.5-r4.ebuild 9375 RMD160 f5b61fab33858dd2f5a1e8f6164bfe7f9d7372b5 SHA1 32877f025d6f6ac9c76986b346e5789a28b15df7 SHA256 2ed2700296da70e2d37547d53b13b8f9eeac4e9164846ed09d627a08867a0228
 EBUILD kdelibs-4.4.5.ebuild 9261 RMD160 fa5cde9fa6918f1b00e99104f38e9906ec3a513f SHA1 731b5f1f193edfae407a40d1563fd731502abc3c SHA256 fae1b2fc955ae6eabc80e3f6c87a2b457a06fc47cd864e7a3c35c6a88a19b884
 EBUILD kdelibs-4.5.5.ebuild 9310 RMD160 0593d2b92de9d79a55a8823762ae822896e1c915 SHA1 578b8b8f225e7c14e05d136df6e505b7f87b143a SHA256 87c375e5dd65b6975f45a58487473f59405073b06ed8aa07df8f9e16074837ba
 EBUILD kdelibs-4.6.0-r1.ebuild 9592 RMD160 311f27c4e286581b70b6861757d741a16071bd03 SHA1 2ad425e2bc961625ea9dd49a5f7b1dc91174c4c6 SHA256 a85c4e7edfa084121151e8de982d4e7326f3f56a590ab396f58c059cfd6208aa
 EBUILD kdelibs-4.6.1-r1.ebuild 9661 RMD160 f0484c8bac349f99e3a1e73944130a1054809b86 SHA1 0dbd6e2e5b62642d226321624ef5bb282bed2eff SHA256 837b0ee605dd964a15312dae90de66e18fc8e68d6985f2352aeeefafd5c7cb5c
 EBUILD kdelibs-4.6.1.ebuild 9556 RMD160 8ed723f6d0822911300997bbd9ef69d7cbd5520c SHA1 2bfa5638a4d7127f893352744cbd3507de4fd195 SHA256 9940c3d6ab42432359a5b0b8065a25b968cf60dcd1f01bd618520ecead8549cd
-MISC ChangeLog 121693 RMD160 359338411dbb7071151e4f14eae89a21432b1d8a SHA1 eae5d94e24dcafe4347e2ba43b0ac7cda79cc680 SHA256 27bb5056d8f1a5bb71bfa5ac58d313ef2d4aebe27629039c10b0888d941ae8e5
+MISC ChangeLog 122012 RMD160 a7a36d8e2ada65688969596b6ad941059c97dac6 SHA1 ecf7d05c98872e3a8a59ae5e9cd859f717650742 SHA256 50477ba5dfd6f7efcacc2a9d8ac6ee8308072afd1ab5f4e1b2d216c5e2f58186
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNjiAwAAoJENwGBM22xffepIEP/1ZjRd3PIMS8C+P/TjCD+MPG
-VzFvJNVGD2XHe7DPvrDjr1IMWlOWE+gLiiFu5sZ7ANsTY9j6VKnl1PNTbZAWiC4g
-6E46QhJMDEBY00ja1lfooBhe3v8BVJ41RELU5YjB4tsyDIsKNLrFk7UOXB8blK+1
-n9DGvlV2kcng6eRzHS4hLsz5SCnkOZA5SxnKZnWY2Wzq6kiQfzWTX4vQA/MC0Zp0
-ozTzaRhAB/KyQVJY61GlBxO6++Md4S4BKOwepHPbOFRNqYLk1MFwoP3Z/9MF1koE
-aW/D2ULCKQf1xUxcGfyzUGUJb9q8GDRX6Txr7ucndEPEzjv1pIwO3L2nlan1wTZS
-1J19bU7LPZR/sqNeBQ7p3FQNnnIhudm5B//fzccjpU8K4G4a7XTztIBJKAwCg5WP
-5Ec+Ev+alml0k1YH5ZKYz2H/aLlLchc5sz4dcA0Gi6cNTHf0QjH4vsp54Vh2zAGV
-924KCnEk4VFtTzaB0s7AYiQcaEpgyfTHuqlPwZhoRErxJ9HvGFCe3v1RYZ0TLULR
-sEkdRTngTuojktHMXbW+Afg3FX6a+ukEs6TEyahqc9lqLlMeXyH0UFz9DKA/ot4J
-GIdYz3mqbH3IBS3cOl2lnF2iWRZ82UFUGeYgl66AYkaLrh15S9s93IViq9BLZbJR
-n2PK6DOWuN29s0FGGn1X
-=LjwS
+iQIcBAEBCgAGBQJNjz83AAoJENwGBM22xffeW5QP+wRLZ/iDst8pof5hQTkzn91N
+J3QMXP1vNs/El1g2jgpyB8I46ja2utRQDXgv0i17qjVKJkzQ4zOpPuQooZlv0TBT
+XrU19kI+85ThoN2WNFbAXmocXGru92hLc31yyD2hb/P5nYYLEFp8N0ry5klgW4eo
+REINVCG6PweZF629Bkl6zvR586ffoXILm2trklUKuQa2qz8ljg3Fn2WxOEuYvh2j
+Pe25CRcFhbOlIin46/pb5Pei72NX/g9tv+rM9pJDYO4oVzh13QQ28wPBE3WM+k0g
+RVnjxrMud6omTDEOJTaYL1lsA3La4WLEONf1icGQt/xAeZnIyqPoQ7N9z1M5fo+F
+9zs/u+SU36ge3TC2SUhJiiMVipApmprLtFHFFxHtNmCMWW+Xpigz7HzgImtU3DDk
+57iJkliETsbvxgjiVsY3d7NqYm0l6U5roRZ/OS2NIkBjOQgMZz9vfjHfiTymdnQc
+P7VCBOLA4uQjrnDaiXiaOecpKXz1p//lFlKXVQQgZt7U6fIGBezw9ARzt/LzXx6e
+BSUKVORfuylcZxnqiAAg62Z2c9CmCpUKprUgAkbNfuadJEkjsIF+0jwpAAxzBLV8
+xiqvOl7C7EUO+9ohNKZOQYVyQ82Qt7jLaeB0lPeIjUWWh6vytGUhJTDxNJ83wvxs
+m2gWdrctx4XYaooqdi9R
+=mhOh
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch
new file mode 100644
index 000000000000..9a81db700566
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch
@@ -0,0 +1,14 @@
+--- a/khtml/khtml_part.cpp
++++ b/khtml/khtml_part.cpp
+@@ -1848,7 +1848,10 @@ void KHTMLPart::htmlError( int errorCode
+   stream >> errorName >> techName >> description >> causes >> solutions;
+ 
+   QString url, protocol, datetime;
+-  url = Qt::escape( reqUrl.prettyUrl() );
++
++  // This is somewhat confusing, but we have to escape the externally-
++  // controlled URL twice: once for i18n, and once for HTML.
++  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+   protocol = reqUrl.protocol();
+   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
+                                                 KLocale::LongDate );
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.5-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.5.5-cve20111168.patch
new file mode 100644
index 000000000000..356f30a61046
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.5.5-cve20111168.patch
@@ -0,0 +1,14 @@
+--- a/khtml/khtml_part.cpp
++++ b/khtml/khtml_part.cpp
+@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode
+   stream >> errorName >> techName >> description >> causes >> solutions;
+ 
+   QString url, protocol, datetime;
+-  url = Qt::escape( reqUrl.prettyUrl() );
++
++  // This is somewhat confusing, but we have to escape the externally-
++  // controlled URL twice: once for i18n, and once for HTML.
++  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+   protocol = reqUrl.protocol();
+   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
+                                                 KLocale::LongDate );
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.1-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.6.1-cve20111168.patch
new file mode 100644
index 000000000000..007eef91085c
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.1-cve20111168.patch
@@ -0,0 +1,14 @@
+--- a/khtml/khtml_part.cpp
++++ b/khtml/khtml_part.cpp
+@@ -1804,7 +1804,10 @@ void KHTMLPart::htmlError( int errorCode
+   stream >> errorName >> techName >> description >> causes >> solutions;
+ 
+   QString url, protocol, datetime;
+-  url = Qt::escape( reqUrl.prettyUrl() );
++
++  // This is somewhat confusing, but we have to escape the externally-
++  // controlled URL twice: once for i18n, and once for HTML.
++  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+   protocol = reqUrl.protocol();
+   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
+                                                 KLocale::LongDate );
diff --git a/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild b/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild
new file mode 100644
index 000000000000..8885bad82dc6
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild,v 1.1 2011/03/27 13:44:12 dilfridge Exp $
+
+EAPI="3"
+
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
+inherit kde4-base fdo-mime
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl zeroconf"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.6.3
+	~dev-libs/libattica-0.1.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	>=media-libs/phonon-4.3.80
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXtst
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lzma? ( app-arch/xz-utils )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	policykit? ( sys-auth/polkit-qt )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.2
+		>=dev-libs/soprano-2.3.73[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-libs/conversion
+	!dev-libs/kunitconversion
+	!x11-libs/qt-phonon
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+	)
+"
+PDEPEND="
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? ( >=sys-auth/polkit-kde-0.95.1 )
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Blockers added due to packages from old versions, removed in the meanwhile
+# as well as for file collisions
+add_blocker libknotificationitem
+add_blocker libkworkspace '<4.3.66'
+# @since 4.4 - kpilot is gone (blocker added to help upgrades)
+add_blocker kpilot
+# Block some old versions of KDE-3.5 packages that don't work well with KDE-4
+add_blocker kdebase 0 3.5.9-r4:3.5
+add_blocker kdebase-startkde 0 3.5.10:3.5
+add_blocker kdelibs 0 '<3.5.10:3.5'
+# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
+add_blocker plasma-workspace '<4.3.75'
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
+	"${FILESDIR}/dist/23_solid_no_double_build.patch"
+	"${FILESDIR}/${PN}-4.3.80-module-suffix.patch"
+	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch"
+	"${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"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.4.5-qt471.patch"
+	"${FILESDIR}/${PN}-4.4.5-formpainter.patch"
+	"${FILESDIR}/${PN}-4.4.5-hostname.patch"
+	"${FILESDIR}/${PN}-4.4.5-cve20111168.patch"
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
+	local menu_prefix="kde-${SLOT}-"
+	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \
+		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		-DKAUTH_BACKEND=POLKITQT-1
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt \
+	"${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EKDEDIR}/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	elog "Your homedir is set to \${HOME}/${HME}"
+	echo
+
+	if ! has_version sys-apps/hal; then
+		echo
+		ewarn "You need sys-apps/hal for new device notifications, power management and any"
+		ewarn "other hardware related functionalities to work."
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}