1 |
commit: 6d2542b78229140b21c3c3342600afd92679719c |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jul 31 22:23:14 2015 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 31 22:43:21 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6d2542b7 |
7 |
|
8 |
Workaround for kde4-base vs kde5 conflict |
9 |
|
10 |
Package-Manager: portage-2.2.20 |
11 |
|
12 |
Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org> |
13 |
|
14 |
kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild | 2 +- |
15 |
kde-apps/kdebase-data/kdebase-data-9999.ebuild | 2 +- |
16 |
2 files changed, 2 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild |
19 |
index 9d2261b..44f4c8a 100644 |
20 |
--- a/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild |
21 |
+++ b/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild |
22 |
@@ -13,7 +13,7 @@ IUSE="+wallpapers" |
23 |
KEYWORDS="" |
24 |
|
25 |
RDEPEND=" |
26 |
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) |
27 |
+ wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) ) |
28 |
x11-themes/hicolor-icon-theme |
29 |
" |
30 |
|
31 |
|
32 |
diff --git a/kde-apps/kdebase-data/kdebase-data-9999.ebuild b/kde-apps/kdebase-data/kdebase-data-9999.ebuild |
33 |
index 9d2261b..44f4c8a 100644 |
34 |
--- a/kde-apps/kdebase-data/kdebase-data-9999.ebuild |
35 |
+++ b/kde-apps/kdebase-data/kdebase-data-9999.ebuild |
36 |
@@ -13,7 +13,7 @@ IUSE="+wallpapers" |
37 |
KEYWORDS="" |
38 |
|
39 |
RDEPEND=" |
40 |
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) |
41 |
+ wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) ) |
42 |
x11-themes/hicolor-icon-theme |
43 |
" |