gentoo resync : 22.10.2018

4 files changed, 15 insertions, 75 deletions

diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 12c5af3e28b1..99584e97199d 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxqt-meta-0.11.0.ebuild 1585 BLAKE2B d492e4f81d541fcf70de23b0987d357a12b888e90a450405873ac033f4d3f56f12bc3132688fff7ea8ce512ef7e77c164db66d6c615db117e1313e4dc8dde7d8 SHA512 9ea1fdb61d530ff727f7427b8aec3ebc9f0e85558e061e93da252ed68107ee73367aefff59bb9d53e29a74609909c0ea7f4bebeb1ab5bba311392c6b4005da77
-EBUILD lxqt-meta-0.13.0.ebuild 1690 BLAKE2B 87bedb9e5f83cf6872c2a2179f8c95e2c65fd07361ea6297a718fe7d0a419be42245c3390f16b76fbe4a984cf03d8b0e825a13b5613441022df99041997d0366 SHA512 e23ee9a82b303f33e2d9a3b83b13b6d9e1eba8e2aaf88be289c14d8a1da02792c6ff3c456af6f55a2c32edff521ee07806d90cafb8d5eb684c5bdaf215de3ebf
-MISC metadata.xml 1600 BLAKE2B 198979543b1001dbfae6fdc3f088e752c44a24086a346fdaad24376aed1016ab65953005b40b3a27b05cce07f6ead2ab38ed1d94ff1b2db5632f48a205d779b9 SHA512 cf40f79ab9124952d27ab80736b9ec22c486dcb421ab6ffc3506c1331308fd0156a50ba9bdc7703b7527b98f32294ad88e50d6d02138dc47e59443589f23a9f3
+EBUILD lxqt-meta-0.13.0.ebuild 1695 BLAKE2B 3a8e34a40c873031f02e84ceeeff3b96cb14519e111dbcc12df56164d18f659843c720b74d96855ebddf4c27974a70aac7289b0ef052a0bac18f146b2450849e SHA512 634ec73834ad8479249c7b3fd07ecfac8daad2bf0c4299e79712ff6a6a7245a9c0337719c5b0956ff0a8e64a535bdc5ef1741ac50b06e7ed50a5fc46ef14e87c
+MISC metadata.xml 1302 BLAKE2B ba3ea148f21190737b6d2aa77ab61280efd80018a6fad4b116934c707d4a5c7a895b6a5fc6eec0c0634470f125551e3c0d1f0956df17d203c2d7720b06fe8036 SHA512 e5f9b1a9d4485391920a048a1d75b6a7a2391dcd8914d6dd7e1119cbf01b9f3e75391742c9898b20a4fb1e4f1bc62a2f271a4796c9022087e26217ff53ff69f6
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild
deleted file mode 100644
index f1654fe9f48a..000000000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
-	powermanagement sddm ssh-askpass sudo"
-REQUIRED_USE="oxygen? ( icons )"
-
-RDEPEND="
-	>=lxde-base/lxmenu-data-0.1.2
-	~lxqt-base/lxqt-common-${PV}
-	~lxqt-base/lxqt-config-${PV}
-	~lxqt-base/lxqt-globalkeys-${PV}
-	~lxqt-base/lxqt-notificationd-${PV}
-	~lxqt-base/lxqt-panel-${PV}
-	~lxqt-base/lxqt-qtplugin-${PV}
-	~lxqt-base/lxqt-runner-${PV}
-	~lxqt-base/lxqt-session-${PV}
-	virtual/ttf-fonts
-	about? ( ~lxqt-base/lxqt-about-${PV} )
-	admin? ( ~lxqt-base/lxqt-admin-${PV} )
-	filemanager? ( >=x11-misc/pcmanfm-qt-${PV} )
-	icons? ( oxygen? ( kde-frameworks/oxygen-icons )
-		!oxygen? ( virtual/freedesktop-icon-theme ) )
-	lightdm? ( x11-misc/lightdm )
-	lximage? ( media-gfx/lximage-qt )
-	!minimal? ( x11-wm/openbox
-		x11-misc/obconf-qt )
-	policykit? ( ~lxqt-base/lxqt-policykit-${PV}
-		|| ( sys-auth/consolekit[policykit(-)]
-			sys-apps/systemd[policykit(-)] ) )
-	powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} )
-	sddm? ( >=x11-misc/sddm-0.11.0 )
-	ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )
-	sudo? ( ~lxqt-base/lxqt-sudo-${PV} )"
-
-# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
-# install expects oxygen icons, until the user specifies otherwise (bug 543380)
-
-S="${WORKDIR}"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
index 9b17a66af76b..df945a56312d 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-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
@@ -11,9 +11,9 @@ HOMEPAGE="https://lxqt.org/"
 MY_PV="$(ver_cut 1-2)*"
 
 if [[ ${PV} = *9999* ]]; then
-	KEYWORDS="-*"
+	KEYWORDS="-* amd64 x86"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index e7895d12a9f3..c68821c7a25d 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -8,28 +8,16 @@
 	<use>
 		<flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag>
 		<flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag>
-		<flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
-			file manager</flag>
-		<flag name="icons">Install an icon theme</flag>
-		<flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
-			display manager</flag>
-		<flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
-			image viewer</flag>
-		<flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
-			window manager</flag>
-		<flag name="oxygen">Prefer <pkg>kde-frameworks/oxygen-icons</pkg> (default)</flag>
-		<flag name="powermanagement" restrict="&gt;=lxqt-base/lxqt-meta-0.13.0">Install
-			<pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
-		<flag name="processviewer">Install
-			<pkg>x11-misc/qps</pkg> package</flag>
-		<flag name="screenshot" restrict="&gt;=lxqt-base/lxqt-meta-0.13.0">Install
-			<pkg>x11-misc/screengrab</pkg> package</flag>
-		<flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
-			display manager</flag>
-		<flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg>
-			user password prompt tool</flag>
+		<flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>file manager</flag>
+		<flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>display manager</flag>
+		<flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>image viewer</flag>
+		<flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>window manager</flag>
+		<flag name="powermanagement">Install <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
+		<flag name="processviewer">Install <pkg>x11-misc/qps</pkg> package</flag>
+		<flag name="screenshot">Install <pkg>x11-misc/screengrab</pkg> package</flag>
+		<flag name="sddm">Install <pkg>x11-misc/sddm</pkg> display manager</flag>
+		<flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> user password prompt tool</flag>
 		<flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag>
-		<flag name="terminal" restrict="&gt;=lxqt-base/lxqt-meta-0.13.0">Install
-			<pkg>x11-terms/qterminal</pkg> package</flag>
+		<flag name="terminal">Install <pkg>x11-terms/qterminal</pkg> package</flag>
 	</use>
 </pkgmetadata>