merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'

     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'

58 files changed, 1142 insertions, 174 deletions

diff --git a/packages/blassic/.mtn2git_empty b/packages/blassic/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/blassic/.mtn2git_empty
diff --git a/packages/blassic/blassic_0.10.1.bb b/packages/blassic/blassic_0.10.1.bb
new file mode 100644
index 0000000000..52b5ae4644
--- /dev/null
+++ b/packages/blassic/blassic_0.10.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "classic basic interpreter"
+LICENSE = "GPLv2"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://www.blassic.org/bin/blassic-${PV}.tgz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-graphics=yes"
+
+
diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb
new file mode 100644
index 0000000000..d50e8e5fde
--- /dev/null
+++ b/packages/bluez/bluez-gnome_0.10.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb
index 65412663a0..ea5bbe6c2f 100644
--- a/packages/bluez/bluez-gnome_cvs.bb
+++ b/packages/bluez/bluez-gnome_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \
           "
  
-PV = "0.9+cvs${SRCDATE}"
+PV = "0.10+cvs${SRCDATE}"
 S = "${WORKDIR}/gnome"
 
 inherit autotools pkgconfig gconf
diff --git a/packages/bluez/bluez-gnome_git.bb b/packages/bluez/bluez-gnome_git.bb
index ac772f8825..e16fee109d 100644
--- a/packages/bluez/bluez-gnome_git.bb
+++ b/packages/bluez/bluez-gnome_git.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "BLuetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
+DEFAULT_PREFERENCE = "-2"
+
 DEPENDS = "dbus-glib gconf libnotify gtk+"
 
 SRC_URI = "git://people.freedesktop.org/~hadess/bluez-gnome;protocol=git \
            file://pkgconfig-add-gthread.patch;patch=1 "
 
-PV = "0.9+git${SRCDATE}"
+PV = "0.10+git${SRCDATE}"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gconf
diff --git a/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.38.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.13.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb
new file mode 100644
index 0000000000..5ea1429641
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.13.bb
@@ -0,0 +1,114 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+           file://hcid.conf \
+          "
+PR = "r0"
+
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --enable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+# The config options are explained below:
+
+#  --enable-obex           enable OBEX support
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-cups           install CUPS backend support
+#  --enable-bccmd          install BCCMD interface utility
+#  --enable-avctrl         install Audio/Video control utility
+#  --enable-hid2hci        install HID mode switching utility
+#  --enable-dfutool        install DFU firmware upgrade utility
+
+#  --enable-glib           For systems that use and install GLib anyway
+#  --disable-sdpd          The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+#	--enable-network
+#	--enable-serial
+#	--enable-input
+#	--enable-audio
+#	--enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+#	--enable-configfile
+#	--enable-initscripts
+
+#For even smaller -doc packages
+#	--disable-manpages
+#	--disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+#	--disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+			 " 
+
+FILES_${PN} = " \
+               ${base_sbindir}/hcid \
+               ${libdir}/bluetooth \
+               ${sysconfdir}/init.d/bluetooth \
+               ${sysconfdir}/bluetooth/*.service \
+               ${sysconfdir}/bluetooth/hcid.conf \
+               ${sysconfdir}/default \
+               ${sysconfdir}/dbus-1 \
+	       ${base_sbindir}/hciattach \
+              "
+
+FILES_${PN}-dbg += " \
+                   ${libdir}/bluetooth/.debug \
+		   ${libdir}/cups/backend/.debug \
+		   ${libdir}/alsa-lib/.debug \
+		  " 
+
+FILES_${PN}-compat = " \
+                    ${base_bindir}/sdptool \
+                    ${base_bindir}/dund \
+		    ${base_bindir}/rctest \
+		    ${base_bindir}/ciptool \
+		    ${base_bindir}/l2test \
+		    ${base_bindir}/rfcomm \
+		    ${base_bindir}/hcitool \
+		    ${base_bindir}/pand \
+		    ${base_bindir}/hidd \
+		    ${base_bindir}/l2ping \
+		    ${base_sbindir}/hciconfig \
+                    ${base_sbindir}/bccmd \
+		    ${base_sbindir}/hciemu \
+		    ${base_sbindir}/hid2hci \
+		    ${base_bindir}/passkey-agent \
+		    ${sysconfdir}/bluetooth/rfcomm.conf \
+		   " 
+
+FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
diff --git a/packages/classpath/classpath-minimal-native_0.95.bb b/packages/classpath/classpath-minimal-native_0.95.bb
new file mode 100644
index 0000000000..c7716ed639
--- /dev/null
+++ b/packages/classpath/classpath-minimal-native_0.95.bb
@@ -0,0 +1,8 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+inherit native
+
+require classpath-minimal.inc
+
diff --git a/packages/classpath/classpath-minimal.inc b/packages/classpath/classpath-minimal.inc
new file mode 100644
index 0000000000..5a2587b56c
--- /dev/null
+++ b/packages/classpath/classpath-minimal.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
+
+S = "${WORKDIR}/classpath-${PV}"
+
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+DEPENDS = "ecj-native zip-native"
+
+inherit autotools
+
+
+EXTRA_OECONF = "--with-glibj \
+                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+                --disable-alsa \
+                --disable-gconf-peer \
+                --disable-gtk-peer \
+                --disable-plugin \
+                --disable-dssi \
+                --disable-examples \
+               "
+do_install() {
+        :
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
+        install -d ${STAGING_LIBDIR}/java/classpath-minimal/
+        install -m 0644 lib/glibj.zip ${STAGING_LIBDIR}/java/classpath-minimal/
+}
+
+PACKAGES = " "
diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
new file mode 100644
index 0000000000..e489a4efc9
--- /dev/null
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -0,0 +1,5 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+require classpath-minimal.inc
diff --git a/packages/glibc/glibc_2.6.bb b/packages/glibc/glibc_2.6.bb
index d4803fa5cc..b3880df613 100644
--- a/packages/glibc/glibc_2.6.bb
+++ b/packages/glibc/glibc_2.6.bb
@@ -16,7 +16,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 
-GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index 4d4b80efbc..02beafa044 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -4,7 +4,7 @@ PR = "r2"
 DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
+DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/packages/gnome/gnome-keyring_0.6.0.bb b/packages/gnome/gnome-keyring_0.6.0.bb
new file mode 100644
index 0000000000..dd6235263d
--- /dev/null
+++ b/packages/gnome/gnome-keyring_0.6.0.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+inherit gnome
+
+DEPENDS = "gtk+"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/gnome/gnome-menus_2.16.1.bb b/packages/gnome/gnome-menus_2.16.1.bb
index 30e0abc14f..1307c026f2 100644
--- a/packages/gnome/gnome-menus_2.16.1.bb
+++ b/packages/gnome/gnome-menus_2.16.1.bb
@@ -1,6 +1,7 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
+PR = "r1"
 
 inherit gnome pkgconfig
 
@@ -11,4 +12,6 @@ autotools_stage_all
 PACKAGES += "${PN}-python"
 FILES_${PN} += "${datadir}/desktop-directories/"
 FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
