Clean up blockers

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

5 files changed, 40 insertions, 39 deletions

diff --git a/kde-base/kactivities/ChangeLog b/kde-base/kactivities/ChangeLog
index d0cf7ebf8b25..5b6ea29120c2 100644
--- a/kde-base/kactivities/ChangeLog
+++ b/kde-base/kactivities/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kactivities
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/ChangeLog,v 1.118 2014/04/01 18:09:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/ChangeLog,v 1.119 2014/04/05 18:24:17 dilfridge Exp $
+
+  05 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  kactivities-4.11.5.ebuild, kactivities-4.12.3.ebuild,
+  kactivities-4.12.4.ebuild:
+  Clean up blockers
 
 *kactivities-4.12.4 (01 Apr 2014)
 
diff --git a/kde-base/kactivities/Manifest b/kde-base/kactivities/Manifest
index a271594f784c..22ed3a577ea2 100644
--- a/kde-base/kactivities/Manifest
+++ b/kde-base/kactivities/Manifest
@@ -4,25 +4,27 @@ Hash: SHA256
 DIST kactivities-4.11.5.tar.xz 87108 SHA256 4c030d0c95a8d1d3bff1fa479f08f8145a7e1de899f028e0f917081d43ed3d28 SHA512 ce7871493b5432f0ad4b31830f73d011b53ccf90dd2e44e4cb6952632ba428bb8066855e0180f66909b0625909dcf1c605fe7b297fc3c3827dcd6fd24ee968be WHIRLPOOL fb731b9da768332545d9702b86933ba336bba768885b4d44a3c3624b7aac15db8bcb50a18750c8596c16759b52bc358629c3b0cc2c0354e3bb78f48748b474bd
 DIST kactivities-4.12.3.tar.xz 87112 SHA256 ffae67144d8e5c8334347c345c22841c9c8b58a40543d743a5141bf92d8c5458 SHA512 d151aafcf312adac5ff4db8a79397a9f32b6c61dacc3c0affa8b56c3a4c019cde9342f114a4473431185d6be3dea024c7cf8276acdce123621366cd6e425d129 WHIRLPOOL d8b3b3a0430cc41b0a523da86ce104457606833bf3c9e862f1e6ea83742d307928c40053fa5be4aebb937fc0e86390d768e4cd1a9e6dd39f19e442a58525ce74
 DIST kactivities-4.12.4.tar.xz 87156 SHA256 b21caa6f120aaf2b83a38ed4d883f6b5d51647d3d831bcaaeb4b0de9191a86ba SHA512 03114226eccba5857221bcc14db3f557117dfa128d59f7d62631772486d0bd44763757e1f2dcc279fe5d5871e5ede106d8e2dd4864186cb44fe197682f68516d WHIRLPOOL 2119490904ff27828c7fa4f0f1bbec7cde8d4896c6f35c4531ac8cb23b6e51eb3096a80da9000c809ba2cd7c1ab14ec0afaf001d959a21ce4a53df247b3cf7b0
