gentoo resync : 22.10.2018

4 files changed, 7 insertions, 124 deletions

diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index 668de2c96ee1..5f80f8a97cda 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,6 +1,3 @@
-AUX lxqt-panel-0.11.0-fix-undef-explicit.patch 1052 BLAKE2B 15ace146aa361659b80188c5061444f413d13812fb1982363a8d28d1d2442318598d3f613494bfce5fa170aa536a686b9b0d945084bf570f16dd7b491bf97dc5 SHA512 e7c29561dac09b90cc6f924f73ff80114e705337f6f40086682c236d6c387a776d733e34ac6421e7af34a0ae77e2debd000ae6b74ebeb2eb967fedcbe6a99a88
-DIST lxqt-panel-0.11.0.tar.xz 262964 BLAKE2B 6cbb741731e89dbe99fefc8ceb983e346128a3122507a6816db848c9bed0b8f4f3b5f08e8f7ccd3a1b72ed7161a0772188836bec55610e248c17425f806dec44 SHA512 875ec28868bb68dff8c4e3be0adb5e5c88213f9ebdeb83eb0df9d5c31a7b4cb70a4d9b347f1ed9526a1eef7adb07f92c36263e12a6455291ec7022901abd100c
 DIST lxqt-panel-0.13.0.tar.xz 273924 BLAKE2B affed55daf1c0a4bf20faeb35278a7d0c7474e514627d24c33469954bcf57ef2c5ee0ac1346918a3edc58f929f07a923e730d0c8ec1d32eeb3d2af41134beced SHA512 f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3
-EBUILD lxqt-panel-0.11.0.ebuild 2334 BLAKE2B 9b61f77151060636c5e4d656cc1143e455250355d8a2c48a480fc4cfaab556e34f7a1a07616f57119637aeda480c9406d3ab2691dd573254758a1534d775d94e SHA512 8646b36a9d8db271b94b3fd794e913a3942d1ed5f2db8db2d3c11a0c0877097525b57424f3af09ca17d5ccc21e195b81e2077b793da7589748d6865dcd362f70
-EBUILD lxqt-panel-0.13.0.ebuild 2832 BLAKE2B 6b5cbf64a66f10e5838639c5fa1c14402dd10b7eeb07bea12a46552cbfb6f5eef55e20ec34267201fc707839ea48982c600402892ea26b2bb464e8ccd4f43d0b SHA512 e40881e762efce80d2f0926079c0cd93ba7c597d66e3c559c4b5a7afcb2f9fa59a3f1c6a17919a153efd4d0fd3c104f2b041683f9460bdbf714eeaf20566ea03
+EBUILD lxqt-panel-0.13.0.ebuild 2881 BLAKE2B bb9694192d9a3beb262d16faa94fe3fc21bef539bf15d1b267e5ec24594f633e5baca6b8d02566abd29b18be3a47adbee8a55abf576b79ee18de3c25e6a6a9de SHA512 a3c8a76c97111435069c591a7d122c8201604a55676c5e4e002d919379e659a40eb4927b711b9bd7d9e112d500a7f1830d1f7021eca00713b75181b3e0ab8d08
 MISC metadata.xml 1505 BLAKE2B bab5a3343f1b765980b9b59a7a7d2b3d4e9968e9f47c2d9965bd1cc59b9770d69e543ecb2adf0c65bed3324becd988e7388218ddc19039a895ede16713014b80 SHA512 3c4775f11a763645878d24f3f5cf4a6c6b8622ee6bb6ccc8cd28582eedc8092030dcff06734db1c3266f13a076a63e1474d1334c206fb4d0bc55829eb3f9f1b4
diff --git a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch b/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch
deleted file mode 100644
index c6349c25cba0..000000000000
--- a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Mon, 30 Jan 2017 12:21:10 +0100
-Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround
-
-..after include and add explanation of the workaround.
-
-closes lxde/lxqt#1251
----
- plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp
-index c4aa4e27..883df074 100644
---- a/plugin-kbindicator/src/x11/kbdlayout.cpp
-+++ b/plugin-kbindicator/src/x11/kbdlayout.cpp
-@@ -33,8 +33,15 @@
- 
- #include <xkbcommon/xkbcommon-x11.h>
- #include <xcb/xcb.h>
-+
-+// Note: We need to override "explicit" as this is a C++ keyword. But it is
-+// used as variable name in xkb.h. This is causing a failure in C++ compile
-+// time.
-+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
- #define explicit _explicit
- #include <xcb/xkb.h>
-+#undef explicit
-+
- #include "../kbdinfo.h"
- #include "../controls.h"
- 
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
deleted file mode 100644
index f37be9fee9f2..000000000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu
-	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
-	statusnotifier sysstat +taskbar +tray +volume worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kguiaddons:5
-	kde-frameworks/kwindowsystem:5[X]
-	>=lxde-base/menu-cache-0.3.3
-	~lxqt-base/liblxqt-${PV}
-	~lxqt-base/lxqt-globalkeys-${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.3* )
-	tray? ( x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender )
-	volume? ( alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio ) )"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${CDEPEND}
-	dev-qt/qtsvg:5
-	>=lxde-base/lxmenu-data-0.1.2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-undef-explicit.patch
-)
-
-src_configure() {
-	local mycmakeargs i y
-	mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \
-		networkmonitor quicklaunch sensors showdesktop statusnotifier \
-		sysstat taskbar tray volume worldclock; do
-		#Switch to ^^ when we switch to EAPI=6.
-		#y=${i^^}
-		y=$(tr '[:lower:]' '[:upper:]' <<< "${i}")
-		mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) )
-	done
-
-	if use volume; then
-		mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA)
-			$(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
index 899778b60714..2a7a81060a7c 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
@@ -23,7 +23,10 @@ SLOT="0"
 IUSE="+alsa clock colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu
 	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
 	+spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
+REQUIRED_USE="
+	|| ( desktopswitch mainmenu showdesktop taskbar )
+	volume? ( || ( alsa pulseaudio ) )
+"
 
 RDEPEND="
 	>=dev-libs/libqtxdg-3.0.0