From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABA49158013 for ; Wed, 22 Sep 2021 19:15:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA037E08BB; Wed, 22 Sep 2021 19:15:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEFB9E08BB for ; Wed, 22 Sep 2021 19:15:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12792340CF2 for ; Wed, 22 Sep 2021 19:15:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0178C111 for ; Wed, 22 Sep 2021 19:15:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1632337766.7f93de7768bc79e4a4c50689d04a987045ecc5e0.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: lxqt-base/lxqt-panel/ X-VCS-Repository: proj/qt X-VCS-Files: lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild lxqt-base/lxqt-panel/metadata.xml X-VCS-Directories: lxqt-base/lxqt-panel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7f93de7768bc79e4a4c50689d04a987045ecc5e0 X-VCS-Branch: master Date: Wed, 22 Sep 2021 19:15:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01b5d828-c382-493c-8826-971fb24af671 X-Archives-Hash: 7484160079d1a0ab48ad8d00149cbf55 commit: 7f93de7768bc79e4a4c50689d04a987045ecc5e0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 22 18:44:41 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ Build colorpicker plugin Build cpuload plugin Build desktopswitch plugin - Build directorymenu plugin + Build directorymenu plugin Build dom plugin Build kbindicator plugin Build mainmenu plugin Build mount plugin Build networkmonitor plugin Build quicklaunch plugin - Build sensors plugin Build showdesktop plugin Build statusnotifier plugin - Build spacer plugin + Build spacer plugin Build sysstat plugin Build taskbar plugin Build tray plugin