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/kinfocenter/
Date: Sat, 17 Jan 2015 19:10:27 +0000 (UTC)	[thread overview]
Message-ID: <1421518990.b553b3635f2bad974a7bb1bf960b4c0147ff7c6d.johu@gentoo> (raw)

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

[kde-plasma/kinfocenter] Fix file collison with kde-base/kinfocenter

Package-Manager: portage-2.2.15

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

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild
index 6561b17..91cb219 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild
@@ -48,8 +48,8 @@ RDEPEND="
 	samba? ( net-fs/samba[server(+)] )
 	wayland? ( $(add_kdeplasma_dep kwayland) )
 	X? ( x11-libs/libX11 )
-	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
+	!kde-base/kcontrol
+	!kde-base/kinfocenter
 "
 DEPEND="${RDEPEND}
 	$(add_frameworks_dep plasma)

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild
index 6561b17..91cb219 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild
@@ -48,8 +48,8 @@ RDEPEND="
 	samba? ( net-fs/samba[server(+)] )
 	wayland? ( $(add_kdeplasma_dep kwayland) )
 	X? ( x11-libs/libX11 )
-	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
+	!kde-base/kcontrol
+	!kde-base/kinfocenter
 "
 DEPEND="${RDEPEND}
 	$(add_frameworks_dep plasma)

diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index 936f5ff..c1fd54a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -48,8 +48,8 @@ RDEPEND="
 	samba? ( net-fs/samba[server(+)] )
 	wayland? ( $(add_kdeplasma_dep kwayland) )
 	X? ( x11-libs/libX11 )
-	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
+	!kde-base/kcontrol
+	!kde-base/kinfocenter
 "
 DEPEND="${RDEPEND}
 	$(add_frameworks_dep plasma)


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

Thread overview: 68+ 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-13 14:30 [gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/ Manuel Rüger
2015-06-11 16:06 Johannes Huber
2015-08-07 19:05 Michael Palimaka
2016-04-20 13:19 Michael Palimaka
2016-05-11 11:55 Michael Palimaka
2016-06-19 10:50 Michael Palimaka
2016-06-19 10:50 Michael Palimaka
2016-06-19 10:50 Michael Palimaka
2016-07-20 17:18 Michael Palimaka
2016-11-03 19:15 Johannes Huber
2017-03-10 18:18 Andreas Sturmlechner
2017-03-18 22:27 Andreas Sturmlechner
2017-03-21 12:52 Andreas Sturmlechner
2017-03-30 16:57 Andreas Sturmlechner
2018-06-24 18:04 Andreas Sturmlechner
2018-06-25  6:52 Andreas Sturmlechner
2018-08-18 20:51 Andreas Sturmlechner
2018-08-18 20:51 Andreas Sturmlechner
2018-11-01 21:51 Andreas Sturmlechner
2018-11-01 21:51 Andreas Sturmlechner
2018-12-13 22:24 Andreas Sturmlechner
2018-12-14  0:41 Andreas Sturmlechner
2019-02-09  9:48 Andreas Sturmlechner
2019-02-13 13:43 Andreas Sturmlechner
2019-04-13  4:15 Michael Palimaka
2019-06-05 19:06 Andreas Sturmlechner
2019-08-18 11:40 Andreas Sturmlechner
2019-11-16 10:07 Andreas Sturmlechner
2020-01-02 20:49 Andreas Sturmlechner
2020-01-02 21:07 Andreas Sturmlechner
2020-01-28 13:46 Andreas Sturmlechner
2020-05-13 21:35 Andreas Sturmlechner
2020-09-07 15:07 Andreas Sturmlechner
2020-09-28 21:26 Andreas Sturmlechner
2020-09-28 21:26 Andreas Sturmlechner
2021-01-21 14:27 Andreas Sturmlechner
2021-04-04 19:21 Andreas Sturmlechner
2021-04-25 22:26 Andreas Sturmlechner
2021-07-29 18:12 Andreas Sturmlechner
2021-08-26 16:46 Andreas Sturmlechner
2021-08-26 16:46 Andreas Sturmlechner
2022-01-15 15:06 Andreas Sturmlechner
2022-01-15 15:06 Andreas Sturmlechner
2022-01-15 15:06 Andreas Sturmlechner
2022-01-15 15:06 Andreas Sturmlechner
2022-01-15 15:06 Andreas Sturmlechner
2022-02-09 20:30 Andreas Sturmlechner
2022-09-14 14:03 Andreas Sturmlechner
2022-10-09 16:39 Andreas Sturmlechner
2022-12-13 19:14 Andreas Sturmlechner
2023-01-16 18:58 Andreas Sturmlechner
2023-09-18 21:06 Andreas Sturmlechner
2023-12-16 12:34 Andreas Sturmlechner
2024-02-27 22:08 Andreas Sturmlechner
2024-05-15 19:32 Andreas Sturmlechner
2024-05-30 12:24 Andreas Sturmlechner
2024-06-30 22:51 Andreas Sturmlechner
2024-08-10 14:16 Andreas Sturmlechner
2024-09-14 15:16 Andreas Sturmlechner
2024-12-11 16:07 Andreas Sturmlechner
2025-01-02 19:46 Andreas Sturmlechner
2025-01-09 20:43 Andreas Sturmlechner
2025-02-12 21:08 Andreas Sturmlechner
2025-04-27 21:38 Andreas Sturmlechner
2025-05-15 22:14 Andreas Sturmlechner
2025-08-06  0:36 Sam James
2025-08-17  7:42 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=1421518990.b553b3635f2bad974a7bb1bf960b4c0147ff7c6d.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