merge of '92b38b8c6e237f7df0177373a95c59b85ad01087'

     and 'd73006a33d6286f7506fbf07c816c81e2e9c215c'

66 files changed, 602 insertions, 807 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 3c555751da..fccf2b6d80 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -139,6 +139,13 @@ autotools_do_configure() {
 
 autotools_do_install() {
 	oe_runmake 'DESTDIR=${D}' install
+
+        for i in `find ${D} -name "*.la"` ; do \
+            sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+            sed -i -e s:${D}::g $i
+            sed -i -e 's:-I${WORKDIR}\S*: :g' $i
+            sed -i -e 's:-L${WORKDIR}\S*: :g' $i
+	done
 }
 
 STAGE_TEMP="${WORKDIR}/temp-staging"
diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index f2054b0b07..cd6e04731e 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -17,8 +17,17 @@ def get_pkgconfig_mangle(d):
 		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
 		s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
 		s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:-L${WORKDIR}\S*: :g'"
+		s += " -e 's:-I${WORKDIR}\S*: :g'"
+
 	return s
 
+do_install_append () {
+        for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
+                sed -i ${@get_pkgconfig_mangle(d)} ${pc}
+        done
+}
+
 do_stage_append () {
 	for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index d2fd4b0b04..a0da0667dd 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -89,7 +89,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
+	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 34a02514d3..17690d8277 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -148,7 +148,7 @@ PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.10.3"
-PREFERRED_VERSION_gtk+             = "2.10.12"
+PREFERRED_VERSION_gtk+             = "2.10.14"
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
 # catch up with api changes
diff --git a/packages/ecj/ecj-native_3.3.bb b/packages/ecj/ecj-native_3.3.bb
new file mode 100644
index 0000000000..ff2eb5f49e
--- /dev/null
+++ b/packages/ecj/ecj-native_3.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "JDT Core Batch Compiler"
+HOMEPAGE = "http://www.eclipse.org/"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "EPL"
+PR = "r0"
+
+inherit native
+
+SRC_URI = "http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecj.jar \
+	   file://ecj.sh"
+
+do_stage() {
+        install -d ${STAGING_BINDIR_NATIVE}
+        install -m 755 ${S}/../ecj.jar ${STAGING_BINDIR_NATIVE}
+	install -m 755 ${S}/../ecj.sh ${STAGING_BINDIR_NATIVE}/ecj
+}
diff --git a/packages/gcc/gcc-4.0.2/libstdc++-configure.patch b/packages/gcc/gcc-4.0.2/libstdc++-configure.patch
new file mode 100644
index 0000000000..8dc613104d
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2/libstdc++-configure.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure	2007-06-02 09:26:29.000000000 +0200
++++ gcc-4.0.2/libstdc++-v3/configure	2007-06-02 09:26:40.135215000 +0200
+@@ -101472,7 +101472,6 @@
+ _ACEOF
+ 
+ fi
+-done
+ 
+   fi
+ 
diff --git a/packages/gcc/gcc-4.2.0/.mtn2git_empty b/packages/gcc/gcc-4.2.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gcc/gcc-4.2.0/.mtn2git_empty
+++ b/packages/gcc/gcc-4.2.1/.mtn2git_empty
diff --git a/packages/gcc/gcc-4.2.0/100-uclibc-conf.patch b/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch
index 4243ff7b91..4243ff7b91 100644
--- a/packages/gcc/gcc-4.2.0/100-uclibc-conf.patch
+++ b/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch
diff --git a/packages/gcc/gcc-4.2.0/110-arm-eabi.patch b/packages/gcc/gcc-4.2.1/110-arm-eabi.patch
index acebe5308f..acebe5308f 100644
--- a/packages/gcc/gcc-4.2.0/110-arm-eabi.patch
+++ b/packages/gcc/gcc-4.2.1/110-arm-eabi.patch
diff --git a/packages/gcc/gcc-4.2.0/200-uclibc-locale.patch b/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch
index c933d1c446..c933d1c446 100644
--- a/packages/gcc/gcc-4.2.0/200-uclibc-locale.patch
+++ b/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch
diff --git a/packages/gcc/gcc-4.2.0/300-libstdc++-pic.patch b/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch
index 89d03a85e5..89d03a85e5 100644
--- a/packages/gcc/gcc-4.2.0/300-libstdc++-pic.patch
+++ b/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch
diff --git a/packages/gcc/gcc-4.2.0/301-missing-execinfo_h.patch b/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch
index 0e2092f3fb..0e2092f3fb 100644
--- a/packages/gcc/gcc-4.2.0/301-missing-execinfo_h.patch
+++ b/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch
diff --git a/packages/gcc/gcc-4.2.0/302-c99-snprintf.patch b/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch
index dfb22d681b..dfb22d681b 100644
--- a/packages/gcc/gcc-4.2.0/302-c99-snprintf.patch
+++ b/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch
diff --git a/packages/gcc/gcc-4.2.0/303-c99-complex-ugly-hack.patch b/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch
index 2ccc80d9bb..2ccc80d9bb 100644
--- a/packages/gcc/gcc-4.2.0/303-c99-complex-ugly-hack.patch
+++ b/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch
diff --git a/packages/gcc/gcc-4.2.0/304-index_macro.patch b/packages/gcc/gcc-4.2.1/304-index_macro.patch
index d8e476555d..d8e476555d 100644
--- a/packages/gcc/gcc-4.2.0/304-index_macro.patch
+++ b/packages/gcc/gcc-4.2.1/304-index_macro.patch
diff --git a/packages/gcc/gcc-4.2.0/602-sdk-libstdc++-includes.patch b/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch
index 23fce7544d..23fce7544d 100644
--- a/packages/gcc/gcc-4.2.0/602-sdk-libstdc++-includes.patch
+++ b/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch
diff --git a/packages/gcc/gcc-4.2.0/740-sh-pr24836.patch b/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch
index 7992282cff..7992282cff 100644
--- a/packages/gcc/gcc-4.2.0/740-sh-pr24836.patch
+++ b/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch
diff --git a/packages/gcc/gcc-4.2.0/800-arm-bigendian.patch b/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch
index 07c6093379..07c6093379 100644
--- a/packages/gcc/gcc-4.2.0/800-arm-bigendian.patch
+++ b/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch
diff --git a/packages/gcc/gcc-4.2.0/801-arm-bigendian-eabi.patch b/packages/gcc/gcc-4.2.1/801-arm-bigendian-eabi.patch
index 54490fc24f..54490fc24f 100644
--- a/packages/gcc/gcc-4.2.0/801-arm-bigendian-eabi.patch
+++ b/packages/gcc/gcc-4.2.1/801-arm-bigendian-eabi.patch
diff --git a/packages/gcc/gcc-4.2.0/README b/packages/gcc/gcc-4.2.1/README
index b85840dc20..b85840dc20 100644
--- a/packages/gcc/gcc-4.2.0/README
+++ b/packages/gcc/gcc-4.2.1/README
diff --git a/packages/gcc/gcc-4.2.0/arm-nolibfloat.patch b/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch
index c4897c0330..c4897c0330 100644
--- a/packages/gcc/gcc-4.2.0/arm-nolibfloat.patch
+++ b/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch
diff --git a/packages/gcc/gcc-4.2.0/arm-softfloat.patch b/packages/gcc/gcc-4.2.1/arm-softfloat.patch
index c86c83ed15..c86c83ed15 100644
--- a/packages/gcc/gcc-4.2.0/arm-softfloat.patch
+++ b/packages/gcc/gcc-4.2.1/arm-softfloat.patch
diff --git a/packages/gcc/gcc-4.2.0/arm-thumb-cache.patch b/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch
index fa63846c8c..fa63846c8c 100644
--- a/packages/gcc/gcc-4.2.0/arm-thumb-cache.patch
+++ b/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch
diff --git a/packages/gcc/gcc-4.2.0/arm-thumb.patch b/packages/gcc/gcc-4.2.1/arm-thumb.patch
index 69e2f68cf2..69e2f68cf2 100644
--- a/packages/gcc/gcc-4.2.0/arm-thumb.patch
+++ b/packages/gcc/gcc-4.2.1/arm-thumb.patch
diff --git a/packages/gcc/gcc-4.2.0/cache-amnesia.patch b/packages/gcc/gcc-4.2.1/cache-amnesia.patch
index ef7cd111c5..ef7cd111c5 100644
--- a/packages/gcc/gcc-4.2.0/cache-amnesia.patch
+++ b/packages/gcc/gcc-4.2.1/cache-amnesia.patch
diff --git a/packages/gcc/gcc-4.2.0/fix-ICE-in-arm_unwind_emit_set.diff b/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff
index 568e15abff..568e15abff 100644
--- a/packages/gcc/gcc-4.2.0/fix-ICE-in-arm_unwind_emit_set.diff
+++ b/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff
diff --git a/packages/gcc/gcc-4.2.0/gcc41-configure.in.patch b/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch
index 3d33bcb978..3d33bcb978 100644
--- a/packages/gcc/gcc-4.2.0/gcc41-configure.in.patch
+++ b/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch
diff --git a/packages/gcc/gcc-4.2.0/ldflags.patch b/packages/gcc/gcc-4.2.1/ldflags.patch
index 9576f60778..9576f60778 100644
--- a/packages/gcc/gcc-4.2.0/ldflags.patch
+++ b/packages/gcc/gcc-4.2.1/ldflags.patch
diff --git a/packages/gcc/gcc-4.2.0/sdk-libstdc++-includes.patch b/packages/gcc/gcc-4.2.1/sdk-libstdc++-includes.patch
index 4377c2143b..4377c2143b 100644
--- a/packages/gcc/gcc-4.2.0/sdk-libstdc++-includes.patch
+++ b/packages/gcc/gcc-4.2.1/sdk-libstdc++-includes.patch
diff --git a/packages/gcc/gcc-4.2.0/sh3-installfix-fixheaders.patch b/packages/gcc/gcc-4.2.1/sh3-installfix-fixheaders.patch
index a06cd2e075..a06cd2e075 100644
--- a/packages/gcc/gcc-4.2.0/sh3-installfix-fixheaders.patch
+++ b/packages/gcc/gcc-4.2.1/sh3-installfix-fixheaders.patch
diff --git a/packages/gcc/gcc-4.2.0/unbreak-armv4t.patch b/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch
index b3399abfdb..b3399abfdb 100644
--- a/packages/gcc/gcc-4.2.0/unbreak-armv4t.patch
+++ b/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch
diff --git a/packages/gcc/gcc-4.2.0/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
index 6afb10d6ef..6afb10d6ef 100644
--- a/packages/gcc/gcc-4.2.0/zecke-no-host-includes.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
diff --git a/packages/gcc/gcc-4.2.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
index 42ec190600..42ec190600 100644
--- a/packages/gcc/gcc-4.2.0/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
diff --git a/packages/gcc/gcc-cross-sdk_4.2.0.bb b/packages/gcc/gcc-cross-sdk_4.2.0.bb
deleted file mode 100644
index 71c2cd08a2..0000000000
--- a/packages/gcc/gcc-cross-sdk_4.2.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r0"
-
-inherit sdk
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
-require gcc_${PV}.bb
-require gcc4-build-sdk.inc
-require gcc-package-sdk.inc
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-        file://100-uclibc-conf.patch;patch=1 \
-        file://200-uclibc-locale.patch;patch=1 \
-        file://300-libstdc++-pic.patch;patch=1 \
-        file://301-missing-execinfo_h.patch;patch=1 \
-        file://302-c99-snprintf.patch;patch=1 \
-        file://303-c99-complex-ugly-hack.patch;patch=1 \
-        file://304-index_macro.patch;patch=1 \
-        file://602-sdk-libstdc++-includes.patch;patch=1 \
-        file://740-sh-pr24836.patch;patch=1 \
-        file://800-arm-bigendian.patch;patch=1 \
-        file://arm-nolibfloat.patch;patch=1 \
-        file://arm-softfloat.patch;patch=1 \
-        file://gcc41-configure.in.patch;patch=1 \
-        file://arm-thumb.patch;patch=1 \
-        file://arm-thumb-cache.patch;patch=1 \
-        file://ldflags.patch;patch=1 \
-        file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-        "
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
diff --git a/packages/gcc/gcc-cross_4.2.0.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 9025a98f3c..9025a98f3c 100644
--- a/packages/gcc/gcc-cross_4.2.0.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
diff --git a/packages/gcc/gcc_4.2.0.bb b/packages/gcc/gcc_4.2.1.bb
index b5c4b3c936..dd3a9c59cc 100644
--- a/packages/gcc/gcc_4.2.0.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -10,7 +10,7 @@ require gcc-package.inc
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
+#	file://200-uclibc-locale.patch;patch=1 \
 	file://300-libstdc++-pic.patch;patch=1 \
 	file://301-missing-execinfo_h.patch;patch=1 \
 	file://302-c99-snprintf.patch;patch=1 \
diff --git a/packages/gpephone/cms92init-0.1/.mtn2git_empty b/packages/gpephone/cms92init-0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/cms92init-0.1/.mtn2git_empty
diff --git a/packages/gpephone/cms92init-0.1/oe-install.patch b/packages/gpephone/cms92init-0.1/oe-install.patch
new file mode 100644
index 0000000000..23e321c6bd
--- /dev/null
+++ b/packages/gpephone/cms92init-0.1/oe-install.patch
@@ -0,0 +1,9 @@
+--- cms92init-simple/Makefile~	2007-05-24 12:14:31.000000000 +0200
++++ cms92init-simple/Makefile	2007-05-24 12:14:31.000000000 +0200
+@@ -12,5 +12,5 @@
+ 	
+ install:
+ 	install -d $(DESTDIR)/$(PREFIX)/bin
+-	install -m755  cms92init $(DESTDIR)/$(PREFIX)/bin
++	install -m 755  cms92init $(DESTDIR)/$(PREFIX)/bin
+ 
diff --git a/packages/gpephone/cms92init_0.1.bb b/packages/gpephone/cms92init_0.1.bb
index ab0388a45d..4b943f4a6d 100644
--- a/packages/gpephone/cms92init_0.1.bb
+++ b/