public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kde-cli-tools/
Date: Sat, 17 Jan 2015 19:10:27 +0000 (UTC)	[thread overview]
Message-ID: <1421515870.9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32.johu@gentoo> (raw)

commit:     9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 17:31:10 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 17:31:10 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9b57ee3f

[kde-plasma/kde-cli-tools] Fix file collisions with kde-base/kde-cli-tools

Package-Manager: portage-2.2.15

---
 kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild  | 4 +++-
 kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild | 4 +++-
 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild
index 0405eff..3f60a7f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild
@@ -36,7 +36,9 @@ DEPEND="
 		x11-libs/libX11
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-base/kde-cli-tools
+"
 
 # requires running kde environment
 RESTRICT="test"

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild
index 0405eff..3f60a7f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild
@@ -36,7 +36,9 @@ DEPEND="
 		x11-libs/libX11
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-base/kde-cli-tools
+"
 
 # requires running kde environment
 RESTRICT="test"

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index 67fe968..7fb5d77 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -36,7 +36,9 @@ DEPEND="
 		x11-libs/libX11
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-base/kde-cli-tools
+"
 
 # requires running kde environment
 RESTRICT="test"


             reply	other threads:[~2015-01-17 19:10 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-17 19:10 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-04-10 18:42 [gentoo-commits] proj/kde:master commit in: kde-plasma/kde-cli-tools/ Michael Palimaka
2015-06-30 18:42 Johannes Huber
2015-12-27 14:19 Michael Palimaka
2017-01-14 17:36 Johannes Huber
2017-05-06 20:14 Andreas Sturmlechner
2017-06-06 17:59 Andreas Sturmlechner
2017-06-06 17:59 Andreas Sturmlechner
2017-07-10 18:02 Andreas Sturmlechner
2018-03-29 21:57 Andreas Sturmlechner
2018-10-22 18:14 Andreas Sturmlechner
2019-01-30 17:37 Andreas Sturmlechner
2019-06-08  7:19 Andreas Sturmlechner
2020-01-26 10:39 Andreas Sturmlechner
2022-10-09 16:39 Andreas Sturmlechner
2023-12-09 15:15 Andreas Sturmlechner
2023-12-12 18:32 Andreas Sturmlechner
2024-03-16  8:56 Andreas Sturmlechner
2024-03-30 21:08 Andreas Sturmlechner
2024-04-21 19:42 Andreas Sturmlechner
2024-07-01 15:47 Andreas Sturmlechner
2024-09-02 16:03 Andreas Sturmlechner
2024-09-04 11:43 Andreas Sturmlechner
2024-09-04 11:43 Andreas Sturmlechner
2024-09-25 23:22 Andreas Sturmlechner
2024-11-26 18:18 Andreas Sturmlechner

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=1421515870.9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32.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