Merge bk://openembedded@openembedded.bkbits.net/packages

into handhelds.org:/home/mhentges/OpenEmbedded/packages

2004/10/12 16:03:13+02:00 handhelds.org!CoreDump
More section fixes

BKrev: 416be478U3wZ_yiCDqd0QreoBYPNrg

81 files changed, 559 insertions, 65 deletions

diff --git a/dvbtools/dvbstream_cvs.oe b/dvbtools/dvbstream_cvs.oe
index af5589173b..c65a30d816 100644
--- a/dvbtools/dvbstream_cvs.oe
+++ b/dvbtools/dvbstream_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-SECTION = "console/dvb"
+SECTION = "console/multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libxml2"
diff --git a/dvbtools/dvbtune_cvs.oe b/dvbtools/dvbtune_cvs.oe
index e9d60ea766..14260ecd2b 100644
--- a/dvbtools/dvbtune_cvs.oe
+++ b/dvbtools/dvbtune_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-SECTION = "console/dvb"
+SECTION = "console/multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libxml2"
diff --git a/flac/flac_1.1.0.oe b/flac/flac_1.1.0.oe
index e69de29bb2..e9c2bf921a 100644
--- a/flac/flac_1.1.0.oe
+++ b/flac/flac_1.1.0.oe
@@ -0,0 +1,69 @@
+DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "libs"
+DEPENDS = "libogg"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
+	   file://xmms.m4"
+S = "${WORKDIR}/flac-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
+		--with-ogg-libraries=${STAGING_LIBDIR} \
+		--with-ogg-includes=${STAGING_INCDIR} \
+		--without-xmms-prefix \
+		--without-xmms-exec-prefix \
+		--without-libiconv-prefix \
+		--without-id3lib"
+
+do_configure () {
+	install -d ${S}/m4
+	install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
+	autotools_do_configure
+}
+
+do_stage () {
+	install -d ${STAGING_DATADIR}/aclocal
+
+	oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/OggFLAC
+	install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
+	install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
+	install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
+	install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
+	install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
+
+	oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/FLAC
+	install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
+	install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
+	install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
+	install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
+	install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
+	install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
+	install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
+	install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
+	install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
+	install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
+	install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
+	install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
+	install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
+
+	oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/FLAC++
+	install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
+	install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
+	install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
+	install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
+	install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
+	install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
+
+	oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/OggFLAC++
+	install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
+	install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
+	install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
+	install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
+	install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/frodo/frodo_4.1b.oe b/frodo/frodo_4.1b.oe
index e69de29bb2..59016835e0 100644
--- a/frodo/frodo_4.1b.oe
+++ b/frodo/frodo_4.1b.oe
@@ -0,0 +1,45 @@
+DESCRIPTION = "A C64 emulator based on SDL."
+SECTION = "opie/utils"
+DEPENDS = "libsdl-qpe"
+
+SRC_URI = "http://wwwthep.physik.uni-mainz.de/~cbauer/FrodoV4_1b.Src.tar.gz \
+           file://frodo-qte.diff;patch=1 \
+           file://frodo-joystick-4state.diff;patch=1 \
+           file://frodorc \
+           file://Frodo.png \
+           file://frodo.desktop"
+S = "${WORKDIR}/Frodo-${PV}/Src"
+
+inherit autotools 
+
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_install() {
+        install -d ${D}/${palmtopdir}/bin \
+        	   ${D}/${palmtopdir}/apps/Games \
+        	   ${D}/${palmtopdir}/pics
+	install -m 0644 ${WORKDIR}/Frodo.png ${D}/${palmtopdir}/pics/Frodo.png
+	install -m 0644 ${WORKDIR}/frodo.desktop ${D}/${palmtopdir}/apps/Games/frodo.desktop
+	# start script and executable
+	install -d ${D}/${palmtopdir}/bin/${PN}
+	install -m 0755 Frodo ${D}/${palmtopdir}/bin/${PN}/Frodo
+	cat <<STARTER_EOF > ${D}/${palmtopdir}/bin/${PN}/frodostart
+#!/bin/sh
+cd ${palmtopdir}/bin/${PN}
+./Frodo
+STARTER_EOF
+	chmod 0755 ${D}/${palmtopdir}/bin/${PN}/frodostart
+	ln -sf ${PN}/frodostart ${D}/${palmtopdir}/bin/Frodo
+	# conffiles
+	install -d ${D}/${sysconfdir}
+	install -m 644 ${WORKDIR}/frodorc ${D}/${sysconfdir}/frodorc
+}
+
+FILES_${PN} = "${palmtopdir} ${sysconfdir}"
+
+#FIXME: Add postinst which copies /etc/frodorc into $HOME/.frodorc
diff --git a/frodo/frodo_4.2.oe b/frodo/frodo_4.2.oe
index ca82fd1206..e7a2d4db13 100644
--- a/frodo/frodo_4.2.oe
+++ b/frodo/frodo_4.2.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "C64 Emulator based on SDL"
-SECTION = "games"
+SECTION = "opie/utils"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 CVSDATE = "20040801"
diff --git a/gammu/gammu_0.98.9.oe b/gammu/gammu_0.98.9.oe
index 7bc613a9da..60265a9824 100644
--- a/gammu/gammu_0.98.9.oe
+++ b/gammu/gammu_0.98.9.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
 AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-SECTION = "base"
+SECTION = "console/network"
 
 SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/test/gammu-${PV}.tar.gz \
 file://ldflags.patch;patch=1 \
diff --git a/gcc-csl/gcc-csl_2004-q1a.oe b/gcc-csl/gcc-csl_2004-q1a.oe
index 7c6c83d93d..b179975816 100644
--- a/gcc-csl/gcc-csl_2004-q1a.oe
+++ b/gcc-csl/gcc-csl_2004-q1a.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "devel"
 inherit autotools
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
diff --git a/gdb/gdb-cross_6.1.oe b/gdb/gdb-cross_6.1.oe
index 526f095279..54558656ab 100644
--- a/gdb/gdb-cross_6.1.oe
+++ b/gdb/gdb-cross_6.1.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "gdb - GNU debugger"
-SECTION = "base"
+SECTION = "devel"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
 DEPENDS = "ncurses-native"
diff --git a/gdb/gdb-cross_6.2.oe b/gdb/gdb-cross_6.2.oe
index e69de29bb2..54558656ab 100644
--- a/gdb/gdb-cross_6.2.oe
+++ b/gdb/gdb-cross_6.2.oe
@@ -0,0 +1,35 @@
+DESCRIPTION = "gdb - GNU debugger"
+SECTION = "devel"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+DEPENDS = "ncurses-native"
+
+inherit autotools sdk
+
+S = "${WORKDIR}/gdb-${PV}"
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
+	file://sim-install.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gdb-${PV}"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CXX_FOR_BUILD = "${BUILD_CXX}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+
+EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
+
+EXTRA_OECONF = "--with-curses --with-readline"
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+	gnu-configize
+	oe_runconf
+}
+
+do_stage() {
+	:	
+}
diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index 6c13efc9aa..5e950668a4 100644
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -1,4 +1,4 @@
-SECTION = "gnome/base"
+SECTION = "x11/gnome"
 DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
 	   file://backends.patch;patch=1"
