merge of '5b5a99c95ab4ee23e5e5c0460ba6744420c75edb'

     and '84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6'

14 files changed, 69 insertions, 19 deletions

diff --git a/packages/font-update-common/.mtn2git_empty b/packages/font-update-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/font-update-common/.mtn2git_empty
diff --git a/packages/font-update-common/files/.mtn2git_empty b/packages/font-update-common/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/font-update-common/files/.mtn2git_empty
diff --git a/packages/font-update-common/files/update-fonts b/packages/font-update-common/files/update-fonts
new file mode 100644
index 0000000000..19e3157d2f
--- /dev/null
+++ b/packages/font-update-common/files/update-fonts
@@ -0,0 +1,4 @@
+#!/bin/sh
+#Author: Rolf Leggewie
+
+run-parts /etc/update-fonts-common.d/
diff --git a/packages/font-update-common/font-update-common_0.1.bb b/packages/font-update-common/font-update-common_0.1.bb
new file mode 100644
index 0000000000..eae0a8a55f
--- /dev/null
+++ b/packages/font-update-common/font-update-common_0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Scripts to be called when fonts are installed or removed \
+to make them known to the WM, whether X11 or Opie"
+AUTHOR = "Rolf Leggewie <oe-devel@rolf.leggewie.biz"
+
+SRC_URI = "file://update-fonts"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${sysconfdir}/update-fonts-common.d/
+        install -m 0755 ${WORKDIR}/update-fonts ${D}${bindir}
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.31.bb b/packages/gpe-filemanager/gpe-filemanager_0.31.bb
new file mode 100644
index 0000000000..84bf2d3d2f
--- /dev/null
+++ b/packages/gpe-filemanager/gpe-filemanager_0.31.bb
@@ -0,0 +1,13 @@
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit autotools gpe
+
+PR          = "r0"
+LICENSE     = "GPL"
+DESCRIPTION = "GPE file manager"
+DEPENDS     = "libgpewidget gnome-vfs dbus-glib"
+SECTION = "gpe"
+RDEPENDS    = "gpe-icons"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
+
+FILES_${PN} += " ${datadir}/gpe"
diff --git a/packages/gpephone/libgpephone_svn.bb b/packages/gpephone/libgpephone_svn.bb
index 255d251eff..ce960ac3cc 100644
--- a/packages/gpephone/libgpephone_svn.bb
+++ b/packages/gpephone/libgpephone_svn.bb
@@ -6,8 +6,10 @@ DEPENDS     = "gtk+ gtk-doc dbus-glib"
 PV = "0.4+svnr-${SRCREV}"
 PR          = "r0"
 
-SRC_URI = "${GPEPHONE_SVN}"
 inherit gpephone pkgconfig autotools
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/gsm/libgsmd-lips_svn.bb b/packages/gsm/libgsmd-lips_svn.bb
deleted file mode 100644
index 081833dc2b..0000000000
--- a/packages/gsm/libgsmd-lips_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-BASEPN = "gsmd-lips"
-CONFLICTNAME = "gsmd-devel gsmd"
-
-require gsmd.inc
-
-RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel libtapi libgsmd-dev"
-
-PV = "0.0+svnr${SRCREV}"
-PR = "r3"
-
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=gsm \
-           file://gsmd \
-           file://default"
-
diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb
new file mode 100644
index 0000000000..74205da673
--- /dev/null
+++ b/packages/libgcrypt/libgcrypt_1.4.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+DEPENDS = "libgpg-error"
+PR = "r1"
+
+# move libgcrypt-config into -dev package
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
+
+ARM_INSTRUCTION_SET = "arm"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/madwifi/madwifi-ng_r2702-20070903.bb b/packages/madwifi/madwifi-ng_r2702-20070903.bb
index 43a491bd1f..627d4f52b5 100644
--- a/packages/madwifi/madwifi-ng_r2702-20070903.bb
+++ b/packages/madwifi/madwifi-ng_r2702-20070903.bb
@@ -2,8 +2,6 @@
 
 # Don't use this unless you know what you're doing -- this version does
 # *NOT* build on BE kernels.
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
diff --git a/packages/madwifi/madwifi-ng_r2826-20071105.bb b/packages/madwifi/madwifi-ng_r2826-20071105.bb
index 5a8bb116a3..5301e3bd42 100644
--- a/packages/madwifi/madwifi-ng_r2826-20071105.bb
+++ b/packages/madwifi/madwifi-ng_r2826-20071105.bb
@@ -1,6 +1,7 @@
 # Bitbake recipe for the madwifi-ng driver
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_alix = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
 # Disable stripping of kernel modules, since this action strips too
diff --git a/packages/openssl/openssl-0.9.7g/avr32.patch b/packages/openssl/openssl-0.9.7g/avr32.patch
new file mode 100644
index 0000000000..b6ac81b717
--- /dev/null
+++ b/packages/openssl/openssl-0.9.7g/avr32.patch
@@ -0,0 +1,10 @@
+--- Configure~	2008-01-23 17:44:04.000000000 +0100
++++ Configure	2008-01-23 17:44:04.000000000 +0100
+@@ -442,6 +442,7 @@
+ "linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc32.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # -bpowerpc64-linux is transient option, -m64 should be the one to use...
++"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
+ "linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
+ "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb
index c128275867..3a420001c9 100644
--- a/packages/openssl/openssl_0.9.7g.bb
+++ b/packages/openssl/openssl_0.9.7g.bb
@@ -2,10 +2,11 @@ inherit pkgconfig
 
 require openssl.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
             file://gnueabi-arm.patch;patch=1 \
             file://gnueabi-armeb.patch;patch=1 \
-            file://uclibcgnueabi.patch;patch=1"
+            file://uclibcgnueabi.patch;patch=1 \
+            file://avr32.patch;patch=1;pnum=0"
diff --git a/packages/zbedic/libbedic_1.0.bb b/packages/zbedic/libbedic_1.1.bb
index 4ffb13cee0..4ffb13cee0 100644
--- a/packages/zbedic/libbedic_1.0.bb
+++ b/packages/zbedic/libbedic_1.1.bb
diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.2.bb
index afdfdd5350..afdfdd5350 100644
--- a/packages/zbedic/zbedic_1.0.bb
+++ b/packages/zbedic/zbedic_1.2.bb