public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdesdk-kioslaves/
Date: Sat,  8 Apr 2017 21:13:32 +0000 (UTC)	[thread overview]
Message-ID: <1491685990.f643ec3473c3060c7f8d673d149275a8bc4097bc.asturm@gentoo> (raw)

commit:     f643ec3473c3060c7f8d673d149275a8bc4097bc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 21:12:37 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 21:13:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f643ec34

kde-apps/kdesdk-kioslaves: Block <kde-apps/kde4-l10n-17.03.90

Translation files collide with versions pre-KF5 porting.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.03.90.ebuild      | 4 +++-
 kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild | 4 +++-
 kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild          | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.03.90.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.03.90.ebuild
index 2f4896ad07..80d32b7dd9 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.03.90.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.03.90.ebuild
@@ -15,4 +15,6 @@ DEPEND="
 	$(add_frameworks_dep kio)
 	dev-lang/perl
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"

diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
index f90614946c..faa75a6dbf 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
@@ -15,4 +15,6 @@ DEPEND="
 	$(add_frameworks_dep kio)
 	dev-lang/perl
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"

diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
index f90614946c..faa75a6dbf 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
@@ -15,4 +15,6 @@ DEPEND="
 	$(add_frameworks_dep kio)
 	dev-lang/perl
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"


             reply	other threads:[~2017-04-08 21:13 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-08 21:13 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-14 21:22 [gentoo-commits] proj/kde:master commit in: kde-apps/kdesdk-kioslaves/ Andreas Sturmlechner
2020-07-09 16:27 Andreas Sturmlechner
2020-07-07  9:29 Andreas Sturmlechner
2018-08-15 17:40 Andreas Sturmlechner
2017-03-21 22:41 Andreas Sturmlechner
2017-03-04 20:10 Andreas Sturmlechner
2017-01-05  8:44 Michael Palimaka
2017-01-05  8:40 Michael Palimaka
2017-01-05  8:40 Michael Palimaka
2016-04-07 19:19 Michael Palimaka
2016-04-04 18:08 Johannes Huber
2016-03-13 16:47 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=1491685990.f643ec3473c3060c7f8d673d149275a8bc4097bc.asturm@gentoo \
    --to=asturm@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