From 3e2effd8fab714985d1187e17ba1fb484439b78d Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 29 Apr 2006 12:27:49 +0000
Subject: slugos-init: Removed the modprobes from linuxrc while we have those
 modules compiled into the kernel.

---
 packages/slugos-init/files/turnup        | 12 ++++++------
 packages/slugos-init/slugos-init_0.10.bb |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 55750dd5fe..ff1397e4c1 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -406,12 +406,12 @@ boot_rootfs() {
 			return 1
 		};;
 	*)	{	echo '#!/bin/sh'
-			echo 'modprobe ehci-hcd'
-			echo 'modprobe ohci-hcd'
-			echo 'modprobe sd_mod'
-			echo 'modprobe usb-storage'
-			echo 'modprobe ext3'
-			echo 'sleep 5'
+#			echo 'modprobe ehci-hcd'
+#			echo 'modprobe ohci-hcd'
+#			echo 'modprobe sd_mod'
+#			echo 'modprobe usb-storage'
+#			echo 'modprobe ext3'
+#			echo 'sleep 5'
 			echo 'leds beep'
 			test "$sleep" -gt 0 && echo -n "sleep='$sleep' "
 			test -n "$uuid" && echo -n "UUID='$uuid' "
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index c57f985f81..6a46eb49d7 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r61"
+PR = "r62"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
-- 
cgit v1.2.3


From 101afde2841e3c110181ad4c71bb0cbeae0f1fa1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 May 2006 18:58:46 +0000
Subject: glib: update to 2.8.4

---
 packages/glib-2.0/glib-2.0_2.8.4.bb | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 packages/glib-2.0/glib-2.0_2.8.4.bb

diff --git a/packages/glib-2.0/glib-2.0_2.8.4.bb b/packages/glib-2.0/glib-2.0_2.8.4.bb
new file mode 100644
index 0000000000..d660b61c06
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.8.4.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r1"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	autotools_stage_all
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
-- 
cgit v1.2.3


From 1d58c916264c6d87021435329b30108cab9819e7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 May 2006 19:50:43 +0000
Subject: freetype 2.1.10: apply patch to fix rpath abuse, courtesy Phil
 Blundell

---
 packages/freetype/files/no-hardcode.patch | 11 +++++++++++
 packages/freetype/freetype_2.1.10.bb      |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 packages/freetype/files/no-hardcode.patch

diff --git a/packages/freetype/files/no-hardcode.patch b/packages/freetype/files/no-hardcode.patch
new file mode 100644
index 0000000000..44ae450a14
--- /dev/null
+++ b/packages/freetype/files/no-hardcode.patch
@@ -0,0 +1,11 @@
+--- freetype-2.1.10/builds/unix/freetype-config.in.old	2006-05-01 12:39:20.000000000 +0100
++++ freetype-2.1.10/builds/unix/freetype-config.in	2006-05-01 12:39:34.000000000 +0100
+@@ -16,7 +16,7 @@
+ libdir=@libdir@
+ enable_shared=@enable_shared@
+ wl=@wl@
+-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
++hardcode_libdir_flag_spec=''
+ 
+ usage()
+ {
diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb
index 772b316cc8..35c0d0cbd6 100644
--- a/packages/freetype/freetype_2.1.10.bb
+++ b/packages/freetype/freetype_2.1.10.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library"
 HOMEPAGE = "http://www.freetype.org"
 SECTION = "libs"
 LICENSE = "freetype"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch;patch=1 \
+	   file://no-hardcode.patch;patch=1"
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
-- 
cgit v1.2.3


From b0001466290c332ff1720a5ed3763511826e4167 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 May 2006 07:10:34 +0000
Subject: libcroco: update to 0.6.1

---
 packages/libcroco/libcroco_0.6.1.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/libcroco/libcroco_0.6.1.bb

diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb
new file mode 100644
index 0000000000..d5553cf138
--- /dev/null
+++ b/packages/libcroco/libcroco_0.6.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
+SECTION = "x11/utils"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+DEPENDS = "glib-2.0 libxml2"
+LICENSE = "LGPL"
+PR = "r0"
+
+inherit autotools pkgconfig gnome
+
+do_stage() {
+	autotools_stage_all
+}
-- 
cgit v1.2.3


From f6bb411f9a58f8b13a2b273f6b101c4cd7b005f0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 2 May 2006 09:58:58 +0000
Subject: gnuz: fixed levels - close #835

---
 packages/gnuz/gnuz_0.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
index 54056d7a8a..9a164978ff 100644
--- a/packages/gnuz/gnuz_0.3.bb
+++ b/packages/gnuz/gnuz_0.3.bb
@@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-PR = "r1"
+PR = "r2"
 
 APPTYPE = "binary"
 APPNAME = "gnuz"
 APPDESKTOP = "${S}/data/"
 
 SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
-	   http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2"
+           http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2"
 
 S = "${WORKDIR}/gnuz"
 
-- 
cgit v1.2.3


From e64c00e3dea991e7a540afa4b5974b2bdd14c9ef Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 May 2006 18:04:41 +0000
Subject: libcroco: fix staging

---
 packages/libcroco/libcroco_0.6.1.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb
index d5553cf138..d92987adf3 100644
--- a/packages/libcroco/libcroco_0.6.1.bb
+++ b/packages/libcroco/libcroco_0.6.1.bb
@@ -3,10 +3,13 @@ SECTION = "x11/utils"
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "glib-2.0 libxml2"
 LICENSE = "LGPL"
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig gnome
 
 do_stage() {
-	autotools_stage_all
+        install -d ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/libcroco
+        install -m 644 src/*.h ${STAGING_INCDIR}/libcroco/
+        install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/
 }
-- 
cgit v1.2.3


From d08fb535971f6269da3d4f85d5cee0074efd52d3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 May 2006 18:19:01 +0000
Subject: jornada6xx.conf: sh -> sh3 and remove PREFERRED_VERSIONS, those
 should be in the $DISTRO.conf

---
 conf/machine/jornada6xx.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index 03fa7faa62..5aa492f57d 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -2,9 +2,7 @@
 #@NAME: HP Jornada 680
 #@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer
 
-TARGET_ARCH = "sh"
+TARGET_ARCH = "sh3"
 IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}"
-PREFERRED_VERSION_glibc = "2.3.4"
-PREFERRED_VERSION_glibc-initial = "2.3.4"
 
 include conf/machine/include/tune-sh3.conf
-- 
cgit v1.2.3


From 6f0a42794ed574ba83f4a67ed0b9f9de079e758e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 May 2006 18:20:08 +0000
Subject: lite5200.conf: remove stuff that should be in $DISTRO.conf

---
 conf/machine/lite5200.conf | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf
index 8df7b51d69..68efccef32 100644
--- a/conf/machine/lite5200.conf
+++ b/conf/machine/lite5200.conf
@@ -1,18 +1,10 @@
 TARGET_ARCH = "powerpc"
-TARGET_OS = "linux"
 IPKG_ARCHS = "all ppc ${MACHINE}"
 UBOOT_MACHINE = "Lite5200"
 SERIAL_CONSOLE="38400 ttyS0"
 
-DISTRO = "familiar"
 
 TARGET_PREFIX = powerpc-603e-linux-gnu-
-ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
-PREFERRED_PROVIDERS += "virtual/qte:qte virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 IMAGE_FSTYPES = "jffs2 tar.bz2"
 
-- 
cgit v1.2.3


From 3f77edde39cacd61aef016f48b1ac0e33105453d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 May 2006 10:07:26 +0000
Subject: angstrom 2006.9: slide cvsdate for hh-pxa kernel forward to get some
 bugfixes for hx4700 and h2200 machines

---
 conf/distro/angstrom-2006.9.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 1f1be076c9..c80a574a0d 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -15,6 +15,7 @@ FEED_URIS += " \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 SRCDATE = "20060425"
+SRCDATE_handhelds-pxa-2.6 = "20060506"
 
 
 # Opie
-- 
cgit v1.2.3


From 0d3454a64da518604fc4185eef1aa1ffe1c693e5 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 6 May 2006 12:32:14 +0000
Subject: zeroconf: add 0.9

---
 packages/zeroconf/files/.mtn2git_empty            |  0
 packages/zeroconf/files/debian-zeroconf           | 51 +++++++++++++++++++++++
 packages/zeroconf/files/zeroconf-default          | 17 ++++++++
 packages/zeroconf/zeroconf-0.6.1/zeroconf-default | 17 --------
 packages/zeroconf/zeroconf_0.9.bb                 | 21 ++++++++++
 5 files changed, 89 insertions(+), 17 deletions(-)
 create mode 100644 packages/zeroconf/files/.mtn2git_empty
 create mode 100644 packages/zeroconf/files/debian-zeroconf
 create mode 100644 packages/zeroconf/files/zeroconf-default
 delete mode 100644 packages/zeroconf/zeroconf-0.6.1/zeroconf-default
 create mode 100644 packages/zeroconf/zeroconf_0.9.bb

diff --git a/packages/zeroconf/files/.mtn2git_empty b/packages/zeroconf/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/zeroconf/files/debian-zeroconf b/packages/zeroconf/files/debian-zeroconf
new file mode 100644
index 0000000000..c3705d2788
--- /dev/null
+++ b/packages/zeroconf/files/debian-zeroconf
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+if [ ! -x /usr/sbin/zeroconf ]; then
+    exit 0
+fi
+
+# IPv4 link-local addresses (zeroconf) are
+# only applicable on the 'inet' address family
+[ "X$ADDRFAM" != "Xinet" ] && exit 0
+
+# However there are some methods where it doesn't
+# make any sense to configure an IPv4LL address
+
+# not on loopback
+[ "X$METHOD" = "Xloopback" ] && exit 0
+
+# not on ppp or wvdial either
+[ "X$METHOD" = "Xppp" ] && exit 0
+[ "X$METHOD" = "Xwvdial" ] && exit 0
+
+# The administrator may have blacklisted interfaces
+# or only want zeroconf in a fallback situation
+[ -f /etc/default/zeroconf ] &&
+    . /etc/default/zeroconf
+
+[ -n "$DISABLE" ] && exit 0
+
+for BLACK in $IFBLACKLIST; do
+    case $IFACE in
+	$BLACK)
+	exit 0
+	;;
+    esac
+done
+
+# should we only allocate an address if we do not already have one?
+if [ -n "$FALLBACK" ]; then
+    /bin/ip addr show $IFACE scope global | grep -q "inet"
+    IP=$?
+    if [ $IP -eq 0 ]; then
+        /bin/ip route add 169.254.0.0/16 dev $IFACE
+        exit 0
+    fi
+fi
+
+# otherwise, run if we aren't already going
+if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then
+	/usr/sbin/zeroconf -i $IFACE
+fi
+
+exit 0
diff --git a/packages/zeroconf/files/zeroconf-default b/packages/zeroconf/files/zeroconf-default
new file mode 100644
index 0000000000..cc07b275f1
--- /dev/null
+++ b/packages/zeroconf/files/zeroconf-default
@@ -0,0 +1,17 @@
+# Default for zeroconf
+
+# disable zeroconf
+# If you want to disable zeroconf completely, uncomment the following line
+# this may be useful if you are debugging zeroconf or starting it manually
+#DISABLE=yes
+
+# black-listed interfaces
+# Interfaces which you never wish to have zeroconf run on should
+# be listed here. e.g. "eth2 wlan1" in a space seperated string
+IFBLACKLIST=""
+
+# fallback only
+# If you would only like a link-local address if you were unable to
+# obtain an address via DHCP then uncomment the following line
+#FALLBACK=yes
+
diff --git a/packages/zeroconf/zeroconf-0.6.1/zeroconf-default b/packages/zeroconf/zeroconf-0.6.1/zeroconf-default
deleted file mode 100644
index cc07b275f1..0000000000
--- a/packages/zeroconf/zeroconf-0.6.1/zeroconf-default
+++ /dev/null
@@ -1,17 +0,0 @@
-# Default for zeroconf
-
-# disable zeroconf
-# If you want to disable zeroconf completely, uncomment the following line
-# this may be useful if you are debugging zeroconf or starting it manually
-#DISABLE=yes
-
-# black-listed interfaces
-# Interfaces which you never wish to have zeroconf run on should
-# be listed here. e.g. "eth2 wlan1" in a space seperated string
-IFBLACKLIST=""
-
-# fallback only
-# If you would only like a link-local address if you were unable to
-# obtain an address via DHCP then uncomment the following line
-#FALLBACK=yes
-
diff --git a/packages/zeroconf/zeroconf_0.9.bb b/packages/zeroconf/zeroconf_0.9.bb
new file mode 100644
index 0000000000..c8f7ddfa3a
--- /dev/null
+++ b/packages/zeroconf/zeroconf_0.9.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "IPv4 link-local address allocator"
+AUTHOR = "Anand Kumria <wildfire@progsoc.uts.edu.au>"
+HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/"
+LICENSE = "GPL"
+SECTION = "net"
+PRIORITY = "optional"
+
+PR = "r0"
+
+SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
+	   file://zeroconf-default \
+	   file://debian-zeroconf"
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -d ${D}${sysconfdir}/network/if-up.d
+	install -d ${D}${sysconfdir}/default
+	install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf
+	install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf
+	install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf
+}
-- 
cgit v1.2.3


From e1b98dd7d44d5d6bdb5c473ffe9158f03bbcfbd6 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 6 May 2006 13:15:38 +0000
Subject: avahi: bugfix release 0.6.10 - See
 http://avahi.org/milestone/Avahi%200.6.10

---
 packages/avahi/avahi_0.6.10.bb | 54 ++++++++++++++++++++++++++++++++++++++++++
 packages/avahi/avahi_0.6.9.bb  | 54 ------------------------------------------
 2 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 packages/avahi/avahi_0.6.10.bb
 delete mode 100644 packages/avahi/avahi_0.6.9.bb

diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb
new file mode 100644
index 0000000000..95c930d8e8
--- /dev/null
+++ b/packages/avahi/avahi_0.6.10.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+SECTION = "network"
+PRIORITY = "optional"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
+HOMEPAGE = "http://avahi.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+LICENSE= "GPL"
+
+DEPENDS = "expat libdaemon dbus"
+RRECOMMENDS = "libnss-mdns"
+
+SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
+
+PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+		      ${sysconfdir}/avahi/avahi-daemon.conf \
+		      ${sysconfdir}/avahi/hosts \
+		      ${sysconfdir}/avahi/services \
+		      ${sysconfdir}/dbus-1 \
+		      ${sysconfdir}/init.d/avahi-daemon \
+		      ${datadir}/avahi/introspection/*.introspect \
+		      ${datadir}/avahi/avahi-service.dtd \
+		      ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+			${sysconfdir}/avahi/avahi-dnsconfd.action \
+			${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_avahi-utils = "${bindir}/avahi-*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+pkg_postinst_avahi-daemon () {
+	grep avahi /etc/group || addgroup avahi
+	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+	/etc/init.d/dbus-1 force-reload
+}
+
+pkg_postrm_avahi-daemon () {
+	deluser avahi || true
+	delgroup avahi || true
+}
diff --git a/packages/avahi/avahi_0.6.9.bb b/packages/avahi/avahi_0.6.9.bb
deleted file mode 100644
index 95c930d8e8..0000000000
--- a/packages/avahi/avahi_0.6.9.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
-LICENSE= "GPL"
-
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/hosts \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-pkg_postinst_avahi-daemon () {
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
-- 
cgit v1.2.3


From 017e0d534efae56a86e77aaaaa21b904b675f5e9 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 May 2006 15:57:21 +0000
Subject: libgpewidget: add 0.111

---
 packages/libgpewidget/libgpewidget_0.111.bb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 packages/libgpewidget/libgpewidget_0.111.bb

diff --git a/packages/libgpewidget/libgpewidget_0.111.bb b/packages/libgpewidget/libgpewidget_0.111.bb
new file mode 100644
index 0000000000..780d1e920b
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.111.bb
@@ -0,0 +1,26 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION     = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ cairo libxrender gtk-doc"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR          = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
+
+SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}"
+
+EXTRA_OECONF = "--enable-cairo"
+
+PARALLEL_MAKE = ""
+
+LDFLAGS += " -L${STAGING_LIBDIR}" 
+
+do_stage () {
+	autotools_stage_all
+}
+
-- 
cgit v1.2.3


From 0e8a03ebe07638a2055dc2316cc43bf735a30a3f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 May 2006 16:54:45 +0000
Subject: qt3x11.bbclass: add DEPENDS on qt3 qt4x11.bbclass: add DEPENDS on qt4

---
 classes/qt3x11.bbclass | 20 ++++++++++++--------
 classes/qt4x11.bbclass | 25 +++++++++++++------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 09b9cbac96..6e3d5f8ba2 100644
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -1,11 +1,15 @@
+DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
-export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM"
-export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT="qt"
-export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm"
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+
+
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 04aff565be..635fc67694 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,16 +1,17 @@
 DEPENDS_prepend = "qmake2-native "
+DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
 #
 # override variables set by qmake-base to compile Qt4/X11 apps
 #
-export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4"
-export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4"
-export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4"
-export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2"
-export OE_QMAKE_LINK="${CXX}"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
-export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT="qt"
-export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm"
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
+export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4"
+export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/qmake2"
+export OE_QMAKE_LINK = "${CXX}"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
-- 
cgit v1.2.3


From 4588de1cde5001a58577d246187a6d77d69f38d2 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 May 2006 16:55:40 +0000
Subject: libqanava, lyx, texmaker, wpa-gui: no need to explicitly depend on
 qt, inheriting will do

---
 packages/libqanava/libqanava_0.0.7.bb    | 1 -
 packages/lyx/lyx_1.4.0.bb                | 2 +-
 packages/lyx/lyx_1.4.1.bb                | 2 +-
 packages/texmaker/texmaker_1.3.bb        | 1 -
 packages/wpa-supplicant/wpa-gui_0.4.8.bb | 3 +--
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb
index 8562a5f112..13ab88c3d2 100644
--- a/packages/libqanava/libqanava_0.0.7.bb
+++ b/packages/libqanava/libqanava_0.0.7.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Qanava is a gtaph library based on the Qt4 Arthur framework."
 SECTION = "x11/libs"
 HOMEPAGE = "http://www.libqanava.org/"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "qt4x11"
 # LGPL after 0.0.7
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/lyx/lyx_1.4.0.bb b/packages/lyx/lyx_1.4.0.bb
index b3f6a2c7ad..644d8bfa73 100644
--- a/packages/lyx/lyx_1.4.0.bb
+++ b/packages/lyx/lyx_1.4.0.bb
@@ -3,7 +3,7 @@ SECTION = "x11/office"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "boost qt3x11"
+DEPENDS = "boost"
 RRECOMMENDS = "tetex"
 PR = "r0"
 
diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb
index 0cd925ad50..59dc35f0ff 100644
--- a/packages/lyx/lyx_1.4.1.bb
+++ b/packages/lyx/lyx_1.4.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/office"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "boost qt3x11"
+DEPENDS = "boost"
 RRECOMMENDS = "tetex"
 PR = "r0"
 
diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb
index 0ca09032cb..34704ba111 100644
--- a/packages/texmaker/texmaker_1.3.bb
+++ b/packages/texmaker/texmaker_1.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor"
 HOMEPAGE = "http://www.xm1math.net/texmaker"
 SECTION = "x11/apps"
 LICENSE = "GPL"
-DEPENDS = "qt4x11"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2"
diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
index 0908a5c995..686545a148 100644
--- a/packages/wpa-supplicant/wpa-gui_0.4.8.bb
+++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
@@ -5,6 +5,7 @@ edit wpa_supplicant networks."
 SECTION = "network"
 LICENSE = "GPL BSD"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz "
 
@@ -12,8 +13,6 @@ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/"
 
 inherit qmake qt3x11
 
-EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
-
 do_install () {
 	install -d ${D}${sbindir}
 	install -m 755 wpa_gui ${D}${sbindir}
-- 
cgit v1.2.3


From b7c0b97dec8d44496972003a3258654945872d29 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 6 May 2006 17:52:09 +0000
Subject: zaurusd: Use our own copy of zaurus-hinge.in instead of patching.
 Clean up the .bb a bit.

---
 .../files/mbinputmgr-honor-user-prefs.patch        | 65 ----------------
 packages/zaurusd/files/zaurus-hinge.in             | 91 ++++++++++++++++++++++
 packages/zaurusd/zaurusd_svn.bb                    | 17 ++--
 3 files changed, 101 insertions(+), 72 deletions(-)
 delete mode 100644 packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
 create mode 100644 packages/zaurusd/files/zaurus-hinge.in

diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
deleted file mode 100644
index e2d56874c9..0000000000
--- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- zaurusd/scripts/zaurus-hinge.in	2006-03-24 18:23:15.000000000 +0100
-+++ zaurusd/scripts/zaurus-hinge	2006-03-24 18:33:24.480748696 +0100
-@@ -18,6 +18,10 @@
-    exit 1
- fi
- 
-+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`"
-+
-+
-+
- STATE=$1
- 
- if [ $STATE = "3" ]; then
-@@ -29,8 +33,21 @@
- fi
- 
- if [ $STATE = "0" ]; then
--  #echo "lanscape"
--  killproc @bindir@/mbinputmgr
-+  #echo "landscape"
-+
-+  # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure
-+  # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance
-+  # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;)
-+
-+  if ! test -e "/tmp/gpe-panel.session-$panel_user"
-+  then
-+    test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
-+    test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
-+  else
-+    cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
-+    rm "/tmp/gpe-panel.session-$panel_user"
-+  fi
-+   
-   # urg mbinputmgr should kill below
-   killproc @bindir@/matchbox-keyboard
-   killproc @bindir@/matchbox-stroke
-@@ -47,8 +64,25 @@
-   fi
-   # just to be extra safe
-   sleep 1
--  if [ -x @bindir@/mbinputmgr ]; then
--    @bindir@/mbinputmgr &
-+      
-+  echo "panel_user = [$panel_user]"
-+
-+  if ! test -e "/tmp/gpe-panel.session-$panel_user"
-+  then
-+    cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
-+  else
-+    rm "/tmp/gpe-panel.session-$panel_user"
-   fi
-+  
-+  if test -n "$panel_user"
-+  then
-+    echo "Running panel as user [$panel_user]"
-+    ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr &
-+  else
-+     # A failsafe can't hurt
-+     echo "Warning: Running mbinputmgr as root!"
-+     ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr &
-+  fi
-+
-   exit 0
- fi
diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in
new file mode 100644
index 0000000000..1d4682e603
--- /dev/null
+++ b/packages/zaurusd/files/zaurus-hinge.in
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# Quick handler for chkhinge26 and X. 
+#
+
+killproc() {            # kill the named process(es)
+        pid=`/bin/ps -e x |
+             /bin/grep $1 |
+             /bin/grep -v grep |
+             /bin/sed -e 's/^  *//' -e 's/ .*//'`
+        [ "$pid" != "" ] && kill $pid
+}
+
+export DISPLAY=:0
+
+if [ -z "$1" ]; then
+   echo "Usage: hinge-handler <state> ( 3 = closed, 0 = landscape, 2 = portrait )"
+   exit 1
+fi
+
+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`"
+
+
+
+STATE=$1
+
+if [ $STATE = "3" ]; then
+  #echo "sleeping"
+#
+# uncomment 'if' block below to have zaurus suspend on hinge close
+#
+#  if [ -x @bindir@/apm ]; then
+#    apm -s
+#  fi
+  exit 0
+fi
+
+if [ $STATE = "0" ]; then
+  #echo "landscape"
+
+  # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure
+  # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance
+  # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;)
+
+  if ! test -e "/tmp/gpe-panel.session-$panel_user"
+  then
+    test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
+    test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
+  else
+    cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
+    rm "/tmp/gpe-panel.session-$panel_user"
+  fi
+   
+  # urg mbinputmgr should kill below
+  killproc @bindir@/matchbox-keyboard
+  killproc @bindir@/matchbox-stroke
+  if [ -x @bindir@/xrandr ]; then
+    xrandr -o normal
+  fi
+  exit 0
+fi
+
+if [ $STATE = "2" ]; then
+  #echo "portrait"
+  if [ -x @bindir@/xrandr ]; then
+    @bindir@/xrandr -o left 
+  fi
+  # just to be extra safe
+  sleep 1
+      
+  echo "panel_user = [$panel_user]"
+
+  if ! test -e "/tmp/gpe-panel.session-$panel_user"
+  then
+    cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
+  else
+    rm "/tmp/gpe-panel.session-$panel_user"
+  fi
+  
+  if test -n "$panel_user"
+  then
+    echo "Running panel as user [$panel_user]"
+    ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr &
+  else
+     # A failsafe can't hurt
+     echo "Warning: Running mbinputmgr as root!"
+     ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr &
+  fi
+
+  exit 0
+fi
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 52a7b353d3..ec385d4934 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -1,20 +1,23 @@
-LICENSE = "GPL"
+DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
 MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
-DESCRIPTION = "Daemon to handle device specifc features."
-PV = "0.0+svn${SRCDATE}"
-PR = "r2"
+LICENSE = "GPL"
 DEPENDS = "tslib"
+PV = "0.0+svn${SRCDATE}"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
-	   file://mbinputmgr-honor-user-prefs.patch;patch=1"
+           file://zaurus-hinge.in"
+
 S = "${WORKDIR}/${PN}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit autotools pkgconfig
+do_configure_prepend () {
+	cp ${WORKDIR}/zaurus-hinge.in ${S}/scripts
+}
 
-inherit update-rc.d
+inherit autotools pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "zaurusd"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
-- 
cgit v1.2.3


From dae79b434ee64cc19d09eb27d0adb61cd5dd282d Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 6 May 2006 21:17:02 +0000
Subject: slugos-packages.conf: added dhcp (includes dhclient)

---
 conf/distro/slugos-packages.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 87ca470069..784bc5d8fd 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -41,6 +41,7 @@ ${PKGDIR}/packages/dbus/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/device-mapper/*.bb \
 ${PKGDIR}/packages/devlabel/*.bb \
+${PKGDIR}/packages/dhcp/*.bb \
 ${PKGDIR}/packages/didiwiki/*.bb \
 ${PKGDIR}/packages/diffstat/*.bb \
 ${PKGDIR}/packages/diffutils/*.bb \
-- 
cgit v1.2.3


From c0d6211841a0da37a2e92ca603630fee633732bf Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 May 2006 22:32:48 +0000
Subject: add ulxmlrpcpp, a lightweight c++ based library for XMLRPC
 applications

---
 packages/ulxmlrpcpp/.mtn2git_empty           |  0
 packages/ulxmlrpcpp/files/.mtn2git_empty     |  0
 packages/ulxmlrpcpp/files/disable-docs.patch | 15 +++++++++++++++
 packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb      | 23 +++++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 packages/ulxmlrpcpp/.mtn2git_empty
 create mode 100644 packages/ulxmlrpcpp/files/.mtn2git_empty
 create mode 100644 packages/ulxmlrpcpp/files/disable-docs.patch
 create mode 100644 packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb

diff --git a/packages/ulxmlrpcpp/.mtn2git_empty b/packages/ulxmlrpcpp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ulxmlrpcpp/files/.mtn2git_empty b/packages/ulxmlrpcpp/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ulxmlrpcpp/files/disable-docs.patch b/packages/ulxmlrpcpp/files/disable-docs.patch
new file mode 100644
index 0000000000..959e559c15
--- /dev/null
+++ b/packages/ulxmlrpcpp/files/disable-docs.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- ulxmlrpcpp-1.5.2/ulxmlrpcpp/Makefile.am~disable-docs
++++ ulxmlrpcpp-1.5.2/ulxmlrpcpp/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I. -I $(top_srcdir)  $(all_includes) $(EA_EXTRA_INC)
+ 
+-SUBDIRS = . contrib docs tests po apps httpd
++SUBDIRS = . contrib tests po apps httpd
+ 
+ AM_CXXFLAGS = -DULXR_DATADIR=\"$(datadir)\" -DULXR_HAVE_CONFIG_H
+ 
diff --git a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb b/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
new file mode 100644
index 0000000000..e41bf2f4d3
--- /dev/null
+++ b/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A lightweight C++ based library for XMLRPC applications"
+HOMEPAGE = "http://ulxmlrpcpp.sf.net"
+LICENSE = "LGPL"
+SECTION = "libs"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "expat"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ulxmlrpcpp/ulxmlrpcpp-${PV}-src.tar.bz2 \
+           file://disable-docs.patch;patch=1"
+
+inherit autotools
+
+do_configure_prepend() {
+	install -d config
+	touch config/lib-prefix.m4 config/lib-link.m4 config/lib-ld.m4
+}
+
+LEAD_SONAME = "libulxmlrpcpp.so"
+PACKAGES =+ "${PN}-examples ${PN}-contrib"
+FILES_${PN}-examples = "${bindir}"
+FILES_${PN}-contrib = "${libdir}/*contrib*"
+
-- 
cgit v1.2.3


From 139bf32df21d4359c8d8a7ea92216c5af2bf99e3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 6 May 2006 23:17:08 +0000
Subject: xlibs: Update XORG_MIRROR SRC_URIs to match upstream changes

---
 packages/xlibs/libfontenc_1.0.1.bb              |  8 ++------
 packages/xlibs/libice_X11R7.0-1.0.0.bb          |  9 ++-------
 packages/xlibs/liblbxutil_1.0.0.bb              | 12 +++++-------
 packages/xlibs/libsm_X11R7.0-1.0.0.bb           |  9 ++-------
 packages/xlibs/libx11_X11R7.0-1.0.0.bb          |  9 ++-------
 packages/xlibs/libxau_1.0.0.bb                  |  8 ++------
 packages/xlibs/libxaw_X11R7.0-1.0.1.bb          |  9 ++-------
 packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb | 11 ++++-------
 packages/xlibs/libxcursor_1.1.5.2.bb            | 11 +++--------
 packages/xlibs/libxdamage_1.0.2.2.bb            |  9 ++-------
 packages/xlibs/libxdmcp_1.0.0.bb                |  9 ++-------
 packages/xlibs/libxext_1.0.0.bb                 | 10 +++-------
 packages/xlibs/libxfixes_3.0.1.2.bb             |  9 ++-------
 packages/xlibs/libxfont_X11R7.0-1.0.0.bb        |  9 ++-------
 packages/xlibs/libxft_2.1.8.2.bb                | 12 ++++--------
 packages/xlibs/libxi_X11R7.0-1.0.0.bb           |  9 ++-------
 packages/xlibs/libxinerama_X11R7.0-1.0.1.bb     |  9 ++-------
 packages/xlibs/libxkbfile_1.0.1.bb              |  8 ++------
 packages/xlibs/libxkbui_1.0.1.bb                |  7 ++-----
 packages/xlibs/libxmu_1.0.0.bb                  | 11 +++--------
 packages/xlibs/libxp_1.0.0.bb                   |  9 ++-------
 packages/xlibs/libxpm_3.5.4.2.bb                |  5 ++---
 packages/xlibs/libxrandr_1.1.0.2.bb             |  9 ++-------
 packages/xlibs/libxrender_0.9.0.2.bb            |  9 ++-------
 packages/xlibs/libxres_X11R7.0-1.0.0.bb         |  9 ++-------
 packages/xlibs/libxss_1.0.1.bb                  |  9 ++-------
 packages/xlibs/libxt_1.0.0.bb                   |  9 ++-------
 packages/xlibs/libxtst_1.0.1.bb                 |  9 ++-------
 packages/xlibs/libxv_X11R7.0-1.0.1.bb           |  9 ++-------
 packages/xlibs/libxxf86dga_1.0.0.bb             |  5 ++---
 packages/xlibs/libxxf86misc_1.0.0.bb            |  9 ++-------
 packages/xlibs/libxxf86vm_1.0.0.bb              |  8 ++------
 packages/xlibs/util-macros_1.0.1.bb             | 10 +++-------
 packages/xlibs/xorg-xlibs.inc                   |  8 ++++++++
 packages/xlibs/xtrans_1.0.0.bb                  |  8 ++------
 35 files changed, 87 insertions(+), 226 deletions(-)
 create mode 100644 packages/xlibs/xorg-xlibs.inc

diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb
index 3d56bca223..02883c4d26 100644
--- a/packages/xlibs/libfontenc_1.0.1.bb
+++ b/packages/xlibs/libfontenc_1.0.1.bb
@@ -6,10 +6,6 @@ LICENSE = "BSD-X"
 
 DEPENDS = "zlib xproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb
index 251188b1c2..cd5c2d372f 100644
--- a/packages/xlibs/libice_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libice_X11R7.0-1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE= "MIT"
 DEPENDS = "libx11 util-macros"
 PROVIDES = "ice"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libICE-${PV}.tar.bz2"
-S = "${WORKDIR}/libICE-${PV}"
+XORG_PN = "libICE"
 
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xlibs/liblbxutil_1.0.0.bb
index 4edaa71ba4..36837c23e4 100644
--- a/packages/xlibs/liblbxutil_1.0.0.bb
+++ b/packages/xlibs/liblbxutil_1.0.0.bb
@@ -6,14 +6,12 @@ LICENSE = "GPL"
 
 DEPENDS = "xextproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2 \
-		   file://mkg3states.patch;patch=1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
 
-inherit autotools pkgconfig
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \
+		   file://mkg3states.patch;patch=1"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
index d102f7db7a..bf96271ba6 100644
--- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE = "MIT-X"
 
 DEPENDS = "libx11 libice util-macros"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-${PV}.tar.bz2"
-S = "${WORKDIR}/libSM-${PV}"
+XORG_PN = "libSM"
 
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
index d5be287341..ac9d87292a 100644
--- a/packages/xlibs/libx11_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
@@ -9,10 +9,9 @@ PROVIDES = "x11"
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
-S = "${WORKDIR}/libX11-${PV}"
+XORG_PN = "libX11"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
@@ -24,7 +23,3 @@ do_compile() {
 	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb
index 828d4ebd3d..f64be68583 100644
--- a/packages/xlibs/libxau_1.0.0.bb
+++ b/packages/xlibs/libxau_1.0.0.bb
@@ -7,11 +7,7 @@ LICENSE= "MIT"
 DEPENDS = "xproto util-macros"
 PROVIDES = "xau"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
-S = "${WORKDIR}/libXau-${PV}"
+XORG_PN = "libXau"
 
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
index 4d3c6acdbd..03ac373f77 100644
--- a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
+++ b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
@@ -7,14 +7,9 @@ LICENSE = "MIT"
 DEPENDS = "xproto libx11 libxt libxmu libxpm"
 PROVIDES = "xaw"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXaw-${PV}.tar.bz2"
-S = "${WORKDIR}/libXaw-${PV}"
+XORG_PN = "libXaw"
 
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
 # FIXME: libXaw needs a full x11, not diet
 BROKEN = "1"
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
index 57eef74aa3..c26f12e5c9 100644
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -6,12 +6,9 @@ LICENSE= "BSD-X"
 DEPENDS = "libx11 compositeproto xextproto libxfixes"
 PROVIDES = "xcomposite"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
-	   file://change-include-order.patch;patch=1"
-S = "${WORKDIR}/libXcomposite-${PV}"
+XORG_PN = "libXcomposite"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-X11R7.0-${PV}.tar.bz2 \
+	   file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb
index d20b52d0f0..9aed134fbb 100644
--- a/packages/xlibs/libxcursor_1.1.5.2.bb
+++ b/packages/xlibs/libxcursor_1.1.5.2.bb
@@ -6,13 +6,8 @@ LICENSE= "BSD-X"
 
 DEPENDS = "libxfixes"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcursor-${PV}.tar.bz2"
-S = "${WORKDIR}/libXcursor-${PV}"
+XORG_PN = "libXcursor"
 
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb
index 572df1d190..acea09c7bd 100644
--- a/packages/xlibs/libxdamage_1.0.2.2.bb
+++ b/packages/xlibs/libxdamage_1.0.2.2.bb
@@ -6,11 +6,6 @@ LICENSE= "BSD-X"
 DEPENDS = "libx11 damageproto libxfixes xproto"
 PROVIDES = "xdamage"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdamage-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdamage-${PV}"
+XORG_PN = "libXdamage"
 
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb
index 4ba746369f..5ea8cdd513 100644
--- a/packages/xlibs/libxdmcp_1.0.0.bb
+++ b/packages/xlibs/libxdmcp_1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE= "MIT"
 DEPENDS = "xproto util-macros"
 PROVIDES = "xdmcp"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXdmcp-${PV}"
+XORG_PN = "libXdmcp"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb
index 1c15f819b6..1c4a21280e 100644
--- a/packages/xlibs/libxext_1.0.0.bb
+++ b/packages/xlibs/libxext_1.0.0.bb
@@ -7,13 +7,9 @@ LICENSE= "MIT"
 DEPENDS = "xproto libx11 xextproto util-macros"
 PROVIDES = "xext"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXext-${PV}.tar.bz2"
-S = "${WORKDIR}/libXext-${PV}"
+EXTRA_OECONF="--enable-malloc0returnsnull"
 
-inherit autotools pkgconfig 
+XORG_PN = "libXext"
 
-EXTRA_OECONF="--enable-malloc0returnsnull"
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb
index ea898d723b..b22da223f5 100644
--- a/packages/xlibs/libxfixes_3.0.1.2.bb
+++ b/packages/xlibs/libxfixes_3.0.1.2.bb
@@ -5,11 +5,6 @@ LICENSE= "BSD-X"
 
 DEPENDS = "libx11 fixesproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfixes-${PV}.tar.bz2"
-S = "${WORKDIR}/libXfixes-${PV}"
+XORG_PN = "libXfixes"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
index c4614e8d78..aff0e55e21 100644
--- a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
@@ -7,11 +7,6 @@ LICENSE = "BSD-X"
 DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype"
 PROVIDES = "xfont"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
-S = "${WORKDIR}/libXfont-${PV}"
+XORG_PN = "libXfont"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb
index d97049d935..f1b6456740 100644
--- a/packages/xlibs/libxft_2.1.8.2.bb
+++ b/packages/xlibs/libxft_2.1.8.2.bb
@@ -5,20 +5,16 @@ SECTION = "x11/libs"
 DEPENDS = "libx11 xproto libxrender freetype fontconfig"
 PROVIDES = "xft"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXft-${PV}.tar.bz2"
-S = "${WORKDIR}/libXft-${PV}"
+
+XORG_PN = "libXft"
+
+include xorg-xlibs.inc
 
 FILES_${PN} = ${libdir}/lib*.so.*
 FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig \
 		${datadir}/aclocal ${bindir} ${sbindir}
 
-inherit autotools pkgconfig 
-
-do_stage() {
-	autotools_stage_all
-}
-
 python do_package() {
         if bb.data.getVar('DEBIAN_NAMES', d, 1):
             bb.data.setVar('PKG_${PN}', 'libxft2', d)
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
index e771e60cda..fa63e588f3 100644
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -5,13 +5,8 @@ LICENSE = "MIT-X"
 
 DEPENDS = "xproto libx11 xextproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXi-${PV}.tar.bz2"
-S = "${WORKDIR}/libXi-${PV}"
+XORG_PN = "libXi"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
index 26b746d465..09a4f564f5 100644
--- a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
+++ b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
@@ -7,13 +7,8 @@ LICENSE = "MIT"
 DEPENDS = "xineramaproto xproto libx11 libxext"
 PROVIDES = "xinerama"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXinerama-${PV}.tar.bz2"
-S = "${WORKDIR}/libXinerama-${PV}"
+XORG_PN = "libXinerama"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb
index deae8278c5..5cbc9a1150 100644
--- a/packages/xlibs/libxkbfile_1.0.1.bb
+++ b/packages/xlibs/libxkbfile_1.0.1.bb
@@ -6,10 +6,6 @@ LICENSE = "GPL"
 
 DEPENDS = "libx11"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xlibs/libxkbui_1.0.1.bb
index b1ce4f4c11..ded3da66f3 100644
--- a/packages/xlibs/libxkbui_1.0.1.bb
+++ b/packages/xlibs/libxkbui_1.0.1.bb
@@ -6,10 +6,7 @@ LICENSE = "GPL"
 
 DEPENDS = "libx11 libxt libxkbfile kbproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb
index e404ff527d..1693e5d0d5 100644
--- a/packages/xlibs/libxmu_1.0.0.bb
+++ b/packages/xlibs/libxmu_1.0.0.bb
@@ -7,8 +7,9 @@ LICENSE = "MIT"
 DEPENDS = "libxt libxext util-macros"
 PROVIDES = "xmu"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXmu-${PV}.tar.bz2"
-S = "${WORKDIR}/libXmu-${PV}"
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
 
 PACKAGES =+ "libxmuu libxmuu-dev"
 
@@ -16,9 +17,3 @@ FILES_libxmuu = "${libdir}/libXmuu.so.*"
 FILES_libxmuu-dev = "${libdir}/libXmuu.so"
 
 LEAD_SONAME = "libXmu"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb
index c8547cf783..15653f1390 100644
--- a/packages/xlibs/libxp_1.0.0.bb
+++ b/packages/xlibs/libxp_1.0.0.bb
@@ -5,14 +5,9 @@ LICENSE = "MIT"
 
 DEPENDS = "libx11 libxext xextproto libxau printproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXp-${PV}.tar.bz2"
-S = "${WORKDIR}/libXp-${PV}"
+XORG_PN = "libXp"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb
index 0f2b8a94a1..c88bd3f6bc 100644
--- a/packages/xlibs/libxpm_3.5.4.2.bb
+++ b/packages/xlibs/libxpm_3.5.4.2.bb
@@ -7,10 +7,9 @@ PR = "r1"
 
 DEPENDS = "xproto libx11 util-macros"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXpm-${PV}.tar.bz2"
-S = "${WORKDIR}/libXpm-${PV}"
+XORG_PN = "libXpm"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 do_stage () {
 	install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb
index 81787ad871..3081f4ab86 100644
--- a/packages/xlibs/libxrandr_1.1.0.2.bb
+++ b/packages/xlibs/libxrandr_1.1.0.2.bb
@@ -5,13 +5,8 @@ LICENSE = "BSD-X"
 
 DEPENDS = "randrproto libx11 libxrender libxext"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrandr-${PV}.tar.bz2"
-S = "${WORKDIR}/libXrandr-${PV}"
+XORG_PN = "libXrandr"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb
index fdaa9f4eb9..1cff60983a 100644
--- a/packages/xlibs/libxrender_0.9.0.2.bb
+++ b/packages/xlibs/libxrender_0.9.0.2.bb
@@ -5,13 +5,8 @@ LICENSE = "BSD"
 
 DEPENDS = "renderproto libx11"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrender-${PV}.tar.bz2"
-S = "${WORKDIR}/libXrender-${PV}"
+XORG_PN = "libXrender"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
index 69f20fc8f4..a9806f57b1 100644
--- a/packages/xlibs/libxres_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
@@ -6,13 +6,8 @@ LICENSE = "X-MIT"
 DEPENDS = "libx11 xextproto libxext resourceproto"
 PROVIDES = "xres"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXres-${PV}.tar.bz2"
-S = "${WORKDIR}/libXres-${PV}"
+XORG_PN = "libXres"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
index 54abc86a23..fa6cb61ec7 100644
--- a/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xlibs/libxss_1.0.1.bb
@@ -7,14 +7,9 @@ DEPENDS = "libx11 libxext xextproto scrnsaverproto"
 PROVIDES = "libxss"
 RREPLACES = "libxss"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
-S = "${WORKDIR}/libXScrnSaver-${PV}"
+XORG_PN = "libXscrnSaver"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb
index be1b4c94e9..606de5f31c 100644
--- a/packages/xlibs/libxt_1.0.0.bb
+++ b/packages/xlibs/libxt_1.0.0.bb
@@ -7,10 +7,9 @@ LICENSE =  "X-MIT"
 DEPENDS = "libx11 libsm util-macros kbproto"
 PROVIDES = "xt"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/libXt-X11R7.0-${PV}"
+XORG_PN = "libXt"
 
-inherit autotools pkgconfig 
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
 
@@ -21,7 +20,3 @@ do_compile() {
 	)
 	oe_runmake
 }
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb
index 89c7b6607a..1355142ffd 100644
--- a/packages/xlibs/libxtst_1.0.1.bb
+++ b/packages/xlibs/libxtst_1.0.1.bb
@@ -7,11 +7,6 @@ LICENSE = "GPL"
 DEPENDS = "libx11 libxext recordproto xextproto inputproto"
 PROVIDES = "xtst"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXtst-${PV}.tar.bz2"
-S = "${WORKDIR}/libXtst-${PV}"
+XORG_PN = "libXtst"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
index 12b480dedc..2d5c6aeb17 100644
--- a/packages/xlibs/libxv_X11R7.0-1.0.1.bb
+++ b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
@@ -5,13 +5,8 @@ LICENSE = "GPL"
 
 DEPENDS = "libx11 libxext xextproto videoproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXv-${PV}.tar.bz2"
-S = "${WORKDIR}/libXv-${PV}"
+XORG_PN = "libXv"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
index 46ab999c5f..82e784789f 100644
--- a/packages/xlibs/libxxf86dga_1.0.0.bb
+++ b/packages/xlibs/libxxf86dga_1.0.0.bb
@@ -4,10 +4,9 @@ LICENSE = "XFree86"
 
 DEPENDS = "libx11 libxext xf86dgaproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2"
-S = "${WORKDIR}/libXxf86dga-${PV}"
+XORG_PN = "libXxf86dga"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xlibs/libxxf86misc_1.0.0.bb
index dfb65af2bc..5d5badb7a1 100644
--- a/packages/xlibs/libxxf86misc_1.0.0.bb
+++ b/packages/xlibs/libxxf86misc_1.0.0.bb
@@ -1,16 +1,11 @@
 DESCRIPTION = "Xxf86vm extension library."
 SECTION = "x11/libs"
 LICENSE = "MIT"
-
 DEPENDS = "libx11 libxext xf86miscproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86misc-${PV}.tar.bz2"
-S = "${WORKDIR}/libXxf86misc-${PV}"
+XORG_PN = "libXxf86misc"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
index a5df50e566..47a319c28e 100644
--- a/packages/xlibs/libxxf86vm_1.0.0.bb
+++ b/packages/xlibs/libxxf86vm_1.0.0.bb
@@ -4,13 +4,9 @@ LICENSE = "MIT"
 
 DEPENDS = "libx11 libxext xf86vidmodeproto"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2"
-S = "${WORKDIR}/libXxf86vm-${PV}"
+XORG_PN = "libXxf86vm"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb
index c019e94780..6b009a7ea7 100644
--- a/packages/xlibs/util-macros_1.0.1.bb
+++ b/packages/xlibs/util-macros_1.0.1.bb
@@ -3,12 +3,8 @@ SECTION = "x11/libs"
 LICENSE= "Xorg"
 #MAINTAINER = ""
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+XORG_PN = "${PN}"
 
-inherit autotools pkgconfig
+include xorg-xlibs.inc
 
-do_stage () {
-	autotools_stage_all
-}
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc
new file mode 100644
index 0000000000..037e2b9958
--- /dev/null
+++ b/packages/xlibs/xorg-xlibs.inc
@@ -0,0 +1,8 @@
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${XORG_PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb
index 79503126f2..b6933bf615 100644
--- a/packages/xlibs/xtrans_1.0.0.bb
+++ b/packages/xlibs/xtrans_1.0.0.bb
@@ -4,10 +4,6 @@ DESCRIPTION = "network API translation layer to \
 insulate X applications and libraries from OS \
 network vageries."
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+XORG_PN = "${PN}"
 
-inherit autotools  pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+include xorg-xlibs.inc
-- 
cgit v1.2.3


From 7f4df0a164bf45479f5c9aaf5fdbf76dae8e522e Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 6 May 2006 23:29:35 +0000
Subject: various: Update remaining XORG_MIRROR SRC_URIs to match upstream
 changes

---
 packages/xdpyinfo/xdpyinfo_1.0.1.bb | 3 ++-
 packages/xev/xev_1.0.1.bb           | 3 ++-
 packages/xhost/xhost_1.0.0.bb       | 3 ++-
 packages/xmodmap/xmodmap_1.0.0.bb   | 3 ++-
 packages/xorg-data/data-common.inc  | 3 ++-
 packages/xorg-fonts/font-common.inc | 3 ++-
 packages/xrandr/xrandr_1.0.1.bb     | 4 ++--
 packages/xrdb/xrdb_1.0.1.bb         | 4 ++--
 packages/xset/xset_1.0.1.bb         | 3 ++-
 9 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
index 41d9807551..a8972e18ab 100644
--- a/packages/xdpyinfo/xdpyinfo_1.0.1.bb
+++ b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
@@ -3,8 +3,9 @@ DEPENDS = "libx11 libxext libxtst"
 DESCRIPTION = "X display information utility"
 SECTION = "x11/base"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xdpyinfo-1.0.1.tar.bz2 \
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \
 	   file://disable-xkb.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb
index 4f00093a37..2d0f79b046 100644
--- a/packages/xev/xev_1.0.1.bb
+++ b/packages/xev/xev_1.0.1.bb
@@ -5,7 +5,8 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "x11/base"
 DEPENDS = "libx11 libxau"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
 	   file://diet-x11.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools
diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb
index baacf25564..220de1b535 100644
--- a/packages/xhost/xhost_1.0.0.bb
+++ b/packages/xhost/xhost_1.0.0.bb
@@ -4,6 +4,7 @@ DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 
diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb
index 57140361b4..d65c84bb71 100644
--- a/packages/xmodmap/xmodmap_1.0.0.bb
+++ b/packages/xmodmap/xmodmap_1.0.0.bb
@@ -5,6 +5,7 @@ SECTION = "x11/base"
 
 DEPENDS = "libx11"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xmodmap-1.0.0.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.0.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig 
diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/data-common.inc
index 4d01e474c7..47dc922500 100644
--- a/packages/xorg-data/data-common.inc
+++ b/packages/xorg-data/data-common.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "X data files"
 SECTION = "x11/data"
 LICENSE= "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-fonts/font-common.inc
index 0acd27406a..37d478bdc6 100644
--- a/packages/xorg-fonts/font-common.inc
+++ b/packages/xorg-fonts/font-common.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "X font files"
 SECTION = "x11/fonts"
 LICENSE= "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/fo