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

into chris.(none):/home/cwiiis/oe/packages

2004/09/19 02:45:25+01:00 (none)!cwiiis
Polish gpe for OpenZaurus-3.5.1.

2004/09/19 02:29:54+01:00 (none)!cwiiis
* Fix detect-sylus for the Zaurus
* Add missing/extra RDEPENDS for gpe-go and gpe-image
* Move/rename gpe-terminal files to conform with everything else

2004/09/18 23:52:14+01:00 (none)!cwiiis
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/18 22:18:37+01:00 (none)!cwiiis
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/18 21:38:04+01:00 (none)!cwiiis
Add gpe-games (gpe-lights, gpe-othello, gpe-tetris - I added gpe-go earlier).

2004/09/18 21:37:01+01:00 (none)!cwiiis
Stop packages that use libsdl-qpe from depending on virtual/libsdl.

BKrev: 414ce4c0YgyPZ2U5dMn-RkCNoRk30w

29 files changed, 305 insertions, 95 deletions

diff --git a/aliens/aliens_1.0.0.oe b/aliens/aliens_1.0.0.oe
index 8a0a9009af..0ad5217b26 100644
--- a/aliens/aliens_1.0.0.oe
+++ b/aliens/aliens_1.0.0.oe
@@ -3,7 +3,8 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqpe virtual/libsdl libsdl-mixer libsdl-image"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-mixer libsdl-image"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/aliens/src/aliens_V${PV}.tar.gz"
 S = "${WORKDIR}/aliens_V${PV}"
diff --git a/billiardz/billiardz_0.1.4.oe b/billiardz/billiardz_0.1.4.oe
index dda743579f..8ca2c7d8c8 100644
--- a/billiardz/billiardz_0.1.4.oe
+++ b/billiardz/billiardz_0.1.4.oe
@@ -4,7 +4,8 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libsdl libsdl-image"
+DEPENDS = "libsdl-qpe libsdl-image"
+PR = "r1"
 
 SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
 
diff --git a/brickout/brickout_2002.06.09.oe b/brickout/brickout_2002.06.09.oe
index 9df5a208d0..7cd7c454af 100644
--- a/brickout/brickout_2002.06.09.oe
+++ b/brickout/brickout_2002.06.09.oe
@@ -3,7 +3,8 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libsdl"
+DEPENDS = "libsdl-qpe"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/brickout/src/brickout-${PV}.tar.gz \
            file://directories.patch;patch=1"
diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index 8397851fe7..c8e1986391 100644
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -3,7 +3,8 @@ include conf/openzaurus.conf
 CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
