Fixed knode crash patch name in kdelibs, blocks moved to RDEPEND and sorted out a bit, updated required soprano to 2.2.1

4 files changed, 57 insertions, 44 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index ed5bf464e06..3e5607b9830 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  kdelibs-4.2.61.ebuild, kdelibs-9999.ebuild:
+  Fixed knode crash patch name in kdelibs, blocks moved to RDEPEND and
+  sorted out a bit, updated required soprano to 2.2.1
+
   05 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   +files/kdelibs-4.2.0-knode_crash.patch, kdelibs-4.2.61.ebuild:
   Added knode crash patch to kdelibs as of bug 257535
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 46e2fa85177..c438bb51221 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -5,7 +5,7 @@ AUX kdelibs-4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90
 AUX kdelibs-4.2.0-klauncher.patch 2877 RMD160 42432fc21fd08f725b3c0551eb1b2388376dadf5 SHA1 069afec796194d2fbb3b7730077ee10b5d48c6ef SHA256 624d16db755fd1efbc0121a25f3497eb4453212ca2f376f2ad62ba78a30b1d72
 AUX kdelibs-4.2.0-knode_crash.patch 404 RMD160 ecb72bd6ef1a111b155780d85a2dde026ffdf2fc SHA1 08aecb72471af440b6e32c3a062fed6e12579004 SHA256 a2e7417cecb55b7fcd706703520233546210fe250e7846df04df911019acffc4
 DIST kdelibs-4.2.61.svn917530.tar.bz2 10016503 RMD160 afbf16f5c2d7dcdaea82e126ff0f7aab125cb681 SHA1 1948d084a2b23429f3221ef84d850f0cf14c4187 SHA256 b03d11589a97fa2c5fae5312c87da2fdc20cb0ef455cba36df50fc1d0afd94e8
-EBUILD kdelibs-4.2.61.ebuild 6615 RMD160 3c6654bf5e10e38430a5c8f3bdcd21fef4947779 SHA1 dd7e8c8ad6634a051d8cc35b20b88baa49673a43 SHA256 07e4a2bafecdc916f390e99fa87251c16b16f8d970222ec74248ea5b1b42eaad
-EBUILD kdelibs-9999.ebuild 6452 RMD160 a13b50f6fa04da589bc1ddfd0eb84feb39da6195 SHA1 e68d04fc497c428daf1453fde4f10bad2386816d SHA256 9764d1c3f7c3c34c9a50941a6da6037a7c6b3346bc490597f922782221f85c05
-MISC ChangeLog 9885 RMD160 8aae93abf4c176e7d80c388c6fca8f676a3fdc23 SHA1 896efbda982b031cb58f57b557dc82bf81238cdf SHA256 f2317b6df359021a5afae7488929c9a802099775fcc00cb475106d4cd3d43fe5
+EBUILD kdelibs-4.2.61.ebuild 6641 RMD160 b88a8988c9f8dc97516c6323e682ddd4e3eb64fb SHA1 d62381c76dbbd943f597448e5b035f008ed70237 SHA256 cd95e00740e84a7ed9998e6b62691ae41c9097543333063a857359fd3e0a393d
+EBUILD kdelibs-9999.ebuild 6472 RMD160 abecf14ab6b962f58c55e43e35fb56d219d4511f SHA1 079e45b51b77bbf1c28207d78a9e20be24627c38 SHA256 cf88db8d1e7b68d0b0e026e7e155422c312dc4c3f91d1dddff32b15bb517f4ec
+MISC ChangeLog 10121 RMD160 c988ec3070935fca52f742af61e21a734ae32276 SHA1 6eab67db399b271ca03144bc514ab21fccd4cdcd SHA256 c8b77ac5e38e5baaf3a3917676c374e22a02bcfb9280d471db770414fdc1258f
 MISC metadata.xml 402 RMD160 8991971dbbb15472b4501c538a85517353ba2c31 SHA1 b5428ffe34e12cb89d8ff66ff743a7d20b52ae33 SHA256 347f16542b0bbba7ed2183538b350eeb4ac224cb122108cef1ce10a2d4400473
diff --git a/kde-base/kdelibs/kdelibs-4.2.61.ebuild b/kde-base/kdelibs/kdelibs-4.2.61.ebuild
index 7eca0520446..66c2c82de48 100644
--- a/kde-base/kdelibs/kdelibs-4.2.61.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.61.ebuild
@@ -17,26 +17,7 @@ kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
 LICENSE="LGPL-2.1"
 RESTRICT="test"
 
-# Blockers added for !kdeprefix? due to packages from old versions,
-# removed in the meanwhile
-# kde-base/libplasma
-# kde-base/knewsticker
-# kde-base/kpercentage
-# kde-base/ktnef
 COMMONDEPEND="
