summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Porta <vindex17@outlook.it>2015-10-05 11:20:25 +0200
committerMichael Palimaka <kensington@gentoo.org>2015-10-11 18:03:51 +1100
commitad1c936ed9b944c9d8da12da3a54d45f42431ed6 (patch)
tree8e25db6c809d345fa8de973d0804b50cf3d08df0
parent2310dddb7e59da47159fd93b4ad72a25816d4648 (diff)
downloadkde-ad1c936ed9b944c9d8da12da3a54d45f42431ed6.tar.gz
kde-ad1c936ed9b944c9d8da12da3a54d45f42431ed6.tar.bz2
kde-ad1c936ed9b944c9d8da12da3a54d45f42431ed6.zip
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.
-rw-r--r--kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild1
-rw-r--r--kde-apps/kio-extras/kio-extras-9999.ebuild1
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild1
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild1
4 files changed, 0 insertions, 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 672e8ab0ec0..b596dadb15e 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 672e8ab0ec0..b596dadb15e 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 d4db63e2673..0dac3bcb41e 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 1a52c969298..540f18f7764 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