gentoo resync : 25.08.2020

4 files changed, 3 insertions, 62 deletions

diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index ad40bcac7b0f..0388b65876b4 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxqt-meta-0.14.1-r1.ebuild 1754 BLAKE2B 83f074c61de45136ede7907e161faf08968528221961e820a65c62bf1eb508890f99f6f0b8f10fbdbea369fa8190f1d138f2c80f0aa7f447a05b5dc6c6361cf0 SHA512 3cc6b452a1d7080e2c445e8d7ac9802dad6282fa25b30ccee3b6dd887ecef6cbdb7d4123e7b6843f0bb405de3637098e23087f6af99ac9669f0f8d55e3fcf389
-EBUILD lxqt-meta-0.15.0.ebuild 1868 BLAKE2B 84e1b2f434e999878b3919810f46955ac212ec0587cdae346bd83ae8d9f8fbd683020d3c9422ac65adecd6a1eee19586eae1d683555469663a794c87e9b8bc11 SHA512 5c33c69d97f5cbb16f910ef957a879d81ac2e971094844664d9a3eaee9086066d5369538997cf11bbdbaeba2ec36331e9e938dc99cf6d9a4bceb898207cca0ea
-MISC metadata.xml 1673 BLAKE2B 287e43bf365c162a168591241ead35c89f89462780e9f1f5823d4705cb9c384f8690f173a2984455eeab814e5d18b1cd66da976150ec7dcedb6cd9cbf8dab364 SHA512 441411ce4cff50b5650563c3d061048cc661e01075afa204413438f29d1371ca9d276b465fcb1b65e4bb153f393ecfb1299433836c12acb30b8f8bd07e15fd2b
+EBUILD lxqt-meta-0.15.0.ebuild 1866 BLAKE2B ef3fba6955394617124182d85474d71e15d023f33d3e53694379dbe2b7e3a92343f99e76d7599f252db06ebff06d6b62c4d1034bad62b05121f847241a26f3bc SHA512 f5948360935fbc1e931153f1bcdb6617ba03c392c60e583b61a6c0505c0a4dad5f2a6d9a4bb21e4eded399f667e41d2c3d888aadad053b17556a2077ba6d4782
+MISC metadata.xml 1592 BLAKE2B 6339857aed9196217fd3f88332a9bb5329b0c645f76255d729cbd886dcb624d23c5f27e675de81b8b1a6771c9b7efb2bd4efe634032075356370e95eca2beeb5 SHA512 de705e73b7cb77fcee5d6911cef3ea75f34264c7c8c4060eb97b3fab9c8b5f415ffb75620c9b0c8bb38f16d41318b74b6687806b9e88e6ff3e168bb7ccf7c725
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
deleted file mode 100644
index 707df2c9f050..000000000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="$(ver_cut 1-2)*"
-
-DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="metapackage"
-SLOT="0"
-
-IUSE="+about admin +filemanager lightdm lximage minimal nls
-	+policykit powermanagement processviewer screenshot sddm
-	ssh-askpass sudo terminal +trash"
-
-REQUIRED_USE="trash? ( filemanager )"
-
-# 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)
-RDEPEND="
-	kde-frameworks/oxygen-icons
-	>=lxde-base/lxmenu-data-0.1.5
-	=lxqt-base/lxqt-config-${MY_PV}
-	=lxqt-base/lxqt-globalkeys-${MY_PV}
-	=lxqt-base/lxqt-notificationd-${MY_PV}
-	=lxqt-base/lxqt-panel-${MY_PV}
-	=lxqt-base/lxqt-qtplugin-${MY_PV}
-	=lxqt-base/lxqt-runner-${MY_PV}
-	=lxqt-base/lxqt-session-${MY_PV}
-	virtual/ttf-fonts
-	=x11-themes/lxqt-themes-${MY_PV}
-	about? ( =lxqt-base/lxqt-about-${MY_PV} )
-	admin? ( =lxqt-base/lxqt-admin-${MY_PV} )
-	filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV} )
-	lightdm? ( x11-misc/lightdm )
-	lximage? ( media-gfx/lximage-qt )
-	!minimal? (
-		x11-wm/openbox
-		x11-misc/obconf-qt
-	)
-	nls? ( dev-qt/qttranslations:5 )
-	policykit? ( =lxqt-base/lxqt-policykit-${MY_PV} )
-	powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV} )
-	processviewer? ( x11-misc/qps:0 )
-	screenshot? ( x11-misc/screengrab:0 )
-	sddm? ( >=x11-misc/sddm-0.11.0 )
-	ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV} )
-	sudo? ( =lxqt-base/lxqt-sudo-${MY_PV} )
-	terminal? ( x11-terms/qterminal:0 )
-	trash? ( gnome-base/gvfs )
-"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
index 520e7e85168c..c764d554669a 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 53ee47f24102..c090b132945d 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="archiver">Install <pkg>app-arch/lxqt-archiver</pkg></flag>
 		<flag name="display-manager">Install a graphical display manager</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="nls">Install <pkg>dev-qt/qttranslations</pkg> to better support different locales</flag>