From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-872215-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 6B89F59CA5
for <garchives@archives.gentoo.org>; Fri, 25 Mar 2016 14:00:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9DED221C00C;
Fri, 25 Mar 2016 14:00:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EE5BC21C009
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2016 14:00:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 36ABB340B09
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2016 14:00:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BCFE86A
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2016 14:00:02 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1458912107.eb661d3477d6731cf8309f04e7d95d9676dc8678.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-meta/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/plasma-meta/plasma-meta-5.6.0-r1.ebuild kde-plasma/plasma-meta/plasma-meta-5.6.0.ebuild kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild kde-plasma/plasma-meta/plasma-meta-9999.ebuild
X-VCS-Directories: kde-plasma/plasma-meta/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: eb661d3477d6731cf8309f04e7d95d9676dc8678
X-VCS-Branch: master
Date: Fri, 25 Mar 2016 14:00:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 55b0e726-1799-428e-bd4c-43dcbd66f81a
X-Archives-Hash: a477e841ed5d87bd636966423eea8ea1
commit: eb661d3477d6731cf8309f04e7d95d9676dc8678
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar 23 14:00:44 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 13:21:47 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb661d34
kde-plasma/plasma-meta: Add alternative dep on kde-apps/khelpcenter
Package-Manager: portage-2.2.27
.../{plasma-meta-5.6.0.ebuild => plasma-meta-5.6.0-r1.ebuild} | 8 +++-----
kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild | 8 +++-----
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 8 +++-----
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.6.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.6.0-r1.ebuild
similarity index 87%
rename from kde-plasma/plasma-meta/plasma-meta-5.6.0.ebuild
rename to kde-plasma/plasma-meta/plasma-meta-5.6.0-r1.ebuild
index b88f1ad..06d0bc2 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.6.0.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.6.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
LICENSE="metapackage"
SLOT="5"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +display-manager grub gtk mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
+IUSE="bluetooth +display-manager grub gtk +handbook mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
RDEPEND="
$(add_plasma_dep breeze)
@@ -20,7 +20,6 @@ RDEPEND="
$(add_plasma_dep kdecoration)
$(add_plasma_dep kdeplasma-addons)
$(add_plasma_dep kgamma)
- $(add_plasma_dep khelpcenter)
$(add_plasma_dep khotkeys)
$(add_plasma_dep kinfocenter)
$(add_plasma_dep kmenuedit)
@@ -42,9 +41,7 @@ RDEPEND="
$(add_plasma_dep powerdevil)
$(add_plasma_dep systemsettings)
$(add_plasma_dep user-manager)
- bluetooth? (
- $(add_plasma_dep bluedevil)
- )
+ bluetooth? ( $(add_plasma_dep bluedevil) )
display-manager? (
sddm? ( x11-misc/sddm )
!sddm? ( x11-misc/lightdm )
@@ -54,6 +51,7 @@ RDEPEND="
$(add_plasma_dep breeze-gtk)
$(add_plasma_dep kde-gtk-config)
)
+ handbook? ( || ( $(add_kdeapps_dep khelpcenter) $(add_plasma_dep khelpcenter) ) )
mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
networkmanager? ( $(add_plasma_dep plasma-nm) )
pam? ( $(add_plasma_dep kwallet-pam) )
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
index 04d3051..604e2f8 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
LICENSE="metapackage"
SLOT="5"
KEYWORDS=""
-IUSE="bluetooth +display-manager grub gtk mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
+IUSE="bluetooth +display-manager grub gtk +handbook mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
RDEPEND="
$(add_plasma_dep breeze)
@@ -20,7 +20,6 @@ RDEPEND="
$(add_plasma_dep kdecoration)
$(add_plasma_dep kdeplasma-addons)
$(add_plasma_dep kgamma)
- $(add_plasma_dep khelpcenter)
$(add_plasma_dep khotkeys)
$(add_plasma_dep kinfocenter)
$(add_plasma_dep kmenuedit)
@@ -42,9 +41,7 @@ RDEPEND="
$(add_plasma_dep powerdevil)
$(add_plasma_dep systemsettings)
$(add_plasma_dep user-manager)
- bluetooth? (
- $(add_plasma_dep bluedevil)
- )
+ bluetooth? ( $(add_plasma_dep bluedevil) )
display-manager? (
sddm? ( x11-misc/sddm )
!sddm? ( x11-misc/lightdm )
@@ -54,6 +51,7 @@ RDEPEND="
$(add_plasma_dep breeze-gtk)
$(add_plasma_dep kde-gtk-config)
)
+ handbook? ( || ( $(add_kdeapps_dep khelpcenter) $(add_plasma_dep khelpcenter) ) )
mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
networkmanager? ( $(add_plasma_dep plasma-nm) )
pam? ( $(add_plasma_dep kwallet-pam) )
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
index 04d3051..604e2f8 100644
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
LICENSE="metapackage"
SLOT="5"
KEYWORDS=""
-IUSE="bluetooth +display-manager grub gtk mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
+IUSE="bluetooth +display-manager grub gtk +handbook mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
RDEPEND="
$(add_plasma_dep breeze)
@@ -20,7 +20,6 @@ RDEPEND="
$(add_plasma_dep kdecoration)
$(add_plasma_dep kdeplasma-addons)
$(add_plasma_dep kgamma)
- $(add_plasma_dep khelpcenter)
$(add_plasma_dep khotkeys)
$(add_plasma_dep kinfocenter)
$(add_plasma_dep kmenuedit)
@@ -42,9 +41,7 @@ RDEPEND="
$(add_plasma_dep powerdevil)
$(add_plasma_dep systemsettings)
$(add_plasma_dep user-manager)
- bluetooth? (
- $(add_plasma_dep bluedevil)
- )
+ bluetooth? ( $(add_plasma_dep bluedevil) )
display-manager? (
sddm? ( x11-misc/sddm )
!sddm? ( x11-misc/lightdm )
@@ -54,6 +51,7 @@ RDEPEND="
$(add_plasma_dep breeze-gtk)
$(add_plasma_dep kde-gtk-config)
)
+ handbook? ( || ( $(add_kdeapps_dep khelpcenter) $(add_plasma_dep khelpcenter) ) )
mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
networkmanager? ( $(add_plasma_dep plasma-nm) )
pam? ( $(add_plasma_dep kwallet-pam) )