gentoo resync : 25.08.2020

4 files changed, 3 insertions, 122 deletions

diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index e0f9596a7088..4306554fba57 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-panel-0.14.1.tar.xz 439252 BLAKE2B 28172f61cba99450965ca2c1660ca51f268a93ffc32769b270e5c5984b8f3534c3e8736f07334bdec1a1eb408ef35a20bf12de5a445faff161a93efbdacbe51c SHA512 e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
 DIST lxqt-panel-0.15.1.tar.xz 473356 BLAKE2B 297e704c51b3c950551fd09012c0aa533fdecf3d46d0f988428ce4100b7936970c5b400c6dc77103e26c07a05d10611fcd921354063cc55252b0a9cb93b0ebe6 SHA512 8eb9856faa2ce56c56df7514772d3ae6d31339a10d16e1ed659be0a2affc57fd16e01e05cb67c4205dfb773234ca9b8a69f414f742ccc30495bf4e2acfa0513f
-EBUILD lxqt-panel-0.14.1.ebuild 2882 BLAKE2B 5cbc945a545782068cf3306e4eccb8a265bc994a6324835e6ddae3ab68f2633c2b317b5ff3babd11d87d8bf4d41da109817c989fbe3dcfeb9f523580918d2508 SHA512 ded2739b9d8b5c2752efe732c2239243a05c2827c436987d5c35362a5c449efc11caad1797c8e6ec434cce7719a89c485958bfe26f68cbc41155f2fb738f4301
-EBUILD lxqt-panel-0.15.1.ebuild 2905 BLAKE2B da22333a1d7e98c5f49a52cce5ec0b14b5857be9b1b12e6cf9003a2bcf30a4630d39fe27055bdd6243825f42399fc8d72e296a3d0ed1eb3729704fea9328f6e6 SHA512 035534cdc5001fbc6334e52146f0192afd84d13cce3673645ed28b34da6b95d1d73f3e49a234ac14b10175578907b50d439caad4f24443a1e14bafcf9962728c
-MISC metadata.xml 1370 BLAKE2B 6f9292ad43d3b829ba3968762f767e65b91bd71156e5e81f77168eb1377d812790e087e173e2db80e30238d423cebb9909013528e8cb8e83dad22f6cf8ade9f6 SHA512 cfa369a013c942515cdb50400c03ca57089d0a81eefca77997e217928af08357f71cbb77e526815cf3bc101f597dbf813acf56fbd04e4e593fe6110e8f711747
+EBUILD lxqt-panel-0.15.1.ebuild 2903 BLAKE2B bcb9e2065c5a552533828d69811baaf685c3ea288c3d1d2c33fb77f44b4167bc38859db512850bb8f5fed416530b5e428c80dab79a473312fd3087980ddee6fb SHA512 e9b2e20b6bb86cf970d260c667e75a1ece43f2f30f221fb13c85a43c4442421c6ef52d0c73ca737b1ac7ffb961ed0a457efc6842bcd1837e485b377d7c90cebc
+MISC metadata.xml 1319 BLAKE2B 3bfa4db473764d962cab5c005d97a1a1449a799546d1d7d20cbd7da095b25ed6dd40aa47046d561bc9041255cfca62af9f08e16f69a14557325b12a81911fb1b SHA512 26b2c71f50db3c8efe9df6dcd4a497ffbd9d281549a1e7bc12faa22be9aef28bf51d89a172b7ba6c17e9c3cce926b837c4f5d6598567e8359545b166eae19d3a
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
deleted file mode 100644
index ac429b2e7571..000000000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="https://lxqt.github.io/"
-
-MY_PV="$(ver_cut 1-2)*"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="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"
-
-# Work around a missing header issue: https://bugs.gentoo.org/666278
-REQUIRED_USE="
-	|| ( desktopswitch mainmenu showdesktop taskbar )
-	volume? ( || ( alsa pulseaudio ) )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	>=lxde-base/lxmenu-data-0.1.5
-	>=lxde-base/menu-cache-1.1.0
-	=lxqt-base/liblxqt-${MY_PV}
-	=lxqt-base/lxqt-globalkeys-${MY_PV}
-	x11-libs/libX11
-	cpuload? ( sys-libs/libstatgrab )
-	kbindicator? ( x11-libs/libxkbcommon )
-	mount? ( kde-frameworks/solid:5 )
-	networkmonitor? ( sys-libs/libstatgrab )
-	sensors? ( sys-apps/lm-sensors )
-	statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	sysstat? ( >=lxqt-base/libsysstat-0.4.1 )
-	tray? (
-		x11-libs/libxcb:=
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/xcb-util
-	)
-	volume? (
-		alsa? ( media-libs/alsa-lib )
-		pulseaudio? (
-			media-sound/pavucontrol-qt
-			media-sound/pulseaudio
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		# Plugins
-		-DCOLORPICKER_PLUGIN=$(usex colorpicker)
-		-DCPULOAD_PLUGIN=$(usex cpuload)
-		-DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch)
-		-DDIRECTORYMENU_PLUGIN=$(usex directorymenu)
-		-DDOM_PLUGIN=$(usex dom)
-		-DKBINDICATOR_PLUGIN=$(usex kbindicator)
-		-DMAINMENU_PLUGIN=$(usex mainmenu)
-		-DMOUNT_PLUGIN=$(usex mount)
-		-DNETWORKMONITOR_PLUGIN=$(usex networkmonitor)
-		-DQUICKLAUNCH_PLUGIN=$(usex quicklaunch)
-		-DSENSORS_PLUGIN=$(usex sensors)
-		-DSHOWDESKTOP_PLUGIN=$(usex showdesktop)
-		-DSPACER_PLUGIN=$(usex spacer)
-		-DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier)
-		-DSYSSTAT_PLUGIN=$(usex sysstat)
-		-DTASKBAR_PLUGIN=$(usex taskbar)
-		-DTRAY_PLUGIN=$(usex tray)
-		-DVOLUME_PLUGIN=$(usex volume)
-		-DWORLDCLOCK_PLUGIN=$(usex worldclock)
-	)
-
-	if use volume; then
-		mycmakeargs+=(
-			-DVOLUME_USE_ALSA=$(usex alsa)
-			-DVOLUME_USE_PULSEAUDIO=$(usex pulseaudio)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
index 7e0b20dfb8d9..e6c4a1354464 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml
index 65b58642b254..0b60befd6e88 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -16,7 +16,6 @@
 		<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">Build spacer plugin</flag>