diff --git a/gnome/gnome-common_2.4.0.oe b/gnome/gnome-common_2.4.0.oe
index 6ad7efa577..8d74dfc47b 100644
--- a/gnome/gnome-common_2.4.0.oe
+++ b/gnome/gnome-common_2.4.0.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/base"
+SECTION = "x11/gnome"
 PR = "r0"
 DESCRIPTION = "Common macros for building GNOME applications"
 inherit gnome
diff --git a/gnome/gnome-desktop_2.7.90.oe b/gnome/gnome-desktop_2.7.90.oe
index 5b8562a9a5..cb597645e5 100644
--- a/gnome/gnome-desktop_2.7.90.oe
+++ b/gnome/gnome-desktop_2.7.90.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome"
 PR = "r0"
 DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome
diff --git a/gnome/gnome-games_2.6.1.oe b/gnome/gnome-games_2.6.1.oe
index e1d5529416..f3448fc54f 100644
--- a/gnome/gnome-games_2.6.1.oe
+++ b/gnome/gnome-games_2.6.1.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/games"
+SECTION = "x11/gnome"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
 PR = "r2"
diff --git a/gnome/gnome-icon-theme_1.3.3.oe b/gnome/gnome-icon-theme_1.3.3.oe
index ebe1fb387f..7688d6fbd3 100644
--- a/gnome/gnome-icon-theme_1.3.3.oe
+++ b/gnome/gnome-icon-theme_1.3.3.oe
@@ -1,4 +1,4 @@
-SECTION = "x11"
+SECTION = "x11/gnome"
 SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2"
 
 FILES_${PN} += "${datadir}/icons"
diff --git a/gnome/gnome-keyring_0.2.1.oe b/gnome/gnome-keyring_0.2.1.oe
index f6232ed855..6f672e2c2c 100644
--- a/gnome/gnome-keyring_0.2.1.oe
+++ b/gnome/gnome-keyring_0.2.1.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/utils"
+SECTION = "x11/gnome"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/0.2/${PN}-${PV}.tar.bz2"
 
 inherit autotools libtool pkgconfig
diff --git a/gnome/gnome-mime-data_2.4.1.oe b/gnome/gnome-mime-data_2.4.1.oe
index 81edcfa1e0..5775919fd6 100644
--- a/gnome/gnome-mime-data_2.4.1.oe
+++ b/gnome/gnome-mime-data_2.4.1.oe
@@ -1,2 +1,2 @@
-SECTION = "x11/base"
+SECTION = "x11/gnome"
 inherit gnome
diff --git a/gnome/gnome-vfs-extras_0.99.13.oe b/gnome/gnome-vfs-extras_0.99.13.oe
index f1d33654a7..56f5233322 100644
--- a/gnome/gnome-vfs-extras_0.99.13.oe
+++ b/gnome/gnome-vfs-extras_0.99.13.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/base"
+SECTION = "x11/gnome"
 PR = "r1"
 
 inherit gnome
diff --git a/gnome/gnome-vfs_2.6.0.oe b/gnome/gnome-vfs_2.6.0.oe
index ca477fa2b1..39974c09b0 100644
--- a/gnome/gnome-vfs_2.6.0.oe
+++ b/gnome/gnome-vfs_2.6.0.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/base"
+SECTION = "x11/gnome"
 PR = "r3"
 
 inherit gnome
diff --git a/gnome/gnome-vfs_2.6.2.oe b/gnome/gnome-vfs_2.6.2.oe
index d6ef32ce59..e11915351c 100644
--- a/gnome/gnome-vfs_2.6.2.oe
+++ b/gnome/gnome-vfs_2.6.2.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/base"
+SECTION = "x11/gnome"
 PR = "r4"
 
 inherit gnome
diff --git a/gnome/libart-lgpl_2.3.16.oe b/gnome/libart-lgpl_2.3.16.oe
index 9e5770f68c..6e611d5a3d 100644
--- a/gnome/libart-lgpl_2.3.16.oe
+++ b/gnome/libart-lgpl_2.3.16.oe
@@ -1,4 +1,4 @@
-SECTION = "libs"
+SECTION = "x11/gnome"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
 	file://${HOST_SYS}/art_config.h \	
 	file://Makefile.am.patch;patch=1"
diff --git a/gnome/libbonobo_2.6.0.oe b/gnome/libbonobo_2.6.0.oe
index d8086d6c3f..0c713b2d98 100644
--- a/gnome/libbonobo_2.6.0.oe
+++ b/gnome/libbonobo_2.6.0.oe
@@ -1,4 +1,4 @@
-SECTION = "gnome/base"
+SECTION = "x11/gnome"
 DESCRIPTION = "Bonobo CORBA interfaces library"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
            file://gtk-doc.m4 \
diff --git a/gnome/libbonobo_2.6.2.oe b/gnome/libbonobo_2.6.2.oe
index f58950d655..4092908de9 100644
--- a/gnome/libbonobo_2.6.2.oe
+++ b/gnome/libbonobo_2.6.2.oe
@@ -1,5 +1,5 @@
 PR = "r1"
-SECTION = "gnome/base"
+SECTION = "x11/gnome/libs"
 DESCRIPTION = "Bonobo CORBA interfaces library"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
            file://gtk-doc.m4 \
diff --git a/gnome/libbonoboui_2.6.1.oe b/gnome/libbonoboui_2.6.1.oe
index 6fb6cb8876..0a21d3de87 100644
--- a/gnome/libbonoboui_2.6.1.oe
+++ b/gnome/libbonoboui_2.6.1.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome/libs"
 PR = "r1"
 
 inherit gnome pkgconfig
diff --git a/gnome/libgnome_2.6.1.1.oe b/gnome/libgnome_2.6.1.1.oe
index b1518a4797..8e34b6682b 100644
--- a/gnome/libgnome_2.6.1.1.oe
+++ b/gnome/libgnome_2.6.1.1.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome/libs"
 PR = "r1"
 
 inherit gnome
diff --git a/gnome/libgnomecanvas_2.6.1.1.oe b/gnome/libgnomecanvas_2.6.1.1.oe
index 0d0d879994..c3a8241259 100644
--- a/gnome/libgnomecanvas_2.6.1.1.oe
+++ b/gnome/libgnomecanvas_2.6.1.1.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome/libs"
 PR = "r1"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
diff --git a/gnome/libgnomeprint_2.6.2.oe b/gnome/libgnomeprint_2.6.2.oe
index aa53e2b366..af239707ab 100644
--- a/gnome/libgnomeprint_2.6.2.oe
+++ b/gnome/libgnomeprint_2.6.2.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome/libs"
 PR = "r1"
 
 DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
diff --git a/gnome/libgnomeprintui_2.6.2.oe b/gnome/libgnomeprintui_2.6.2.oe
index a1b44b243e..aa24d873bb 100644
--- a/gnome/libgnomeprintui_2.6.2.oe
+++ b/gnome/libgnomeprintui_2.6.2.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome/libs"
 PR = "r1"
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
diff --git a/gnome/libgnomeui_2.6.1.1.oe b/gnome/libgnomeui_2.6.1.1.oe
index 4ae7ce508f..d6cd985247 100644
--- a/gnome/libgnomeui_2.6.1.1.oe
+++ b/gnome/libgnomeui_2.6.1.1.oe
@@ -1,4 +1,4 @@
-SECTION = "x11/libs"
+SECTION = "x11/gnome/libs"
 PR = "r1"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
diff --git a/gnome/orbit2-native_2.10.2.oe b/gnome/orbit2-native_2.10.2.oe
index ce1f22e438..2182ae8d80 100644
--- a/gnome/orbit2-native_2.10.2.oe
+++ b/gnome/orbit2-native_2.10.2.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "CORBA ORB"
-SECTION = "gnome/base"
+SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
            file://configure-lossage.patch;patch=1;pnum=1 \
 	   file://gtk-doc.m4 \
diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe
index a28ea1e88d..bff22ea3d5 100644
--- a/gnome/orbit2_2.10.2.oe
+++ b/gnome/orbit2_2.10.2.oe
@@ -1,6 +1,6 @@
 PR = "r2"
 DESCRIPTION = "CORBA ORB"
-SECTION = "gnome/base"
+SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
            file://configure-lossage.patch;patch=1;pnum=1 \
 	   file://gtk-doc.m4 \
diff --git a/gstreamer/gpe-gst-plugins_0.8.4.oe b/gstreamer/gpe-gst-plugins_0.8.4.oe
index 77061dde96..ef8f06bda5 100644
--- a/gstreamer/gpe-gst-plugins_0.8.4.oe
+++ b/gstreamer/gpe-gst-plugins_0.8.4.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Plugins for GStreamer"
-SECTION = "base"
+SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 PROVIDES = "gst-plugins"
diff --git a/gstreamer/gst-plugins_0.8.0.oe b/gstreamer/gst-plugins_0.8.0.oe
index 2a9e08634e..20df8100af 100644
--- a/gstreamer/gst-plugins_0.8.0.oe
+++ b/gstreamer/gst-plugins_0.8.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Plugins for GStreamer"
-SECTION = "base"
+SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
diff --git a/gstreamer/gst-plugins_0.8.1.oe b/gstreamer/gst-plugins_0.8.1.oe
index 2c73ab7372..e47067a485 100644
--- a/gstreamer/gst-plugins_0.8.1.oe
+++ b/gstreamer/gst-plugins_0.8.1.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Plugins for GStreamer"
-SECTION = "base"
+SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r3"
diff --git a/gstreamer/gst-plugins_0.8.3.oe b/gstreamer/gst-plugins_0.8.3.oe
index 8102ddb4de..bef13ba73e 100644
--- a/gstreamer/gst-plugins_0.8.3.oe
+++ b/gstreamer/gst-plugins_0.8.3.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Plugins for GStreamer"
-SECTION = "base"
+SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r0"
diff --git a/gstreamer/gst-plugins_0.8.4.oe b/gstreamer/gst-plugins_0.8.4.oe
index 88c262ceb7..ac310d79c9 100644
--- a/gstreamer/gst-plugins_0.8.4.oe
+++ b/gstreamer/gst-plugins_0.8.4.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Plugins for GStreamer"
-SECTION = "base"
+SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r2"
diff --git a/gstreamer/gstreamer_0.8.0.oe b/gstreamer/gstreamer_0.8.0.oe
index f394a86b0a..dce1e5ca00 100644
--- a/gstreamer/gstreamer_0.8.0.oe
+++ b/gstreamer/gstreamer_0.8.0.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
 DEPENDS = "glib-2.0 gettext libxml2 popt"
-SECTION = "base"
+SECTION = "x11/network"
 PRIORITY = "optional"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.8.0.tar.bz2"
diff --git a/gstreamer/gstreamer_0.8.1.oe b/gstreamer/gstreamer_0.8.1.oe
index ce948bb2a5..dfa5f39e2f 100644
--- a/gstreamer/gstreamer_0.8.1.oe
+++ b/gstreamer/gstreamer_0.8.1.oe
@@ -3,7 +3,7 @@ PR = "r1"
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
 DEPENDS = "glib-2.0 gettext-native libxml2 popt"
-SECTION = "base"
+SECTION = "x11/network"
 PRIORITY = "optional"
 
 FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
diff --git a/gstreamer/gstreamer_0.8.2.oe b/gstreamer/gstreamer_0.8.2.oe
index e69de29bb2..6e03cceca2 100644
--- a/gstreamer/gstreamer_0.8.2.oe
+++ b/gstreamer/gstreamer_0.8.2.oe
@@ -0,0 +1,26 @@
+PR = "r0"
+
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+SECTION = "x11/network"
+PRIORITY = "optional"
+
+FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+	file://configure-largefile.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
diff --git a/gstreamer/gstreamer_0.8.3.oe b/gstreamer/gstreamer_0.8.3.oe
index 019dc380f4..4c1956970d 100644
--- a/gstreamer/gstreamer_0.8.3.oe
+++ b/gstreamer/gstreamer_0.8.3.oe
@@ -3,7 +3,7 @@ PR = "r1"
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
 DEPENDS = "glib-2.0 gettext-native libxml2 popt"
-SECTION = "base"
+SECTION = "x11/network"
 PRIORITY = "optional"
 
 FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
diff --git a/gstreamer/gstreamer_0.8.5.oe b/gstreamer/gstreamer_0.8.5.oe
index e69de29bb2..16ce7056dc 100644
--- a/gstreamer/gstreamer_0.8.5.oe
+++ b/gstreamer/gstreamer_0.8.5.oe
@@ -0,0 +1,33 @@
+PR = "r0"
+
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+SECTION = "x11/network"
+PRIORITY = "optional"
+
+FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+	file://gstreamer.xsession \
+	file://configure-largefile.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+do_install_append() {
+	install -d ${D}/etc/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}/etc/X11/Xsession.d/90gst-register
+}
+
diff --git a/gzip/gzip_1.3.5.oe b/gzip/gzip_1.3.5.oe
index e6c403afe7..695901327b 100644
--- a/gzip/gzip_1.3.5.oe
+++ b/gzip/gzip_1.3.5.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "console/utils"
 PRIORITY = "required"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "gzip (GNU zip) is a compression utility designed \
diff --git a/ipaq-sleep/ipaq-sleep_0.7-9.oe b/ipaq-sleep/ipaq-sleep_0.7-9.oe
index e69de29bb2..78ce5a29b7 100644
--- a/ipaq-sleep/ipaq-sleep_0.7-9.oe
+++ b/ipaq-sleep/ipaq-sleep_0.7-9.oe
@@ -0,0 +1,15 @@
+
+PR = "r3"
+
+inherit gpe pkgconfig
+
+DEPENDS = "apmd virtual/xserver xextensions x11 xau xscrnsaverh libxss"
+SECTION = "x11/base"
+RDEPENDS = "apm"
+
+DESCRIPTION = "Automatic sleep/suspend control daemon"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+
+#CPPFLAGS_append += " -DDEBUG"
+#CFLAGS_append += " -DDEBUG"
diff --git a/lirc/lirc_0.6.6+cvs20040918.oe b/lirc/lirc_0.6.6+cvs20040918.oe
index dd05e2a568..7f2a62b4b9 100644
--- a/lirc/lirc_0.6.6+cvs20040918.oe
+++ b/lirc/lirc_0.6.6+cvs20040918.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
diff --git a/lirc/lirc_0.6.6.oe b/lirc/lirc_0.6.6.oe
index 4a7def12be..9a8a76c63b 100644
--- a/lirc/lirc_0.6.6.oe
+++ b/lirc/lirc_0.6.6.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
diff --git a/lrzsz/lrzsz_0.12.20.oe b/lrzsz/lrzsz_0.12.20.oe
index b72e4570ee..7595ca74d6 100644
--- a/lrzsz/lrzsz_0.12.20.oe
+++ b/lrzsz/lrzsz_0.12.20.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "standard"
 DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer"
 DEPENDS = "gettext-native"
