merge of '4d01e12fde33f43c99f3c6215f4514d9f9d24479'

     and 'aa44d626baaae40ee498aea453176a8aea90d9fc'

35 files changed, 544 insertions, 148 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index d4a40eddba..5fa414d2b4 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -127,7 +127,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh10"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh11"
 
 PREFERRED_VERSION_linux_at91sam9263ek               ?= "2.6.20"
 
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index b16630510e..4e07379582 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -11,9 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -26,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  alsa-state"
+"
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
 #SERIAL_CONSOLE = "115200 ttySAC0"
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index a946f49c4f..45483fd21e 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -11,9 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -21,7 +19,12 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-ext2 \
-  alsa-state"
+  kernel-module-vfat \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-smdk2440 \
+  kernel-module-nls-iso8859-1 \
+  kernel-module-nls-cp437 \
+"
 
 SERIAL_CONSOLE = "115200 ttySAC2"
 
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index cd6a6dd6a1..5aeab899b3 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget  screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
 # Software/packages selection
@@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
                              kernel-module-i2c-pxa \
                              kernel-module-acx \
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 77bb0b5639..5f2814844d 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \
 			     kernel-module-blueangel_audio \
 			     kernel-module-blueangel_rom \
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
new file mode 100644
index 0000000000..2ddb808836
--- /dev/null
+++ b/conf/machine/include/palm.conf
@@ -0,0 +1,89 @@
+#
+# Hardware-based properties
+#
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_pxapwm_bl = "pxapwm_bl"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
+module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
+module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-module-ac97-bus \
+	kernel-module-apm-power \
+	kernel-module-backlight \
+	kernel-module-battery \
+	kernel-module-led-class \
+	kernel-module-lcd \
+	kernel-module-gpioed \
+	kernel-module-gpioed-ng \
+	kernel-module-external-power \
+	kernel-module-snd \
+	kernel-module-snd-ac97-codec \
+	kernel-module-snd-page-alloc \
+	kernel-module-snd-pcm \
+	kernel-module-snd-seq \
+	kernel-module-snd-seq-device \
+	kernel-module-snd-seq-midi-event \
+	kernel-module-snd-seq-oss \
+	kernel-module-snd-timer \
+	kernel-module-soundcore \
+	"
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 9857108472..99d85977b9 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -2,43 +2,15 @@
 #@NAME: Palm LifeDrive
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
-#
-# Hardware-based properties
-#
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth pcmcia irda wifi ext2 usbgadget screen"
-
-#
-# Software/packages selection
-#
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+MACHINE_FEATURES += "pcmcia wifi"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RRECOMMENDS = "\
-	kernel-module-ac97-bus \
-	kernel-module-apm-power \
-	kernel-module-backlight \
-	kernel-module-battery \
+MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-bcm2035-uart \
-	kernel-module-external-power \
-	kernel-module-gpioed \
-	kernel-module-gpioed-ng \
-	kernel-module-lcd \
-	kernel-module-led-class \
 	kernel-module-leds-palmld \
 	kernel-module-ledtrig-heartbeat \
 	kernel-module-ledtrig-hwtimer \
@@ -50,18 +22,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 	kernel-module-pda-power \
 	kernel-module-pxa2xx-core \
 	kernel-module-pxapwm-bl \
-	kernel-module-snd \
-	kernel-module-snd-ac97-codec \
-	kernel-module-snd-page-alloc \
-	kernel-module-snd-pcm \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-snd-seq \
-	kernel-module-snd-seq-device \
-	kernel-module-snd-seq-midi-event \
-	kernel-module-snd-seq-oss \
-	kernel-module-snd-timer \
-	kernel-module-soundcore \
 	kernel-module-wm97xx-ts \		
 	"
 
@@ -71,39 +33,3 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 
 module_conf_wm97xx-ts = "options wm97xx-ts pil=2"
 
