[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-apps/kio-extras/

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-apps/kio-extras/

[Michael Palimaka]

commit:     ad1c936ed9b944c9d8da12da3a54d45f42431ed6
Author:     Lorenzo Porta <vindex17 <AT> outlook <DOT> it>
AuthorDate: Mon Oct  5 09:20:25 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 07:03:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad1c936e

Remove problematic blockers

These changes fix unresolvable portage blocks. The transition of the kio-extras
package from the former category is handled by the 3Q-2015 update file.

 kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild             | 1 -
 kde-apps/kio-extras/kio-extras-9999.ebuild                      | 1 -
 kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild | 1 -
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild
index 672e8ab..b596dad 100644
--- a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild
@@ -51,7 +51,6 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
 	!<kde-apps/kcontrol-15.08.0-r1:4
-	!kde-plasma/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info

diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
index 672e8ab..b596dad 100644
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-9999.ebuild
@@ -51,7 +51,6 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
 	!<kde-apps/kcontrol-15.08.0-r1:4
-	!kde-plasma/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
index d4db63e..0dac3bc 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
@@ -117,7 +117,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-base/ksmserver:4
 	!kde-base/ksplash:4
 	!kde-base/plasma-workspace:4
-	!kde-plasma/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 1a52c96..540f18f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -117,7 +117,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-base/ksmserver:4
 	!kde-base/ksplash:4
 	!kde-base/plasma-workspace:4
-	!kde-plasma/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto