| 1 |
commit: 3a2409d6a8c05e2cd085b3901289897b6aa0b7f6 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jul 25 19:37:44 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 25 20:18:18 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a2409d6 |
| 7 |
|
| 8 |
[kde-apps/kdebase-runtime-meta] Fix conflict with kf5-based apps |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.04.3.ebuild | 4 +++- |
| 13 |
.../kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild | 4 +++- |
| 14 |
kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild | 4 +++- |
| 15 |
3 files changed, 9 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.04.3.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.04.3.ebuild |
| 18 |
index cf150e7..8f50da6 100644 |
| 19 |
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.04.3.ebuild |
| 20 |
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.04.3.ebuild |
| 21 |
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg |
| 22 |
|
| 23 |
DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" |
| 24 |
KEYWORDS="~amd64 ~x86" |
| 25 |
-IUSE="+crash-reporter +handbook minimal nepomuk" |
| 26 |
+IUSE="crash-reporter +handbook minimal nepomuk" |
| 27 |
|
| 28 |
RDEPEND=" |
| 29 |
$(add_kdeapps_dep kcmshell) |
| 30 |
@@ -47,6 +47,7 @@ RDEPEND=" |
| 31 |
$(add_plasma_dep khelpcenter) |
| 32 |
kde-base/khelpcenter:4 |
| 33 |
) ) |
| 34 |
+ minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) |
| 35 |
nepomuk? ( $(add_kdeapps_dep nepomuk) ) |
| 36 |
!minimal? ( |
| 37 |
$(add_kdeapps_dep attica) |
| 38 |
@@ -55,3 +56,4 @@ RDEPEND=" |
| 39 |
$(add_kdeapps_dep knetattach) |
| 40 |
) |
| 41 |
" |
| 42 |
+REQUIRED_USE="minimal? ( !crash-reporter )" |
| 43 |
|
| 44 |
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild |
| 45 |
index fc5226d..de425f6 100644 |
| 46 |
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild |
| 47 |
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild |
| 48 |
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg |
| 49 |
|
| 50 |
DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" |
| 51 |
KEYWORDS="" |
| 52 |
-IUSE="+crash-reporter +handbook minimal nepomuk" |
| 53 |
+IUSE="crash-reporter +handbook minimal nepomuk" |
| 54 |
|
| 55 |
RDEPEND=" |
| 56 |
$(add_kdeapps_dep kcmshell) |
| 57 |
@@ -47,6 +47,7 @@ RDEPEND=" |
| 58 |
$(add_plasma_dep khelpcenter) |
| 59 |
kde-base/khelpcenter:4 |
| 60 |
) ) |
| 61 |
+ minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) |
| 62 |
nepomuk? ( $(add_kdeapps_dep nepomuk) ) |
| 63 |
!minimal? ( |
| 64 |
$(add_kdeapps_dep attica) |
| 65 |
@@ -55,3 +56,4 @@ RDEPEND=" |
| 66 |
$(add_kdeapps_dep knetattach) |
| 67 |
) |
| 68 |
" |
| 69 |
+REQUIRED_USE="minimal? ( !crash-reporter )" |
| 70 |
|
| 71 |
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild |
| 72 |
index fc5226d..de425f6 100644 |
| 73 |
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild |
| 74 |
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild |
| 75 |
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg |
| 76 |
|
| 77 |
DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" |
| 78 |
KEYWORDS="" |
| 79 |
-IUSE="+crash-reporter +handbook minimal nepomuk" |
| 80 |
+IUSE="crash-reporter +handbook minimal nepomuk" |
| 81 |
|
| 82 |
RDEPEND=" |
| 83 |
$(add_kdeapps_dep kcmshell) |
| 84 |
@@ -47,6 +47,7 @@ RDEPEND=" |
| 85 |
$(add_plasma_dep khelpcenter) |
| 86 |
kde-base/khelpcenter:4 |
| 87 |
) ) |
| 88 |
+ minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) |
| 89 |
nepomuk? ( $(add_kdeapps_dep nepomuk) ) |
| 90 |
!minimal? ( |
| 91 |
$(add_kdeapps_dep attica) |
| 92 |
@@ -55,3 +56,4 @@ RDEPEND=" |
| 93 |
$(add_kdeapps_dep knetattach) |
| 94 |
) |
| 95 |
" |
| 96 |
+REQUIRED_USE="minimal? ( !crash-reporter )" |
Archives