Add USEs for optional dependencies, closing bug #511786

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)

3 files changed, 34 insertions, 6 deletions

diff --git a/lxqt-base/lxqt-meta/ChangeLog b/lxqt-base/lxqt-meta/ChangeLog
index 5d87c86b60a5..659e882ee641 100644
--- a/lxqt-base/lxqt-meta/ChangeLog
+++ b/lxqt-base/lxqt-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxqt-base/lxqt-meta
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.2 2014/05/29 13:28:51 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.3 2014/05/29 17:59:32 jauhien Exp $
+
+*lxqt-meta-0.7.0-r1 (29 May 2014)
+
+  29 May 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +lxqt-meta-0.7.0-r1.ebuild, -lxqt-meta-0.7.0.ebuild, metadata.xml:
+  Add USEs for optional dependencies, closing bug #511786
 
   29 May 2014; Manuel Rüger <mrueg@gentoo.org> lxqt-meta-0.7.0.ebuild:
   Add ~arm keyword. This was tested on Radxa Rock (armv7).
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild
index 84d2f8596722..ba7c9e0b73f7 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild,v 1.2 2014/05/29 13:28:51 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/lxqt-meta-0.7.0-r1.ebuild,v 1.1 2014/05/29 17:59:32 jauhien Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://lxqt.org/"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="-minimal powermanagement"
+IUSE="+icons lightdm lximage -minimal +policykit powermanagement sddm ssh-askpass"
 
 S="${WORKDIR}"
 
@@ -22,7 +22,6 @@ DOC_CONTENTS="
 	http://wiki.lxde.org/en/LXDE-Qt"
 
 RDEPEND="
-	>=lxde-base/lxde-icon-theme-0.5
 	>=lxde-base/lxmenu-data-0.1.2
 	~lxqt-base/lxqt-about-${PV}
 	~lxqt-base/lxqt-common-${PV}
@@ -30,16 +29,29 @@ RDEPEND="
 	~lxqt-base/lxqt-config-randr-${PV}
 	~lxqt-base/lxqt-notificationd-${PV}
 	~lxqt-base/lxqt-panel-${PV}
-	~lxqt-base/lxqt-policykit-${PV}
 	~lxqt-base/lxqt-qtplugin-${PV}
 	~lxqt-base/lxqt-runner-${PV}
 	~lxqt-base/lxqt-session-${PV}
 	~x11-misc/pcmanfm-qt-${PV}
+	icons? (
+		>=lxde-base/lxde-icon-theme-0.5 )
+	lightdm? (
+		x11-misc/lightdm )
+	lximage? (
+		media-gfx/lximage-qt )
 	!minimal? (
 		x11-wm/openbox
 		>=x11-misc/obconf-qt-0.1.0 )
+	policykit? (
+		~lxqt-base/lxqt-policykit-${PV}
+		|| ( sys-auth/consolekit[policykit(-)]
+			sys-apps/systemd[policykit(-)] ) )
 	powermanagement? (
 		~lxqt-base/lxqt-powermanagement-${PV} )
+	sddm? (
+		x11-misc/sddm )
+	ssh-askpass? (
+		net-misc/lxqt-openssh-askpass )
 "
 
 pkg_postinst() {
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 638148fca5e3..c6331fcde9b6 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -7,9 +7,19 @@
     <name>Jauhien Piatlicki</name>
   </maintainer>
   <use>
+    <flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
+    icon theme</flag>
+    <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
+    display manager</flag>
+    <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
+    image viewer</flag>
     <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
     window manager</flag>
-    <flag name="powermanagement">Pull in
+    <flag name="powermanagement">Install
     <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
+    <flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
+    display manager</flag>
+    <flag name="ssh-askpass">Install <pkg>net-misc/lxqt-openssh-askpass</pkg>
+    user password prompt tool</flag>
   </use>
 </pkgmetadata>