@@ -208,3 +209,69 @@ PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 
+#
+# GPE
+#
+
+PREFERRED_VERSION_libmatchbox = "1.2"
+PREFERRED_VERSION_matchbox = "0.8.1"
+PREFERRED_VERSION_matchbox-common = "0.8"
+PREFERRED_VERSION_matchbox-desktop = "0.8.1"
+PREFERRED_VERSION_matchbox-wm = "0.8.2"
+PREFERRED_VERSION_matchbox-panel = "0.8.1"
+PREFERRED_VERSION_gtk+ = "2.4.4"
+PREFERRED_VERSION_libgpewidget = "0.90"
+PREFERRED_VERSION_libgpelaunch = "0.10"
+PREFERRED_VERSION_libgpepimc = "0.3"
+PREFERRED_VERSION_libgpevtype = "0.4"
+PREFERRED_VERSION_gpe-icons = "0.22"
+PREFERRED_VERSION_diet-x11 = "6.2.1"
+PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
+PREFERRED_VERSION_rxvt-unicode = "3.7"
+PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
+PREFERRED_VERSION_xst = "0.14"
+PREFERRED_VERSION_xprop = "cvs" 
+PREFERRED_VERSION_xhost = "20040413"
+PREFERRED_VERSION_xrdb = "cvs"
+PREFERRED_VERSION_gpe-soundserver = "0.4-1"
+PREFERRED_VERSION_gpe-todo = "0.48"
+PREFERRED_VERSION_gpe-calendar = "0.56"
+PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
+PREFERRED_VERSION_gpe-contacts = "0.28"
+PREFERRED_VERSION_gpe-today = "0.08"
+PREFERRED_VERSION_matchbox-panel-manager = "0.1"
+PREFERRED_VERSION_gpe-bluetooth = "0.37"
+PREFERRED_VERSION_gpe-su = "0.18"
+PREFERRED_VERSION_gpe-conf = "0.1.19"
+PREFERRED_VERSION_gpe-clock = "0.14"
+PREFERRED_VERSION_gpe-mininet = "0.4"
+PREFERRED_VERSION_gpe-mixer = "0.38"
+PREFERRED_VERSION_gpe-shield = "0.6"
+PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager = "0.17"
+PREFERRED_VERSION_keylaunch = "2.0.7"
+PREFERRED_VERSION_minilite = "0.44"
+PREFERRED_VERSION_xmonobut = "0.4"
+PREFERRED_VERSION_gpe-edit = "0.28"
+PREFERRED_VERSION_gpe-gallery = "0.95"
+PREFERRED_VERSION_gpe-calculator = "0.2"
+PREFERRED_VERSION_gpe-package = "0.0.12"
+PREFERRED_VERSION_gpe-terminal = "1.1"
+PREFERRED_VERSION_gpe-watch = "0.10"
+PREFERRED_VERSION_gpe-what = "0.31"
+PREFERRED_VERSION_gpe-filemanager = "0.17"
+PREFERRED_VERSION_gpe-go = "0.05"
+PREFERRED_VERSION_gpe-irc = "0.07"
+PREFERRED_VERSION_gpe-lights = "0.12"
+PREFERRED_VERSION_gpe-othello = "0.2-1"
+PREFERRED_VERSION_gpe-plucker = "0.1"
+PREFERRED_VERSION_gpe-session-scripts = "0.61"
+PREFERRED_VERSION_gpe-tetris = "0.6-2"
+PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
+PREFERRED_VERSION_rosetta = "cvs"
+PREFERRED_VERSION_dillo2 = "0.6.6"
+PREFERRED_VERSION_minimo = "cvs"
+PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
+PREFERRED_VERSION_linphone = "0.12.2"
+PREFERRED_VERSION_firefox = "0.9.3"
+
diff --git a/gpe-terminal/gpe-terminal.desktop b/detect-stylus/detect-stylus-0.13/extra-device-check.patch
index e69de29bb2..e69de29bb2 100644
--- a/gpe-terminal/gpe-terminal.desktop
+++ b/detect-stylus/detect-stylus-0.13/extra-device-check.patch
diff --git a/detect-stylus/detect-stylus_0.13.oe b/detect-stylus/detect-stylus_0.13.oe
index d9c0907c11..c82d05dbb1 100644
--- a/detect-stylus/detect-stylus_0.13.oe
+++ b/detect-stylus/detect-stylus_0.13.oe
@@ -1,6 +1,6 @@
 inherit gpe pkgconfig
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "x11 xcursor-transparent-theme xrdb"
 SECTION = "gpe"
@@ -11,6 +11,7 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
            file://access.patch;patch=1;pnum=0 \
+	   file://extra-device-check.patch;patch=1 \
 	   file://correct-theme-name.patch;patch=1"
 
 export CVSBUILD=no
diff --git a/freedroid/freedroid_1.0.2.oe b/freedroid/freedroid_1.0.2.oe
index 55fe7861bd..ebaefdc559 100644
--- a/freedroid/freedroid_1.0.2.oe
+++ b/freedroid/freedroid_1.0.2.oe
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqpe virtual/libsdl libsdl-image"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freedroid/freedroid-${PV}.tar.gz \
            file://icon.png"
diff --git a/gemdropx/gemdropx_0.9.oe b/gemdropx/gemdropx_0.9.oe
index 333cb1d5c2..becd4bef08 100644
--- a/gemdropx/gemdropx_0.9.oe
+++ b/gemdropx/gemdropx_0.9.oe
@@ -3,7 +3,8 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqpe virtual/libsdl"
+DEPENDS = "virtual/libqpe libsdl-qpe"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/src/gemdropx-${PV}.tar.gz \
            file://directories.patch;patch=1 \
