gentoo resync : 30.06.2019

3 files changed, 3 insertions, 121 deletions

diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index 67ca18e5a1c5..d5f7409b9bd6 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-panel-0.13.0.tar.xz 273924 BLAKE2B affed55daf1c0a4bf20faeb35278a7d0c7474e514627d24c33469954bcf57ef2c5ee0ac1346918a3edc58f929f07a923e730d0c8ec1d32eeb3d2af41134beced SHA512 f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3
 DIST lxqt-panel-0.14.1.tar.xz 439252 BLAKE2B 28172f61cba99450965ca2c1660ca51f268a93ffc32769b270e5c5984b8f3534c3e8736f07334bdec1a1eb408ef35a20bf12de5a445faff161a93efbdacbe51c SHA512 e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
-EBUILD lxqt-panel-0.13.0.ebuild 2881 BLAKE2B bb9694192d9a3beb262d16faa94fe3fc21bef539bf15d1b267e5ec24594f633e5baca6b8d02566abd29b18be3a47adbee8a55abf576b79ee18de3c25e6a6a9de SHA512 a3c8a76c97111435069c591a7d122c8201604a55676c5e4e002d919379e659a40eb4927b711b9bd7d9e112d500a7f1830d1f7021eca00713b75181b3e0ab8d08
 EBUILD lxqt-panel-0.14.1.ebuild 2886 BLAKE2B 94f6fc488f88e6ba186677242cd2b8e04e602d96cddc9fd70aeb0a3231b1a7ab3149fabad37d324b2530c1e246b8105e3296eaa5fe5b14fee135f0e48a45d0f5 SHA512 22000c78dad5c66c28a9c587bc7d68a1e79ee9330767474686124f176d1637249967fcd6299c7f6cb5af078e023c0adcddd1bb08b4a492f478835a7d6f9add7c
-MISC metadata.xml 1505 BLAKE2B bab5a3343f1b765980b9b59a7a7d2b3d4e9968e9f47c2d9965bd1cc59b9770d69e543ecb2adf0c65bed3324becd988e7388218ddc19039a895ede16713014b80 SHA512 3c4775f11a763645878d24f3f5cf4a6c6b8622ee6bb6ccc8cd28582eedc8092030dcff06734db1c3266f13a076a63e1474d1334c206fb4d0bc55829eb3f9f1b4
+MISC metadata.xml 1370 BLAKE2B 6f9292ad43d3b829ba3968762f767e65b91bd71156e5e81f77168eb1377d812790e087e173e2db80e30238d423cebb9909013528e8cb8e83dad22f6cf8ade9f6 SHA512 cfa369a013c942515cdb50400c03ca57089d0a81eefca77997e217928af08357f71cbb77e526815cf3bc101f597dbf813acf56fbd04e4e593fe6110e8f711747
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
deleted file mode 100644
index 2a7a81060a7c..000000000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.13.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="https://lxqt.org/"
-
-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 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-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="
-	|| ( desktopswitch mainmenu showdesktop taskbar )
-	volume? ( || ( alsa pulseaudio ) )
-"
-
-RDEPEND="
-	>=dev-libs/libqtxdg-3.0.0
-	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
-		)
-	)
-	!lxqt-base/lxqt-common
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-
-		# Plugins
-		-DCLOCK_PLUGIN=$(usex clock)
-		-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-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml
index 389e2ab7f8a6..65b58642b254 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -6,11 +6,10 @@
 		<name>LXQt</name>
 	</maintainer>
 	<use>
-		<flag name="clock">Build clock plugin</flag>
 		<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>
@@ -20,7 +19,7 @@
 		<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>