-module_autoload_snd-ac97-bus = "snd-ac97-bus"
-module_autoload_apm_power = "apm_power"
-module_autoload_backlight = "backlight"
-module_autoload_battery = "battery"
-module_autoload_bcm2035_uart = "bcm2035_uart"
-module_autoload_gpioed = "gpioed"
-module_autoload_gpioed-ng = "gpioed-ng"
-module_autoload_lcd = "lcd"
-module_autoload_led-class = "led-class"
-module_autoload_leds-palmld = "leds-palmld"
-module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
-module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
-module_autoload_ledtrig-timer = "ledtrig-timer"
-module_autoload_palmld_battery = "palmld-battery"
-module_autoload_palmld_ide = "palmld-ide"
-module_autoload_palmld_pcmcia = "palmld-pcmcia"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_pcmcia_core = "pcmcia-core"
-module_autoload_pda_power = "pda_power"
-module_autoload_pxa2xx_core = "pxa2xx-core"
-module_autoload_pxapwm_bl = "pxapwm_bl"
-module_autoload_snd = "snd"
-module_autoload_snd-ac97-codec = "snd-ac97-codec"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-page-alloc = "snd-page-alloc"
-module_autoload_snd-pcm = "snd-pcm"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
-module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
-module_autoload_snd-seq = "snd-seq"
-module_autoload_snd-seq-device = "snd-seq-device"
-module_autoload_seq-midi-event = "seq-midi-event"
-module_autoload_snd-seq-oss = "snd-seq-oss"
-module_autoload_snd-timer = "snd-timer"
-module_autoload_soundcore = "soundcore"
-module_autoload_wm97xx-ts = "wm97xx-ts"
diff --git a/conf/machine/palmtt3.conf b/conf/machine/palmtt3.conf
index 8572838d2e..b4d65284ae 100644
--- a/conf/machine/palmtt3.conf
+++ b/conf/machine/palmtt3.conf
@@ -2,25 +2,8 @@
 #@NAME: Palm Tungsten|T3
 #@DESCRIPTION: Machine configuration for the Palm Tungsten|T3
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-PREFERRED_PROVIDER_linux = "linux-hackndev-2.6"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-#SRCDATE_linux-hackndev-2.6 = "20070217"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth ext2 usbgadget screen"
+require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
 
 SERIAL_CONSOLE = "115200 ttyS3"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-module_autoload_sa1100-rtc = "sa1100-rtc"
-
-#EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash --eraseblock=0x10000 -n"
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index a9b92ff7cc..4eb804aba0 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -2,14 +2,9 @@
 #@NAME: Palm TX
 #@DESCRIPTION: Machine configuration for the Palm TX
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+require conf/machine/include/palm.conf
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen"
+MACHINE_FEATURES += "pcmcia wifi"
 
 ROOT_FLASH_SIZE = "100"
 
@@ -17,16 +12,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
                            kernel-module-pxapwm-bl \
                            kernel-module-wm97xx-ts \
                            kernel-module-palmtx-battery"
-
-module_autoload_sa1100-rtc = "sa1100-rtc"
-module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_pxapwm-bl = "pxapwm-bl"
-module_autoload_wm97xx-ts = "wm97xx-ts"
-module_autoload_palmtx-battery = "palmtx-battery"
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index 3017d9da31..8bcdfc0eef 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -2,14 +2,7 @@
 #@NAME: Palm Zire 72
 #@DESCRIPTION: Machine configuration for the Palm Zire 72
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda ext2 usbgadget screen"
+require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
 
@@ -18,18 +11,13 @@ SERIAL_CONSOLE = "115200 ttyS0"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
 require conf/machine/include/tune-thumb.conf
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-i2c-pxa \
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
 			     kernel-module-i2c-core \
 			     kernel-module-i2c-algo-pxa \
 			     kernel-module-i2c-dev \
 			     kernel-module-palmz72-battery"
 
-module_autoload_sa1100-rtc = "sa1100-rtc"
-module_autoload_palmz72_battery = "palmz72_battery"
-module_autoload_i2c-dev = "i2c-dev"
-module_autoload_i2c-pxa = "i2c-pxa"
 module_autoload_g_ether = "g_ether"
 
