From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-runtime-meta/
Date: Sun, 26 Jul 2015 08:35:59 +0000 (UTC) [thread overview]
Message-ID: <1437855498.3a2409d6a8c05e2cd085b3901289897b6aa0b7f6.johu@gentoo> (raw)
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 )"
next reply other threads:[~2015-07-26 8:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-26 8:35 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-04-07 19:19 [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-runtime-meta/ Michael Palimaka
2016-03-10 13:12 Michael Palimaka
2016-01-26 18:18 Michael Palimaka
2016-01-19 17:52 Michael Palimaka
2015-10-15 8:15 Michael Palimaka
2015-08-27 17:17 Michael Palimaka
2015-08-27 17:13 Michael Palimaka
2015-08-07 21:23 Johannes Huber
2015-02-02 13:28 Michael Palimaka
2014-11-29 17:11 Michael Palimaka
2014-11-24 15:49 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437855498.3a2409d6a8c05e2cd085b3901289897b6aa0b7f6.johu@gentoo \
--to=johu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox