Remove gtk-directfb

similarity index 49%
rename from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 55b0b9d..aca3a67 100644
@@ -1,14 +1,9 @@
-SUMMARY = "GTK+ over DirectFB without X11"
-PR = "r1"
+SUMMARY = "DirectFB without X11"
+PR = "r0"
 LICENSE = "MIT"
 
 inherit packagegroup
 
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-gtk-directfb-base"
-RREPLACES_${PN} = "task-core-gtk-directfb-base"
-RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
-
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

@@ -17,7 +12,5 @@ RDEPENDS_${PN} = " \
 		pango \
 		pango-modules \
 		fontconfig \
-		gtk+ \
-		gtk-demo \
 		${TOUCH} \
 "

similarity index 78%
rename from meta/recipes-graphics/images/core-image-gtk-directfb.bb
rename to meta/recipes-graphics/images/core-image-directfb.bb
index 05f03cd..4f47185 100644
@@ -1,21 +1,20 @@
 LICENSE = "MIT"
-PR="r1"
+PR="r0"
 
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-
 inherit core-image
 
 IMAGE_INSTALL += "\
 	${CORE_IMAGE_BASE_INSTALL} \
 	packagegroup-core-basic \
-	packagegroup-core-gtk-directfb \
+	packagegroup-core-directfb \
 "
 
 python __anonymous () {
 	packages = d.getVar('DISTRO_FEATURES', True).split()
 	if "x11" in packages:
-		raise bb.parse.SkipPackage("FEATURE \"x11\" is in DISTRO_FEATURES, Please remove \"x11\" from DISTRO_FEATURES, use \"gtk-directfb\" instead of it\n")
+		raise bb.parse.SkipPackage("FEATURE \"x11\" is in DISTRO_FEATURES, Please remove \"x11\" from DISTRO_FEATURES, use \"directfb\" instead of it\n")
 }

index 97d3650..3a40409 100644
@@ -14,14 +14,9 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
 DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
  libgcrypt cairo gdk-pixbuf"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 
-# for gtk+ 2.x, have to pick either x11 or directfb not both
-# for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb will not be support as
-# a backend.
 PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
-PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb"
 
 inherit autotools gtk-doc pkgconfig update-alternatives
 

index d794840..fab360d 100644
@@ -29,7 +29,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "e2c16f119ed624893ecfc3775930ae4c"
 SRC_URI[sha256sum] = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac"

index 217e297..9bec6c2 100644
@@ -13,9 +13,9 @@ LICENSE = "MPL-1 & LGPLv2.1"
 X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 DEPENDS = "libpng fontconfig pixman glib-2.0"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
+           ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
 PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
-PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
+PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
 BBCLASSEXTEND = "native"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 

index 567a17f..49b1786 100644
@@ -2,7 +2,7 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"