[gentoo-commits] proj/qt:master commit in: razorqt-base/razorqt-meta/, razorqt-base/razorqt-session/, ...

[gentoo-commits] proj/qt:master commit in: razorqt-base/razorqt-meta/, razorqt-base/razorqt-session/, ...

[Ben de Groot]

commit:     47c066c641c02f0181a6d45c0a37119ed49d1d32
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Mon Oct 15 07:58:56 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 07:58:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=47c066c6

razorqt-base pkgs: upstream suggested updates to ebuilds

---
 razorqt-base/libqtxdg/libqtxdg-9999.ebuild         |    2 +-
 .../razorqt-config/razorqt-config-9999.ebuild      |    2 --
 razorqt-base/razorqt-libs/razorqt-libs-9999.ebuild |    3 ++-
 .../razorqt-lightdm-greeter-9999.ebuild            |    1 +
 razorqt-base/razorqt-meta/razorqt-meta-9999.ebuild |    9 +++++++++
 .../razorqt-session/razorqt-session-9999.ebuild    |   12 ++----------
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/razorqt-base/libqtxdg/libqtxdg-9999.ebuild b/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
index 919bbad..6ec421b 100644
--- a/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
+++ b/razorqt-base/libqtxdg/libqtxdg-9999.ebuild
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
 

diff --git a/razorqt-base/razorqt-config/razorqt-config-9999.ebuild b/razorqt-base/razorqt-config/razorqt-config-9999.ebuild
index 8137563..77420f7 100644
--- a/razorqt-base/razorqt-config/razorqt-config-9999.ebuild
+++ b/razorqt-base/razorqt-config/razorqt-config-9999.ebuild
@@ -30,8 +30,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DSPLIT_BUILD=On
 		-DMODULE_CONFIG=On
-		-DMODULE_CONFUPDATE=On
-		-DMODULE_ABOUT=On
 	)
 	cmake-utils_src_configure
 }

diff --git a/razorqt-base/razorqt-libs/razorqt-libs-9999.ebuild b/razorqt-base/razorqt-libs/razorqt-libs-9999.ebuild
index f029bee..71828c5 100644
--- a/razorqt-base/razorqt-libs/razorqt-libs-9999.ebuild
+++ b/razorqt-base/razorqt-libs/razorqt-libs-9999.ebuild
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
@@ -41,6 +41,7 @@ src_configure() {
 		-DMODULE_LIBRAZORQT=On
 		-DMODULE_LIBRAZORQXT=On
 		-DMODULE_LIBRAZORMOUNT=On
+		-DMODULE_ABOUT=On
 		-DMODULE_X11INFO=On
 	)
 	cmake-utils_src_configure

diff --git a/razorqt-base/razorqt-lightdm-greeter/razorqt-lightdm-greeter-9999.ebuild b/razorqt-base/razorqt-lightdm-greeter/razorqt-lightdm-greeter-9999.ebuild
index 027de09..b7eb169 100644
--- a/razorqt-base/razorqt-lightdm-greeter/razorqt-lightdm-greeter-9999.ebuild
+++ b/razorqt-base/razorqt-lightdm-greeter/razorqt-lightdm-greeter-9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="razorqt-base/razorqt-libs
 	x11-misc/lightdm[qt4]"
 RDEPEND="${DEPEND}
 	razorqt-base/razorqt-data
+	razorqt-base/razorqt-power
 	!x11-misc/lightdm-razorqt-greeter"
 
 src_configure() {

diff --git a/razorqt-base/razorqt-meta/razorqt-meta-9999.ebuild b/razorqt-base/razorqt-meta/razorqt-meta-9999.ebuild
index d807a9f..f813a18 100644
--- a/razorqt-base/razorqt-meta/razorqt-meta-9999.ebuild
+++ b/razorqt-base/razorqt-meta/razorqt-meta-9999.ebuild
@@ -35,4 +35,13 @@ RDEPEND="~razorqt-base/libqtxdg-${PV}
 	~razorqt-base/razorqt-session-${PV}
 	lightdm? ( ~razorqt-base/razorqt-lightdm-greeter-${PV} )
 	policykit? ( ~razorqt-base/razorqt-policykit-${PV} )
+	|| ( x11-wm/openbox
+		kde-base/kwin
+		x11-wm/metacity
+		xfce-base/xfwm4
+		x11-wm/enlightenment
+		x11-wm/fvwm
+		x11-wm/sawfish
+		x11-wm/windowmaker
+	)
 	!x11-wm/razorqt"

diff --git a/razorqt-base/razorqt-session/razorqt-session-9999.ebuild b/razorqt-base/razorqt-session/razorqt-session-9999.ebuild
index e4cb156..0e64e66 100644
--- a/razorqt-base/razorqt-session/razorqt-session-9999.ebuild
+++ b/razorqt-base/razorqt-session/razorqt-session-9999.ebuild
@@ -24,21 +24,13 @@ IUSE=""
 
 DEPEND="razorqt-base/razorqt-libs"
 RDEPEND="${DEPEND}
-	razorqt-base/razorqt-data
-	|| ( x11-wm/openbox
-		kde-base/kwin
-		x11-wm/metacity
-		xfce-base/xfwm4
-		x11-wm/enlightenment
-		x11-wm/fvwm
-		x11-wm/sawfish
-		x11-wm/windowmaker
-	)"
+	razorqt-base/razorqt-data"
 
 src_configure() {
 	local mycmakeargs=(
 		-DSPLIT_BUILD=On
 		-DMODULE_SESSION=On
+		-DMODULE_CONFUPDATE=On
 		-DBUNDLE_XDG_UTILS=No
 	)
 	cmake-utils_src_configure