[kde-base/kdelibs] Clean up blockers

This adds "[-kdeprefix]" to all kde 4.x blockers wrapped in !kdeprefix?
and moves a common blocker out from both kdeprefix? and !kdeprefix?

6 files changed, 40 insertions, 55 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5d1122d2f07..af9aefb49d8 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -6,9 +6,9 @@ AUX kdelibs-4.3.0-webkit-kpart-build-fix.patch 3134 RMD160 344f31aceb3feee0fe7bf
 DIST kdelibs-4.3.0.tar.bz2 10505396 RMD160 32ebf5f5786e2f350e7ed12dce257bb74df85ba8 SHA1 39d6577530a22e46a03ec64d1e5c075a163ca7d8 SHA256 cf5714baeaf12242cbe4d950121ddda03612fcd53f953c15df3e9ee32c10c859
 DIST kdelibs-4.3.1.tar.bz2 10510833 RMD160 25c8d6225813a677d4f1e1006f18b0d5c14f9003 SHA1 511532852caca9302c643fded4013ef1f57d5433 SHA256 a06ff50031cf14ba929ad2868b3f19434b7acfdcfbce75d87db625786fab615d
 DIST kdelibs-4.3.65.tar.lzma 10590625 RMD160 9954d8a838f274a5346d53471656d3609614e296 SHA1 989d62d67c87464903d62645a33982c847df60b8 SHA256 4df0e683a2445be20944e6a8c5db82b703d9e6db830bb368eb3ff7936b934f10
-EBUILD kdelibs-4.3.0-r2.ebuild 6435 RMD160 9a59512d1f9163d1a2c414b8bcefe4920f5ed479 SHA1 736b2c39ec1419fa0e32a27a767796d613fd74d1 SHA256 84d57458c77b6383d04285c4b5468ca1c87bb46fde3274f265f4fe6fd1fcdc9d
-EBUILD kdelibs-4.3.1.ebuild 6277 RMD160 b8a9c0748b0497dd8d68c0a72792a5cc92c82bef SHA1 0b65bcf8bee25298713c36e643470e8b2b7f2890 SHA256 a349e3b02c9c1480f34bfab73daa141f1d10e09931f7ce1c0b0076b08f0393ec
-EBUILD kdelibs-4.3.65-r1.ebuild 6277 RMD160 b8a9c0748b0497dd8d68c0a72792a5cc92c82bef SHA1 0b65bcf8bee25298713c36e643470e8b2b7f2890 SHA256 a349e3b02c9c1480f34bfab73daa141f1d10e09931f7ce1c0b0076b08f0393ec
-EBUILD kdelibs-4.3.9999.ebuild 6235 RMD160 ab61bc9baeb5d3e2b76144b8c552c820d84b20dc SHA1 a6ed4e0ad17b3bb75ba9c48bb02b13e23f991ed8 SHA256 ba44dd8d64045e3ea77281f58fa843cbc7dcdbb6a7404a1b1a0c375207e02959
-EBUILD kdelibs-9999.ebuild 6235 RMD160 ab61bc9baeb5d3e2b76144b8c552c820d84b20dc SHA1 a6ed4e0ad17b3bb75ba9c48bb02b13e23f991ed8 SHA256 ba44dd8d64045e3ea77281f58fa843cbc7dcdbb6a7404a1b1a0c375207e02959
+EBUILD kdelibs-4.3.0-r2.ebuild 6442 RMD160 3e31ca3487288cc1095e6ab5988b74a54207565d SHA1 07b1d578f8e3d5a89eb1fcd048af6419e503378b SHA256 9374a92e1101505087d4c7406deb9b126df538ad7eace5f83962ecd83ab17508
+EBUILD kdelibs-4.3.1.ebuild 6284 RMD160 a7cbc7b77be6182f1f282e8042539d578aba1831 SHA1 157c3c43dc4c38d854e02a1d911555c6a06486b7 SHA256 576d8945e01a8245373b499c20a58378f4571bad1317b0ee7b1a5e2cf8ed4735
+EBUILD kdelibs-4.3.65-r1.ebuild 6284 RMD160 a7cbc7b77be6182f1f282e8042539d578aba1831 SHA1 157c3c43dc4c38d854e02a1d911555c6a06486b7 SHA256 576d8945e01a8245373b499c20a58378f4571bad1317b0ee7b1a5e2cf8ed4735
+EBUILD kdelibs-4.3.9999.ebuild 6242 RMD160 1a906079d59632512d2e8186134113ec566bbe58 SHA1 25887f717b62662f990b99aca314be377e4b9ac5 SHA256 3082e976bb918d95d313b0f843aa3eb015464825a8d93e150a257e776f9b3242
+EBUILD kdelibs-9999.ebuild 6242 RMD160 0f98c0224d9242eef9b32a456f2f7932f5c1460a SHA1 6e5b286215dd76ba15fb04cefb6607fc3cccdb20 SHA256 cbd1b28e481a2c3a5c2c0943f5c96dee88fbb9936aa975d7c8d776bd402891b6
 MISC metadata.xml 241 RMD160 e23ea97bfdc981201294af826fc0f315ebc0c663 SHA1 65e562c9b76e5c338c984bdd9dd5f1026013c0d3 SHA256 3f6cec1e375ad99ac2929f89e8fbe74237333497106dfc52c36af0aa5629b139
