libmatchbox: Drop 1.7 (old version), use autotools_stage instead of broken custom staging function

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

meta/packages/libmatchbox/libmatchbox.inc

@@ -2,22 +2,9 @@ SECTION = "x11/libs"
 DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
-PR="r3"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"
 
 S = "${WORKDIR}/libmatchbox-${PV}"
-
-headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \
-	   mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h"
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/libmb
-	for h in ${headers}; do
-		install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/
-	done
-
-	oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR}
-}

meta/packages/libmatchbox/libmatchbox_1.7.bb

@@ -1,8 +0,0 @@
-require libmatchbox.inc
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-	   file://check.m4"
-
-do_configure_prepend () {
-	cp ${WORKDIR}/check.m4 ${S}/
-}

meta/packages/libmatchbox/libmatchbox_1.9.bb

@@ -1,6 +1,6 @@
 require libmatchbox.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
            file://16bppfixes.patch;patch=1 \

meta/packages/libmatchbox/libmatchbox_svn.bb

@@ -1,6 +1,7 @@
 require libmatchbox.inc
 
 PV = "1.7+svnr${SRCREV}"
+PR = "r3"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \