Add USEs for optional dependencies, closing bug #511786

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

4 files changed, 57 insertions, 9 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/Manifest b/lxqt-base/lxqt-meta/Manifest
index e8a3eaf7854e..f2406be98994 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,23 @@
-EBUILD lxqt-meta-0.7.0.ebuild 1206 SHA256 3e7066d1fa6cb2c2761f4a061ec365e1d94719a98404c95c72c0ac6b26a7d928 SHA512 8e70390847f145c6a57c6297a5ba63d95e12f2ec1442b2c4da2c87ba850f680373803f0af5336ebd7c36660ca2c58992cf9f39c3d1cd4aaffc9bdefe22700841 WHIRLPOOL 433e6b32bf061608f30ccbbc887d24f4a8d5f428f50b6531ad917ad880fc02d5ae75ad4f128a7b838daff82b652a769eeb0a54ea97d6785d3c35ade40fd0fbec
-MISC ChangeLog 573 SHA256 ceb72ebb2a981e44743a170d354f33deaa15979446c67cedeb3afb0d6b7331ea SHA512 e635c22267deb8a201d5e06dc435bc135d8f87f5495be67114f0ad9187111518447035db9c30c524505f8f5dff3b41e5583e77961af5778e0ea916c9bc58620e WHIRLPOOL 8bcb119570ef06cabe46b432778666c9de2ea19da7787ea7f5184d962eac87486357c9d8395b973705700f0b2ce1c340eadd963bf85ac37d99a8cbf88edc3adc
-MISC metadata.xml 474 SHA256 45a8e04e8778b5b288a6454c46ea80b9e89969b572f3feefc44b0b4ceca56c74 SHA512 877f55ea55c911a35c1aa07ea0d229c4e35af983e09ea25d0db5853b4d8df40a5c150b79ae8d51432dcaf60b6efe0fd2660be9afcbb7cd9242d68d5d44034491 WHIRLPOOL 4b081203f9e816a55179d8d41c4a9e5cec3b89293088b5a768c385802c5b77c1bb143b820891d2d99b9ea5fd33d15373f835ab016c2f2ef5572d1b65364b6f76
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD lxqt-meta-0.7.0-r1.ebuild 1516 SHA256 9566ed8538a227cf607a2bca4d5d29a454260b8bab4427ff424ac87ed4f2447b SHA512 36b34891852785cee2b9d89dda766e6e0e4fe80e09c0566b5ea5a4051f53cf9fe2caa80d598eba6a3d6425bfdfa19c084eaebaa02ea21698b3b3f42e32a636c8 WHIRLPOOL 82e6bea7b426719bf4579c471ee638e56d8eb0e9c3b761afaffd5434e30a854325cb4cc0f85bb021a67471066cf80da04d068dbfda8efcee07b29a8fa3de6a64
+MISC ChangeLog 792 SHA256 bc6cdfb902b19f8877187cf5fd066a08c20ecceedf145882df71ea3d1f775a51 SHA512 d5ef87085e0c4ee1e6912cb31c03debc04cc7b2555792d43a6c3b77d345ba7de38f4d5b3aeebca6c6b2343b5758335a398528bf502a3d5bad2d72fa2ac4eec8f WHIRLPOOL 70dced520c0fe155dca789d3291d855d5c62e3ef7b8f975959ac75f85ad2e71853dcee32a9bb83238d8ba1543ebd9ee9194dfe43980d292e5bc2afae6c52dbd3
+MISC metadata.xml 938 SHA256 cff8e588077bd361da9fa466c5aa0abbfcc2360ef5b1a3fa3a0086cb9061993d SHA512 9e79b0aa2f1abf7ae8bafeadba956a7fc0c3f6b2b255b2a10b2c9a6f75b90afb564dd4299c0f0063f7dffa95100e1689c8ba68f53062fb002bd9fc5f904876c0 WHIRLPOOL 506bbe5596d32bf1a11d1f99feb7f4be7241cae0b460ca1b30abec83c5398853e9cc28360728df7981c7a2873b0b7657d7d83cab660468208d635d3b14826c60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTh3WNAAoJELvuk32y76HUDKMQAMMLV9PSu/8fyheC4bBmgDl5
+j282V7Sq0kCxHyO1izXjPc4k6UwjZ9EP+TVsC5jc7ZJnkjqSpAacLJPuJeI5ygnG
+SlZsjqUwWDWhMW+HEPebOKgRHPjZ1Z8bcCtuL4ORVFhSu8IWSDgeEjmSXlBaofj8
+xof0ilSv7vFJrg2O5rfLYAFTk/k8p0Jbz5MXLtnfYYqo0r0mrD/cFkrJeYhubOZb
+baeZKL1kf9yxmZS3ZGBxxA+TBFQNIg/WnArtSZyEMwLmMuo9cTrZ9sY/tKULTT/e
+6XZ+T7rYm0vMRECg6GCwIgEy4zTPW3WsVr5a3OQ9QsJrFgpFjt4NozuM3HxO5vKj
+TuDNmAktNVNya1F+D+WC12wYXCDYRkjggTANVK/lShBPXMFS5Ptl9BCPsIvDVlOq
+QvD2+r2okV34y0yubWoOej0RK8FWuYfUSeSYlIAF9fDt/3yCnmUA0boAQHZrS1Ll
+sylB4HNxniDrLa8VRzwjrqv5PYiUykUOHADwa05S2fn6k9vOA8ccyrOvPUx9ETz1
+U/EFJnv0N0SbuF1jAoK0fK0EgSvTCal+ITL6+F8Cc/2mxcnU9JjHHUaPsCQGYBS5
+QrFWGJATYxPgjyvLcC0hOY759s/ikVS7gCftXWAh5d4jLY993wgQqQ9Ue/9fBzUA
+FbCg2iZci0jVzCm1m8zH
+=24Hc
+-----END PGP SIGNATURE-----
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>