[gentoo-commits] proj/qt:master commit in: lxqt-base/lxqt-meta/

[Jimi Huotari]

commit:     36e7ff6e986cddf27288b3c1ec4b9c715940dcfe
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 21:51:05 2024 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat May 25 21:56:56 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=36e7ff6e

lxqt-base/lxqt-meta: add USE="window-manager"

Since there is the USE-flag 'desktop-manager' already, it should
make more sense to suggest a window manager via a 'window-manager'
flag instead of 'minimal'.

Also remove the version specifics from 'sddm'.

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild | 8 ++++----
 lxqt-base/lxqt-meta/metadata.xml          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild 
b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
index 3c43cf9e..a15e5930 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="
        +about admin archiver +desktop-portal +display-manager +filemanager
        lximage minimal nls +policykit powermanagement processviewer screenshot
-       +sddm ssh-askpass sudo terminal +trash
+       +sddm ssh-askpass sudo terminal +trash +window-manager
 "
 
 REQUIRED_USE="trash? ( filemanager )"
@@ -44,20 +44,20 @@ RDEPEND="
        archiver? ( >=app-arch/lxqt-archiver-1.0 )
        desktop-portal? ( >=gui-libs/xdg-desktop-portal-lxqt-1.0 )
        display-manager? (
-               sddm? ( >=x11-misc/sddm-0.11.0 )
+               sddm? ( x11-misc/sddm )
                !sddm? ( x11-misc/lightdm )
        )
        filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* )
        lximage? ( =media-gfx/lximage-qt-${MY_PV}* )
-       !minimal? ( kde-plasma/kwin:6 )
        nls? ( dev-qt/qttranslations:6 )
        policykit? ( =lxqt-base/lxqt-policykit-${MY_PV}* )
        powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV}* )
        processviewer? ( >=x11-misc/qps-2.9 )
        screenshot? ( >=x11-misc/screengrab-2.8 )
-       sddm? ( >=x11-misc/sddm-0.11.0 )
+       sddm? ( x11-misc/sddm )
        ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV}* )
        sudo? ( =lxqt-base/lxqt-sudo-${MY_PV}* )
        terminal? ( =x11-terms/qterminal-${MY_PV}* )
        trash? ( gnome-base/gvfs )
+       window-manager? ( kde-plasma/kwin:6 )
 "

diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index bc7f1512..fd5fbd6b 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -14,7 +14,6 @@
                <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg> 
file manager</flag>
                <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg> 
image viewer</flag>
                <flag name="minimal" restrict="&lt;lxqt-base/lxqt-meta-2.0">Do 
not install <pkg>x11-wm/openbox</pkg> window manager</flag>
-               <flag name="minimal">Do not install <pkg>kde-plasma/kwin</pkg> 
window manager</flag>
                <flag name="nls">Install <pkg>dev-qt/qttranslations</pkg> to 
better support different locales</flag>
                <flag name="powermanagement">Install 
<pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
                <flag name="processviewer">Install <pkg>x11-misc/qps</pkg> 
package</flag>
@@ -25,5 +24,6 @@
                <flag name="terminal">Install <pkg>x11-terms/qterminal</pkg> 
package</flag>
                <flag name="trash">Install <pkg>gnome-base/gvfs</pkg> to enable 
'trash'
                        functionality in <pkg>x11-misc/pcmanfm-qt</pkg></flag>
+               <flag name="window-manager" 
restrict="&gt;lxqt-base/lxqt-meta-1.4">Install <pkg>kde-plasma/kwin</pkg> 
window manager</flag>
        </use>
 </pkgmetadata>