1 |
commit: ad1c936ed9b944c9d8da12da3a54d45f42431ed6 |
2 |
Author: Lorenzo Porta <vindex17 <AT> outlook <DOT> it> |
3 |
AuthorDate: Mon Oct 5 09:20:25 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 11 07:03:51 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad1c936e |
7 |
|
8 |
Remove problematic blockers |
9 |
|
10 |
These changes fix unresolvable portage blocks. The transition of the kio-extras |
11 |
package from the former category is handled by the 3Q-2015 update file. |
12 |
|
13 |
kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild | 1 - |
14 |
kde-apps/kio-extras/kio-extras-9999.ebuild | 1 - |
15 |
kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild | 1 - |
16 |
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 1 - |
17 |
4 files changed, 4 deletions(-) |
18 |
|
19 |
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 |
20 |
index 672e8ab..b596dad 100644 |
21 |
--- a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild |
22 |
+++ b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild |
23 |
@@ -51,7 +51,6 @@ COMMON_DEPEND=" |
24 |
RDEPEND="${COMMON_DEPEND} |
25 |
$(add_frameworks_dep kded) |
26 |
!<kde-apps/kcontrol-15.08.0-r1:4 |
27 |
- !kde-plasma/kio-extras |
28 |
" |
29 |
DEPEND="${COMMON_DEPEND} |
30 |
x11-misc/shared-mime-info |
31 |
|
32 |
diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild |
33 |
index 672e8ab..b596dad 100644 |
34 |
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild |
35 |
+++ b/kde-apps/kio-extras/kio-extras-9999.ebuild |
36 |
@@ -51,7 +51,6 @@ COMMON_DEPEND=" |
37 |
RDEPEND="${COMMON_DEPEND} |
38 |
$(add_frameworks_dep kded) |
39 |
!<kde-apps/kcontrol-15.08.0-r1:4 |
40 |
- !kde-plasma/kio-extras |
41 |
" |
42 |
DEPEND="${COMMON_DEPEND} |
43 |
x11-misc/shared-mime-info |
44 |
|
45 |
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 |
46 |
index d4db63e..0dac3bc 100644 |
47 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild |
48 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild |
49 |
@@ -117,7 +117,6 @@ RDEPEND="${COMMON_DEPEND} |
50 |
!kde-base/ksmserver:4 |
51 |
!kde-base/ksplash:4 |
52 |
!kde-base/plasma-workspace:4 |
53 |
- !kde-plasma/kio-extras |
54 |
" |
55 |
DEPEND="${COMMON_DEPEND} |
56 |
x11-proto/xproto |
57 |
|
58 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
59 |
index 1a52c96..540f18f 100644 |
60 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
61 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
62 |
@@ -117,7 +117,6 @@ RDEPEND="${COMMON_DEPEND} |
63 |
!kde-base/ksmserver:4 |
64 |
!kde-base/ksplash:4 |
65 |
!kde-base/plasma-workspace:4 |
66 |
- !kde-plasma/kio-extras |
67 |
" |
68 |
DEPEND="${COMMON_DEPEND} |
69 |
x11-proto/xproto |