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

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

2004/10/20 21:53:43+01:00 (none)!cwiiis
- Restore old function of meta-gpe for gpe-image
- Add new package meta-gpe-extras.

2004/10/20 21:51:56+01:00 (none)!cwiiis
Add gweled with patches to remove all gnome dependencies.

BKrev: 4176d06fqiDF_pNoYIptiYelne-6Yw

6 files changed, 42 insertions, 138 deletions

diff --git a/gweled/gweled-0.5/de-gnome.patch b/gweled/gweled-0.5/de-gnome.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gweled/gweled-0.5/de-gnome.patch
diff --git a/gweled/gweled_0.5.oe b/gweled/gweled_0.5.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gweled/gweled_0.5.oe
diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe
deleted file mode 100644
index 52b03fdadb..0000000000
--- a/meta/gpe-collections.oe
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# 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 \
-    ttf-bitstream-vera"
-
-GPE_BASE_RDEPENDS = "\
-    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-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 \
-    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_INSTALL_bigscreen = "firefox linphone"
-
-GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh"
-
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
-
-XSERVER ?= "xserver-kdrive-fbdev"
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 9417c7efeb..5376eac8a4 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,20 +1,34 @@
-include gpe-collections.oe
 
 MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 
-PR = "r4"
+PR = "r5"
 
 export IMAGE_BASENAME = "gpe-image"
 
-DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
-	   ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \
+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_INSTALL_bigscreen = "firefox linphone"
+
+GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
+GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh"
+
+GPE_EXTRA_DEPENDS_none = ""
+GPE_EXTRA_INSTALL_none = ""
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+DEPENDS = "task-bootstrap \
+	   meta-gpe \
 	   ${GPE_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
-           	       ${GPE_PIM} ${GPE_BASE_SETTINGS} \
-	               ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
+export IPKG_INSTALL = "task-bootstrap gpe-task-base \
+           	       gpe-task-pim gpe-task-settings \
+	               gpe-task-apps ${GPE_EXTRA_DEPENDS} \
 		       ${XSERVER} \
-		       ${GPE_BASE_RDEPENDS} \
 		       ${GPE_EXTRA_INSTALL}"
 
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
diff --git a/meta/meta-gpe-extras.oe b/meta/meta-gpe-extras.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/meta-gpe-extras.oe
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index c8bb4b19d2..e640655cca 100644
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -1,13 +1,18 @@
-PACKAGES = gpe gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-gtkapps gpe-task-gnomeapps
+PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r14"
+PR = "r15"
 
 ALLOW_EMPTY = 1
 
-gpe-base = "\
+gpe-base-depends = "\
     diet-x11 \
-    virtual/xserver \
+    virtual/xserver"
+
+RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
+DEPENDS += " ${gpe-base-depends}"
+
+gpe-task-base = "\
     matchbox \
     xcursor-transparent-theme \
     rxvt-unicode \
@@ -17,6 +22,7 @@ gpe-base = "\
     xhost \
     xrdb \
     gpe-soundserver \
+    ttf-bitstream-vera \
     gpe-dm \
     gpe-login \
     gpe-session-scripts \
@@ -27,8 +33,15 @@ gpe-base = "\
     libgtkstylus \
     detect-stylus"
 
-RDEPENDS_gpe-task-base := "${gpe-base}"
-DEPENDS += " ${gpe-base}"
+RDEPENDS_gpe-task-base := "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-task-base}"
+DEPENDS += " ${gpe-task-base}"
 
 gpe-task-pim = "\
     gpe-timesheet \
@@ -62,48 +75,13 @@ gpe-task-apps = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
-    gpe-filemanager \
-    gpe-irc \
-    gpe-nmf \
     gpe-package \
     gpe-plucker \
-    gpe-soundbite \
     gpe-terminal \
     gpe-watch \
     gpe-what \
     matchbox-panel-hacks \
-    rosetta \
-    dillo2"
+    rosetta"
 
 RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
 DEPENDS += " ${gpe-task-apps}"
-
-gpe-task-games = "\
-    gpe-go \
-    gpe-lights \
-    gpe-othello \
-    gpe-tetris \
-    gsoko \
-    xdemineur"
-
-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}"
-
-gpe-task-gnomeapps = "\
-    gail \
-    galculator \
-    gnumeric \
-    gpdf \
-    totem"
-
-RDEPENDS_gpe-task-gnomeapps := "${gpe-task-gnomeapps}"
-DEPENDS += " ${gpe-task-gnomeapps}"