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

[Andreas Sturmlechner]

commit:     7f93de7768bc79e4a4c50689d04a987045ecc5e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 18:44:41 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 19:09:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f93de77

lxqt-base/lxqt-panel: Sync with Gentoo ebuild repo

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 27 ++++++++++++++++-----------
 lxqt-base/lxqt-panel/metadata.xml           |  5 ++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild 
b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
index eeda5f32..23dcad5c 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
@@ -18,11 +18,13 @@ else
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-2.1 LGPL-2.1+"
 SLOT="0"
-IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator 
+mainmenu
-       +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
-       +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
+IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator
++mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop
++spacer +statusnotifier sysstat +taskbar tray +volume +worldclock"
+
+# Work around a missing header issue: https://bugs.gentoo.org/666278
 REQUIRED_USE="
        || ( desktopswitch mainmenu showdesktop taskbar )
        volume? ( || ( alsa pulseaudio ) )
@@ -30,10 +32,10 @@ REQUIRED_USE="
 
 BDEPEND="
        dev-qt/linguist-tools:5
-       >=dev-util/lxqt-build-tools-0.6.0
+       >=dev-util/lxqt-build-tools-0.9.0
        virtual/pkgconfig
 "
-RDEPEND="
+DEPEND="
        >=dev-libs/libqtxdg-3.3.1
        dev-qt/qtcore:5
        dev-qt/qtdbus:5
@@ -50,10 +52,13 @@ RDEPEND="
        x11-libs/libX11
        cpuload? ( sys-libs/libstatgrab )
        kbindicator? ( x11-libs/libxkbcommon )
+       lm-sensors? ( sys-apps/lm-sensors )
        mount? ( kde-frameworks/solid:5 )
        networkmonitor? ( sys-libs/libstatgrab )
-       sensors? ( sys-apps/lm-sensors )
-       statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+       statusnotifier? (
+               dev-libs/libdbusmenu-qt[qt5(+)]
+               dev-qt/qtconcurrent:5
+       )
        sysstat? ( >=lxqt-base/libsysstat-0.4.1 )
        tray? (
                x11-libs/libxcb:=
@@ -70,7 +75,7 @@ RDEPEND="
                )
        )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
@@ -85,7 +90,7 @@ src_configure() {
                -DMOUNT_PLUGIN=$(usex mount)
                -DNETWORKMONITOR_PLUGIN=$(usex networkmonitor)
                -DQUICKLAUNCH_PLUGIN=$(usex quicklaunch)
-               -DSENSORS_PLUGIN=$(usex sensors)
+               -DSENSORS_PLUGIN=$(usex lm-sensors)
                -DSHOWDESKTOP_PLUGIN=$(usex showdesktop)
                -DSPACER_PLUGIN=$(usex spacer)
                -DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier)
@@ -106,7 +111,7 @@ src_configure() {
        cmake_src_configure
 }
 
-src_install(){
+src_install() {
        cmake_src_install
        doman panel/man/*.1
 }

diff --git a/lxqt-base/lxqt-panel/metadata.xml 
b/lxqt-base/lxqt-panel/metadata.xml
index 4519e700..ac1ead07 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -9,17 +9,16 @@
                <flag name="colorpicker">Build colorpicker plugin</flag>
                <flag name="cpuload">Build cpuload plugin</flag>
                <flag name="desktopswitch">Build desktopswitch plugin</flag>
-               <flag name="directorymenu" 
restrict="&gt;=lxqt-base/lxqt-panel-0.13.0">Build directorymenu plugin</flag>
+               <flag name="directorymenu">Build directorymenu plugin</flag>
                <flag name="dom">Build dom plugin</flag>
                <flag name="kbindicator">Build kbindicator plugin</flag>
                <flag name="mainmenu">Build mainmenu plugin</flag>
                <flag name="mount">Build mount plugin</flag>
                <flag name="networkmonitor">Build networkmonitor plugin</flag>
                <flag name="quicklaunch">Build quicklaunch plugin</flag>
-               <flag name="sensors">Build sensors plugin</flag>
                <flag name="showdesktop">Build showdesktop plugin</flag>
                <flag name="statusnotifier">Build statusnotifier plugin</flag>
-               <flag name="spacer" 
restrict="&gt;=lxqt-base/lxqt-panel-0.13.0">Build spacer plugin</flag>
+               <flag name="spacer">Build spacer plugin</flag>
                <flag name="sysstat">Build sysstat plugin</flag>
                <flag name="taskbar">Build taskbar plugin</flag>
                <flag name="tray">Build tray plugin</flag>