-EBUILD kactivities-4.11.5.ebuild 700 SHA256 65cc2dae048df5848f68d9e629081a596bf6cd361803c8d94629d3f97cdceb3e SHA512 8af4940747064b7c4ae0061bd4bb49d0900ddbe547666793593b70ef11ecd162683b990d8a8ef86e9867d89332a41f8123712d727cc2f8a252d0cbaba6f73afd WHIRLPOOL 9ca35df1b9ba90a18894b9e23b79e788b5c71eebed1e9f5a6b73a096c45027ab595d393b83b48ef856c8a24fb7e1f7124b31922b9ec62d9a879bf62edaa28677
-EBUILD kactivities-4.12.3.ebuild 706 SHA256 e76c3ff88455dc2a3c304a9a780a15292ebf8b7424c55b3758532c818ba83c0b SHA512 4fce912a390921cda9a557dde7da3d45cb464f174aa11a10cfbef01cbb4b11164fb590eb9ef3a6c65f8b44bbb606cb84de097cb3adef63043c21ae47978490c7 WHIRLPOOL cc8fe55eceea4c4344ede5a692a0b9805e046d08bf804fe075f401361300d5a51bf978c00fa331c52499fe3e81434b82b492d3890c9248342c18f3df1d548a71
-EBUILD kactivities-4.12.4.ebuild 706 SHA256 7d6c30e0b5cceb16591eac11f401ddb6bed31fbae6b53e4034df90a8768dcb64 SHA512 209e1d8ce4319f7421433c40cd0989cad3b68fe5c341f2e1af9c0ececfaef79ccd838bae4dd520d1beb5037ed7e360ed85994512fdf85d709f3e0bc98c6e037c WHIRLPOOL ab21f44c47664794b3029dcc9868f23df215a5f41739a613db279e79cbb89ba839c60a33ef80a94564013dc25911b86c1183cf0dbb398c25961fc49de0f0e723
-MISC ChangeLog 14447 SHA256 a8b5e9cd9f91c2382f57aa4951dbf8dfd280106adb3ec38085a837c8040bd265 SHA512 1989838864b64dc623903ffa2f27b12e0eb377d5fc8b94d36d8fa2ccf55a07a441979f9f3c21d92b481f8d2e1e8f99f3d364b219e7346594b9d67b55dfccc332 WHIRLPOOL d8dadf92cf2a7937b50b88e4fb0e0b512bc076a1eff0c315e5587cee04a9ed742a5e14f44562f44b42e5dd866be837d9d1c80327ac8553c25afd6d920f64a5d1
+EBUILD kactivities-4.11.5.ebuild 621 SHA256 cf505963c03c7ef736323c1e023a9a3ac794c822f1a5c8773548535811d58222 SHA512 103ea79cea732560cc1ed2c2a6c8be60316e504c0d3315bbfe7de0a563fe2f36f80998974fb395e8843081c20c67567e45914dbd9d0ede9799e7a9c829ec9a08 WHIRLPOOL ba030238e7b099c7b1570a565c6767b913582c5011ba8d93b115c1436b4b0f109a23e7839911115911bc5818081511f7d08cb5159e509dc0798723b301800ec1
+EBUILD kactivities-4.12.3.ebuild 626 SHA256 df8bafe6e6adece7d6292870211c57ebeb0029074f535f84c43e8acde911ce09 SHA512 7153aacd7c3003833001e00e8c9e8168bfeb512307e3da18a49e32863cd52edb7556866d058c1e5e547a92cf01bc7aabaa719377700e8340e75858a8f2fe18c6 WHIRLPOOL a62a54dbb76d70c0f73f7537373afd0411bbf368f150572dcd5a122534a87c991c5df889c55526c85b337a1474557c66435a6c11ebc395c3ef6e8cd9368c8f56
+EBUILD kactivities-4.12.4.ebuild 626 SHA256 c8e6e03f59874cdd94fa362068c4da34b38dd1fa76057b24995e7ff86bcc605f SHA512 de7efd9a6fb40f35daad028e6cc816ca613f0afa07f5f002d293aa81745425343f9104bdaca8cb897bba4338fee6b34adf1a67cbc7d24da92d42fbccd54e59f9 WHIRLPOOL 8c92085191d0da2b3520da572c6467772546ef12512cb509bd83323d900b62a1cfda3668cf01af3423fbf18a7a230684a93fd44532935323db83c0335fd23324
+MISC ChangeLog 14615 SHA256 1a2e83e52bba49340cbd14a2a5a9611d121133031c4f9a2cec44089d9e529494 SHA512 ee1f253789c7883343f2200903eb634aab7b14e4513b28fc6f5dfa6790d3c93c65187821ee4bf78bb120354bacc57f8d987e5bc6e0a083d3145dfecf72744850 WHIRLPOOL 740908b2e0b399a686709e7e0a907f8c4fb89b49efcc47058880e97c676eae721cf827351eb12239f4e9a779f537bd38ff27718966c4a5d61ecaccc25db1cb3e
 MISC metadata.xml 158 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 SHA512 a9f1d39008120816359e4198157b5613ab427fde9b8503e24346193fe9c84edc9a62860b90fd56c4adf4526bb7873a489a0f98efc75b52caa913e911ffd50f12 WHIRLPOOL 22e1f5aef99c4356a076c106161a1a73b40367e9f95e3ddc38c66a153674daef83871f77d765dd7d1bd7d970b72fd3841577176e361fcdb9936bf0309fd28635
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTOwEoAAoJEGVpnaTzz9K9PYQP/2hwO/zrqh6k4XpKDtNsxnnd
-Y2k2j58Tszc4OElWOe8I/zOw0DIMv67fOoLZxHhi9RF+82NLD0sKSlNnhJwV0tHi
-D2oK+/kRt463C5WCEwtjpY9SOisg4Zjv1MfxvURCcsgGwzhxdvFivpp7Dis5uLe+
-ov7my/1I9/gT8VDuD2Q+Cz4xXsbFsgqxDbJNKKpgtBp3OnJUCK+0k2cJk5pB+2Zu
-KhmDDHRpgLPQd5I9reAf5JFPSw9oqysYq8eP+5Um0fwgG6vVlPh4EnEiYo24r5/a
-AK6vAMfQJbHHyXjhCjjQe/9n9VxIsLES3PpLwxyWjMu4gNaWJtWDcj+Go4YPEZt5
-gsQ+pMDXaJVUTD702kGPf+jSWGWE9gO8zumGR76RyEr7GRWIVtqfFIDaNq7v99st
-8tBFkx0XNe9pkImnu9aVlT50L4thCGXQt7eNfpF/SUB3KnisreX+/8EkzDPUghqW
-1JQULBbFnnLKpzn6BCboZv9fOatPocCbDB0XHBLqLyRIYZWw0XGdS65X+X8yL83F
-TZ4dOiWflY9DVn9XxZVJ//wcj5yXJmy9XirG/J5jQO2BC0imgt/afmCl612JQ8Qq
-o8NfB+kc/V3riVBu5ZwMmZi6IRo0/neEb+PR+0eij79vjAnxrbXfq978JOUQ1gLK
-EtViIfkOVEhySFKEbPb8
-=kYXT
+iQJ8BAEBCABmBQJTQEpSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcDqAP/RCfTyg6L9BmcKQ4kFd2II22
+an8/aWlDBls1YS6JfLTI+8IikHN6ikHFunYddJdlUSQ1dOB12p5NGXf6iHo7Vevq
+jnFAkw86zL8cKc29yPgQnGICKL5pcREiHiC+4Ys5I++P0GLeKk/fU0yV6fi8k0CW
+kvSjv2E+XsBMtuF+podQN6piJn7nHO6qnd2HUEaTPyT3T7Hh0iBbX5Pj7Nekql8Y
+8punLKcljRMBZYvkCJd//qy+o659Boqklwm3gwNYMnRh1A7bF78PFWtDHFOJLjED
+vIpEdXX4BH1vMWUH+KfCitSlUy4hpD7ZbubDxEsZRrCXVtsBUMuA/Vw+bTQTIspk
+++XUzGUm8lRPMgMpl0as9AB2Tlwicw/Jh8Ge2yVK2KwHvd5PT0FcsbR6FpuOrJgz
+6fyXhZeP308XE0XX+voWrmyeJQN1mhi2+8N4RVOtLWfKH515MDsbF+YCrOMD48B7
+KAP00DP7saSW3aQmNraF9t0n2CtniFOeCVMse+V7VkG6rD9ydfKUKgh4YLu8jeE3
+NNU8oNB6MCRqtFbggvILRiv6P1LxzEOLL6gWu++TtIw6SDvNpgxjoFsdL9Q4GDqd
+TQE1D2cS3gcPFiqwf8oOoBxM1HB8L+xf3YN2toa750v95PYzcebboQzmJu+xzjY2
+yA1jSznLJoBX7OxCx9Xk
+=xVNi
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kactivities/kactivities-4.11.5.ebuild b/kde-base/kactivities/kactivities-4.11.5.ebuild
index 24cfe9bf9594..0ecdefa10f1c 100644
--- a/kde-base/kactivities/kactivities-4.11.5.ebuild
+++ b/kde-base/kactivities/kactivities-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.11.5.ebuild,v 1.6 2014/02/23 09:07:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.11.5.ebuild,v 1.7 2014/04/05 18:24:17 dilfridge Exp $
 
 EAPI=5
 
