5 files changed, 44 insertions, 6 deletions
diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb
new file mode 100644
index 0000000000..64e2e41275
--- /dev/null
+++ b/packages/evince/evince_0.9.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
+LICENSE = "GPL"
+SECTION = "x11/office"
+DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+RDEPENDS = "espgs "
+RRECOMMENDS = "gnome-vfs-plugin-file"
+PR = "r1"
+
+inherit gnome pkgconfig gtk-icon-cache
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
+           file://no-icon-theme.diff;patch=1;pnum=0 \
+           file://no-help-dir.patch;patch=1"
+
+EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+
diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
index 286a1edf8d..a2a38a0e2e 100644
--- a/packages/gpephone/ptim-engine_svn.bb
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine"
 
 S = "${WORKDIR}/imengine"
 
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
index 0d0ac653b5..4aa308ccbf 100644
--- a/packages/gpephone/ptim-helper_svn.bb
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper"
 
 S = "${WORKDIR}/imhelper"
 
diff --git a/packages/m4/m4-native_1.4.8.bb b/packages/m4/m4-native_1.4.8.bb
new file mode 100644
index 0000000000..7febc214df
--- /dev/null
+++ b/packages/m4/m4-native_1.4.8.bb
@@ -0,0 +1,21 @@
+require m4_${PV}.bb
+
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+DEPENDS += "gnu-config-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+do_configure()  {
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+	oe_runconf
+}
+
+do_stage() {
+	install -m 0755 src/m4 ${STAGING_BINDIR}/
+}
+
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index c7dbf15388..368e9374d2 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r39"
+PR = "r40"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -190,10 +190,11 @@ RDEPENDS_task-base-alsa = "\
     alsa-utils-alsamixer"
 
 #
-# alsa-state is machine related so can be missing in feed, OSS support is optional
+# alsa-states are machine related so can be missing in feed, OSS support is optional
 #
 RRECOMMENDS_task-base-alsa = "\
     alsa-state \
+    alsa-states \
     kernel-module-snd-mixer-oss \
     kernel-module-snd-pcm-oss"