[gentoo-commits] proj/qt:master commit in: lxde-base/lxsession/, lxde-base/lxqt-common/, sets/

[gentoo-commits] proj/qt:master commit in: lxde-base/lxsession/, lxde-base/lxqt-common/, sets/

[Ben de Groot]

commit:     6012f8596e9b5249cbd925e9f21a51d82c77642a
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 13:48:16 2013 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 13:48:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6012f859

lxde-base/lxqt-common: initial commit

---
 lxde-base/lxqt-common/lxqt-common-9999.ebuild | 26 ++++++++++++++++++++++++++
 lxde-base/lxqt-common/metadata.xml            |  6 ++++++
 lxde-base/lxsession/lxsession-9999.ebuild     |  6 ++++--
 sets/lxde-qt-live                             |  1 +
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lxde-base/lxqt-common/lxqt-common-9999.ebuild b/lxde-base/lxqt-common/lxqt-common-9999.ebuild
new file mode 100644
index 0000000..d253f44
--- /dev/null
+++ b/lxde-base/lxqt-common/lxqt-common-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="LXDE-Qt common resources"
+HOMEPAGE="http://www.lxde.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/lxde/${PN}.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="lxde-base/liblxqt"
+DEPEND="${RDEPEND}"

diff --git a/lxde-base/lxqt-common/metadata.xml b/lxde-base/lxqt-common/metadata.xml
new file mode 100644
index 0000000..c141026
--- /dev/null
+++ b/lxde-base/lxqt-common/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>lxde</herd>
+  <herd>qt</herd>
+</pkgmetadata>

diff --git a/lxde-base/lxsession/lxsession-9999.ebuild b/lxde-base/lxsession/lxsession-9999.ebuild
index 956e5c4..82ef204 100644
--- a/lxde-base/lxsession/lxsession-9999.ebuild
+++ b/lxde-base/lxsession/lxsession-9999.ebuild
@@ -26,17 +26,19 @@ SLOT="0"
 IUSE=""
 
 # vala and gtk+ deps should be dropped later
-RDEPEND="dev-libs/dbus-glib
+CDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
 	sys-apps/dbus
 	sys-auth/polkit
 	x11-libs/gtk+:2
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	$(vala_depend)
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	lxde-base/lxqt-common"
 
 src_prepare() {
 	vala_src_prepare

diff --git a/sets/lxde-qt-live b/sets/lxde-qt-live
index e061c6f..139597d 100644
--- a/sets/lxde-qt-live
+++ b/sets/lxde-qt-live
@@ -17,3 +17,4 @@
 =lxde-base/lxrandr-qt-9999
 =lxde-base/lxqt-about-9999
 =lxde-base/lxqt-config-9999
+=lxde-base/lxqt-common-9999