diff --git a/gpe-go/gpe-go_0.05.oe b/gpe-go/gpe-go_0.05.oe
index e69de29bb2..59b2b8526d 100644
--- a/gpe-go/gpe-go_0.05.oe
+++ b/gpe-go/gpe-go_0.05.oe
@@ -0,0 +1,10 @@
+inherit gpe
+
+DESCRIPTION = "A Go Board for GPE."
+DEPENDS = "gtk+ libgpewidget gpe-icons"
+RDEPENDS = "gdk-pixbuf-loader-jpeg"
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r1"
+
+SRC_URI += "file://fix-make.patch;patch=1"
diff --git a/gpe-terminal/gpe-terminal.png b/gpe-lights/gpe-lights-0.12/fix-makefiles.patch
index e69de29bb2..e69de29bb2 100644
--- a/gpe-terminal/gpe-terminal.png
+++ b/gpe-lights/gpe-lights-0.12/fix-makefiles.patch
diff --git a/gpe-lights/gpe-lights_0.12.oe b/gpe-lights/gpe-lights_0.12.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-lights/gpe-lights_0.12.oe
diff --git a/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch b/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch
diff --git a/gpe-othello/gpe-othello_0.2-1.oe b/gpe-othello/gpe-othello_0.2-1.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-othello/gpe-othello_0.2-1.oe
diff --git a/gpe-terminal/files/gpe-terminal.desktop b/gpe-terminal/files/gpe-terminal.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-terminal/files/gpe-terminal.desktop
diff --git a/gpe-terminal/files/gpe-terminal.png b/gpe-terminal/files/gpe-terminal.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-terminal/files/gpe-terminal.png
diff --git a/gpe-terminal/gpe-terminal.oe b/gpe-terminal/gpe-terminal.oe
deleted file mode 100644
index 3480e3fa9b..0000000000
--- a/gpe-terminal/gpe-terminal.oe
+++ /dev/null
@@ -1,11 +0,0 @@
-SRC_URI = "file://${PN}.desktop file://${PN}.png"
-DESCRIPTION = "GPE terminal wrapper"
-PV = "1.1"
-
-do_install() {
-	install -d ${D}${datadir}/applications
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/${PN}.desktop ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/${PN}.png ${D}${datadir}/pixmaps/
-}
-
diff --git a/gpe-terminal/gpe-terminal_1.1.oe b/gpe-terminal/gpe-terminal_1.1.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-terminal/gpe-terminal_1.1.oe
diff --git a/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch b/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch
diff --git a/gpe-tetris/gpe-tetris_0.6-2.oe b/gpe-tetris/gpe-tetris_0.6-2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-tetris/gpe-tetris_0.6-2.oe
diff --git a/irk/irk_0.11.0.oe b/irk/irk_0.11.0.oe
index 198fcc8a6e..729dfe1cf0 100644
--- a/irk/irk_0.11.0.oe
+++ b/irk/irk_0.11.0.oe
@@ -3,7 +3,8 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqpe virtual/libsdl lirc"
+DEPENDS = "virtual/libqpe libsdl-qpe lirc"
+PR = "r1"
 
 SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${PV}.tgz"
 S = "${WORKDIR}/irk"
diff --git a/libgpevtype/libgpevtype_0.4.oe b/libgpevtype/libgpevtype_0.4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libgpevtype/libgpevtype_0.4.oe
diff --git a/libgtkstylus/libgtkstylus_0.3.oe b/libgtkstylus/libgtkstylus_0.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libgtkstylus/libgtkstylus_0.3.oe
diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe
index e69de29bb2..4282a702bf 100644
--- a/meta/gpe-collections.oe
+++ b/meta/gpe-collections.oe
@@ -0,0 +1,90 @@
+#
+# A collection of dependencies for images including GPE or parts of it.
+#
+
+GPE_BASE_DEPENDS = "\
+    diet-x11 \
+    virtual/xserver \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    xst \
+    xprop \
+    xhost \
+    xrdb \
+    gpe-soundserver"
+
+GPE_BASE_RDEPENDS = "\
+    ttf-bitstream-vera \
+    glibc-gconv \
+    glibc-gconv-iso8859-1 \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+    
+GPE_BASE = "\
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    gpe-bootsplash \
+    libgtkstylus \
+    detect-stylus"
+
+GPE_PIM = "\
+    gpe-todo \
+    gpe-calendar \
+    gpe-sketchbook \
+    gpe-contacts \
+    gpe-today"
+
+GPE_EXTRA_PIM = "\
+    gpe-timesheet"
+
+GPE_BASE_SETTINGS = "\
+    matchbox-panel-manager \
+    gpe-bluetooth \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-shield \
+    gpe-wlancfg \
+    gpe-taskmanager \
+    keylaunch \
+    minilite"
+
+GPE_EXTRA_SETTINGS = "\
+    xmonobut"
+    
+GPE_BASE_APPS = "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-package \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    rosetta"
+
+GPE_MACHINE_CLASS ?= "none"
+
+GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+
+GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone ${GPE_EXTRA_PIM}"
+GPE_EXTRA_INSTALL_bigscreen = "firefox linphone ${GPE_EXTRA_PIM}"
+
+GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh ${GPE_EXTRA_PIM}"
+GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh ${GPE_EXTRA_PIM}"
+
+GPE_EXTRA_DEPENDS_none = "dillo2"
+GPE_EXTRA_INSTALL_none = "dillo2"
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 7d9c2180a2..ac67a2cc89 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,6 +1,6 @@
 include gpe-collections.oe
 