+                    ${libdir}/python*/site-packages/.debug"
 
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
new file mode 100644
index 0000000000..349951143b
--- /dev/null
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
+
+inherit gnome pkgconfig
+
+
+do_configure_prepend() {
+        sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/gnome/gnome-power-manager_2.18.3.bb b/packages/gnome/gnome-power-manager_2.18.3.bb
new file mode 100644
index 0000000000..3963da3912
--- /dev/null
+++ b/packages/gnome/gnome-power-manager_2.18.3.bb
@@ -0,0 +1,29 @@
+LICENSE = "GPLv2"
+DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " 
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = " --disable-scrollkeeper \
+                 --disable-keyring \
+		 "
+
+do_configure_append() {
+        rm config.log
+}
+
+PACKAGES =+ "${PN}-applets"
+
+FILES_${PN}-applets = "${bindir}/*applet* \
+                       ${libdir}/bonobo/servers \
+		       ${datadir}/gnome-2.0/ui"
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/dbus-1 \
+		${datadir}/gnome/autostart \
+		"
+
+FILE_{PN}-doc += "${datadir}/omf \
+                  ${datadir}/gnome/help "
+
diff --git a/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty b/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.18.1/.mtn2git_empty
diff --git a/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch
new file mode 100644
index 0000000000..3dbc130ddc
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.6.0/configure.in~	2004-03-22 12:36:23.000000000 +0000
++++ gnome-vfs-2.6.0/configure.in	2004-06-07 16:04:34.000000000 +0100
+@@ -154,7 +154,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ 
+ if test x"$GCONFTOOL" = xno; then
+-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+ 
+ AM_GCONF_SOURCE_2
diff --git a/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch
new file mode 100644
index 0000000000..e25ecdd66f
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch
@@ -0,0 +1,51 @@
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig	2007-01-05 19:42:26.418541610 +0200
++++ configure.in	2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-					   
+-if test "x$KRB5_CONFIG" != "xnone"; then
+-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-   
+-   saved_CPPFLAGS="$CPPFLAGS"
+-   saved_LIBS="$LIBS"
+-   LIBS="$LIBS $GSSAPI_LIBS"
+-   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+-   # MIT and Heimdal put gssapi.h in different places
+-   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+-       AC_CHECK_FUNCS(gss_init_sec_context, [
+-           AC_MSG_NOTICE([GSSAPI authentication support enabled])
+-           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+-           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+-		 have_gssapi=yes
+-	 
+-       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+-       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+-          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
+-             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+-		], [
+-		    #ifdef HAVE_GSSAPI_GSSAPI_H
+-		    #include <gssapi/gssapi.h>
+-		    #else	   
+-		    #include <gssapi.h>
+-		    #endif
+-		])
+-	  ])
+-     break
+-   ])
+-   LIBS="$saved_LIBS" 
+-   CPPFLAGS="$saved_CPPFLAGS" 
+-fi   
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+ 	   
+ dnl ******************************
+ dnl http-method (neon checks)
diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb
new file mode 100644
index 0000000000..4ae7406a46
--- /dev/null
+++ b/packages/gnome/gnome-vfs_2.18.1.bb
@@ -0,0 +1,38 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
+
+PR = "r0"
+
+inherit gnome
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = " \
+		 --disable-openssl \
+		 --enable-gnutls \
+		 --enable-avahi \
+                 --with-samba-includes=${STAGING_INCDIR} \
+               "
+
+FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+do_stage () {
+autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
diff --git a/packages/gnome/libwnck_2.13.5.bb b/packages/gnome/libwnck_2.13.5.bb
new file mode 100644
index 0000000000..1830a7540a
--- /dev/null
+++ b/packages/gnome/libwnck_2.13.5.bb
@@ -0,0 +1,10 @@
+LICENSE =	"LGPL"
+DEPENDS = 	"gtk+"
+DESCRIPTION =	"Window navigation construction toolkit"
+HOMEPAGE =	""
+
+inherit gnome
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
new file mode 100644
index 0000000000..4916411f0a
--- /dev/null
+++ b/packages/gnuradio/gnuradio.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "GNU Radio"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
+
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+RDEPENDS_gnuradio-usrp = "python-core"
+
+inherit autotools pkgconfig
+
+CXXFLAGS_powerpc += "-lstdc++"
+
+export BUILD_SYS := "${BUILD_SYS}"
+export HOST_SYS := "${HOST_SYS}"
+
+EXTRA_OECONF = " \
+                --disable-gr-atsc \
+		--enable-gr-video-sdl \
+		--enable-gr-audio-alsa  \
+                --enable-gr-audio-jack \
+                --enable-gr-audio-oss \
+                --enable-mblock \