commit: 3a2409d6a8c05e2cd085b3901289897b6aa0b7f6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 25 19:37:44 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 20:18:18 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a2409d6
[kde-apps/kdebase-runtime-meta] Fix conflict with kf5-based apps
Package-Manager: portage-2.2.20
kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.04.3.ebuild | 4 +++-
.../kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild | 4 +++-
kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
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
index cf150e7..8f50da6 100644
--- 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
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
KEYWORDS="~amd64 ~x86"
-IUSE="+crash-reporter +handbook minimal nepomuk"
+IUSE="crash-reporter +handbook minimal nepomuk"
RDEPEND="
$(add_kdeapps_dep kcmshell)
@@ -47,6 +47,7 @@ RDEPEND="
$(add_plasma_dep khelpcenter)
kde-base/khelpcenter:4
) )
+ minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
nepomuk? ( $(add_kdeapps_dep nepomuk) )
!minimal? (
$(add_kdeapps_dep attica)
@@ -55,3 +56,4 @@ RDEPEND="
$(add_kdeapps_dep knetattach)
)
"
+REQUIRED_USE="minimal? ( !crash-reporter )"
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
index fc5226d..de425f6 100644
--- 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
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
KEYWORDS=""
-IUSE="+crash-reporter +handbook minimal nepomuk"
+IUSE="crash-reporter +handbook minimal nepomuk"
RDEPEND="
$(add_kdeapps_dep kcmshell)
@@ -47,6 +47,7 @@ RDEPEND="
$(add_plasma_dep khelpcenter)
kde-base/khelpcenter:4
) )
+ minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
nepomuk? ( $(add_kdeapps_dep nepomuk) )
!minimal? (
$(add_kdeapps_dep attica)
@@ -55,3 +56,4 @@ RDEPEND="
$(add_kdeapps_dep knetattach)
)
"
+REQUIRED_USE="minimal? ( !crash-reporter )"
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
index fc5226d..de425f6 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
KEYWORDS=""
-IUSE="+crash-reporter +handbook minimal nepomuk"
+IUSE="crash-reporter +handbook minimal nepomuk"
RDEPEND="
$(add_kdeapps_dep kcmshell)
@@ -47,6 +47,7 @@ RDEPEND="
$(add_plasma_dep khelpcenter)
kde-base/khelpcenter:4
) )
+ minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
nepomuk? ( $(add_kdeapps_dep nepomuk) )
!minimal? (
$(add_kdeapps_dep attica)
@@ -55,3 +56,4 @@ RDEPEND="
$(add_kdeapps_dep knetattach)
)
"
+REQUIRED_USE="minimal? ( !crash-reporter )"