-PR = "r1"
+PR = "r2"
 
 export IMAGE_BASENAME = "gpe-image"
 
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index 25c2dee3d1..88bda7ca23 100644
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -1,32 +1,33 @@
-PACKAGES = gpe gpe-task-base gpe-task-utils gpe-task-pim
+PACKAGES = gpe gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-gtkapps gpe-task-gnomeapps
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r13"
+PR = "r14"
 
 ALLOW_EMPTY = 1
 
-RDEPENDS_gpe = "gpe-task-base gpe-task-utils gpe-task-pim"
-
 gpe-base = "\
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
+    diet-x11 \
+    virtual/xserver \
     matchbox \
     xcursor-transparent-theme \
     rxvt-unicode \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    gpe-bootsplash \
     gtk2-theme-angelistic \
-    libgtkstylus \
     xst \
     xprop \
     xhost \
     xrdb \
-    gpe-soundserver"
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    gpe-bootsplash \
+    libgtkstylus \
+    detect-stylus"
 
-RDEPENDS_gpe-task-base := "${gpe-base} libfontconfig-utils"
+RDEPENDS_gpe-task-base := "${gpe-base}"
 DEPENDS += " ${gpe-base}"
 
 gpe-task-pim = "\
@@ -35,78 +36,72 @@ gpe-task-pim = "\
     gpe-calendar \
     gpe-sketchbook \
     gpe-contacts \
-    gpe-today \
-    dillo2"
+    gpe-today"
 RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
 DEPENDS += " ${gpe-task-pim}"
 
-gpe-task-utils = "\
+gpe-task-settings = "\
+    matchbox-panel-manager \
     gpe-bluetooth \
-    gpe-mixer \
-    gpe-edit \
     gpe-su \
     gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-shield \
     gpe-wlancfg \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    xmonobut"
+
+RDEPENDS_gpe-task-settings := "${gpe-task-settings}"
+DEPENDS += " ${gpe-task-settings}"
+
+gpe-task-apps = "\
+    gpe-edit \
     gpe-gallery \
     gpe-calculator \
-    minilite \
-    miniclipboard \
-    gpe-taskmanager \
+    gpe-filemanager \
+    gpe-irc \
+    gpe-nmf \
     gpe-package \
-    gpe-clock \
-    gpe-watch \
+    gpe-plucker \
     gpe-terminal \
+    gpe-watch \
     gpe-what \
-    gpe-shield \
-    keylaunch \
-    gpe-mininet \
-    xmonobut \
     matchbox-panel-hacks \
     rosetta \
-    detect-stylus"
+    dillo2"
+
+RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
+DEPENDS += " ${gpe-task-apps}"
+
+gpe-task-games = "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris"
+
+RDEPENDS_gpe-task-games := "${gpe-task-games}"
+DEPENDS += " ${gpe-task-games}"
+
+gpe-task-gtkapps = "\
+    firefox \
+    thunderbird \
+    minimo \
+    gaim"
+
+RDEPENDS_gpe-task-gtkapps := "${gpe-task-gtkapps}"
+DEPENDS += " ${gpe-task-gtkapps}"
 
-RDEPENDS_gpe-task-utils := "${gpe-task-utils}"
-DEPENDS += " ${gpe-task-utils}"
+gpe-task-gnomeapps = "\
+    gail \
+    gal \
+    galculator \
+    gnumeric \
+    gpdf \
+    totem"
 
