merge of 0f46196206904515c0939c84c80210e251c74960

     and 5ec5f2c198db5c371a9cf2cada82144032025895

68 files changed, 405 insertions, 91 deletions

diff --git a/packages/gpe-theme-foxbox/.mtn2git_empty b/packages/abiword/abiword-2.3.99/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-theme-foxbox/.mtn2git_empty
+++ b/packages/abiword/abiword-2.3.99/.mtn2git_empty
diff --git a/packages/abiword/abiword-2.3.99/cdump-hack.patch b/packages/abiword/abiword-2.3.99/cdump-hack.patch
new file mode 100644
index 0000000000..afe75287e5
--- /dev/null
+++ b/packages/abiword/abiword-2.3.99/cdump-hack.patch
@@ -0,0 +1,11 @@
+--- abi/src/wp/ap/xp/GNUmakefile.am.orig	2005-05-09 21:33:34.915201456 +0000
++++ abi/src/wp/ap/xp/GNUmakefile.am	2005-05-09 21:33:49.341008400 +0000
+@@ -107,7 +107,7 @@
+ 		ap_wp_sidebar.cpp
+ 
+ CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
+-CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
++CDUMPAPP=cdump
+ 
+ ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
+ 	$(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp
diff --git a/packages/abiword/abiword_2.3.99.bb b/packages/abiword/abiword_2.3.99.bb
new file mode 100644
index 0000000000..76b569db29
--- /dev/null
+++ b/packages/abiword/abiword_2.3.99.bb
@@ -0,0 +1,52 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@handhelds.org>"
+LICENSE="GPLv2"
+
+DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
+RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+PR="r4"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+	file://cdump-hack.patch;patch=1"
+S = "${WORKDIR}/abiword-${PV}/abi"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${datadir}/AbiSuite-2.2/AbiWord/glade \
+${datadir}/AbiSuite-2.2/AbiWord/scripts \
+${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
+${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
+#${datadir}/AbiSuite-2.2/templates/A4.awt \
+#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
+${datadir}/AbiSuite-2.2/templates/normal.awt \
+${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
+${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
+${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
+${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
+${datadir}/AbiSuite-2.2/templates/Resume.awt \
+${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
+${datadir}/AbiSuite-2.2/templates/Memo.awt \
+${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
+
+inherit autotools
+
+#abiword needs this native tool
+export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
+
+PARALLEL_MAKE=""
+
+do_configure () {
+        cd ${S}
+        ./autogen.sh
+        ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
+#       --enable-debug
+	cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
+}
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index a3593a4c49..e87bab1986 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -22,7 +22,7 @@ do_install() {
 		   ${D}${palmtopdir}/pics/billiardz
         install -m 0755 billiardz ${D}${palmtopdir}/bin/billiardz
         install -m 0644 billiardz.png ${D}${palmtopdir}/pics/billiardz.png
-	cp -a images/*.png ${D}${palmtopdir}/pics/billiardz
+	cp -pPR images/*.png ${D}${palmtopdir}/pics/billiardz
 
 	echo "[Desktop Entry] " >${D}${palmtopdir}/apps/Games/billiardz.desktop
 	echo "Comment=Billiards for Zaurus" >>${D}${palmtopdir}/apps/Games/billiardz.desktop
diff --git a/packages/brickout/brickout_2002.06.09.bb b/packages/brickout/brickout_2002.06.09.bb
index 1908ff520b..891b615331 100644
--- a/packages/brickout/brickout_2002.06.09.bb
+++ b/packages/brickout/brickout_2002.06.09.bb
@@ -28,9 +28,9 @@ do_install() {
         install -D -m 0755 brickout ${D}${palmtopdir}/bin/brickout
 	install -D -m 0644 brickout.png ${D}${palmtopdir}/pics/brickout.png
 
-        cp -a sounds/* ${D}${palmtopdir}/share/brickout/sounds/
-        cp -a music/* ${D}${palmtopdir}/share/brickout/music/
-        cp -a images-sdl/* ${D}${palmtopdir}/share/brickout/images/
+        cp -pPR sounds/* ${D}${palmtopdir}/share/brickout/sounds/
+        cp -pPR music/* ${D}${palmtopdir}/share/brickout/music/
+        cp -pPR images-sdl/* ${D}${palmtopdir}/share/brickout/images/
 
 	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/brickout.desktop
 	echo "Comment=Arkanoid game" >>${D}${palmtopdir}/apps/Games/brickout.desktop
diff --git a/packages/db/db_4.3.27.bb b/packages/db/db_4.3.27.bb
index 216fb5714b..518fddee9f 100644
--- a/packages/db/db_4.3.27.bb
+++ b/packages/db/db_4.3.27.bb
@@ -69,7 +69,7 @@ do_configure() {
 
 do_stage() {
 	# The .h files get installed read-only, the autostage
-	# function just uses cp -a, so do this by hand
+	# function just uses cp -pPR, so do this by hand
 	# Install, for the moment, into include/db4 to avoid
 	# interfering with the db3 headers (which have the same
 	# name).  -I${STAGING_INCDIR}/db4 to use db4, as opposed
@@ -78,7 +78,7 @@ do_stage() {
 	mkdir -p ${STAGE_TEMP}
 	oe_runmake DESTDIR="${STAGE_TEMP}" install_include
 	mkdir -p ${STAGING_INCDIR}/db4
-	cp -af ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
+	cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
 	rm -rf ${STAGE_TEMP}
 	oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
 }
diff --git a/packages/dviviewer/dviviewer_1.0.2.bb b/packages/dviviewer/dviviewer_1.0.2.bb
index 75523ca793..531ba73362 100644
--- a/packages/dviviewer/dviviewer_1.0.2.bb
+++ b/packages/dviviewer/dviviewer_1.0.2.bb
@@ -17,5 +17,5 @@ do_install() {
         install -D -m 755 dviviewer ${D}${palmtopdir}/bin/dviviewer
         install -D -m 644 dviviewer.desktop ${D}${palmtopdir}/Applications/dviviewer.desktop
         install -d ${D}${palmtopdir}/pics
-        cp -a *.png ${D}${palmtopdir}/pics/
+        cp -pPR *.png ${D}${palmtopdir}/pics/
 }
diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc
index 7b26a45091..60d1ce1bb8 100644
--- a/packages/efl++/efl++.inc
+++ b/packages/efl++/efl++.inc
@@ -48,7 +48,7 @@ do_install() {
 	install -d ${D}${bindir}
 	install *-* ${D}${bindir}
 	install -d ${D}${datadir}/efl++
-	cp -a data/* ${D}${datadir}/efl++
+	cp -pPR data/* ${D}${datadir}/efl++
 }
 
 PACKAGES =+ "efl++-examples"
diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb
index 7718da0696..e51d22ca0b 100644
--- a/packages/freedroid/freedroid_1.0.2.bb
+++ b/packages/freedroid/freedroid_1.0.2.bb
@@ -26,9 +26,9 @@ do_install() {
         install -D -m 0755 src/freedroid ${D}${palmtopdir}/bin/freedroid
 	install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/freedroid.png
 
-	cp -a graphics/* ${D}${palmtopdir}/share/freedroid/graphics
-	cp -a map/* ${D}${palmtopdir}/share/freedroid/map
-	cp -a sound/* ${D}${palmtopdir}/share/freedroid/sound
+	cp -pPR graphics/* ${D}${palmtopdir}/share/freedroid/graphics
+	cp -pPR map/* ${D}${palmtopdir}/share/freedroid/map
+	cp -pPR sound/* ${D}${palmtopdir}/share/freedroid/sound
 
 	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/freedroid.desktop
 	echo "Comment=A Paradroid Clone" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index 5c15b5dcf6..836c44c8b5 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -27,7 +27,7 @@ do_install() {
 		   ${D}${palmtopdir}/share/gemdropx
         install -D -m 0755 gemdropx ${D}${palmtopdir}/bin/gemdropx
 	install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/gemdropx.png
-	cp -a data/* ${D}${palmtopdir}/share/gemdropx
+	cp -pPR data/* ${D}${palmtopdir}/share/gemdropx
 
 	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/gemdropx.desktop
 	echo "Comment=Puzzle game" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop
diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb
index ed60b0c236..fc67bf9243 100644
--- a/packages/gnome/gnome-common_2.4.0.bb
+++ b/packages/gnome/gnome-common_2.4.0.bb
@@ -19,9 +19,9 @@ do_stage () {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
 	make DESTDIR="${STAGE_TEMP}" install
-	cp -a ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
 	install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -a ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -a ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
+	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
+	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
 	rm -rf ${STAGE_TEMP}
 }
diff --git a/packages/gpe-themes/.mtn2git_empty b/packages/gpe-themes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-themes/.mtn2git_empty
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
new file mode 100644
index 0000000000..571ad216e2
--- /dev/null
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION =	"GTK+ clearlooks theme adjusted for GPE"
+MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+PR=		"r1"
+
+#it doesn't really depends on it, but it's nice to make OE build it
+DEPENDS =		"gtk-engines"
+RDEPENDS =		"gtk-engine-clearlooks"
+
+FILES_${PN} =	"${datadir}/themes/"
+SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+
+do_install() {
+install -d ${D}${datadir}/themes/
+cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+}
+
+
diff --git a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
index fedad2189a..fedad2189a 100644
--- a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
diff --git a/packages/klimt/klimt_0.6.1.bb b/packages/klimt/klimt_0.6.1.bb
index c7c70bf9ae..fbb67de480 100644
--- a/packages/klimt/klimt_0.6.1.bb
+++ b/packages/klimt/klimt_0.6.1.bb
@@ -14,7 +14,7 @@ inherit opie
 
 do_stage() {
 	oe_libinstall -so libKlimt ${STAGING_LIBDIR}/
-	cp -a ${S}/../../include/* ${STAGING_INCDIR}/
+	cp -pPR ${S}/../../include/* ${STAGING_INCDIR}/
 }
 
 do_install() {
diff --git a/packages/knights/knights_1.14.bb b/packages/knights/knights_1.14.bb
index 87c0dc01ef..777ac6bda8 100644
--- a/packages/knights/knights_1.14.bb
+++ b/packages/knights/knights_1.14.bb
@@ -28,5 +28,5 @@ do_install() {
         install -D -m 755 knights/knights ${D}${palmtopdir}/bin/knights
         install -D -m 644 knights.desktop ${D}${palmtopdir}/apps/Games/knights.desktop
         install -d ${D}${palmtopdir}/pics
-        cp -a pics/knights ${D}${palmtopdir}/pics/
+        cp -pPR pics/knights ${D}${palmtopdir}/pics/
 }
diff --git a/packages/kstars/kstars-embedded_0.8.5.bb b/packages/kstars/kstars-embedded_0.8.5.bb
index a0c43e29d1..58a8522600 100644
--- a/packages/kstars/kstars-embedded_0.8.5.bb
+++ b/packages/kstars/kstars-embedded_0.8.5.bb
@@ -19,6 +19,6 @@ do_install() {
     install -d ${D}${palmtopdir}/bin \
 	       ${D}${palmtopdir}/pics/kstars \
 	       ${D}${palmtopdir}/share/apps/kstars
-    cp -a ${WORKDIR}/pics ${D}${palmtopdir}
-    cp -a ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/
+    cp -pPR ${WORKDIR}/pics ${D}${palmtopdir}
+    cp -pPR ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/
 }
diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.7.bb
index 85afa1534d..72bd6adfbd 100644
--- a/packages/libmodplug/libmodplug_0.7.bb
+++ b/packages/libmodplug/libmodplug_0.7.bb
@@ -8,5 +8,5 @@ inherit autotools  pkgconfig
 do_stage() {
 	install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR}
 #FIXME!
-	cp -a src/.libs/libmodplug.so* ${STAGING_LIBDIR}
+	cp -pPR src/.libs/libmodplug.so* ${STAGING_LIBDIR}
 }
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index 444fb5b7ea..1676562a93 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -85,12 +85,12 @@ export CFLAGS_KERNEL="-fno-delayed-branch "
 
 do_unpack_extra(){
 	# copy kernel source which is maintained in openwrt via cvs
-	cp -a ${WORKDIR}/kernel-source/* ${S}
+	cp -pPR ${WORKDIR}/kernel-source/* ${S}
 	# copy binary wlan driver
-	cp -a ${WORKDIR}/wl/*.o ${S}/drivers/net/wl
+	cp -pPR ${WORKDIR}/wl/*.o ${S}/drivers/net/wl
 	# copy proprietary et source
-	cp -a ${WORKDIR}/et/* ${S}/drivers/net/et
-	cp -a ${WORKDIR}/et/*.h ${S}/include/
+	cp -pPR ${WORKDIR}/et/* ${S}/drivers/net/et
+	cp -pPR ${WORKDIR}/et/*.h ${S}/include/
 }
 addtask unpack_extra after do_unpack before do_patch
 
diff --git a/packages/linux/nslu2-kernel/2.6.12/disk_led_blinking.patch b/packages/linux/nslu2-kernel/2.6.12/disk_led_blinking.patch
new file mode 100644
index 0000000000..7487cf3ee8
--- /dev/null
+++ b/packages/linux/nslu2-kernel/2.6.12/disk_led_blinking.patch
@@ -0,0 +1,127 @@
+--- linux-2.6.12.2/drivers/usb/core/hub.c.bak	2005-09-19 20:29:14.000000000 +0000
++++ linux-2.6.12.2/drivers/usb/core/hub.c	2005-09-19 20:30:44.000000000 +0000
+@@ -1026,6 +1026,19 @@
+ 
+ 	dev_info (&udev->dev, "USB disconnect, address %d\n", udev->devnum);
+ 
++	// --- Forward-Ported Linksys Disk 1 & Disk 2 LED Control (Port done 16.Sept.05 by Philipp Kirchhofer) ---
++	// Copy & paste from nslu2-io.c
++	#define DISK1_OFF	0x00000008	//0b0000 0000 0000 1000
++	#define	DISK2_OFF	0x00000004	//0b0000 0000 0000 0100
++	// Copy & Paste end
++
++	if (*udev->devpath == 0x31) {
++		*IXP4XX_GPIO_GPOUTR |= DISK1_OFF;
++	} else if (*udev->devpath == 0x32) {
++		*IXP4XX_GPIO_GPOUTR |= DISK2_OFF;
++	}
++	// --- End LED Control ---
++
+ 	/* Free up all the children before we remove this device */
+ 	for (i = 0; i < USB_MAXCHILDREN; i++) {
+ 		if (udev->children[i])
+@@ -2175,6 +2188,19 @@
+ 			udev->bus->controller->driver->name,
+ 			udev->devnum);
+ 
++	// --- Start LED Control ---
++	// Copy & paste from nslu2-io.c
++	#define DISK1_ON	0xfffffff7	//0b1111 1111 1111 0111
++	#define	DISK2_ON	0xfffffffb	//0b1111