Synced kdelibs with tree

5 files changed, 19 insertions, 9 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 35aaadf4357..4b2e48baed1 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,7 +1,11 @@
-# ChangeLog for kde-base/kdelibs
+# ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  kdelibs-4.2.1-r1.ebuild, kdelibs-4.2.65.ebuild, kdelibs-9999.ebuild:
+  Synced kdelibs with tree
+
   09 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   kdelibs-4.2.1-r1.ebuild, kdelibs-4.2.65.ebuild, kdelibs-9999.ebuild:
   Raised deps of soprano as it supports new USE flag and we want to sort it
@@ -308,7 +312,7 @@
   kde-base/kdebase-startkde/Manifest, kde-base/kdelibs/Manifest:
   Fixed Manifest.
 
-  01 Sep 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> 
+  01 Sep 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   kdelibs-4.1.1.ebuild:
   Restricted dep on phonon to >=4.2.0.
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index c7b03e7496a..2d49905bc0c 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -9,8 +9,8 @@ AUX kdelibs-4.2.0-klauncher.patch 2877 RMD160 42432fc21fd08f725b3c0551eb1b238837
 AUX kdelibs-4.2.0-knode_crash.patch 404 RMD160 ecb72bd6ef1a111b155780d85a2dde026ffdf2fc SHA1 08aecb72471af440b6e32c3a062fed6e12579004 SHA256 a2e7417cecb55b7fcd706703520233546210fe250e7846df04df911019acffc4
 DIST kdelibs-4.2.1.tar.bz2 10049614 RMD160 8099366677a4d238d8cfa18862f74c4fafa49ef7 SHA1 d2214b9864b64e4a8382a9f593d082c801c58571 SHA256 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d
 DIST kdelibs-4.2.65.tar.lzma 8373343 RMD160 dd032a5698325147bf0ae23d0e6c0b2ca4626806 SHA1 8b480f4565f9c2f6847a5f14cdd699f302b1884f SHA256 efada135fc3a174148dd96717b95805d0fbcd10b9f093a40b98ba37b1d4a9164
-EBUILD kdelibs-4.2.1-r1.ebuild 6766 RMD160 00ee774a9a50a8be9fa0352b7d18ff703d610b53 SHA1 0b280543ae709caa3d71df7e6cdb30dc0730149f SHA256 e25ffca945b6ad2135cd51aa24cbbacfd7b0849d3e0f29ee410bd54e6f55d858
-EBUILD kdelibs-4.2.65.ebuild 6508 RMD160 6d33bb72bf2fa31ad670563bd8b8751951c41750 SHA1 0dc4f01fe3adbde7836dd4841e72d2385f2a07d7 SHA256 f4ba4790cc75477e4f592431d33dd0e5672fb48e297572f40c9a889278282462
-EBUILD kdelibs-9999.ebuild 6497 RMD160 abd0357fb191b1c151895c16857564a3d64f7caf SHA1 c837fd2531cad1d6711d80d7fc4e566cf9893d35 SHA256 7a27897decd9f957da55d60e512f20e15a41cd8d8fe28d4042c6f50fc4e7a1ca
-MISC ChangeLog 11251 RMD160 54105acd104c0212de4aea63cca6f3d7f7527fdd SHA1 19a91865486533618116c1dd679f137287f7d235 SHA256 ca599caeb96818fd8c9726b91f6cc096ddd2f6ef31133ae94242306793c23a23
+EBUILD kdelibs-4.2.1-r1.ebuild 6941 RMD160 efcf8c213563d20a397165ffb16bb41c1a5d48de SHA1 1cbcc1b634a4ce5a0b3512aa99de569143f79d39 SHA256 d95b4c38d300573ee8201b56fee1b3dc55848b71148876ed7013b843df597a15
+EBUILD kdelibs-4.2.65.ebuild 6533 RMD160 6dccd06babb52a7fd5077ceee8da7d022e248e1e SHA1 a33baf941b7c8efc1d33d6bc811931cf49df3a2e SHA256 b888de5eb708cde6b5f286c212a5f955f8d8a8da63c3e3b1d1ea3462caead1d9
+EBUILD kdelibs-9999.ebuild 6522 RMD160 aa9830b18e09ad79e6de3d1763f730699fe34fce SHA1 3b3ad9e7d416db959607b502cd3c9129b67ae352 SHA256 cabd75249a7bbf07311f62d43e6920749b8b8ff572ed5b246127212810e666cf
+MISC ChangeLog 11410 RMD160 f38d3b3f78f66141d268974e9bdb1922ddb4ca35 SHA1 0e9687c930b71fcc6814661fb674698b55801a64 SHA256 976da51f30299d7701099962ce6af4f05c34335afede9fb3b4dd216c10551455
 MISC metadata.xml 402 RMD160 8991971dbbb15472b4501c538a85517353ba2c31 SHA1 b5428ffe34e12cb89d8ff66ff743a7d20b52ae33 SHA256 347f16542b0bbba7ed2183538b350eeb4ac224cb122108cef1ce10a2d4400473
diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r1.ebuild
index 2764df999a8..39412e25249 100644
--- a/kde-base/kdelibs/kdelibs-4.2.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.1-r1.ebuild
@@ -6,6 +6,7 @@ EAPI="2"
 
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
 inherit kde4-base fdo-mime
 
 DESCRIPTION="KDE libraries needed by all KDE programs."
@@ -105,10 +106,13 @@ RDEPEND="${COMMONDEPEND}
 "
 
 # upstream patches / dist patches
+# {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640
+# and fixes upstream bug 186038 and Gentoo bug 261367
 PATCHES=(
-	"$FILESDIR/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
-	"$FILESDIR/dist/20_use_dejavu_as_default_font.patch"
-	"$FILESDIR/dist/23_solid_no_double_build.patch"
+	"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
+	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
+	"${FILESDIR}/dist/23_solid_no_double_build.patch"
+	"${FILESDIR}/${P}-qt4.5.patch"
 )
 
 src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.2.65.ebuild b/kde-base/kdelibs/kdelibs-4.2.65.ebuild
index a4016ecf029..dd78298e52f 100644
--- a/kde-base/kdelibs/kdelibs-4.2.65.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.65.ebuild
@@ -6,6 +6,7 @@ EAPI="2"
 
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
 inherit kde4-base fdo-mime
 
 DESCRIPTION="KDE libraries needed by all KDE programs."
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 271f166225a..82bb37d848f 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="2"
 
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
 inherit kde4-base fdo-mime
 
 DESCRIPTION="KDE libraries needed by all KDE programs."