4 files changed, 3 insertions, 23 deletions

diff --git a/meta/packages/libmatchbox/libmatchbox.inc b/meta/packages/libmatchbox/libmatchbox.inc
index 8f9fe6d6a0..da86970ca6 100644
--- a/meta/packages/libmatchbox/libmatchbox.inc
+++ b/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}
-}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.7.bb b/meta/packages/libmatchbox/libmatchbox_1.7.bb
deleted file mode 100644
index be6d1884d6..0000000000
--- a/meta/packages/libmatchbox/libmatchbox_1.7.bb
+++ /dev/null
@@ -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}/
-}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/packages/libmatchbox/libmatchbox_1.9.bb
index a0c5e272c0..7e20feee2c 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/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 \
diff --git a/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/packages/libmatchbox/libmatchbox_svn.bb
index f203da56c5..52c1cc5728 100644
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/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 \