diff --git a/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild b/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild
index 41436c9e3df..e53c94a627e 100644
--- a/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild
@@ -86,18 +86,15 @@ RDEPEND="${COMMONDEPEND}
 	!<=kde-base/kdebase-3.5.9-r4
 	!<=kde-base/kdebase-startkde-3.5.10
 	!<kde-base/kdelibs-3.5.10
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
 	!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/libplasma
-		!kde-base/libkworkspace:4.2[kdeprefix=]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
-	kdeprefix? (
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
+		!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/libplasma[-kdeprefix]
+		!kde-base/libkworkspace:4.2[-kdeprefix]
 	)
 	>=app-crypt/gnupg-2.0.11
 	x11-apps/iceauth
diff --git a/kde-base/kdelibs/kdelibs-4.3.1.ebuild b/kde-base/kdelibs/kdelibs-4.3.1.ebuild
index 801b0776c7c..39bcb4ebe65 100644
--- a/kde-base/kdelibs/kdelibs-4.3.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.1.ebuild
@@ -86,18 +86,15 @@ RDEPEND="${COMMONDEPEND}
 	!<=kde-base/kdebase-3.5.9-r4
 	!<=kde-base/kdebase-startkde-3.5.10
 	!<kde-base/kdelibs-3.5.10
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
 	!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/libplasma
-		!kde-base/libkworkspace:4.2[kdeprefix=]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
-	kdeprefix? (
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
+		!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/libplasma[-kdeprefix]
+		!kde-base/libkworkspace:4.2[-kdeprefix]
 	)
 	>=app-crypt/gnupg-2.0.11
 	x11-apps/iceauth
diff --git a/kde-base/kdelibs/kdelibs-4.3.65-r1.ebuild b/kde-base/kdelibs/kdelibs-4.3.65-r1.ebuild
index 801b0776c7c..39bcb4ebe65 100644
--- a/kde-base/kdelibs/kdelibs-4.3.65-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.65-r1.ebuild
@@ -86,18 +86,15 @@ RDEPEND="${COMMONDEPEND}
 	!<=kde-base/kdebase-3.5.9-r4
 	!<=kde-base/kdebase-startkde-3.5.10
 	!<kde-base/kdelibs-3.5.10
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
 	!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/libplasma
-		!kde-base/libkworkspace:4.2[kdeprefix=]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
-	kdeprefix? (
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
+		!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/libplasma[-kdeprefix]
+		!kde-base/libkworkspace:4.2[-kdeprefix]
 	)
 	>=app-crypt/gnupg-2.0.11
 	x11-apps/iceauth
diff --git a/kde-base/kdelibs/kdelibs-4.3.9999.ebuild b/kde-base/kdelibs/kdelibs-4.3.9999.ebuild
index f8141389ff4..9417bce2ad9 100644
--- a/kde-base/kdelibs/kdelibs-4.3.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.9999.ebuild
@@ -86,18 +86,15 @@ RDEPEND="${COMMONDEPEND}
 	!<=kde-base/kdebase-3.5.9-r4
 	!<=kde-base/kdebase-startkde-3.5.10
 	!<kde-base/kdelibs-3.5.10
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
 	!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/libplasma
-		!kde-base/libkworkspace:4.2[kdeprefix=]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
-	kdeprefix? (
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
+		!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/libplasma[-kdeprefix]
+		!kde-base/libkworkspace:4.2[-kdeprefix]
 	)
 	>=app-crypt/gnupg-2.0.11
 	x11-apps/iceauth
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index f8141389ff4..f9556f75570 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -87,17 +87,14 @@ RDEPEND="${COMMONDEPEND}
 	!<=kde-base/kdebase-startkde-3.5.10
 	!<kde-base/kdelibs-3.5.10
 	!x11-libs/qt-phonon
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
 	!kdeprefix? (
-		!kde-base/kitchensync:4.1
-		!kde-base/knewsticker:4.1
-		!kde-base/kpercentage:4.1
-		!kde-base/ktnef:4.1
-		!kde-base/libplasma
-		!kde-base/libkworkspace:4.2[kdeprefix=]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
-	kdeprefix? (
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
+		!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/libplasma[-kdeprefix]
+		!kde-base/libkworkspace:4.2[-kdeprefix]
 	)
 	>=app-crypt/gnupg-2.0.11
 	x11-apps/iceauth