merge of ce94922846908c2edd7362a56618ea051b244c3b

     and f3d0cda096d15213040e8dd3f198a10398314030

18 files changed, 383 insertions, 9 deletions

diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb
index 9094bb9dff..2fa5178cac 100644
--- a/packages/cups/cups_1.1.23.bb
+++ b/packages/cups/cups_1.1.23.bb
@@ -22,7 +22,7 @@ do_compile () {
 		   "-I."
 }
 
-do_install () {
+fakeroot do_install () {
 	oe_runmake "DSTROOT=${D}" install
 }
 
diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb
index f141330276..8ae7ca38be 100644
--- a/packages/fakeroot/fakeroot_1.2.13.bb
+++ b/packages/fakeroot/fakeroot_1.2.13.bb
@@ -1,8 +1,8 @@
-SECTION = "base"
 DESCRIPTION = "Gives a fake root environment"
+SECTION = "base"
 HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html"
 LICENSE = "GPL"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz"
+SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/gnutls/gnutls-1.4.0/.mtn2git_empty b/packages/gnutls/gnutls-1.4.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnutls/gnutls-1.4.0/.mtn2git_empty
diff --git a/packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch b/packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch
new file mode 100644
index 0000000000..6eca97efd7
--- /dev/null
+++ b/packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch
@@ -0,0 +1,120 @@
+--- gnutls-1.3.5/libextra/gnutls_openssl.c.orig	2006-04-28 20:01:40.000000000 +0100
++++ gnutls-1.3.5/libextra/gnutls_openssl.c	2006-04-28 20:10:33.000000000 +0100
+@@ -252,12 +252,17 @@
+   ssl->rfd = (gnutls_transport_ptr_t) - 1;
+   ssl->wfd = (gnutls_transport_ptr_t) - 1;
+ 
++  ssl->ssl_peek_buffer = NULL;
++  ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
++
+   return ssl;
+ }
+ 
+ void
+ SSL_free (SSL * ssl)
+ {
++  if (ssl->ssl_peek_buffer)
++    free(ssl->ssl_peek_buffer);
+   gnutls_certificate_free_credentials (ssl->gnutls_cred);
+   gnutls_deinit (ssl->gnutls_state);
+   free (ssl);
+@@ -281,6 +286,7 @@
+ SSL_set_fd (SSL * ssl, int fd)
+ {
+   gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr_t) fd);
++  ssl->rfd = ssl->wfd = fd;
+   return 1;
+ }
+ 
+@@ -306,6 +312,17 @@
+   return 1;
+ }
+ 
++int SSL_get_rfd(SSL *ssl)
++{
++  return ssl->rfd;
++}
++
++int SSL_get_wfd(SSL *ssl)
++{
++  return ssl->wfd;
++}
++
++
+ void
+ SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
+ {
+@@ -321,6 +338,8 @@
+ int
+ SSL_pending (SSL * ssl)
+ {
++  if (ssl->ssl_peek_avail)
++    return ssl->ssl_peek_avail;
+   return gnutls_record_check_pending (ssl->gnutls_state);
+ }
+ 
+@@ -476,11 +495,50 @@
+   return 1;
+ }
+ 
++int SSL_peek(SSL *ssl, void *buf, int len)
++{
++  if (len > ssl->ssl_peek_buffer_size) {
++    ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
++    ssl->ssl_peek_buffer_size = len;
++  }
++
++  if (ssl->ssl_peek_avail == 0) {
++
++    int ret;
++    
++    ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
++    ssl->last_error = ret;
++    
++    if (ret > 0)
++      ssl->ssl_peek_avail += ret;
++  }
++
++  if (len > ssl->ssl_peek_avail)
++    len = ssl->ssl_peek_avail;
++
++  memcpy (buf, ssl->ssl_peek_buffer, len);
++
++  return len;
++}
++
+ int
+ SSL_read (SSL * ssl, void *buf, int len)
+ {
+   int ret;
+ 
++  if (ssl->ssl_peek_avail) {
++    int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
++
++    memcpy (buf, ssl->ssl_peek_buffer, n);
++
++    if (ssl->ssl_peek_avail > n)
++      memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
++
++    ssl->ssl_peek_avail -= n;
++
++    return n;
++  }
++
+   ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
+   ssl->last_error = ret;
+ 
+--- gnutls-1.3.5/includes/gnutls/openssl.h.orig	2006-04-28 20:10:55.000000000 +0100
++++ gnutls-1.3.5/includes/gnutls/openssl.h	2006-04-28 20:11:52.000000000 +0100
+@@ -164,6 +164,11 @@
+ 
+     gnutls_transport_ptr_t rfd;
+     gnutls_transport_ptr_t wfd;
++
++    char *ssl_peek_buffer;
++    size_t ssl_peek_buffer_size;
++    size_t ssl_peek_avail;
++
+   };
+ 
+ #define rbio gnutls_state
diff --git a/packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch
new file mode 100644
index 0000000000..e2a2762424
--- /dev/null
+++ b/packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch
@@ -0,0 +1,16 @@
+The version of texinfo in Debian Sarge does not understand the @euro{} command.
+This patch replaces the @euro{} command with the word "euro".
+
+--- gnutls-1.3.5/doc/signatures.texi.orig	2006-04-26 08:06:40.918268000 +0930
++++ gnutls-1.3.5/doc/signatures.texi	2006-04-26 08:06:52.446515440 +0930
+@@ -11,8 +11,8 @@
+ long as it is difficult enough to generate two different messages with
+ the same hash algorithm output. In that case the same signature could
+ be used as a proof for both messages. Nobody wants to sign an innocent
+-message of donating 1 @euro{} to Greenpeace and find out that he
+-donated 1.000.000 @euro{} to Bad Inc.
++message of donating 1 euro to Greenpeace and find out that he
++donated 1.000.000 euro to Bad Inc.
+ 
+ For a hash algorithm to be called cryptographic the following three
+ requirements must hold
diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb
new file mode 100644
index 0000000000..3c48bc95ff
--- /dev/null
+++ b/packages/gnutls/gnutls_1.4.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "GNU Transport Layer Security Library"
+DEPENDS = "zlib libgcrypt lzo"
+MAINTAINER = "Eric Shattow <lucent@gmail.com>"
+HOMEPAGE = "http://www.gnu.org/software/gnutls/"
+LICENSE = "LGPL"
+
+SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
+           file://gnutls-openssl.patch;patch=1 \
+           file://gnutls-texinfo-euro.patch;patch=1"
+
+inherit autotools binconfig
+
+PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
+FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
+FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
+FILES_${PN} = "${libdir}/libgnutls.so.*"
+FILES_${PN}-bin = "${bindir}/gnutls-serv \
+		   ${bindir}/gnutls-cli \
+		   ${bindir}/srptool \
+		   ${bindir}/certtool \
+		   ${bindir}/gnutls-srpcrypt \
+		   ${bindir}/psktool"
+
+FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
+
+EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
+
+do_stage() {
+	oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
+	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
+	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
+	autotools_stage_includes
+}
+
diff --git a/packages/libeventdb/libeventdb_0.30.bb b/packages/libeventdb/libeventdb_0.30.bb
new file mode 100644
index 0000000000..30dc81c34c
--- /dev/null
+++ b/packages/libeventdb/libeventdb_0.30.bb
@@ -0,0 +1,15 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Database access library for GPE calendar"
+SECTION  = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS  = "libgpewidget libgpepimc sqlite"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit pkgconfig gpe autotools
+
+
+do_stage () {
+autotools_stage_all
+}
diff --git a/packages/libgpevtype/libgpevtype_0.17.bb b/packages/libgpevtype/libgpevtype_0.17.bb
new file mode 100644
index 0000000000..a2639f448c
--- /dev/null
+++ b/packages/libgpevtype/libgpevtype_0.17.bb
@@ -0,0 +1,25 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Data interchange library for GPE"
+SECTION     = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "libmimedir libeventdb"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>
+PR          = "r0"
+
+inherit pkgconfig gpe autotools
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+headers = "tag-db.h vcard.h vevent.h vtodo.h"
+
+
+do_stage () {
+	oe_libinstall -so libgpevtype ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gpe
+	for h in ${headers}; do
+		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/${h}
+	done
+}
+
+
diff --git a/packages/libgpg-error/libgpg-error-1.3/.mtn2git_empty b/packages/libgpg-error/libgpg-error-1.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgpg-error/libgpg-error-1.3/.mtn2git_empty
diff --git a/packages/libgpg-error/libgpg-error-1.3/pkgconfig.patch b/packages/libgpg-error/libgpg-error-1.3/pkgconfig.patch
new file mode 100644
index 0000000000..f367f1ccc2
--- /dev/null
+++ b/packages/libgpg-error/libgpg-error-1.3/pkgconfig.patch
@@ -0,0 +1,54 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: libgpg-error-1.3/configure.ac
+===================================================================
+--- libgpg-error-1.3.orig/configure.ac
++++ libgpg-error-1.3/configure.ac
+@@ -117,6 +117,7 @@ GPG_ERROR_CONFIG_CFLAGS=""
+ AC_SUBST(GPG_ERROR_CONFIG_LIBS)
+ AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
+ AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
++AC_CONFIG_FILES([src/gpg-error.pc])
+ 
+ 
+ # Special defines for certain platforms
+Index: libgpg-error-1.3/src/Makefile.am
+===================================================================
+--- libgpg-error-1.3.orig/src/Makefile.am
++++ libgpg-error-1.3/src/Makefile.am
+@@ -28,6 +28,8 @@ include_HEADERS = gpg-error.h
+ bin_SCRIPTS = gpg-error-config
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = gpg-error.m4
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = gpg-error.pc
+ 
+ 
+ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
+@@ -35,7 +37,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.
+ 	mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
+ 	mkheader.awk gpg-error.h.in \
+ 	err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
+-	gpg-error.def versioninfo.rc.in
++	gpg-error.def versioninfo.rc.in gpg-error.pc.in
+ 
+ BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
+ 	err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h
+Index: libgpg-error-1.3/src/gpg-error.pc.in
+===================================================================
+--- /dev/null
++++ libgpg-error-1.3/src/gpg-error.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: gpg-error
++Description: a library that defines common error values for all GnuPG components
++Version: @VERSION@
++Libs: -L{libdir} -lgpg-error
++Cflags: -I${includedir}
diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb
new file mode 100644
index 0000000000..c29053832b
--- /dev/null
+++ b/packages/libgpg-error/libgpg-error_1.3.bb
@@ -0,0 +1,28 @@
+PR = "r0"
+DESCRIPTION = "GPG-Error library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \
+	   file://pkgconfig.patch;patch=1"
+
+# move libgpg-error-config into -dev package
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+
+inherit autotools binconfig pkgconfig
+
+do_stage() {
+	oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+
+	install -d ${STAGING_INCDIR}/
+	for X in gpg-error.h
+	do
+		install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X
+	done
+
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/meta/task-python-everything_20060425.bb b/packages/meta/task-python-everything_20060425.bb
index fd9bbd9c36..738b823d7b 100644
--- a/packages/meta/task-python-everything_20060425.bb
+++ b/packages/meta/task-python-everything_20060425.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml5"
+PR = "ml7"
 
 BROKEN_BECAUSE_GCC4 = "\
 		python-egenix-mx-base"
@@ -32,6 +32,7 @@ RDEPENDS = "\
 		python-pexpect		\
 		python-pychecker	\
 		python-pycodes		\
+		python-pyfits		\
 		python-pyflakes		\
 		python-pygame		\
 		python-pygoogle		\
@@ -41,6 +42,7 @@ RDEPENDS = "\
 		python-pylint		\
 		python-pyqt		\
 		python-pyqwt		\
+		python-pyraf		\
 		python-pyreverse	\
 		python-pyrex		\
 		python-pyro		\
diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/meta/task-python-sharprom_20060425.bb
index 0c6a74f10b..8ce0dcf855 100644
--- a/packages/meta/task-python-sharprom_20060425.bb
+++ b/packages/meta/task-python-sharprom_20060425.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Everything Python for SharpROM"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml2"
+PR = "ml4"
 
 NONWORKING = "\
 		python-codes		\
@@ -22,7 +22,6 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dialog		\
 		python-egenix-mx-base   \
-		python-pycurl		\
 		python-fnorb		\
 		python-fpconst		\
 		python-gnosis		\
@@ -34,14 +33,18 @@ RDEPENDS = "\
 		python-mad		\
 		python-native		\
 		python-numeric		\
+		python-numarray		\
 		python-ogg		\
 		python-pexpect		\
 		python-pychecker	\
+		python-pycurl		\
+		python-pyfits		\
 		python-pyflakes		\
 		python-pygoogle		\
 		python-pylinda		\
 		python-pylint		\
 		python-pyqt		\
+		python-pyraf		\
 		python-pyreverse	\
 		python-pyro		\
 		python-pyserial		\
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index 96679db0cb..030cd1034c 100644
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -7,6 +7,7 @@ PACKAGES_prepend = "ncurses-tools "
 PACKAGES_append = " ncurses-terminfo"
 FILES_ncurses_append = " ${datadir}/tabset"
 RSUGGESTS_${PN} = "ncurses-terminfo"
+RPROVIDES = "libncurses5"
 
 inherit autotools
 
diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb
index d21dd1cebb..aa100bab36 100644
--- a/packages/obexftp/obexftp_0.20.bb
+++ b/packages/obexftp/obexftp_0.20.bb
@@ -3,12 +3,11 @@ SECTION = "console/network"
 HOMEPAGE = "http://openobex.triq.net"
 LICENSE = "GPL"
 DEPENDS = "openobex libgsm"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
            file://i-hate-libtool.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-           file://iconv.patch;patch=1"
+	   file://m4.patch;patch=1"
 
 inherit autotools 
 
diff --git a/packages/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb
new file mode 100644
index 0000000000..fe641570e2
--- /dev/null
+++ b/packages/puzzles/puzzles_r6712.bb
@@ -0,0 +1,50 @@
+
+DEPENDS = "gtk+ perl-native"
+
+SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \
+           file://game.png"
+
+S = "${WORKDIR}/puzzles/"
+
+do_configure() {
+        cd ${S} && ${STAGING_BINDIR}/perl mkfiles.pl
+}
+
+do_compile_prepend = " \
+        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
+	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
+
+FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
+
+do_install () {
+    export prefix=${D}
+    export DESTDIR=${D}
+    install -d ${D}/${prefix}
+    install -d ${D}/${prefix}/games
+    oe_runmake install
+    
+    install -d ${D}/${datadir}
+    install -d ${D}/${datadir}/applications
+    install -d ${D}/${datadir}/pixmaps
+
+    install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps
+
+    cd ${D}/${prefix}/games 
+    for prog in *; do
+	if [ -x $prog ]; then
+	    echo "making ${D}/${datadir}/applications/$prog.desktop"
+	    cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=$prog
+Exec=${prefix}/games/$prog
+Icon=game.png
+Terminal=false
+Type=Application
+Categories=Game
+StartupNotify=true
+SingleInstance=true
+STOP
+        fi
+    done
+}
diff --git a/packages/python/python-pyfits_1.0.1.bb b/packages/python/python-pyfits_1.0.1.bb
new file mode 100644
index 0000000000..1d1507d406
--- /dev/null
+++ b/packages/python/python-pyfits_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "PyFITS provides an interface to FITS formatted files under the Python scripting language."
+HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
+AUTHOR = "Space Telescope Science Institute"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
+RDEPENDS = "python-numarray"
+SECTION = "devel/python"
+LICENSE = "AURA"
+PR = "ml0"
+
+SRC_URI = "ftp://ra.stsci.edu/pub/pyfits/pyfits-${PV}.tar.gz"
+S = "${WORKDIR}/pyfits-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-pyraf_1.2.1.bb b/packages/python/python-pyraf_1.2.1.bb
new file mode 100644
index 0000000000..2242390853
--- /dev/null
+++ b/packages/python/python-pyraf_1.2.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "PyRAF is a Python-based interface to IRAF."
+HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
+AUTHOR = "Space Telescope Science Institute"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
+RDEPENDS = "python-numarray"
+SECTION = "devel/python"
+LICENSE = "AURA"
+PR = "ml0"
+
+SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/v2.3/pyraf-${PV}.tar.gz"
+S = "${WORKDIR}/pyraf-${PV}"
+
+inherit distutils
+