-	!<=kde-base/kdebase-3.5.9-r4
-	!<=kde-base/kdebase-startkde-3.5.10
-	!<kde-base/kdelibs-3.5.10
-	!x11-libs/qt-phonon
-	!kdeprefix? (
-		!kde-base/kitchensync:4.1[-kdeprefix]
-		!kde-base/knewsticker:4.1[-kdeprefix]
-		!kde-base/kpercentage:4.1[-kdeprefix]
-		!kde-base/ktnef:4.1[-kdeprefix]
-		!<kde-base/libkworkspace-${PV}[-kdeprefix]
-		!kde-base/libplasma[-kdeprefix]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
 	>=app-misc/strigi-0.6.3[qt4,dbus]
 	dev-libs/libpcre
 	dev-libs/libxml2
@@ -76,7 +57,7 @@ COMMONDEPEND="
 		media-libs/ilmbase
 	)
 	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=dev-libs/soprano-2.1.68 )
+	semantic-desktop? ( >=dev-libs/soprano-2.2.1 )
 	spell? (
 		app-dicts/aspell-en
 		app-text/aspell
@@ -94,7 +75,30 @@ DEPEND="${COMMONDEPEND}
 	doc? ( app-doc/doxygen )
 	nls? ( virtual/libintl )
 "
+# Blockers added for !kdeprefix? due to packages from old versions,
+# removed in the meanwhile
+# kde-base/libplasma
+# kde-base/knewsticker
+# kde-base/kpercentage
+# kde-base/ktnef
 RDEPEND="${COMMONDEPEND}
+	!<=kde-base/kdebase-3.5.9-r4
+	!<=kde-base/kdebase-startkde-3.5.10
+	!<kde-base/kdelibs-3.5.10
+	!x11-libs/qt-phonon
+	!kdeprefix? (
+		!kde-base/kitchensync:4.1
+		!kde-base/knewsticker:4.1
+		!kde-base/kpercentage:4.1
+		!kde-base/ktnef:4.1
+		!<kde-base/libkworkspace-${PV}
+		!kde-base/libplasma
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	kdeprefix? (
+		!<kde-base/libkworkspace-${PV}:${SLOT}
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
 	x11-apps/iceauth
 	x11-apps/rgb
 "
@@ -103,7 +107,7 @@ RDEPEND="${COMMONDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-kded.patch"
 	"${FILESDIR}/${PN}-4.2.0-klauncher.patch"
-	"${FILESDIR}/${PN}-4.2.0-knode.patch"
+	"${FILESDIR}/${PN}-4.2.0-knode_crash.patch"
 )
 
 src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 4e8e7c1d1e9..9cf01f68a57 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -17,26 +17,7 @@ kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
 LICENSE="LGPL-2.1"
 RESTRICT="test"
 
-# Blockers added for !kdeprefix? due to packages from old versions,
-# removed in the meanwhile
-# kde-base/libplasma
-# kde-base/knewsticker
-# kde-base/kpercentage
-# kde-base/ktnef
 COMMONDEPEND="
-	!<=kde-base/kdebase-3.5.9-r4
-	!<=kde-base/kdebase-startkde-3.5.10
-	!<kde-base/kdelibs-3.5.10
-	!x11-libs/qt-phonon
-	!kdeprefix? (
-		!kde-base/kitchensync:4.1[-kdeprefix]
-		!kde-base/knewsticker:4.1[-kdeprefix]
-		!kde-base/kpercentage:4.1[-kdeprefix]
-		!kde-base/ktnef:4.1[-kdeprefix]
-		!<kde-base/libkworkspace-${PV}[-kdeprefix]
-		!kde-base/libplasma[-kdeprefix]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
 	>=app-misc/strigi-0.6.3[qt4,dbus]
 	dev-libs/libpcre
 	dev-libs/libxml2
@@ -76,7 +57,7 @@ COMMONDEPEND="
 		media-libs/ilmbase
 	)
 	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=dev-libs/soprano-2.1.68 )
+	semantic-desktop? ( >=dev-libs/soprano-2.2.1 )
 	spell? (
 		app-dicts/aspell-en
 		app-text/aspell
@@ -94,7 +75,30 @@ DEPEND="${COMMONDEPEND}
 	doc? ( app-doc/doxygen )
 	nls? ( virtual/libintl )
 "
+# Blockers added for !kdeprefix? due to packages from old versions,
+# removed in the meanwhile
+# kde-base/libplasma
+# kde-base/knewsticker
+# kde-base/kpercentage
+# kde-base/ktnef
 RDEPEND="${COMMONDEPEND}
+	!<=kde-base/kdebase-3.5.9-r4
+	!<=kde-base/kdebase-startkde-3.5.10
+	!<kde-base/kdelibs-3.5.10
+	!x11-libs/qt-phonon
+	!kdeprefix? (
+		!kde-base/kitchensync:4.1
+		!kde-base/knewsticker:4.1
+		!kde-base/kpercentage:4.1
+		!kde-base/ktnef:4.1
+		!<kde-base/libkworkspace-${PV}
+		!kde-base/libplasma
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	kdeprefix? (
+		!<kde-base/libkworkspace-${PV}:${SLOT}
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
 	x11-apps/iceauth
 	x11-apps/rgb
 "