@@ -12,12 +12,10 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-# Moved here in 4.8
-add_blocker activitymanager
+RDEPEND="
+	${DEPEND}
+	!kde-base/activitymanager
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-base/kactivities/kactivities-4.12.3.ebuild b/kde-base/kactivities/kactivities-4.12.3.ebuild
index da0aa5f1803d..aab6e562b60a 100644
--- a/kde-base/kactivities/kactivities-4.12.3.ebuild
+++ b/kde-base/kactivities/kactivities-4.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.12.3.ebuild,v 1.1 2014/03/04 19:13:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.12.3.ebuild,v 1.2 2014/04/05 18:24:17 dilfridge Exp $
 
 EAPI=5
 
@@ -12,12 +12,10 @@ KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-# Moved here in 4.8
-add_blocker activitymanager
+RDEPEND="
+	${DEPEND}
+	!kde-base/activitymanager
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-base/kactivities/kactivities-4.12.4.ebuild b/kde-base/kactivities/kactivities-4.12.4.ebuild
index 079dad8ab0bd..ff1b7539eaf7 100644
--- a/kde-base/kactivities/kactivities-4.12.4.ebuild
+++ b/kde-base/kactivities/kactivities-4.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.12.4.ebuild,v 1.1 2014/04/01 18:09:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.12.4.ebuild,v 1.2 2014/04/05 18:24:17 dilfridge Exp $
 
 EAPI=5
 
@@ -12,12 +12,10 @@ KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-# Moved here in 4.8
-add_blocker activitymanager
+RDEPEND="
+	${DEPEND}
+	!kde-base/activitymanager
+"
 
 src_configure() {
 	local mycmakeargs=(