Revert unintended commits

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5353 311d38ba-8fff-0310-9ca6-ca027cbcb966

11 files changed, 6 insertions, 38 deletions

diff --git a/meta/packages/base-files/base-files_3.0.14.bb b/meta/packages/base-files/base-files_3.0.14.bb
index b4e2b665de..aa61a1d39a 100644
--- a/meta/packages/base-files/base-files_3.0.14.bb
+++ b/meta/packages/base-files/base-files_3.0.14.bb
@@ -47,8 +47,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
 	   /mnt /media /media/card /media/cf /media/net /media/ram \
 	   /media/union /media/realroot /media/hdd \
 	   /media/mmc1"
-volatiles = "log lock tmp"
-volatiles2 = "cache run"
+volatiles = "cache run log lock tmp"
 conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
 	     ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
 	     ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
@@ -76,10 +75,6 @@ do_install () {
 	for d in ${volatiles}; do
 		ln -sf volatile/$d ${D}/${localstatedir}/$d
 	done
-	for d in ${volatiles2}; do
-		install -d ${D}/${localstatedir}/$d
-	done
-
 	for d in card cf net ram; do
 		ln -sf /media/$d ${D}/mnt/$d
 	done
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index f3b11b2c76..3f7eca4b4e 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -72,6 +72,5 @@ do_configure_append () {
 
 do_install () {
 	autotools_do_install
-	rm -fr ${D}/var/cache
 }
 
diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
index b4b137325e..1b79e09942 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -2,6 +2,7 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf"
+PROVIDES = "matchbox-wm"
 
 PV = "1.2+svnr${SRCREV}"
 PR = "r4"
diff --git a/meta/packages/ncurses/ncurses-native_5.6.bb b/meta/packages/ncurses/ncurses-native_5.6.bb
index 310a4bb27c..e69de29bb2 100644
--- a/meta/packages/ncurses/ncurses-native_5.6.bb
+++ b/meta/packages/ncurses/ncurses-native_5.6.bb
@@ -1,4 +0,0 @@
-require ncurses_${PV}.bb
-inherit native
-EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
-DEPENDS = ""
diff --git a/meta/packages/ncurses/ncurses-sdk_5.6.bb b/meta/packages/ncurses/ncurses-sdk_5.6.bb
index fb69c1ec7d..e69de29bb2 100644
--- a/meta/packages/ncurses/ncurses-sdk_5.6.bb
+++ b/meta/packages/ncurses/ncurses-sdk_5.6.bb
@@ -1,3 +0,0 @@
-require ncurses_${PV}.bb
-inherit sdk
-EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
index b4ec69d92b..fd0885356b 100644
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/packages/ncurses/ncurses.inc
@@ -15,7 +15,7 @@ inherit autotools
 # clear/reset are in already busybox
 FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack "
 FILES_ncurses-terminfo = "${datadir}/terminfo"
-FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* /usr/share/tabset /etc/terminfo"
+FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo"
 
 PARALLEL_MAKE=""
 
diff --git a/meta/packages/ncurses/ncurses_5.6.bb b/meta/packages/ncurses/ncurses_5.6.bb
index f09de84653..e69de29bb2 100644
--- a/meta/packages/ncurses/ncurses_5.6.bb
+++ b/meta/packages/ncurses/ncurses_5.6.bb
@@ -1,11 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
-           file://makefile_tweak.patch;patch=1 \
-	   file://configure_fix.patch;patch=1"
-#           file://visibility.patch;patch=1"
-S = "${WORKDIR}/ncurses-${PV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-require ncurses.inc
diff --git a/meta/packages/rpm/rpm_4.4.2.3.bb b/meta/packages/rpm/rpm_4.4.2.3.bb
index 8a783c7b72..ef6087893c 100644
--- a/meta/packages/rpm/rpm_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
diff --git a/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb b/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb
index d063bf4f34..0959cb25d6 100644
--- a/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb
+++ b/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb
@@ -1,9 +1,5 @@
 require shared-mime-info.inc
 
-PR = "r1"
-
 inherit native
 
-DEPENDS = "libxml2-native intltool-native glib-2.0-native"
-
 S = "${WORKDIR}/shared-mime-info-${PV}"
diff --git a/meta/packages/tasks/task-poky-tools.bb b/meta/packages/tasks/task-poky-tools.bb
index 2fc922d179..f3f30c0b39 100644
--- a/meta/packages/tasks/task-poky-tools.bb
+++ b/meta/packages/tasks/task-poky-tools.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Tools tasks for Poky"
-PR = "r2"
+PR = "r1"
 
 PACKAGES = "\
     task-poky-tools-debug \
@@ -55,5 +55,3 @@ RDEPENDS_task-poky-tools-testapps = "\
     xwininfo \
     xprop \
     xvideo-tests"
-
-RDEPENDS_task-poky-tools-testapps_append_beagleboard = " omapfbplay ffmpeg"
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index 1c1507bfe3..4e4204345c 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Tasks for OpenedHand Poky"
-PR = "r31"
+PR = "r30"
 
 PACKAGES = "\
     task-poky-apps-console \
@@ -38,9 +38,6 @@ RDEPENDS_task-poky-apps-console = "\
 RDEPENDS_task-poky-x11-base = "\
     dbus \
     pointercal \
-    fontconfig \
-    freetype \
-    shared-mime-info \
     matchbox-wm \
     matchbox-keyboard \
     matchbox-keyboard-applet \