-#    gpe-collateral-gtk2 \
-#    gdk-pixbuf2-loader-jpeg \
-#    \
-#    gpe-bootsplash2 \
-#    \
-#    keylaunch \
-#    esd \
-#    detect-stylus \
-#    gpe-soundserver \
-#    gpe-mimedir-tools \
-#    teleport \
-#    gpe-keylock \
-#    \
-#    xmonobut \
-#    minilite \
-#    minibat \
-#    minipredict \
-#    matchbox-panel-hacks \
-#    mbinputmgr \
-#    \
-#    xstroke \
-#    rosetta \
-#    xkbd \
-#    mbmerlin \
-#    \
-#    startup-monitor \
-#    \
-#    xtscal \
-#    gpe-su2 \
-#    gpe-conf \
-#    gpe-confd \
-#    xst \
-#    \
-#    gpe-what \
-#    gpe-question2 \
-#    gpe-announce2 \
-#    \
-#    gpe-wlancfg \
-#    gpe-aerial \
-#    hotplug-dbus \
-#    gpe-autostarter \
-#    nsqld
+RDEPENDS_gpe-task-gnomeapps := "${gpe-task-gnomeapps}"
+DEPENDS += " ${gpe-task-gnomeapps}"
diff --git a/nonworking/openttd/openttd_0.3.2.1.oe b/nonworking/openttd/openttd_0.3.2.1.oe
index e69de29bb2..acd416f5b5 100644
--- a/nonworking/openttd/openttd_0.3.2.1.oe
+++ b/nonworking/openttd/openttd_0.3.2.1.oe
@@ -0,0 +1,29 @@
+DESCRIPTION = "Open Transport Tycoon Clone for SDL."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}.tbz"
+
+do_compile() {
+	oe_runmake WITH_ZLIB=1 UNIX=1 MANUAL_CONFIG=1
+}
+
+do_install() {
+        install -d ${D}/${palmtopdir}/apps/Games \
+        	   ${D}/${palmtopdir}/pics \
+        	   ${D}/${palmtopdir}/share/vectoroids \
+        	   ${D}/${palmtopdir}/bin
+        install -m 0755 vectoroids-${PV} ${D}/${palmtopdir}/bin/vectoroids
+	install -m 0644 data/images/icon.png ${D}/${palmtopdir}/pics/vectoroids.png
+	cp -a data/* ${D}/${palmtopdir}/share/vectoroids
+
+	echo "[Desktop Entry]" >${D}/${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Comment=Asteroids game" >>${D}/${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Exec=vectoroids" >>${D}/${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Icon=vectoroids" >>${D}/${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Type=Application" >>${D}/${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Name=Vectoroids" >>${D}/${palmtopdir}/apps/Games/vectoroids.desktop
+}
diff --git a/powermanga/powermanga_0.79.oe b/powermanga/powermanga_0.79.oe
index c3580bc45b..a39189698d 100644
--- a/powermanga/powermanga_0.79.oe
+++ b/powermanga/powermanga_0.79.oe
@@ -3,7 +3,8 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libsdl libsdl-mixer"
+DEPENDS = "libsdl-qpe libsdl-mixer"
+PR = "r1"
 
 SRC_URI = "http://linux.tlk.fr/games/Powermanga/download/powermanga-0.79.tgz \
 	   file://linuxroutines.cpp \
diff --git a/rott/rott_1.0.oe b/rott/rott_1.0.oe
index e69de29bb2..8865965a9f 100644
--- a/rott/rott_1.0.oe
+++ b/rott/rott_1.0.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Rise of the Triad - an SDL based Doom clone - QtE based Palmtop Environments Edition"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer"
+PR = "r1"
+
+SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz"
+S = "${WORKDIR}/rott-${PV}/rott"
+
+CFLAGS += "-DPLATFORM_UNIX"
+EXTRA_OEMAKE = 'SDL_INC_DIR=${STAGING_INCDIR}/SDL CC="${CC}" EXTRALDFLAGS="${LDFLAGS}"'
+
+# FIXME: Add Opie integration, i.e. a .desktop file and a logo
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin/
+	install -m 0755 rott ${D}/${palmtopdir}/bin/
+}
+
+FILES_${PN} = "${palmtopdir}"
diff --git a/vectoroids/vectoroids_1.1.0.oe b/vectoroids/vectoroids_1.1.0.oe
index 47f3c3b627..fd9fe90d0f 100644
--- a/vectoroids/vectoroids_1.1.0.oe
+++ b/vectoroids/vectoroids_1.1.0.oe
@@ -3,7 +3,8 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/libqpe virtual/libsdl libsdl-image libsdl-mixer"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/x/vectoroids/src/vectoroids-${PV}.tar.gz"