gentoo resync : 12.08.2018

3 files changed, 91 insertions, 26 deletions

diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 0b40fbdbd243..12c5af3e28b1 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD lxqt-meta-0.11.0.ebuild 1585 BLAKE2B d492e4f81d541fcf70de23b0987d357a12b888e90a450405873ac033f4d3f56f12bc3132688fff7ea8ce512ef7e77c164db66d6c615db117e1313e4dc8dde7d8 SHA512 9ea1fdb61d530ff727f7427b8aec3ebc9f0e85558e061e93da252ed68107ee73367aefff59bb9d53e29a74609909c0ea7f4bebeb1ab5bba311392c6b4005da77
-MISC metadata.xml 1267 BLAKE2B de60806c6cfec4985047f386a001893160e3f8f47dfba8738a113de8b113f06eb45f7876ab48983fb9d956f766e6dc975dc4f47f4893ae7410327b0e83074182 SHA512 f3046976faaed6b5e79f37a8cb97316e4451ccb66fe0dc3c8abe5d8627354a87932ed1749e445e03a2f3a86b3af36d7b9fb647ae165bb326c8690a79f32bd4d1
+EBUILD lxqt-meta-0.13.0.ebuild 1690 BLAKE2B 87bedb9e5f83cf6872c2a2179f8c95e2c65fd07361ea6297a718fe7d0a419be42245c3390f16b76fbe4a984cf03d8b0e825a13b5613441022df99041997d0366 SHA512 e23ee9a82b303f33e2d9a3b83b13b6d9e1eba8e2aaf88be289c14d8a1da02792c6ff3c456af6f55a2c32edff521ee07806d90cafb8d5eb684c5bdaf215de3ebf
+MISC metadata.xml 1600 BLAKE2B 198979543b1001dbfae6fdc3f088e752c44a24086a346fdaad24376aed1016ab65953005b40b3a27b05cce07f6ead2ab38ed1d94ff1b2db5632f48a205d779b9 SHA512 cf40f79ab9124952d27ab80736b9ec22c486dcb421ab6ffc3506c1331308fd0156a50ba9bdc7703b7527b98f32294ad88e50d6d02138dc47e59443589f23a9f3
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
new file mode 100644
index 000000000000..9b17a66af76b
--- /dev/null
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
+HOMEPAGE="https://lxqt.org/"
+
+MY_PV="$(ver_cut 1-2)*"
+
+if [[ ${PV} = *9999* ]]; then
+	KEYWORDS="-*"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="metapackage"
+SLOT="0"
+
+IUSE="+about admin +filemanager lightdm lximage minimal nls
+	powermanagement processviewer screenshot sddm ssh-askpass
+	sudo terminal"
+
+# 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-policykit-${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? ( =lxqt-base/lxqt-l10n-${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 )
+"
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 08adc227a66a..e7895d12a9f3 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
-  <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">Install
-    <pkg>lxqt-base/lxqt-powermanagement</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>
-  </use>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<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="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>
+	</use>
 </pkgmetadata>