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) )

Reply via email to