From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kio-extras/
Date: Mon, 11 Aug 2014 21:15:57 +0000 (UTC) [thread overview]
Message-ID: <1407782012.0e9a773d3828845cfce1523031a60ed6fd0addc1.johu@gentoo> (raw)
commit: 0e9a773d3828845cfce1523031a60ed6fd0addc1
Author: Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Mon Aug 11 07:16:00 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 18:33:32 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0e9a773d
[kde-base/kio-extras] Block kde-base/kcontrol:4
Block kde-base/kcontrol:4 due to a conflict in the handbooks.
Package-Manager: portage-2.2.8-r1
---
| 1 +
| 1 +
| 1 +
3 files changed, 3 insertions(+)
--git a/kde-base/kio-extras/kio-extras-5.0.0.ebuild b/kde-base/kio-extras/kio-extras-5.0.0.ebuild
index 21c216e..ddbd9e5 100644
--- a/kde-base/kio-extras/kio-extras-5.0.0.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.0.0.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ !kde-base/kcontrol:4
!kde-base/kdebase-kioslaves:4[-minimal(-)]
"
DEPEND="${COMMON_DEPEND}
--git a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
index 0bce8e3..fe9d5c6 100644
--- a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ !kde-base/kcontrol:4
!kde-base/kdebase-kioslaves:4[-minimal(-)]
"
DEPEND="${COMMON_DEPEND}
--git a/kde-base/kio-extras/kio-extras-9999.ebuild b/kde-base/kio-extras/kio-extras-9999.ebuild
index 0bce8e3..fe9d5c6 100644
--- a/kde-base/kio-extras/kio-extras-9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-9999.ebuild
@@ -48,6 +48,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ !kde-base/kcontrol:4
!kde-base/kdebase-kioslaves:4[-minimal(-)]
"
DEPEND="${COMMON_DEPEND}
next reply other threads:[~2014-08-11 21:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 21:15 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-11 18:30 [gentoo-commits] proj/kde:master commit in: kde-base/kio-extras/ Manuel Rüger
2014-10-09 9:42 Michael Palimaka
2014-08-28 16:36 Johannes Huber
2014-08-09 19:57 Johannes Huber
2014-07-27 19:03 Michael Palimaka
2014-06-11 12:46 Michael Palimaka
2014-06-10 14:03 Michael Palimaka
2014-06-10 13:24 Michael Palimaka
2014-04-27 6:40 Johannes Huber
2014-04-23 17:38 Michael Palimaka
2014-04-18 9:49 Michael Palimaka
2014-04-10 21:28 Johannes Huber
2014-04-09 20:12 Johannes Huber
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=1407782012.0e9a773d3828845cfce1523031a60ed6fd0addc1.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