public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdepim-meta/
Date: Sat, 23 May 2015 17:16:07 +0000 (UTC)	[thread overview]
Message-ID: <1432401351.9374e5c69d6ab30cfb6c20f56a06dc72671eb4c5.kensington@gentoo> (raw)

commit:     9374e5c69d6ab30cfb6c20f56a06dc72671eb4c5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May  9 15:28:59 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 17:15:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9374e5c6

[kde-base/kdepim-meta] Add RDEPEND on kde-apps/kde4-l10n

Package-Manager: portage-2.2.18

 kde-base/kdepim-meta/kdepim-meta-4.9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.9999.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.9999.ebuild
index d69adcc..240324c 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.9999.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.9999.ebuild
@@ -31,8 +31,10 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? (
-		$(add_kdebase_dep kde-l10n '' 4.14.3)
-		$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+	nls? ( || (
+			(	$(add_kdebase_dep kde-l10n '' 4.14.3)
+				$(add_kdebase_dep kdepim-l10n '' 4.14.3)	)
+			(	$(add_kdeapps_dep kde4-l10n '' 15.04.0)	)
+		)
 	)
 "


             reply	other threads:[~2015-05-23 17:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-23 17:16 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-12 22:16 [gentoo-commits] proj/kde:master commit in: kde-base/kdepim-meta/ Andreas Hüttel
2015-07-01 21:50 Andreas Hüttel
2015-07-01 21:43 Andreas Hüttel
2015-06-05 16:12 Michael Palimaka
2015-02-21 15:46 Michael Palimaka
2014-11-29 17:16 Michael Palimaka
2014-04-24 13:28 Johannes Huber
2014-01-06  2:30 Chris Reffett
2013-12-14 16:50 Johannes Huber
2013-08-28 16:12 Michael Palimaka
2012-08-23  8:45 Johannes Huber
2012-07-11 20:38 Johannes Huber
2012-06-30 21:41 Johannes Huber
2012-06-22  9:52 Johannes Huber
2012-06-01 19:05 Johannes Huber
2012-06-01 17:07 Alexey Shvetsov
2012-06-01 16:35 Johannes Huber
2012-05-01 11:08 Johannes Huber
2012-04-04  8:15 Johannes Huber
2012-04-04  8:15 Johannes Huber
2011-12-23 14:54 Johannes Huber
2011-07-28 13:07 Andreas Hüttel
2011-07-23  2:01 Jorge Manuel B. S. Vicetto

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=1432401351.9374e5c69d6ab30cfb6c20f56a06dc72671eb4c5.kensington@gentoo \
    --to=kensington@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