Add dependencies for oxygen-icons (bug #528676) and virtual/ttf-fonts, as they are expected in the default install.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

3 files changed, 57 insertions, 3 deletions

diff --git a/lxqt-base/lxqt-meta/ChangeLog b/lxqt-base/lxqt-meta/ChangeLog
index 65c225c057d9..30e4531aebc8 100644
--- a/lxqt-base/lxqt-meta/ChangeLog
+++ b/lxqt-base/lxqt-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxqt-base/lxqt-meta
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.9 2015/02/20 11:47:51 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.10 2015/03/15 03:16:22 yngwin Exp $
+
+*lxqt-meta-0.9.0-r2 (15 Mar 2015)
+
+  15 Mar 2015; Ben de Groot <yngwin@gentoo.org> +lxqt-meta-0.9.0-r2.ebuild,
+  metadata.xml:
+  Add dependencies for oxygen-icons (bug #528676) and virtual/ttf-fonts, as they
+  are expected in the default install.
 
 *lxqt-meta-0.9.0-r1 (20 Feb 2015)
 
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..88f5bec5476c
--- /dev/null
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild,v 1.1 2015/03/15 03:16:22 yngwin Exp $
+
+EAPI=5
+
+DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
+HOMEPAGE="http://lxqt.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
+	powermanagement sddm ssh-askpass"
+REQUIRED_USE="oxygen? ( icons )"
+
+RDEPEND="
+	>=lxde-base/lxmenu-data-0.1.2
+	~lxqt-base/lxqt-about-${PV}
+	=lxqt-base/lxqt-common-0.9*
+	~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
+	admin? ( ~lxqt-base/lxqt-admin-${PV} )
+	filemanager? ( ~x11-misc/pcmanfm-qt-${PV} )
+	icons? ( oxygen? ( kde-base/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.10.0 )
+	ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )"
+
+# Note: we prefer kde-base/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/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 997bb1f86f7d..7bd978785a84 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -6,14 +6,14 @@
     <flag name="admin">Install <pkg>app-admin/lxqt-admin</pkg></flag>
     <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
     file manager</flag>
-    <flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
-    icon theme (pulls in <pkg>x11-libs/gtk+</pkg>)</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-base/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>