diff --git a/madwifi/madwifi-modules_cvs.oe b/madwifi/madwifi-modules_cvs.oe
index e643f3b3e3..088868baba 100644
--- a/madwifi/madwifi-modules_cvs.oe
+++ b/madwifi/madwifi-modules_cvs.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets"
-SECTION = "base/network"
+SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
diff --git a/mc/mc_4.6.0.oe b/mc/mc_4.6.0.oe
index 449cd4ac1e..654b18cf31 100644
--- a/mc/mc_4.6.0.oe
+++ b/mc/mc_4.6.0.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU Midnight Commander is a file \
 manager for free operating systems."
-SECTION = "base"
+SECTION = "console/utils"
 PRIORITY = "optional"
 DEPENDS = "ncurses glib-2.0"
 
diff --git a/micro-emacs/micro-emacs_20040301.oe b/micro-emacs/micro-emacs_20040301.oe
index e69de29bb2..5a460985da 100644
--- a/micro-emacs/micro-emacs_20040301.oe
+++ b/micro-emacs/micro-emacs_20040301.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "Mini-version of emacs, from http://www.jasspa.com"
+SECTION = "console/utils"
+PRIORITY = "optional"
+MAINTAINER = "Jason Haslup <openembedded@haslup.com>"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+S = "${WORKDIR}/me040301"
+
+SRC_URI = "http://www.jasspa.com/release_040301/jasspa-mesrc-20040301.tar.gz \
+           http://www.jasspa.com/release_040301/jasspa-memacros-20040301.tar.gz \
+           file://${FILESDIR}/zaurus_make.patch;patch=1"
+
+do_compile () {
+        oe_runmake -C src -f zaurus.gmk mec
+}
+
+do_install() {
+        install -d ${D}/${bindir}
+        install -d ${D}/${datadir}/jasspa/macros
+        install -m 0755 src/mec ${D}/${bindir}/mec
+        install -m 0644 ${WORKDIR}/*.* ${D}/${datadir}/jasspa/macros/
+}
+
+PACKAGES += " ${PN}-macros"
+FILES_${PN}-macros = "${datadir}/jasspa"
+
diff --git a/mythtv/mythtv_0.16+cvs20040918.oe b/mythtv/mythtv_0.16+cvs20040918.oe
index 4c008abab6..6f2214614d 100644
--- a/mythtv/mythtv_0.16+cvs20040918.oe
+++ b/mythtv/mythtv_0.16+cvs20040918.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "A full featured personal video recorder system."
 MAINTAINER = "Michael 'Mickey' Lauer"
-SECTION = "multimedia"
+SECTION = "x11/multimedia"
 PR = "r3"
 
 SRC_URI = "cvs://mythtv:mythtv@cvs.mythtv.org/var/lib/mythcvs;module=mythtv;date=20040918;method=pserver \
diff --git a/mythtv/mythtv_0.16.oe b/mythtv/mythtv_0.16.oe
index 9186cc9948..fd0c16e075 100644
--- a/mythtv/mythtv_0.16.oe
+++ b/mythtv/mythtv_0.16.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "A full featured personal video recorder system."
 MAINTAINER = "Michael 'Mickey' Lauer"
-SECTION = "multimedia"
+SECTION = "x11/multimedia"
 PR = "r0"
 
 SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
diff --git a/ncftp/ncftp_3.1.7.oe b/ncftp/ncftp_3.1.7.oe
index 52e4207261..a9e3f4db2d 100644
--- a/ncftp/ncftp_3.1.7.oe
+++ b/ncftp/ncftp_3.1.7.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A sophisticated console ftp client"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 
 SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \
diff --git a/ncftp/ncftp_3.1.8.oe b/ncftp/ncftp_3.1.8.oe
index e69de29bb2..a9e3f4db2d 100644
--- a/ncftp/ncftp_3.1.8.oe
+++ b/ncftp/ncftp_3.1.8.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "A sophisticated console ftp client"
+SECTION = "console/network"
+PRIORITY = "optional"
+
+SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \
+	   file://acinclude.m4"
+
+inherit autotools
+
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
+}
+
+do_install () {
+	install -d ${D}/${bindir} ${D}/${sysconfdir} ${D}/${mandir}
+	oe_runmake 'prefix=${D}/${prefix}' 'BINDIR=${D}/${bindir}' \
+		   'SYSCONFDIR=${D}/${sysconfdir}' 'mandir=${D}/${mandir}' \
+		   install
+}
diff --git a/nmixer/nmixer_2.0.oe b/nmixer/nmixer_2.0.oe
index a6ff34786a..b7fbd042b4 100644
--- a/nmixer/nmixer_2.0.oe
+++ b/nmixer/nmixer_2.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A text mode OSS soundmixer"
-SECTION = "base"
+SECTION = "console/multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "ncurses"
diff --git a/obexftp/obexftp_0.10.3.oe b/obexftp/obexftp_0.10.3.oe
index bf13b2503a..d06854881b 100644
--- a/obexftp/obexftp_0.10.3.oe
+++ b/obexftp/obexftp_0.10.3.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "OBEX Ftp Client"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "openobex"
 
diff --git a/openobex-apps/openobex-apps_1.0.0.oe b/openobex-apps/openobex-apps_1.0.0.oe
index 966e2139da..86d9939266 100644
--- a/openobex-apps/openobex-apps_1.0.0.oe
+++ b/openobex-apps/openobex-apps_1.0.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Applications for OpenOBEX"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "openobex"
 
diff --git a/patchutils/patchutils_0.2.25.oe b/patchutils/patchutils_0.2.25.oe
index 85e5181ab8..001c1aed6c 100644
--- a/patchutils/patchutils_0.2.25.oe
+++ b/patchutils/patchutils_0.2.25.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/patchutils/patchutils_0.2.26.oe b/patchutils/patchutils_0.2.26.oe
index 85e5181ab8..001c1aed6c 100644
--- a/patchutils/patchutils_0.2.26.oe
+++ b/patchutils/patchutils_0.2.26.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/patchutils/patchutils_0.2.27.oe b/patchutils/patchutils_0.2.27.oe
index 85e5181ab8..001c1aed6c 100644
--- a/patchutils/patchutils_0.2.27.oe
+++ b/patchutils/patchutils_0.2.27.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/patchutils/patchutils_0.2.28.oe b/patchutils/patchutils_0.2.28.oe
index 85e5181ab8..001c1aed6c 100644
--- a/patchutils/patchutils_0.2.28.oe
+++ b/patchutils/patchutils_0.2.28.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/patchutils/patchutils_0.2.30.oe b/patchutils/patchutils_0.2.30.oe
index 85e5181ab8..001c1aed6c 100644
--- a/patchutils/patchutils_0.2.30.oe
+++ b/patchutils/patchutils_0.2.30.oe
@@ -1,4 +1,4 @@
-SECTION = "base"
+SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/phalanx/phalanx_22.oe b/phalanx/phalanx_22.oe
index f2bca5acaf..6fd1f16266 100644
--- a/phalanx/phalanx_22.oe
+++ b/phalanx/phalanx_22.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Phalanx is a chess playing engine."
-SECTION = "games/libs"
+SECTION = "opie/libs"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer"
 PR = "r3"
diff --git a/prboom/prboom_2.3.0.oe b/prboom/prboom_2.3.0.oe
index 17aaa3c2cd..2a0b323c38 100644
--- a/prboom/prboom_2.3.0.oe
+++ b/prboom/prboom_2.3.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A Doom Clone based on SDL"
-SECTION = "base"
+SECTION = "opie/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe libsdl-mixer libsdl-net"
 PR = "r1"
diff --git a/prism54/prism54-firmware_1.0.4.3.oe b/prism54/prism54-firmware_1.0.4.3.oe
index 24efe32fc0..03204d2420 100644
--- a/prism54/prism54-firmware_1.0.4.3.oe
+++ b/prism54/prism54-firmware_1.0.4.3.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Firmware for the Prism54 driver"
-SECTION = "base/network"
+SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "unknown"
diff --git a/prism54/prism54-module_1.2.oe b/prism54/prism54-module_1.2.oe
index ad9a57cde9..838fcfa0bf 100644
--- a/prism54/prism54-module_1.2.oe
+++ b/prism54/prism54-module_1.2.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Linux Driver for the 802.11g Prism GT / Prism Duette / Prism Indigo Chipsets"
-SECTION = "base/network"
+SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
diff --git a/python/python-pymp3_0.3.4.oe b/python/python-pymp3_0.3.4.oe
index e69de29bb2..713bdbcb66 100644
--- a/python/python-pymp3_0.3.4.oe
+++ b/python/python-pymp3_0.3.4.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "A Curses-based mp3 player. See http://damien.degois.info/PyMP3/"
+SECTION = "console/multimedia"
+PRIORITY = "optional"
+MAINTAINER = "jason haslup <openembedded@haslup.com>"
+RDEPENDS = "python-core python-pyid3lib python-mad python-ao"
+
+SRC_URI = "http://damien.degois.info/PyMP3/PyMP3-0.3.4.tar.gz"
+S = "${WORKDIR}/PyMP3-0.3.4"
+
+PY_FILES = "box_info.py layer.py sound_ctrl.py stack.py txt_tools.py"
+
+do_install() {
+
+   install -d ${D}/${libdir}
+   install -d ${D}/${libdir}/python2.3
+   install -d ${D}/${libdir}/python2.3/site-packages
+
+   for f in ${PY_FILES}
+   do
+      install -m 0644 $f ${D}${libdir}/python2.3/site-packages/
+   done
+
+   install -d ${D}/${bindir}
+   install -m 755 pymp3 ${D}/${bindir}/
+}
+
+FILES_${PN} += " ${libdir}/python2.3/site-packages/"
diff --git a/qpf-fonts/qpf-utopia_1.0.oe b/qpf-fonts/qpf-utopia_1.0.oe
index e69de29bb2..8753625a0b 100644
--- a/qpf-fonts/qpf-utopia_1.0.oe
+++ b/qpf-fonts/qpf-utopia_1.0.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "Utopia fonts - QPF Edition"
+SECTION = "s"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/qpf-utopia.tar.bz2"
+S = "${WORKDIR}/utopia"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES = "qpf-utopia-small qpf-utopia-large"
+
+FILES_qpf-utopia-small = "${palmqtdir}/lib/fonts/utopia_100* ${palmqtdir}/lib/fonts/utopia_120*"
+
+FILES_qpf-utopia-large = "${palmqtdir}/lib/fonts/utopia_140* \
+${palmqtdir}/lib/fonts/utopia_180* ${palmqtdir}/lib/fonts/utopia_240*"
diff --git a/qpf-fonts/terminus.oe b/qpf-fonts/terminus.oe
index e69de29bb2..2008dc970b 100644
--- a/qpf-fonts/terminus.oe
+++ b/qpf-fonts/terminus.oe
@@ -0,0 +1,32 @@
+DESCRIPTION = "Qt/Embedded terminus font"
+HOMEPAGE = "http://www.is-vn.bg/hamster/jimmy-en.html"
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+MAINTAINER = "M&N Solutions GmbH <info@mn-solutions.de>"
+LICENSE = "GPL"
+RDEPENDS = "qte-fonts-common"
+PACKAGE_ARCH = "all"
+PV = "1.0"
+PR = "r1"
+
+SRC_URI = "http://www.mn-solutions.de/downloads/mnci/terminus-fonts.tar.bz2"
+S = ${WORKDIR}/terminus-fonts
+
+OEDEBUG = 2
+
+do_install() {
+	mkdir -p ${D}${palmtopdir}/lib/fonts
+	cp *.qpf ${D}${palmtopdir}/lib/fonts
+}
+
+PACKAGES = "qpf-terminus"
+FILES = ""
+FILES_qpf-terminus = "${palmtopdir}/lib/fonts"
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
diff --git a/snes9x/snes9x-sdl-qpe_1.39.oe b/snes9x/snes9x-sdl-qpe_1.39.oe
index 6b32e8b953..4966926188 100644
--- a/snes9x/snes9x-sdl-qpe_1.39.oe
+++ b/snes9x/snes9x-sdl-qpe_1.39.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Super Nintendo Emulator based on SDL, QtE Palmtop Environments Edition"
-SECTION = "base"
+SECTION = "opie/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 PR = "r1"
diff --git a/snes9x/snes9x_1.43-WIP1.oe b/snes9x/snes9x_1.43-WIP1.oe
index 308a2b0fd7..3abea8283e 100644
--- a/snes9x/snes9x_1.43-WIP1.oe
+++ b/snes9x/snes9x_1.43-WIP1.oe
@@ -1,4 +1,4 @@
-SECTION = "unknown"
+SECTION = "x11/games"
 PR = "r3"
 
 DEPENDS = "libxxf86dga libxxf86vm"
diff --git a/tcpdump/tcpdump_3.8.1.oe b/tcpdump/tcpdump_3.8.1.oe
index 2adeec5ef2..98076d1552 100644
--- a/tcpdump/tcpdump_3.8.1.oe
+++ b/tcpdump/tcpdump_3.8.1.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A sophisticated network protocol dumper"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "libpcap-0.8.1"
 
diff --git a/tcpdump/tcpdump_3.8.3.oe b/tcpdump/tcpdump_3.8.3.oe
index 2adeec5ef2..98076d1552 100644
--- a/tcpdump/tcpdump_3.8.3.oe
+++ b/tcpdump/tcpdump_3.8.3.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A sophisticated network protocol dumper"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "libpcap-0.8.1"
 
diff --git a/tcpick/tcpick_0.1.22.oe b/tcpick/tcpick_0.1.22.oe
index 9f6845d586..696218b136 100644
--- a/tcpick/tcpick_0.1.22.oe
+++ b/tcpick/tcpick_0.1.22.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Tcpick Tcp Stream Sniffer and Connection Tracker"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "required"
 DEPENDS = "ncurses"
 
diff --git a/usbutils/usbutils_0.11.oe b/usbutils/usbutils_0.11.oe
index a9c277a7eb..bf424b7824 100644
--- a/usbutils/usbutils_0.11.oe
+++ b/usbutils/usbutils_0.11.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "USB console utilities."
-SECTION = "console/base"
+SECTION = "base"
 
 SRC_URI = "http://wwwbode.cs.tum.edu/Par/arch/usb/download/usbutils/usbutils-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/vera-fonts/qpf-bitstream-vera-sans-mono-50-t5_1.1.oe b/vera-fonts/qpf-bitstream-vera-sans-mono-50-t5_1.1.oe
index e69de29bb2..38f0da087a 100644
--- a/vera-fonts/qpf-bitstream-vera-sans-mono-50-t5_1.1.oe
+++ b/vera-fonts/qpf-bitstream-vera-sans-mono-50-t5_1.1.oe
@@ -0,0 +1,28 @@
+DESCRIPTION = "fonts-bitstream-vera-sans-mono-50-t5 is a package \
+containing QPF font files of Bitstream Vera Mono, at the \
+normal line weight (not bold), and rotated 90 degrees, for \
+Qtopia apps in -display Transformed:Rot90 mode."
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+
+SRC_URI = "http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono-50-t5_1.1.tar.gz"
+
+FILES_${PN} += "/opt"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+	
+	cd ${WORKDIR}/fonts-bitstream-vera-sans-mono-50-t5_1.1/home/QtPalmtop/lib/fonts/
+	
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
diff --git a/vera-fonts/qpf-bitstream-vera-sans-mono-50_1.1.oe b/vera-fonts/qpf-bitstream-vera-sans-mono-50_1.1.oe
index e69de29bb2..6449a0f5f4 100644
--- a/vera-fonts/qpf-bitstream-vera-sans-mono-50_1.1.oe
+++ b/vera-fonts/qpf-bitstream-vera-sans-mono-50_1.1.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "fonts-bitstream-vera-sans-mono-50 is a package \
+containing QPF font files of Bitstream Vera Mono, at the \
+normal line weight (not bold)."
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+
+SRC_URI = "http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono-50_1.1.tar.gz"
+
+FILES_${PN} += "/opt"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+	
+	cd ${WORKDIR}/fonts-bitstream-vera-sans-mono-50_1.1/home/QtPalmtop/lib/fonts/
+	
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
diff --git a/vera-fonts/qpf-bitstream-vera-sans-mono-75-t5_1.1.oe b/vera-fonts/qpf-bitstream-vera-sans-mono-75-t5_1.1.oe
index e69de29bb2..18868ddaac 100644
--- a/vera-fonts/qpf-bitstream-vera-sans-mono-75-t5_1.1.oe
+++ b/vera-fonts/qpf-bitstream-vera-sans-mono-75-t5_1.1.oe
@@ -0,0 +1,28 @@
+DESCRIPTION = "fonts-bitstream-vera-sans-mono-75-t5 is a \
+package containing QPF font files of Bitstream Vera Mono, \
+at the bold line weight, and rotated 90 degrees, for \
+Qtopia apps in -display Transformed:Rot90 mode."
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+
+SRC_URI = "http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono-75-t5_1.1.tar.gz"
+
+FILES_${PN} += "/opt"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+	
+	cd ${WORKDIR}/fonts-bitstream-vera-sans-mono-75-t5_1.1/home/QtPalmtop/lib/fonts/
+	
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
diff --git a/vera-fonts/qpf-bitstream-vera-sans-mono-75_1.1.oe b/vera-fonts/qpf-bitstream-vera-sans-mono-75_1.1.oe
index e69de29bb2..152330aa9f 100644
--- a/vera-fonts/qpf-bitstream-vera-sans-mono-75_1.1.oe
+++ b/vera-fonts/qpf-bitstream-vera-sans-mono-75_1.1.oe
@@ -0,0 +1,27 @@
+DESCRIPTION = "fonts-bitstream-vera-sans-mono-75 is a package \
+containing QPF font files of Bitstream Vera Mono, at the \
+bold line weight."
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+
+SRC_URI = "http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono-75_1.1.tar.gz"
+
+FILES_${PN} += "/opt"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+	
+	cd ${WORKDIR}/fonts-bitstream-vera-sans-mono-75_1.1/home/QtPalmtop/lib/fonts/
+	
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+pkg_postinst () {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
diff --git a/vera-fonts/qpf-bitstream-vera_1.10.oe b/vera-fonts/qpf-bitstream-vera_1.10.oe
index a79b3f499b..b26d032407 100644
--- a/vera-fonts/qpf-bitstream-vera_1.10.oe
+++ b/vera-fonts/qpf-bitstream-vera_1.10.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "The Bitstream Vera fonts - QPF Edition"
-SECTION = "fonts"
+SECTION = "opie/fonts"
 PRIORITY = "optional"
 
 SRC_URI = "http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz"
diff --git a/vera-fonts/ttf-bitstream-vera_1.10.oe b/vera-fonts/ttf-bitstream-vera_1.10.oe
index f423fa0264..64052009d7 100644
--- a/vera-fonts/ttf-bitstream-vera_1.10.oe
+++ b/vera-fonts/ttf-bitstream-vera_1.10.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "The Bitstream Vera fonts - TTF Edition"
-SECTION = "fonts"
+SECTION = "x11/fonts"
 PRIORITY = "optional"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 
diff --git a/xmame/xmame_0.86.oe b/xmame/xmame_0.86.oe
index e69de29bb2..1536fa39a5 100644
--- a/xmame/xmame_0.86.oe
+++ b/xmame/xmame_0.86.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Multiple Arcade Machine Emulator based on SDL"
+SECTION = "opie/games"
+PRIORITY = "optional"
+DEPENDS = "expat libsdl-qpe libsdl-mixer"
+
+SRC_URI = "http://x.mame.net/download/${P}.tar.bz2 \
+          file://${FILESDIR}/crosscompile.patch;patch=1"
+
+inherit flow-lossage
+
+EXTRA_OEMAKE=
+
+do_compile() {
+    oe_runmake TARGET=mame JOY_SDL=1 SOUND_SDL=1 DISPLAY_METHOD=SDL                                   \
+               CC="${CC}" CXX="${CXX}" CFLAGS="-I. -Isrc -Isrc/include -Isrc/unix ${CFLAGS}"          \
+               CXXFLAGS="${CXXFLAGS}" LD="${CC}" LDFLAGS="${LDFLAGS}"                                 \
+               RANLIB="${RANLIB}" MY_CPU="${TARGET_ARCH}" ARCH="${TARGET_OS}"                         \
+               GLLIBS="" STRIP="${STRIP}" AR="${AR}"
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 xmame.SDL ${D}/${bindir}
+}
+
diff --git a/zsh/zsh_4.1.1.oe b/zsh/zsh_4.1.1.oe
index f466fc51a5..0b9e4367d5 100644
--- a/zsh/zsh_4.1.1.oe
+++ b/zsh/zsh_4.1.1.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Zsh shell"
-SECTION = "console/base"
+SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "ncurses pcre"