diff --git a/packages/autoconf/autoconf-2.61/config-site.patch b/packages/autoconf/autoconf-2.61/config-site.patch
new file mode 100644
index 0000000000..0fa49720c1
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/config-site.patch
@@ -0,0 +1,13 @@
+Index: autoconf-2.61/lib/autoconf/general.m4
+===================================================================
+--- autoconf-2.61.orig/lib/autoconf/general.m4	2007-07-10 15:09:01.000000000 +0100
++++ autoconf-2.61/lib/autoconf/general.m4	2007-07-10 15:09:17.000000000 +0100
+@@ -1767,7 +1767,7 @@
+ m4_define([AC_SITE_LOAD],
+ [# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+-  set x "$CONFIG_SITE"
++  set x $CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+   set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb
index 370315f041..e6a452c9a0 100644
--- a/packages/autoconf/autoconf_2.61.bb
+++ b/packages/autoconf/autoconf_2.61.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://autoreconf-foreign.patch;patch=1 \
 	   file://autoreconf-gnuconfigize.patch;patch=1 \
 	   file://autoheader-nonfatal-warnings.patch;patch=1 \
+	   file://config-site.patch;patch=1 \
 	   ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb
new file mode 100644
index 0000000000..92c861f49c
--- /dev/null
+++ b/packages/automake/automake-native_1.10.bb
@@ -0,0 +1,3 @@
+PV := "${PV}"
+
+require automake-native.inc
diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.bb
new file mode 100644
index 0000000000..eef69f4e4a
--- /dev/null
+++ b/packages/automake/automake_1.10.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+
+S = "${WORKDIR}/automake-${PV}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+
+require automake.inc
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.9 ${D}${datadir}/automake
+	fi
+}
+
+DEFAULT_PREFERENCE = "-1"
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/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
new file mode 100644
index 0000000000..e6cc42bb65
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
@@ -0,0 +1,12 @@
+--- gcc-2005q3/gcc/config/arm/linux-eabi.h~	2007-07-10 09:19:47.000000000 +0930
++++ gcc-2005q3/gcc/config/arm/linux-eabi.h	2007-07-10 10:42:37.000000000 +0930
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++    " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index d1053dad1d..4f41ca06af 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -13,7 +13,8 @@ inherit autotools gettext
 require gcc-package.inc
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
-           file://gcc_optab_arm.patch;patch=1"
+           file://gcc_optab_arm.patch;patch=1 \
+           file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
 
 do_unpack2() {
 	cd ${WORKDIR}
diff --git a/packages/glib-2.0/glib-2.0_2.12.12.bb b/packages/glib-2.0/glib-2.0_2.12.12.bb
index 974081afce..2e5259073a 100644
--- a/packages/glib-2.0/glib-2.0_2.12.12.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.12.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
index 7abd755891..3fa6fe26ab 100644
--- a/packages/glib-2.0/glib.inc
+++ b/packages/glib-2.0/glib.inc
@@ -10,10 +10,11 @@ DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ " glib-2.0-utils "
 
-PR = "r1"
+PR = "r2"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN} = "${libdir}/lib*so.*"
 FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0"
 
 EXTRA_OECONF = "--disable-debug "
diff --git a/packages/gparted/.mtn2git_empty b/packages/gparted/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gparted/.mtn2git_empty
diff --git a/packages/gparted/files/.mtn2git_empty b/packages/gparted/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gparted/files/.mtn2git_empty
diff --git a/packages/gparted/files/cross.patch b/packages/gparted/files/cross.patch
new file mode 100644
index 0000000000..08d4a29e5a
--- /dev/null
+++ b/packages/gparted/files/cross.patch
@@ -0,0 +1,12 @@
+diff -ur gparted-0.3.3.org/configure.in gparted-0.3.3/configure.in
+--- gparted-0.3.3.org/configure.in	2006-12-06 15:23:35.000000000 +0200
++++ gparted-0.3.3/configure.in	2007-07-10 02:10:59.000000000 +0300
+@@ -37,7 +37,7 @@
+ AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
+ LIBS_save="$LIBS"
+ LIBS="-lparted -luuid -ldl"
+-AC_TRY_RUN(
++AC_TRY_LINK(
+ #include <stdio.h>
+ #include <parted/parted.h>
+ 
diff --git a/packages/gparted/files/gparted-0.3.3-llabs.patch b/packages/gparted/files/gparted-0.3.3-llabs.patch
new file mode 100644
index 0000000000..07c4020e57
--- /dev/null
+++ b/packages/gparted/files/gparted-0.3.3-llabs.patch
@@ -0,0 +1,72 @@
+--- src/GParted_Core.cc	2006/09/25 21:49:32	1.1
++++ src/GParted_Core.cc	2006/09/25 22:03:31
+@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons
+ 
+ 	while ( succes &&
+ 		timer .elapsed() <= smallest_time && 
+-		std::llabs( done ) + N <= length && 
++		llabs( done ) + N <= length && 
+ 		optimal_blocksize * 2 < N )
+ 	{
+ 		if ( done != 0 ) 
+@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons
+ 		      	    	    dst_device,
+ 		      	    	    src_start + ( dst_start > src_start ? 0 : done ),
+ 		      	    	    dst_start + ( dst_start > src_start ? 0 : done ),
+-		      	    	    length - std::llabs( done ), 
++		      	    	    length - llabs( done ), 
+ 		      	    	    optimal_blocksize,
+ 		      	    	    operationdetail,
+ 			    	    readonly,
+@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl
+ 	if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
+ 	{
+ 		Glib::ustring error_message ;
+-		buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ;
++		buf = static_cast<char *>( malloc( llabs( blocksize ) * 512 ) ) ;
+ 		if ( buf )
+ 		{
+ 			ped_device_sync( lp_device_dst ) ;
+@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl
+ 			operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
+ 			
+ 			Glib::Timer timer_progress_timeout, timer_total ;
+-			while( succes && std::llabs( done ) < length )
++			while( succes && llabs( done ) < length )
+ 			{
+ 				succes = copy_block( lp_device_src,
+ 						     lp_device_dst,
+@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl
+ 				if ( timer_progress_timeout .elapsed() >= 0.5 )
+ 				{
+ 					set_progress_info( length,
+-							   std::llabs( done + blocksize ),
++							   llabs( done + blocksize ),
+ 							   timer_total,
+ 							   operationdetail .get_last_child() .get_last_child(),
+ 							   readonly ) ;
+@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl
+ 
+ 		//final description
+ 		operationdetail .get_last_child() .get_last_child() .set_description( 
+-			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ;
++			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ;
+ 		
+ 		if ( ! succes && ! error_message .empty() )
+ 			operationdetail .get_last_child() .add_ch