From 07db74000443c473db401df598c4654fa6660436 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Thu, 30 Aug 2012 13:58:00 +0100
Subject: [PATCH] packagegroup-qt4e: tidy up and rename

* Eliminate the -base package, there's only one package and it might as
  well be the main one.
* Rename to packagegroup-core-qt4e to match other package group recipes
* Fix and tidy up qt4e-demo-image at the same time

(From OE-Core rev: 9dddc9dfdc84401fee3b48eb3aba0cabdcf4d05a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-qt/images/qt4e-demo-image.bb              | 10 ++--------
 ...{packagegroup-qt4e.bb => packagegroup-core-qt4e.bb} |  6 ++----
 2 files changed, 4 insertions(+), 12 deletions(-)
 rename meta/recipes-qt/packagegroups/{packagegroup-qt4e.bb => packagegroup-core-qt4e.bb} (94%)

diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 205c912168..9e8b3379ff 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -1,19 +1,13 @@
 DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt."
 LICENSE = "MIT"
-PR="r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-DEPENDS += "packagegroup-qt4e"
-
-RDEPENDS_${PN} += " \
-	packagegroup-qt4e-base \
-	"
-
 IMAGE_INSTALL += "\
 	${CORE_IMAGE_BASE_INSTALL} \
-	packagegroup-qt4e-base \
+	packagegroup-core-qt4e \
 "
 
 inherit core-image
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
similarity index 94%
rename from meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
rename to meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 2ee7959c0c..2ea9c2e551 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-PACKAGES = "${PN}-base"
-
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
-RDEPENDS_${PN}-base = " \
+RDEPENDS_${PN} = " \
 	qt4-embedded \
 	libqt-embedded3support4 \
 	libqt-embeddedclucene4 \
@@ -48,7 +46,7 @@ RDEPENDS_${PN}-base = " \
         qt4-embedded-assistant \
 "
 
-RRECOMMENDS_${PN}-base = " \
+RRECOMMENDS_${PN} = " \
 	libqt-embeddedxmlpatterns4 \
 "