commit: 7205e77531eb88aa60df487b0d148161ceba9086 Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> AuthorDate: Thu May 29 21:30:59 2014 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Thu May 29 21:30:59 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7205e775
lxqt: make policykit dependency optional. add more optional deps to meta --- lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild | 21 ++++++++++++++++----- lxqt-base/lxqt-meta/metadata.xml | 12 +++++++++++- lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 2 -- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild index 11ee8db..0a5e446 100644 --- a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild +++ b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild @@ -11,8 +11,7 @@ HOMEPAGE="http://lxqt.org/"; LICENSE="metapackage" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="-minimal powermanagement" +IUSE="+icons lightdm lximage -minimal +policykit powermanagement sddm ssh-askpass" S="${WORKDIR}" @@ -22,7 +21,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 +28,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-${PV} ) !minimal? ( x11-wm/openbox - >=x11-misc/obconf-qt-${PV} ) + ~x11-misc/obconf-qt-${PV} ) + policykit? ( + ~lxqt-base/lxqt-policykit-${PV} + || ( sys-auth/consolekit[policykit(-)] + sys-apps/systemd[policykit(-)] ) ) powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} ) + sddm? ( + ~x11-misc/sddm-${PV} ) + ssh-askpass? ( + ~net-misc/lxqt-openssh-askpass-${PV} ) " pkg_postinst() { diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml index beb16ac..0abc6b5 100644 --- a/lxqt-base/lxqt-meta/metadata.xml +++ b/lxqt-base/lxqt-meta/metadata.xml @@ -3,9 +3,19 @@ <pkgmetadata> <herd>lxqt</herd> <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> diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild index e730d4c..5f12b77 100644 --- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild +++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild @@ -35,8 +35,6 @@ DEPEND="dev-qt/qtcore:4 ~razorqt-base/libqtxdg-${PV} x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) - mainmenu? ( || ( sys-auth/consolekit[policykit(-)] - sys-apps/systemd[policykit(-)] ) ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) sysstat? ( ~lxqt-base/libsysstat-${PV} )
