gentoo resync : 30.05.2020

4 files changed, 67 insertions, 3 deletions

diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 15322e21a0e6..ad40bcac7b0f 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,2 +1,3 @@
-EBUILD lxqt-meta-0.14.1-r1.ebuild 1748 BLAKE2B e12a4f66b1fb6bead5a55b9132aaa5b7836d9aa10bd58edd1e28b8cbc3a439aaa8d1c3187248559e43dc341bff849f04db3e203cedf681df386df515c3b8f381 SHA512 31707c8acdf43339fb4ffaea6e7ba2355d4baaf7d3d4f20c282cb345730bd37e18794feceefcb739fe42d345088f20a8d36a8aa4c0f77fc2140e15a2ddb98869
-MISC metadata.xml 1526 BLAKE2B 904b5a67781f80fe9467970ea81a52444e5936114ffc5e7e91ee2da9ea68f1d2bc16531e76d08345bf258b1cf3025a63f9333d4bfe74b5a04329c982abab868f SHA512 b8a34fdc1db1caf60524fb7348da13bbe2064dc71a4943c60fbdbfac6a676a5c283e78c77729004952a4f88826c1af7a0435d4aed0db6ae0a96afc5a28998435
+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
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
index 2b3a117cfc9b..707df2c9f050 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV="$(ver_cut 1-2)*"
 
 DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
new file mode 100644
index 000000000000..520e7e85168c
--- /dev/null
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 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 archiver +display-manager +filemanager 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} )
+	archiver? ( app-arch/lxqt-archiver )
+	display-manager? (
+		sddm? ( >=x11-misc/sddm-0.11.0 )
+		!sddm? ( x11-misc/lightdm )
+	)
+	filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV} )
+	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/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 5b3bc3eec067..53ee47f24102 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -8,6 +8,8 @@
 	<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="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>