make python 2.4 as default, move python-sip into python/, make sip4 as default

BKrev: 4208ff7b-sgl7QbT_1xhYPmdi-Oy4g

42 files changed, 2708 insertions, 48 deletions

diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index e69de29bb2..7e049bc65a 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -0,0 +1,53 @@
+DEPENDS_prepend = "sip-native python-sip "
+
+#EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+
+sip_do_generate() {
+	if [ -z "${SIP_MODULES}" ]; then 
+		MODULES="`ls sip/*mod.sip`"
+	else
+		MODULES="${SIP_MODULES}"
+	fi
+
+	if [ -z "$MODULES" ]; then
+		die "SIP_MODULES not set and no modules found in $PWD"
+        else
+		oenote "using modules '${SIP_MODULES}' and tags '${EXTRA_SIPTAGS}'"
+	fi
+
+	if [ -z "${EXTRA_SIPTAGS}" ]; then
+		die "EXTRA_SIPTAGS needs to be set!"
+	else
+		SIPTAGS="${EXTRA_SIPTAGS}"
+	fi
+
+	if [ ! -z "${SIP_FEATURES}" ]; then
+		FEATURES="-z ${SIP_FEATURES}"
+		oenote "sip feature file: ${SIP_FEATURES}"
+	fi
+
+	for module in $MODULES
+	do
+        	install -d ${module}/
+		oenote "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
+		sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf sip/${module}/${module}mod.sip \
+		|| die "Error calling sip on ${module}"
+		cat ${module}/${module}.sbf 	| sed s,target,TARGET, \
+						| sed s,sources,SOURCES, \
+						| sed s,headers,HEADERS, \
+						| sed s,"moc_HEADERS =","HEADERS +=", \
+		>${module}/${module}.pro
+		echo "TEMPLATE=lib" >>${module}/${module}.pro
+		[ "${module}" = "qt" ] 		&& echo "" 		>>${module}/${module}.pro
+		[ "${module}" = "qtcanvas" ] 	&& echo ""		>>${module}/${module}.pro
+		[ "${module}" = "qttable" ] 	&& echo ""		>>${module}/${module}.pro
+		[ "${module}" = "qwt" ] 	&& echo ""		>>${module}/${module}.pro
+		[ "${module}" = "qtpe" ]        && echo ""		>>${module}/${module}.pro
+		[ "${module}" = "qtpe" ]        && echo "LIBS+=-lqpe"	>>${module}/${module}.pro
+		true
+	done
+}
+
+EXPORT_FUNCTIONS do_generate
+
+addtask generate after do_unpack do_patch before do_configure
diff --git a/packages/python/python-2.3.4-manifest.inc b/packages/python/python-2.3.4-manifest.inc
index e69de29bb2..cec02ae024 100644
--- a/packages/python/python-2.3.4-manifest.inc
+++ b/packages/python/python-2.3.4-manifest.inc
@@ -0,0 +1,210 @@
+### AUTO-GENERATED by './generate-bb.py' [(C) 2002-2004 Michael Lauer] on Sat Oct 16 12:45:14 2004
+###
+### Warning: Manual edits will be lost!
+###
+ 
+
+PACKAGES="python-codecs python-threading python-distutils python-textutils python-curses python-pickle python-core python-io python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-math python-hotshot python-unixadmin python-gdbm python-fcntl python-netclient python-pprint python-netserver python-compiler python-syslog python-html python-readline python-pydoc python-xml python-mime python-unittest python-stringold python-compile python-shell python-mmap python-zlib python-db python-crypt python-lang python-audio "
+
+DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
+PR_python-codecs="ml2"
+RDEPENDS_python-codecs="python-core"
+FILES_python-codecs="/usr/lib/python2.3/codecs.* /usr/lib/python2.3/encodings /usr/lib/python2.3/locale.* /usr/lib/python2.3/lib-dynload/_locale.so /usr/lib/python2.3/lib-dynload/unicodedata.so /usr/lib/python2.3/gettext.* /usr/lib/python2.3/xdrlib.* "
+
+DESCRIPTION_python-threading="Python Threading & Synchronization Support"
+PR_python-threading="ml2"
+RDEPENDS_python-threading="python-core python-lang"
+FILES_python-threading="/usr/lib/python2.3/bisect.* /usr/lib/python2.3/threading.* /usr/lib/python2.3/Queue.* "
+
+DESCRIPTION_python-distutils="Python Distribution Utility"
+PR_python-distutils="ml2"
+RDEPENDS_python-distutils="python-core"
+FILES_python-distutils="/usr/lib/python2.3/distutils "
+
+DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
+PR_python-textutils="ml2"
+RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
+FILES_python-textutils="/usr/lib/python2.3/lib-dynload/_csv.so /usr/lib/python2.3/csv.* /usr/lib/python2.3/optparse.* /usr/lib/python2.3/textwrap.* "
+
+DESCRIPTION_python-curses="Python Curses Support"
+PR_python-curses="ml2"
+RDEPENDS_python-curses="python-core libncurses5"
+FILES_python-curses="/usr/lib/python2.3/curses /usr/lib/python2.3/lib-dynload/_curses.so /usr/lib/python2.3/lib-dynload/_curses_panel.so "
+
+DESCRIPTION_python-pickle="Python Persistence Support"
+PR_python-pickle="ml2"
+RDEPENDS_python-pickle="python-core python-re"
+FILES_python-pickle="/usr/lib/python2.3/pickle.* /usr/lib/python2.3/shelve.* /usr/lib/python2.3/lib-dynload/cPickle.so "
+
+DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
+PR_python-core="ml2"
+RDEPENDS_python-core=""
+FILES_python-core="/usr/lib/python2.3/__future__.* /usr/lib/python2.3/copy.* /usr/lib/python2.3/copy_reg.* /usr/lib/python2.3/ConfigParser.py /usr/lib/python2.3/getopt.* /usr/lib/python2.3/new.* /usr/lib/python2.3/os.* /usr/lib/python2.3/posixpath.* /usr/lib/python2.3/warnings.* /usr/lib/python2.3/site.* /usr/lib/python2.3/stat.* /usr/lib/python2.3/UserDict.* /usr/lib/python2.3/lib-dynload/binascii.so /usr/lib/python2.3/lib-dynload/struct.so /usr/lib/python2.3/lib-dynload/time.so /usr/lib/python2.3/lib-dynload/xreadlines.so /usr/lib/python2.3/types.* /usr/bin/python "
+
+DESCRIPTION_python-io="Python Low-Level I/O"
+PR_python-io="ml2"
+RDEPENDS_python-io="python-core python-math"
+FILES_python-io="/usr/lib/python2.3/lib-dynload/_socket.so /usr/lib/python2.3/lib-dynload/select.so /usr/lib/python2.3/lib-dynload/termios.so /usr/lib/python2.3/lib-dynload/cStringIO.so /usr/lib/python2.3/pipes.* /usr/lib/python2.3/socket.* /usr/lib/python2.3/tempfile.* /usr/lib/python2.3/StringIO.* "
+
+DESCRIPTION_python-compression="Python High Level Compression Support"
+PR_python-compression="ml2"
+RDEPENDS_python-compression="python-core python-zlib"
+FILES_python-compression="/usr/lib/python2.3/gzip.* /usr/lib/python2.3/zipfile.* "
+
+DESCRIPTION_python-re="Python Regular Expression APIs"
+PR_python-re="ml2"
+RDEPENDS_python-re="python-core python-stringold"
+FILES_python-re="/usr/lib/python2.3/re.* /usr/lib/python2.3/sre.* /usr/lib/python2.3/sre_compile.* /usr/lib/python2.3/sre_constants* /usr/lib/python2.3/sre_parse.* "
+
+DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
+PR_python-xmlrpc="ml2"
+RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
+FILES_python-xmlrpc="/usr/lib/python2.3/xmlrpclib.* /usr/lib/python2.3/SimpleXMLRPCServer.* "
+
+DESCRIPTION_python-terminal="Python Terminal Controlling Support"
+PR_python-terminal="ml2"
+RDEPENDS_python-terminal="python-core python-io"
+FILES_python-terminal="/usr/lib/python2.3/pty.* /usr/lib/python2.3/tty.* "
+
+DESCRIPTION_python-email="Python Email Support"
+PR_python-email="ml2"
+RDEPENDS_python-email="python-core python-io python-re"
+FILES_python-email="/usr/lib/python2.3/email "
+
+DESCRIPTION_python-image="Python Graphical Image Handling"
+PR_python-image="ml2"
+RDEPENDS_python-image="python-core"
+FILES_python-image="/usr/lib/python2.3/colorsys.* /usr/lib/python2.3/imghdr.* /usr/lib/python2.3/lib-dynload/imageop.so /usr/lib/python2.3/lib-dynload/rgbimg.so "
+
+DESCRIPTION_python-resource="Python Resource Control Interface"
+PR_python-resource="ml2"
+RDEPENDS_python-resource="python-core"
+FILES_python-resource="/usr/lib/python2.3/lib-dynload/resource.so "
+
+DESCRIPTION_python-math="Python Math Support"
+PR_python-math="ml2"
+RDEPENDS_python-math="python-core"
+FILES_python-math="/usr/lib/python2.3/lib-dynload/cmath.so /usr/lib/python2.3/lib-dynload/math.so /usr/lib/python2.3/lib-dynload/_random.so /usr/lib/python2.3/random.* "
+
+DESCRIPTION_python-hotshot="Python Hotshot Profiler"
+PR_python-hotshot="ml2"
+RDEPENDS_python-hotshot="python-core"
+FILES_python-hotshot="/usr/lib/python2.3/hotshot /usr/lib/python2.3/lib-dynload/_hotshot.so "
+
+DESCRIPTION_python-unixadmin="Python Unix Administration Support"
+PR_python-unixadmin="ml2"
+RDEPENDS_python-unixadmin="python-core"
+FILES_python-unixadmin="/usr/lib/python2.3/lib-dynload/nis.so /usr/lib/python2.3/lib-dynload/grp.so /usr/lib/python2.3/lib-dynload/pwd.so /usr/lib/python2.3/getpass.* "
+
+DESCRIPTION_python-gdbm="Python GNU Database Support"
+PR_python-gdbm="ml2"
+RDEPENDS_python-gdbm="python-core libgdbm3"
+FILES_python-gdbm="/usr/lib/python2.3/lib-dynload/gdbm.so "
+
+DESCRIPTION_python-fcntl="Python's fcntl Interface"
+PR_python-fcntl="ml2"
+RDEPENDS_python-fcntl="python-core"
+FILES_python-fcntl="/usr/lib/python2.3/lib-dynload/fcntl.so "
+
+DESCRIPTION_python-netclient="Python Internet Protocol Clients"
+PR_python-netclient="ml2"
+RDEPENDS_python-netclient="python-core python-io python-mime"
+FILES_python-netclient="/usr/lib/python2.3/base64.* /usr/lib/python2.3/ftplib.* /usr/lib/python2.3/gopherlib.* /usr/lib/python2.3/hmac.* /usr/lib/python2.3/httplib.* /usr/lib/python2.3/mimetypes.* /usr/lib/python2.3/nntplib.* /usr/lib/python2.3/poplib.* /usr/lib/python2.3/smtplib.* /usr/lib/python2.3/telnetlib.* /usr/lib/python2.3/urllib.* /usr/lib/python2.3/urllib2.* /usr/lib/python2.3/urlparse.* "
+
+DESCRIPTION_python-pprint="Python Pretty-Print Support"
+PR_python-pprint="ml2"
+RDEPENDS_python-pprint="python-core"
+FILES_python-pprint="/usr/lib/python2.3/pprint.* "
+
+DESCRIPTION_python-netserver="Python Internet Protocol Servers"
+PR_python-netserver="ml2"
+RDEPENDS_python-netserver="python-core python-netclient"
+FILES_python-netserver="/usr/lib/python2.3/cgi.* /usr/lib/python2.3/BaseHTTPServer.* /usr/lib/python2.3/SimpleHTTPServer.* /usr/lib/python2.3/SocketServer.* "
+
+DESCRIPTION_python-compiler="Python Compiler Support"
+PR_python-compiler="ml2"
+RDEPENDS_python-compiler="python-core"
+FILES_python-compiler="/usr/lib/python2.3/compiler "
+
+DESCRIPTION_python-syslog="Python's syslog Interface"
+PR_python-syslog="ml2"
+RDEPENDS_python-syslog="python-core"
+FILES_python-syslog="/usr/lib/python2.3/lib-dynload/syslog.so "
+
+DESCRIPTION_python-html="Python HTML Processing"
+PR_python-html="ml2"
+RDEPENDS_python-html="python-core"
+FILES_python-html="/usr/lib/python2.3/formatter.* /usr/lib/python2.3/htmlentitydefs.* /usr/lib/python2.3/htmllib.* /usr/lib/python2.3/markupbase.* /usr/lib/python2.3/sgmllib.* "
+
+DESCRIPTION_python-readline="Python Readline Support"
+PR_python-readline="ml2"
+RDEPENDS_python-readline="python-core libreadline4"
+FILES_python-readline="/usr/lib/python2.3/lib-dynload/readline.so /usr/lib/python2.3/rlcompleter.* "
+
+DESCRIPTION_python-pydoc="Python Interactive Help Support"
+PR_python-pydoc="ml2"
+RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
+FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.3/pydoc.* "
+
+DESCRIPTION_python-xml="Python basic XML support."
+PR_python-xml="ml2"
+RDEPENDS_python-xml="python-core python-re"
+FILES_python-xml="/usr/lib/python2.3/lib-dynload/pyexpat.so /usr/lib/python2.3/xml /usr/lib/python2.3/xmllib.* "
+
+DESCRIPTION_python-mime="Python MIME Handling APIs"
+PR_python-mime="ml2"
+RDEPENDS_python-mime="python-core python-io"
+FILES_python-mime="/usr/lib/python2.3/mimetools.* /usr/lib/python2.3/rfc822.* "
+
+DESCRIPTION_python-unittest="Python Unit Testing Framework"
+PR_python-unittest="ml2"
+RDEPENDS_python-unittest="python-core python-stringold python-lang"
+FILES_python-unittest="/usr/lib/python2.3/unittest.* "
+
+DESCRIPTION_python-stringold="Python Deprecated String APIs"
+PR_python-stringold="ml2"
+RDEPENDS_python-stringold="python-core"
+FILES_python-stringold="/usr/lib/python2.3/lib-dynload/strop.so /usr/lib/python2.3/string.* "
+
+DESCRIPTION_python-compile="Python Bytecode Compilation Support"
+PR_python-compile="ml2"
+RDEPENDS_python-compile="python-core"
+FILES_python-compile="/usr/lib/python2.3/py_compile.* /usr/lib/python2.3/compileall.* "
+
+DESCRIPTION_python-shell="Python Shell-Like Functionality"
+PR_python-shell="ml2"
+RDEPENDS_python-shell="python-core python-re"
+FILES_python-shell="/usr/lib/python2.3/commands.* /usr/lib/python2.3/dircache.* /usr/lib/python2.3/fnmatch.* /usr/lib/python2.3/glob.* /usr/lib/python2.3/popen2.* /usr/lib/python2.3/shutil.* "
+
+DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
+PR_python-mmap="ml2"
+RDEPENDS_python-mmap="python-core python-io"
+FILES_python-mmap="/usr/lib/python2.3/lib-dynload/mmap.so "
+
+DESCRIPTION_python-zlib="Python zlib Support."
+PR_python-zlib="ml3"
+RDEPENDS_python-zlib="python-core libz1"
+FILES_python-zlib="/usr/lib/python2.3/lib-dynload/zlib.so "
+
+DESCRIPTION_python-db="Python File-Based Database Support"
+PR_python-db="ml2"
+RDEPENDS_python-db="python-core"
+FILES_python-db="/usr/lib/python2.3/anydbm.* /usr/lib/python2.3/dumbdbm.* /usr/lib/python2.3/whichdb.* "
+
+DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
+PR_python-crypt="ml2"
+RDEPENDS_python-crypt="python-core"
+FILES_python-crypt="/usr/lib/python2.3/lib-dynload/crypt.so /usr/lib/python2.3/lib-dynload/md5.so /usr/lib/python2.3/lib-dynload/rotor.so /usr/lib/python2.3/lib-dynload/sha.so "
+
+DESCRIPTION_python-lang="Python Low-Level Language Support"
+PR_python-lang="ml2"
+RDEPENDS_python-lang="python-core"
+FILES_python-lang="/usr/lib/python2.3/lib-dynload/array.so /usr/lib/python2.3/lib-dynload/parser.so /usr/lib/python2.3/lib-dynload/operator.so /usr/lib/python2.3/lib-dynload/_weakref.so /usr/lib/python2.3/atexit.* /usr/lib/python2.3/code.* /usr/lib/python2.3/codeop.* /usr/lib/python2.3/dis.* /usr/lib/python2.3/inspect.* /usr/lib/python2.3/keyword.* /usr/lib/python2.3/opcode.* /usr/lib/python2.3/repr.* /usr/lib/python2.3/token.* /usr/lib/python2.3/tokenize.* /usr/lib/python2.3/traceback.* /usr/lib/python2.3/linecache.* /usr/lib/python2.3/weakref.* "
+
+DESCRIPTION_python-audio="Python Audio Handling"
+PR_python-audio="ml2"
+RDEPENDS_python-audio="python-core"
+FILES_python-audio="/usr/lib/python2.3/wave.* /usr/lib/python2.3/chunk.* /usr/lib/python2.3/lib-dynload/ossaudiodev.so /usr/lib/python2.3/lib-dynload/audioop.so "
+
+
+
diff --git a/packages/python/python-2.3.4/autohell.patch b/packages/python/python-2.3.4/autohell.patch
index e69de29bb2..2b3f5252ad 100644
--- a/packages/python/python-2.3.4/autohell.patch
+++ b/packages/python/python-2.3.4/autohell.patch
@@ -0,0 +1,1209 @@
+--- Python-2.3.3/acinclude.m4	1969-12-31 19:00:00.000000000 -0500
++++ Python-2.3.3/acinclude.m4	2004-02-17 12:22:29.000000000 -0500
+@@ -0,0 +1,10 @@
++dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore
++dnl If this macro is not defined by Autoconf, define it here.
++
++m4_ifdef([AC_PROG_CXX_WORKS],
++         [],
++         [m4_define([AC_PROG_CXX_WORKS],
++		[AC_LANG_PUSH(C++)dnl
++		 _AC_COMPILER_EXEEXT
++		 AC_LANG_POP()]
++		 )])
+--- Python-2.3.3/configure.in	2003-11-18 14:59:39.000000000 -0500
++++ Python-2.3.3/configure.in	2004-02-17 12:22:27.000000000 -0500
+@@ -4,8 +4,8 @@
+ m4_define(PYTHON_VERSION, 2.3)
+ 
+ AC_REVISION($Revision$)
+-AC_PREREQ(2.53)
+-AC_INIT(python, PYTHON_VERSION)
++AC_PREREQ(2.59)
++AC_INIT([python],[PYTHON_VERSION])
+ AC_CONFIG_SRCDIR([Include/object.h])
+ AC_CONFIG_HEADER(pyconfig.h)
+ 
+@@ -58,7 +58,7 @@
+ 
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_ENABLE(framework,
+-              AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework),
++              AS_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@,Build (MacOSX|Darwin) framework),
+ [
+ 	case $enableval in
+ 	yes) 
+@@ -92,8 +92,7 @@
+ AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
+ 
+ ##AC_ARG_WITH(dyld,
+-##            AC_HELP_STRING(--with-dyld,
+-##                           Use (OpenStep|Rhapsody) dynamic linker))
++##            AS_HELP_STRING(--with-dyld,##                           Use (OpenStep|Rhapsody) dynamic linker))
+ ##
+ # Set name for machine-dependent library files
+ AC_SUBST(MACHDEP)
+@@ -227,7 +226,7 @@
+ # on that fiddles with OPT and BASECFLAGS?
+ AC_MSG_CHECKING(for --without-gcc)
+ AC_ARG_WITH(gcc,
+-            AC_HELP_STRING(--without-gcc,never use gcc),
++            AS_HELP_STRING(--without-gcc,never use gcc),
+ [
+ 	case $withval in
+ 	no)	CC=cc
+@@ -273,7 +272,7 @@
+ MAINOBJ=python.o
+ AC_MSG_CHECKING(for --with-cxx=<compiler>)
+ AC_ARG_WITH(cxx,
+-            AC_HELP_STRING(--with-cxx=<compiler>, enable C++ support),
++            AS_HELP_STRING(--with-cxx=<compiler>,enable C++ support),
+ [
+ 	check_cxx=no
+ 	case $withval in
+@@ -298,15 +297,6 @@
+ dnl --without-cxx was given.
+ dnl Finally, it does not test whether CXX is g++.
+ 
+-dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore
+-ifdef([AC_PROG_CXX_WORKS],[],
+-      [AC_DEFUN([AC_PROG_CXX_WORKS],
+-      [AC_LANG_PUSH(C++)dnl
+-       _AC_COMPILER_EXEEXT
+-       AC_LANG_POP()
+-      ]
+-)])
+-
+ if test "$check_cxx" = "yes" 
+ then
+ 	AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound)
+@@ -348,7 +338,7 @@
+ AC_EXEEXT
+ AC_MSG_CHECKING(for --with-suffix)
+ AC_ARG_WITH(suffix,
+-            AC_HELP_STRING(--with-suffix=.exe, set executable suffix),
++            AS_HELP_STRING(--with-suffix=.exe,set executable suffix),
+ [
+ 	case $withval in
+ 	no)	EXEEXT=;;
+@@ -474,7 +464,7 @@
+ 
+ AC_MSG_CHECKING(for --enable-shared)
+ AC_ARG_ENABLE(shared,
+-              AC_HELP_STRING(--enable-shared, disable/enable building shared python library))
++              AS_HELP_STRING(--enable-shared,disable/enable building shared python library))
+ 
+ if test -z "$enable_shared"
+ then 
+@@ -583,7 +573,7 @@
+ # Check for --with-pydebug
+ AC_MSG_CHECKING(for --with-pydebug)
+ AC_ARG_WITH(pydebug, 
+-            AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined),
++            AS_HELP_STRING(--with-pydebug,build with Py_DEBUG defined),
+ [
+ if test "$withval" != no
+ then 
+@@ -660,10 +650,7 @@
+     AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing)
+      ac_save_cc="$CC"
+      CC="$CC -fno-strict-aliasing"
+-     AC_TRY_RUN([int main() { return 0; }],
+-     ac_cv_no_strict_aliasing_ok=yes,
+-     ac_cv_no_strict_aliasing_ok=no,
+-     ac_cv_no_strict_aliasing_ok=no)
++     AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_no_strict_aliasing_ok=yes],[ac_cv_no_strict_aliasing_ok=no],[ac_cv_no_strict_aliasing_ok=no])
+      CC="$ac_save_cc"
+     AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok)
+     if test $ac_cv_no_strict_aliasing_ok = yes
+@@ -711,10 +698,7 @@
+ AC_CACHE_VAL(ac_cv_opt_olimit_ok,
+ [ac_save_cc="$CC"
+ CC="$CC -OPT:Olimit=0"
+-AC_TRY_RUN([int main() { return 0; }],
+-  ac_cv_opt_olimit_ok=yes,
+-  ac_cv_opt_olimit_ok=no,
+-  ac_cv_opt_olimit_ok=no)
++AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_opt_olimit_ok=yes],[ac_cv_opt_olimit_ok=no],[ac_cv_opt_olimit_ok=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_opt_olimit_ok)
+ if test $ac_cv_opt_olimit_ok = yes; then
+@@ -733,10 +717,7 @@
+   AC_CACHE_VAL(ac_cv_olimit_ok,
+   [ac_save_cc="$CC"
+   CC="$CC -Olimit 1500"
+-  AC_TRY_RUN([int main() { return 0; }],
+-    ac_cv_olimit_ok=yes,
+-    ac_cv_olimit_ok=no,
+-    ac_cv_olimit_ok=no)
++  AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_olimit_ok=yes],[ac_cv_olimit_ok=no],[ac_cv_olimit_ok=no])
+   CC="$ac_save_cc"])
+   AC_MSG_RESULT($ac_cv_olimit_ok)
+   if test $ac_cv_olimit_ok = yes; then
+@@ -751,7 +732,7 @@
+ # options before we can check whether -Kpthread improves anything.
+ AC_MSG_CHECKING(whether pthreads are available without options)
+ AC_CACHE_VAL(ac_cv_pthread_is_default,
+-[AC_TRY_RUN([
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+ 
+ void* routine(void* p){return NULL;}
+@@ -763,14 +744,11 @@
+   (void)pthread_detach(p);
+   return 0;
+ }
+-],
+-[
++]])],[
+   ac_cv_pthread_is_default=yes
+   ac_cv_kthread=no
+   ac_cv_pthread=no
+-],
+-  ac_cv_pthread_is_default=no,
+-  ac_cv_pthread_is_default=no)
++],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no])
+ ])
+ AC_MSG_RESULT($ac_cv_pthread_is_default)
+ 
+@@ -788,7 +766,7 @@
+ AC_CACHE_VAL(ac_cv_kpthread,
+ [ac_save_cc="$CC"
+ CC="$CC -Kpthread"
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+ 
+ void* routine(void* p){return NULL;}
+@@ -800,10 +778,7 @@
+   (void)pthread_detach(p);
+   return 0;
+ }
+-],
+-  ac_cv_kpthread=yes,
+-  ac_cv_kpthread=no,
+-  ac_cv_kpthread=no)
++]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_kpthread)
+ fi
+@@ -819,7 +794,7 @@
+ AC_CACHE_VAL(ac_cv_kthread,
+ [ac_save_cc="$CC"
+ CC="$CC -Kthread"
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+ 
+ void* routine(void* p){return NULL;}
+@@ -831,10 +806,7 @@
+   (void)pthread_detach(p);
+   return 0;
+ }
+-],
+-  ac_cv_kthread=yes,
+-  ac_cv_kthread=no,
+-  ac_cv_kthread=no)
++]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_kthread)
+ fi
+@@ -850,7 +822,7 @@
+ AC_CACHE_VAL(ac_cv_thread,
+ [ac_save_cc="$CC"
+ CC="$CC -pthread"
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+ 
+ void* routine(void* p){return NULL;}
+@@ -862,10 +834,7 @@
+   (void)pthread_detach(p);
+   return 0;
+ }
+-],
+-  ac_cv_pthread=yes,
+-  ac_cv_pthread=no,
+-  ac_cv_pthread=no)
++]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_pthread)
+ fi
+@@ -911,11 +880,11 @@
+ 
+ dnl # check for ANSI or K&R ("traditional") preprocessor
+ dnl AC_MSG_CHECKING(for C preprocessor type)
+-dnl AC_TRY_COMPILE([
++dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ dnl #define spam(name, doc) {#name, &name, #name "() -- " doc}
+ dnl int foo;
+ dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something");
+-dnl ], [;], cpp_type=ansi, AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional)
++dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional])
+ dnl AC_MSG_RESULT($cpp_type)
+ 
+ # checks for header files
+@@ -941,19 +910,13 @@
+ 
+ # Check whether using makedev requires defining _OSF_SOURCE
+ AC_MSG_CHECKING(for makedev)
+-AC_TRY_LINK([#include <sys/types.h> ],
+-	    [ makedev(0, 0) ],
+-	    ac_cv_has_makedev=yes,
+-	    ac_cv_has_makedev=no)
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
+ if test "$ac_cv_has_makedev" = "no"; then
+     # we didn't link, try if _OSF_SOURCE will allow us to link
+-    AC_TRY_LINK([
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #define _OSF_SOURCE 1
+ #include <sys/types.h>
+-    ],
+-    [ makedev(0, 0) ],
+-    ac_cv_has_makedev=yes,
+-    ac_cv_has_makedev=no)
++    ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
+     if test "$ac_cv_has_makedev" = "yes"; then
+         AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.])
+     fi
+@@ -972,11 +935,11 @@
+ 
+ use_lfs=yes
+ AC_MSG_CHECKING(Solaris LFS bug)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #define _LARGEFILE_SOURCE 1
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/resource.h>
+-],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes)
++]], [[struct rlimit foo;]])],[sol_lfs_bug=no],[sol_lfs_bug=yes])
+ AC_MSG_RESULT($sol_lfs_bug)
+ if test "$sol_lfs_bug" = "yes"; then
+   use_lfs=no
+@@ -1018,10 +981,10 @@
+ 
+ AC_MSG_CHECKING(for long long support)
+ have_long_long=no
+-AC_TRY_COMPILE([], [long long x; x = (long long)0;], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[
+   AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) 
+   have_long_long=yes
+-])
++],[])
+ AC_MSG_RESULT($have_long_long)
+ if test "$have_long_long" = yes ; then
+ AC_CHECK_SIZEOF(long long, 8)
+@@ -1029,10 +992,10 @@
+ 
+ AC_MSG_CHECKING(for uintptr_t support)
+ have_uintptr_t=no
+-AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[uintptr_t x; x = (uintptr_t)0;]])],[
+   AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.]) 
+   have_uintptr_t=yes
+-])
++],[])
+ AC_MSG_RESULT($have_uintptr_t)
+ if test "$have_uintptr_t" = yes ; then
+ AC_CHECK_SIZEOF(uintptr_t, 4)
+@@ -1041,7 +1004,7 @@
+ # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
+ AC_MSG_CHECKING(size of off_t)
+ AC_CACHE_VAL(ac_cv_sizeof_off_t,
+-[AC_TRY_RUN([#include <stdio.h>
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <sys/types.h>
+ main()
+ {
+@@ -1049,10 +1012,7 @@
+   if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(off_t));
+   exit(0);
+-}],
+-ac_cv_sizeof_off_t=`cat conftestval`,
+-ac_cv_sizeof_off_t=0,
+-ac_cv_sizeof_off_t=4)
++}]])],[ac_cv_sizeof_off_t=`cat conftestval`],[ac_cv_sizeof_off_t=0],[ac_cv_sizeof_off_t=4])
+ ])
+ AC_MSG_RESULT($ac_cv_sizeof_off_t)
+ AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
+@@ -1075,7 +1035,7 @@
+ # AC_CHECK_SIZEOF() doesn't include <time.h>.
+ AC_MSG_CHECKING(size of time_t)
+ AC_CACHE_VAL(ac_cv_sizeof_time_t,
+-[AC_TRY_RUN([#include <stdio.h>
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <time.h>
+ main()
+ {
+@@ -1083,10 +1043,7 @@
+   if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(time_t));
+   exit(0);
+-}],
+-ac_cv_sizeof_time_t=`cat conftestval`,
+-ac_cv_sizeof_time_t=0,
+-ac_cv_sizeof_time_t=4)
++}]])],[ac_cv_sizeof_time_t=`cat conftestval`],[ac_cv_sizeof_time_t=0],[ac_cv_sizeof_time_t=4])
+ ])
+ AC_MSG_RESULT($ac_cv_sizeof_time_t)
+ AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t, 
+@@ -1104,13 +1061,13 @@
+ fi
+ AC_MSG_CHECKING(for pthread_t)
+ have_pthread_t=no
+-AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])],[have_pthread_t=yes],[])
+ AC_MSG_RESULT($have_pthread_t)
+ if test "$have_pthread_t" = yes ; then
+   # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
+   AC_MSG_CHECKING(size of pthread_t)
+   AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
+-  [AC_TRY_RUN([#include <stdio.h>
++  [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <pthread.h>
+   main()
+   {
+@@ -1118,10 +1075,7 @@
+     if (!f) exit(1);
+     fprintf(f, "%d\n", sizeof(pthread_t));
+     exit(0);
+-  }],
+-  ac_cv_sizeof_pthread_t=`cat conftestval`,
+-  ac_cv_sizeof_pthread_t=0,
+-  ac_cv_sizeof_pthread_t=4)
++  }]])],[ac_cv_sizeof_pthread_t=`cat conftestval`],[ac_cv_sizeof_pthread_t=0],[ac_cv_sizeof_pthread_t=4])
+   ])
+   AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
+   AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
+@@ -1131,7 +1085,7 @@
+ 
+ AC_MSG_CHECKING(for --enable-toolbox-glue)
+ AC_ARG_ENABLE(toolbox-glue,
+-              AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions))
++              AS_HELP_STRING(--enable-toolbox-glue,disable/enable MacOSX glue code for extensions))
+ 
+ if test -z "$enable_toolbox_glue"
+ then 
+@@ -1436,13 +1390,10 @@
+ # checks for system dependent C++ extensions support
+ case "$ac_sys_system" in
+ 	AIX*)	AC_MSG_CHECKING(for genuine AIX C++ extensions support)
+-		AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
+-			    [loadAndInit("", 0, "")],
+-			    [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
++		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "/usr/lpp/xlC/include/load.h"]], [[loadAndInit("", 0, "")]])],[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
+                       [Define for AIX if your compiler is a genuine IBM xlC/xlC_r
+                        and you want support for AIX C++ shared extension modules.])
+-			     AC_MSG_RESULT(yes)],
+-			    [AC_MSG_RESULT(no)]);;
++			     AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);;
+ 	*) ;;
+ esac
+ 
+@@ -1464,7 +1415,7 @@
+ 
+ AC_MSG_CHECKING(for --with-libs)
+ AC_ARG_WITH(libs,
+-            AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs),
++            AS_HELP_STRING(--with-libs='lib1 ...',link against additional libs),
+ [
+ AC_MSG_RESULT($withval)
+ LIBS="$withval $LIBS"
+@@ -1476,7 +1427,7 @@
+ AC_SUBST(SIGNAL_OBJS)
+ AC_MSG_CHECKING(for --with-signal-module)
+ AC_ARG_WITH(signal-module,
+-            AC_HELP_STRING(--with-signal-module, disable/enable signal module))
++            AS_HELP_STRING(--with-signal-module,disable/enable signal module))
+ 
+ if test -z "$with_signal_module"
+ then with_signal_module="yes"
+@@ -1498,7 +1449,7 @@
+ AC_MSG_CHECKING(for --with-dec-threads)
+ AC_SUBST(LDLAST)
+ AC_ARG_WITH(dec-threads,
+-            AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries),
++            AS_HELP_STRING(--with-dec-threads,use DEC Alpha/OSF1 thread-safe libraries),
+ [
+ AC_MSG_RESULT($withval)
+ LDLAST=-threads
+@@ -1518,12 +1469,12 @@
+ AC_MSG_CHECKING(for --with-threads)
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_WITH(threads,
+-            AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support))
++            AS_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@,disable/enable thread support))
+ 
+ # --with-thread is deprecated, but check for it anyway
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_WITH(thread,
+-            AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads),
++            AS_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@,deprecated; use --with(out)-threads),
+             [with_threads=$with_thread])
+ 
+ if test -z "$with_threads"
+@@ -1603,7 +1554,7 @@
+     THREADOBJ="Python/thread.o"],[
+     AC_MSG_CHECKING(for --with-pth)
+     AC_ARG_WITH([pth],
+-                AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
++                AS_HELP_STRING(--with-pth,use GNU pth threading libraries),
+                 [AC_MSG_RESULT($withval)
+                   AC_DEFINE([WITH_THREAD])
+                   AC_DEFINE([HAVE_PTH], 1,
+@@ -1618,10 +1569,10 @@
+     _libs=$LIBS
+     LIBS="$LIBS -lpthread"
+     AC_MSG_CHECKING([for pthread_create in -lpthread])
+-    AC_TRY_LINK([#include <pthread.h>
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
+ 
+-void * start_routine (void *arg) { exit (0); }], [
+-pthread_create (NULL, NULL, start_routine, NULL)], [
++void * start_routine (void *arg) { exit (0); }]], [[
++pthread_create (NULL, NULL, start_routine, NULL)]])],[
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(WITH_THREAD)
+     posix_threads=yes
+@@ -1705,7 +1656,7 @@
+ 
+       AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
+       AC_CACHE_VAL(ac_cv_pthread_system_supported,
+-      [AC_TRY_RUN([#include <pthread.h>
++      [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
+       void *foo(void *parm) {
+         return NULL;
+       }
+@@ -1716,10 +1667,7 @@
+         if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
+         if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
+         exit(0);
+-      }],
+-      ac_cv_pthread_system_supported=yes,
+-      ac_cv_pthread_system_supported=no,
+-      ac_cv_pthread_system_supported=no)
++      }]])],[ac_cv_pthread_system_supported=yes],[ac_cv_pthread_system_supported=no],[ac_cv_pthread_system_supported=no])
+       ])
+       AC_MSG_RESULT($ac_cv_pthread_system_supported)
+       if test "$ac_cv_pthread_system_supported" = "yes"; then
+@@ -1754,7 +1702,7 @@
+ 
+ [
+ dnl the check does not work on cross compilation case...
+-  AC_TRY_RUN([ /* AF_INET6 available check */
++  AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ main()
+@@ -1764,25 +1712,19 @@
+  else
+    exit(0);
+ }
+-],
+-  AC_MSG_RESULT(yes)
+-  ipv6=yes,
+-  AC_MSG_RESULT(no)
+-  ipv6=no,
+-  AC_MSG_RESULT(no)
++]])],[AC_MSG_RESULT(yes)
++  ipv6=yes],[AC_MSG_RESULT(no)
++  ipv6=no],[AC_MSG_RESULT(no)
+   ipv6=no
+-)
++])
+ 
+ if test "$ipv6" = "yes"; then
+ 	AC_MSG_CHECKING(if RFC2553 API is available)
+-	AC_TRY_COMPILE([#include <sys/types.h>
+-#include <netinet/in.h>],
+-	[struct sockaddr_in6 x;
+-x.sin6_scope_id;],
+-		AC_MSG_RESULT(yes)
+-		ipv6=yes,
+-		AC_MSG_RESULT(no, IPv6 disabled)
+-		ipv6=no)
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
++#include <netinet/in.h>]], [[struct sockaddr_in6 x;
++x.sin6_scope_id;]])],[AC_MSG_RESULT(yes)
++		ipv6=yes],[AC_MSG_RESULT(no, IPv6 disabled)
++		ipv6=no])
+ fi
+ 
+ if test "$ipv6" = "yes"; then
+@@ -1905,7 +1847,7 @@
+ # Check for universal newline support
+ AC_MSG_CHECKING(for --with-universal-newlines)
+ AC_ARG_WITH(universal-newlines,
+-            AC_HELP_STRING(--with(out)-universal-newlines, disable/enable foreign newlines))
++            AS_HELP_STRING(--with(out)-universal-newlines,disable/enable foreign newlines))
+ 
+ if test -z "$with_universal_newlines"
+ then with_universal_newlines="yes"
+@@ -1923,7 +1865,7 @@
+ # Check for --with-doc-strings
+ AC_MSG_CHECKING(for --with-doc-strings)
+ AC_ARG_WITH(doc-strings,
+-            AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings))
++            AS_HELP_STRING(--with(out)-doc-strings,disable/enable documentation strings))
+ 
+ if test -z "$with_doc_strings"
+ then with_doc_strings="yes"
+@@ -1938,7 +1880,7 @@
+ # Check for Python-specific malloc support
+ AC_MSG_CHECKING(for --with-pymalloc)
+ AC_ARG_WITH(pymalloc,
+-            AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs))
++            AS_HELP_STRING(--with(out)-pymalloc,disable/enable specialized mallocs))
+ 
+ if test -z "$with_pymalloc"
+ then with_pymalloc="yes"
+@@ -1953,7 +1895,7 @@
+ # Check for --with-wctype-functions
+ AC_MSG_CHECKING(for --with-wctype-functions)
+ AC_ARG_WITH(wctype-functions, 
+-            AC_HELP_STRING(--with-wctype-functions, use wctype.h functions),
++            AS_HELP_STRING(--with-wctype-functions,use wctype.h functions),
+ [
+ if test "$withval" != no
+ then 
+@@ -1971,7 +1913,7 @@
+ 
+ AC_MSG_CHECKING(for --with-sgi-dl)
+ AC_ARG_WITH(sgi-dl,
+-            AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking),
++            AS_HELP_STRING(--with-sgi-dl=DIRECTORY,IRIX 4 dynamic linking),
+ [
+ AC_MSG_RESULT($withval)
+ echo --with-sgi-dl is unsupported, see README
+@@ -1993,7 +1935,7 @@
+ 
+ AC_MSG_CHECKING(for --with-dl-dld)
+ AC_ARG_WITH(dl-dld,
+-            AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking),
++            AS_HELP_STRING(--with-dl-dld=DL_DIR,GNU dynamic linking),
+ [
+ AC_MSG_RESULT($withval)
+ echo --with-dl-dld is unsupported, see README
+@@ -2085,41 +2027,29 @@
+ # For some functions, having a definition is not sufficient, since
+ # we want to take their address.
+ AC_MSG_CHECKING(for chroot)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=chroot,
+-  AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=chroot]])],[AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for link)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=link,
+-  AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=link]])],[AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for symlink)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=symlink,
+-  AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=symlink]])],[AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for fchdir)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=fchdir,
+-  AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fchdir]])],[AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for fsync)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync,
+-  AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fsync]])],[AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for fdatasync)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=fdatasync,
+-  AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fdatasync]])],[AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ # On some systems (eg. FreeBSD 5), we would find a definition of the
+ # functions ctermid_r, setgroups in the library, but no prototype
+@@ -2128,34 +2058,28 @@
+ # because of the missing prototypes.
+ 
+ AC_MSG_CHECKING(for ctermid_r)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <stdio.h>
+-], void* p = ctermid_r,
+-  AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = ctermid_r]])],[AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ AC_MSG_CHECKING(for flock)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <sys/file.h>
+-], void* p = flock,
+-  AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = flock]])],[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ AC_MSG_CHECKING(for getpagesize)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <unistd.h>
+-], void* p = getpagesize,
+-  AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = getpagesize]])],[AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ dnl check for true
+ AC_CHECK_PROGS(TRUE, true, /bin/true)
+@@ -2167,54 +2091,45 @@
+ )
+ 
+ AC_MSG_CHECKING(for hstrerror)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <netdb.h>
+-], void* p = hstrerror; hstrerror(0),
+-  AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = hstrerror; hstrerror(0)]])],[AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ AC_MSG_CHECKING(for inet_aton)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-], void* p = inet_aton;inet_aton(0,0),
+-  AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = inet_aton;inet_aton(0,0)]])],[AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ AC_MSG_CHECKING(for inet_pton)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-], void* p = inet_pton,
+-  AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = inet_pton]])],[AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ # On some systems, setgroups is in unistd.h, on others, in grp.h
+ AC_MSG_CHECKING(for setgroups)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h" 
+ #include <unistd.h>
+ #ifdef HAVE_GRP_H
+ #include <grp.h>
+ #endif
+-], 
+-void* p = setgroups,
+-  AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
+-  AC_MSG_RESULT(yes),
+-  AC_MSG_RESULT(no)
+-)
++]], [[void* p = setgroups]])],[AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
++  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ 
+ # check for openpty and forkpty
+ 
+@@ -2226,30 +2141,24 @@
+ 
+ AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove)
+ AC_CHECK_FUNCS(getpgrp, 
+-  AC_TRY_COMPILE([#include <unistd.h>], 
+-   [getpgrp(0);], 
+-   AC_DEFINE(GETPGRP_HAVE_ARG, 1,
+-   [Define if getpgrp() must be called as getpgrp(0).])
+- )
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[getpgrp(0);]])],[AC_DEFINE(GETPGRP_HAVE_ARG, 1,
++   Define if getpgrp() must be called as getpgrp(0).)
++ ],[])
+ )
+ AC_CHECK_FUNCS(setpgrp,
+-  AC_TRY_COMPILE([#include <unistd.h>],
+-    [setpgrp(0,0);],
+-    AC_DEFINE(SETPGRP_HAVE_ARG, 1,
+-    [Define if setpgrp() must be called as setpgrp(0, 0).])
+-  )
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[setpgrp(0,0);]])],[AC_DEFINE(SETPGRP_HAVE_ARG, 1,
++    Define if setpgrp() must be called as setpgrp(0, 0).)
++  ],[])
+ )
+ AC_CHECK_FUNCS(gettimeofday, 
+-  AC_TRY_COMPILE([#include <sys/time.h>], 
+-    [gettimeofday((struct timeval*)0,(struct timezone*)0);], ,
+-    AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
+-    [Define if gettimeofday() does not have second (timezone) argument
+-     This is the case on Motorola V4 (R40V4.2)])
+-  )
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])],[],[AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
++    Define if gettimeofday() does not have second (timezone) argument
++     This is the case on Motorola V4 (R40V4.2))
++  ])
+ )
+ 
+ AC_MSG_CHECKING(for major, minor, and makedev)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if defined(MAJOR_IN_MKDEV)
+ #include <sys/mkdev.h>
+ #elif defined(MAJOR_IN_SYSMACROS)
+@@ -2257,9 +2166,9 @@
+ #else
+ #include <sys/types.h>
+ #endif
+-],[
++]], [[
+   makedev(major(0),minor(0));
+-],[
++]])],[
+   AC_DEFINE(HAVE_DEVICE_MACROS, 1,
+ 	    [Define to 1 if you have the device macros.])
+   AC_MSG_RESULT(yes)
+@@ -2270,14 +2179,14 @@
+ # On OSF/1 V5.1, getaddrinfo is available, but a define
+ # for [no]getaddrinfo in netdb.h. 
+ AC_MSG_CHECKING(for getaddrinfo)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <stdio.h>
+-],[
++]], [[
+ getaddrinfo(NULL, NULL, NULL, NULL);
+-], [
++]])],[
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(getaddrinfo bug)
+ AC_TRY_RUN([
+@@ -2371,7 +2280,7 @@
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+ AC_MSG_RESULT(buggy)
+-buggygetaddrinfo=yes)], [
++buggygetaddrinfo=yes)],[
+ AC_MSG_RESULT(no)
+ buggygetaddrinfo=yes
+ ])
+@@ -2397,9 +2306,7 @@
+ 
+ AC_MSG_CHECKING(for time.h that defines altzone)
+ AC_CACHE_VAL(ac_cv_header_time_altzone,
+-[AC_TRY_COMPILE([#include <time.h>], [return altzone;],
+-  ac_cv_header_time_altzone=yes,
+-  ac_cv_header_time_altzone=no)])
++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],[ac_cv_header_time_altzone=yes],[ac_cv_header_time_altzone=no])])
+ AC_MSG_RESULT($ac_cv_header_time_altzone)
+ if test $ac_cv_header_time_altzone = yes; then
+   AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.])
+@@ -2407,25 +2314,22 @@
+ 
+ was_it_defined=no
+ AC_MSG_CHECKING(whether sys/select.h and sys/time.h may both be included)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/types.h>
+ #include <sys/select.h>
+ #include <sys/time.h>
+-], [;], [
++]], [[;]])],[
+   AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1,
+   [Define if  you can safely include both <sys/select.h> and <sys/time.h>
+    (which you can't on SCO ODT 3.0).]) 
+   was_it_defined=yes
+-])
++],[])
+ AC_MSG_RESULT($was_it_defined)
+ 
+ AC_MSG_CHECKING(for addrinfo)
+ AC_CACHE_VAL(ac_cv_struct_addrinfo,
+-AC_TRY_COMPILE([
+-#		include <netdb.h>],
+-	[struct addrinfo a],
+-	ac_cv_struct_addrinfo=yes,
+-	ac_cv_struct_addrinfo=no))
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#		include <netdb.h>]], [[struct addrinfo a]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no]))
+ AC_MSG_RESULT($ac_cv_struct_addrinfo)
+ if test $ac_cv_struct_addrinfo = yes; then
+ 	AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)])
+@@ -2433,12 +2337,9 @@
+ 
+ AC_MSG_CHECKING(for sockaddr_storage)
+ AC_CACHE_VAL(ac_cv_struct_sockaddr_storage,
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #		include <sys/types.h>
+-#		include <sys/socket.h>],
+-	[struct sockaddr_storage s],
+-	ac_cv_struct_sockaddr_storage=yes,
+-	ac_cv_struct_sockaddr_storage=no))
++#		include <sys/socket.h>]], [[struct sockaddr_storage s]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no]))
+ AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
+ if test $ac_cv_struct_sockaddr_storage = yes; then
+ 	AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)])
+@@ -2451,30 +2352,28 @@
+ 
+ works=no
+ AC_MSG_CHECKING(for working volatile)
+-AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes, 
+-  AC_DEFINE(volatile, [], [Define to empty if the keyword does not work.])
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[volatile int x; x = 0;]])],[works=yes],[AC_DEFINE(volatile, , Define to empty if the keyword does not work.)
++])
+ AC_MSG_RESULT($works)
+ 
+ works=no
+ AC_MSG_CHECKING(for working signed char)
+-AC_TRY_COMPILE([], [signed char c;], works=yes, 
+-  AC_DEFINE(signed, [], [Define to empty if the keyword does not work.])
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char c;]])],[works=yes],[AC_DEFINE(signed, , Define to empty if the keyword does not work.)
++])
+ AC_MSG_RESULT($works)
+ 
+ have_prototypes=no
+ AC_MSG_CHECKING(for prototypes)
+-AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])],[
+   AC_DEFINE(HAVE_PROTOTYPES, 1, 
+    [Define if your compiler supports function prototype]) 
+   have_prototypes=yes
+-])
++],[])
+ AC_MSG_RESULT($have_prototypes)
+ 
+ works=no
+ AC_MSG_CHECKING(for variable length prototypes and stdarg.h)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdarg.h>
+ int foo(int x, ...) {
+ 	va_list va;
+@@ -2484,45 +2383,41 @@
+ 	va_arg(va, double);
+ 	return 0;
+ }
+-], [return foo(10, "", 3.14);], [
++]], [[return foo(10, "", 3.14);]])],[
+   AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1,
+    [Define if your compiler supports variable length function prototypes
+    (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h>]) 
+   works=yes
+-])
++],[])
+ AC_MSG_RESULT($works)
+ 
+ if test "$have_prototypes" = yes; then
+ bad_prototypes=no
+ AC_MSG_CHECKING(for bad exec* prototypes)
+-AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], ,
+-    AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
+-    [Define if your <unistd.h> contains bad prototypes for exec*()
+-    (as it does on SGI IRIX 4.x)]) 
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[char **t;execve("@",t,t);]])],[],[AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
++    Define if your <unistd.h> contains bad prototypes for exec*()
++    (as it does on SGI IRIX 4.x)) 
+     bad_prototypes=yes
+-)
++])
+ AC_MSG_RESULT($bad_prototypes)
+ fi
+ 
+ # check if sockaddr has sa_len member
+ AC_MSG_CHECKING(if sockaddr has sa_len member)
+-AC_TRY_COMPILE([#include <sys/types.h>
+-#include <sys/socket.h>],
+-[struct sockaddr x;
+-x.sa_len = 0;],
+-	AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]),
+-	AC_MSG_RESULT(no))
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
++#include <sys/socket.h>]], [[struct sockaddr x;
++x.sa_len = 0;]])],[AC_MSG_RESULT(yes)
++	AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, Define if sockaddr has sa_len member)],[AC_MSG_RESULT(no)])
+ 
+ va_list_is_array=no
+ AC_MSG_CHECKING(whether va_list is an array)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_STDARG_PROTOTYPES
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
+ #endif
+-], [va_list list1, list2; list1 = list2;], , [
++]], [[va_list list1, list2; list1 = list2;]])],[],[
+  AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind]) 
+  va_list_is_array=yes
+ ])
+@@ -2537,9 +2432,9 @@
+   AC_MSG_CHECKING([gethostbyname_r with 6 args])
+   OLD_CFLAGS=$CFLAGS
+   CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS"
+-  AC_TRY_COMPILE([
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #   include <netdb.h>
+-  ], [
++  ]], [[
+     char *name;
+     struct hostent *he, *res;
+     char buffer[2048];
+@@ -2547,12 +2442,12 @@
+     int h_errnop;
+ 
+     (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop)
+-  ], [
++  ]])],[
+     AC_DEFINE(HAVE_GETHOSTBYNAME_R)
+     AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1,
+     [Define this if you have the 6-arg version of gethostbyname_r().])
+     AC_MSG_RESULT(yes)
+-  ], [
++  ],[
+     AC_MSG_RESULT(no)
+     AC_MSG_CHECKING([gethostbyname_r with 5 args])
+     AC_TRY_COMPILE([
+@@ -2613,7 +2508,7 @@
+ # Check for --with-fpectl
+ AC_MSG_CHECKING(for --with-fpectl)
+ AC_ARG_WITH(fpectl,
+-            AC_HELP_STRING(--with-fpectl, enable SIGFPE catching),
++            AS_HELP_STRING(--with-fpectl,enable SIGFPE catching),
+ [
+ if test "$withval" != no
+ then 
+@@ -2633,7 +2528,7 @@
+ esac
+ AC_MSG_CHECKING(for --with-libm=STRING)
+ AC_ARG_WITH(libm,
+-            AC_HELP_STRING(--with-libm=STRING, math library),
++            AS_HELP_STRING(--with-libm=STRING,math library),
+ [
+ if test "$withval" = no
+ then LIBM=
+@@ -2649,7 +2544,7 @@
+ AC_SUBST(LIBC)
+ AC_MSG_CHECKING(for --with-libc=STRING)
+ AC_ARG_WITH(libc,
+-            AC_HELP_STRING(--with-libc=STRING, C library),
++            AS_HELP_STRING(--with-libc=STRING,C library),
+ [
+ if test "$withval" = no
+ then LIBC=
+@@ -2684,20 +2579,20 @@
+ 
+ AC_MSG_CHECKING(for UCS-4 tcl)
+ have_ucs4_tcl=no
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <tcl.h>
+ #if TCL_UTF_MAX != 6
+ # error "NOT UCS4_TCL"
+-#endif], [], [
++#endif]], [[]])],[
+   AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6])
+   have_ucs4_tcl=yes
+-])
++],[])
+ AC_MSG_RESULT($have_ucs4_tcl)
+ 
+ AC_MSG_CHECKING(what type to use for unicode)
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_ENABLE(unicode, 
+-              AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)),
++              AS_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@,Enable Unicode strings (default is yes)),
+               [],
+               [enable_unicode=yes])
+ 
+@@ -2764,15 +2659,12 @@
+ # or fills with zeros (like the Cray J90, according to Tim Peters).
+ AC_MSG_CHECKING(whether right shift extends the sign bit)
+ AC_CACHE_VAL(ac_cv_rshift_extends_sign, [
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ int main()
+ {
+ 	exit(((-1)>>3 == -1) ? 0 : 1);
+ }
+-],
+-ac_cv_rshift_extends_sign=yes,
+-ac_cv_rshift_extends_sign=no,
+-ac_cv_rshift_extends_sign=yes)])
++]])],[ac_cv_rshift_extends_sign=yes],[ac_cv_rshift_extends_sign=no],[ac_cv_rshift_extends_sign=yes])])
+ AC_MSG_RESULT($ac_cv_rshift_extends_sign)
+ if test "$ac_cv_rshift_extends_sign" = no
+ then
+@@ -2784,12 +2676,12 @@
+ # check for getc_unlocked and related locking functions
+ AC_MSG_CHECKING(for getc_unlocked() and friends)
+ AC_CACHE_VAL(ac_cv_have_getc_unlocked, [
+-AC_TRY_LINK([#include <stdio.h>],[
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[
+ 	FILE *f = fopen("/dev/null", "r");
+ 	flockfile(f);
+ 	getc_unlocked(f);
+ 	funlockfile(f);
+-], ac_cv_have_getc_unlocked=yes, ac_cv_have_getc_unlocked=no)])
++]])],[ac_cv_have_getc_unlocked=yes],[ac_cv_have_getc_unlocked=no])])
+ AC_MSG_RESULT($ac_cv_have_getc_unlocked)
+ if test "$ac_cv_have_getc_unlocked" = yes
+ then
+@@ -2798,8 +2690,7 @@
+ fi
+ 
+ # check for readline 2.2
+-AC_TRY_CPP([#include <readline/readline.h>],
+-have_readline=yes, have_readline=no)
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <readline/readline.h>]])],[have_readline=yes],[have_readline=no])
+ if test $have_readline = yes
+ then
+   AC_EGREP_HEADER([extern int rl_completion_append_character;],
+@@ -2820,7 +2711,7 @@
+ 
+ AC_MSG_CHECKING(for broken nice())
+ AC_CACHE_VAL(ac_cv_broken_nice, [
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ int main()
+ {
+ 	int val1 = nice(1);
+@@ -2828,10 +2719,7 @@
+ 		exit(0);
+ 	exit(1);
+ }
+-],
+-ac_cv_broken_nice=yes,
+-ac_cv_broken_nice=no,
+-ac_cv_broken_nice=no)])
++]])],[ac_cv_broken_nice=yes],[ac_cv_broken_nice=no],[ac_cv_broken_nice=no])])
+ AC_MSG_RESULT($ac_cv_broken_nice)
+ if test "$ac_cv_broken_nice" = yes
+ then
+@@ -2842,7 +2730,7 @@
+ # tzset(3) exists and works like we expect it to
+ AC_MSG_CHECKING(for working tzset())
+ AC_CACHE_VAL(ac_cv_working_tzset, [
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdlib.h>
+ #include <time.h>
+ #include <string.h>
+@@ -2880,10 +2768,7 @@
+ 
+ 	exit(0);
+ }
+-],
+-ac_cv_working_tzset=yes,
+-ac_cv_working_tzset=no,
+-ac_cv_working_tzset=no)])
++]])],[ac_cv_working_tzset=yes],[ac_cv_working_tzset=no],[ac_cv_working_tzset=no])])
+ AC_MSG_RESULT($ac_cv_working_tzset)
+ if test "$ac_cv_working_tzset" = yes
+ then
+@@ -2894,13 +2779,10 @@
+ # Look for subsecond timestamps in struct stat
+ AC_MSG_CHECKING(for tv_nsec in struct stat)
+ AC_CACHE_VAL(ac_cv_stat_tv_nsec,
+-AC_TRY_COMPILE([#include <sys/stat.h>], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
+ struct stat st;
+ st.st_mtim.tv_nsec = 1;
+-],
+-ac_cv_stat_tv_nsec=yes,
+-ac_cv_stat_tv_nsec=no,
+-ac_cv_stat_tv_nsec=no))
++]])],[ac_cv_stat_tv_nsec=yes],[ac_cv_stat_tv_nsec=no]))
+ AC_MSG_RESULT($ac_cv_stat_tv_nsec)
+ if test "$ac_cv_stat_tv_nsec" = yes
+ then
+@@ -2911,12 +2793,10 @@
+ # On HP/UX 11.0, mvwdelch is a block with a return statement
+ AC_MSG_CHECKING(whether mvwdelch is an expression)
+ AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
+-AC_TRY_COMPILE([#include <curses.h>], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+   int rtn;
+   rtn = mvwdelch(0,0,0);
+-], ac_cv_mvwdelch_is_expression=yes,
+-   ac_cv_mvwdelch_is_expression=no,
+-   ac_cv_mvwdelch_is_expression=yes))
++]])],[ac_cv_mvwdelch_is_expression=yes],[ac_cv_mvwdelch_is_expression=no]))
+ AC_MSG_RESULT($ac_cv_mvwdelch_is_expression)
+ 
+ if test "$ac_cv_mvwdelch_is_expression" = yes
+@@ -2927,12 +2807,10 @@
+ 
+ AC_MSG_CHECKING(whether WINDOW has _flags)
+ AC_CACHE_VAL(ac_cv_window_has_flags,
+-AC_TRY_COMPILE([#include <curses.h>], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+   WINDOW *w;
+   w->_flags = 0;
+-], ac_cv_window_has_flags=yes,
+-   ac_cv_window_has_flags=no,
+-   ac_cv_window_has_flags=no))
++]])],[ac_cv_window_has_flags=yes],[ac_cv_window_has_flags=no]))
+ AC_MSG_RESULT($ac_cv_window_has_flags)
+ 
+ 
diff --git a/packages/python/python-2.3.4/bindir-libdir.patch b/packages/python/python-2.3.4/bindir-libdir.patch
index e69de29bb2..999bddc449 100644
--- a/packages/python/python-2.3.4/bindir-libdir.patch
+++ b/packages/python/python-2.3.4/bindir-libdir.patch
@@ -0,0 +1,18 @@
+
+#
+# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Python-2.3.1/Makefile.pre.in~bindir-libdir	2003-09-20 12:50:28.000000000 +0200
++++ Python-2.3.1/Makefile.pre.in	2003-11-02 19:53:17.000000000 +0100
+@@ -78,8 +78,8 @@
+ exec_prefix=	@exec_prefix@
+ 
+ # Expanded directories
+-BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++BINDIR=		@bindir@
++LIBDIR=		@libdir@
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
diff --git a/packages/python/python-2.3.4/crosscompile.patch b/packages/python/python-2.3.4/crosscompile.patch
index e69de29bb2..371399fba4 100644
--- a/packages/python/python-2.3.4/crosscompile.patch
+++ b/packages/python/python-2.3.4/crosscompile.patch
@@ -0,0 +1,109 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Python-2.3.3/Makefile.pre.in~crosscompile	2004-01-10 22:16:05.000000000 +0100
++++ Python-2.3.3/Makefile.pre.in	2004-01-10 22:16:05.000000000 +0100
+@@ -159,6 +159,7 @@
+ 
+ PYTHON=		python$(EXE)
+ BUILDPYTHON=	python$(BUILDEXE)
++HOSTPYTHON=	$(BUILDPYTHON)
+ 
+ # === Definitions added by makesetup ===
+ 
+@@ -185,7 +186,7 @@
+ ##########################################################################
+ # Parser
+ PGEN=		Parser/pgen$(EXE)
+-
++HOSTPGEN=	$(PGEN)$(EXE)
+ POBJS=		\
+ 		Parser/acceler.o \
+ 		Parser/grammar1.o \
+@@ -314,8 +315,8 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ 	case $$MAKEFLAGS in \
+-	*-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++	*-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
++	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+ 	esac
+ 
+ # buildno should really depend on something like LIBRARY_SRC
+@@ -432,7 +433,7 @@
+ 
+ 
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		-$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 
+ $(PGEN):	$(PGENOBJS)
+ 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -705,19 +706,19 @@
+ 	done
+ 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 
+@@ -812,7 +813,7 @@
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall:
+-	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++	$(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+--- Python-2.3.3/setup.py~crosscompile	2003-10-21 22:01:21.000000000 +0200
++++ Python-2.3.3/setup.py	2004-01-10 22:30:12.000000000 +0100
+@@ -208,6 +208,7 @@
+         except ImportError, why:
+             self.announce('*** WARNING: renaming "%s" since importing it'
+                           ' failed: %s' % (ext.name, why), level=3)
++            return
+             assert not self.inplace
+             basename, tail = os.path.splitext(ext_filename)
+             newname = basename + "_failed" + tail
+@@ -241,8 +242,8 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++        # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # fink installs lots of goodies in /sw/... - make sure we
+         # check there
+@@ -264,8 +265,8 @@
+         # lib_dirs and inc_dirs are used to search for files;
+         # if a file is found in one of those directories, it can
+         # be assumed that no additional -I,-L directives are needed.
+-        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
+-        inc_dirs = self.compiler.include_dirs + ['/usr/include']
++        lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
++        inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
+         exts = []
+ 
+         platform = self.get_platform()
diff --git a/packages/python/python-2.4.0-manifest.inc b/packages/python/python-2.4.0-manifest.inc
index e69de29bb2..3ede1edaac 100644
--- a/packages/python/python-2.4.0-manifest.inc
+++ b/packages/python/python-2.4.0-manifest.inc
@@ -0,0 +1,210 @@
+### AUTO-GENERATED by './generate-bb.py' [(C) 2002-2004 Michael Lauer] on Sat Oct 16 12:45:14 2004
+###
+### Warning: Manual edits will be lost!
+###
+ 
+
+PACKAGES="python-codecs python-threading python-distutils python-textutils python-curses python-pickle python-core python-io python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-math python-hotshot python-unixadmin python-gdbm python-fcntl python-netclient python-pprint python-netserver python-compiler python-syslog python-html python-readline python-pydoc python-xml python-mime python-unittest python-stringold python-compile python-shell python-mmap python-zlib python-db python-crypt python-lang python-audio "
+
+DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
+PR_python-codecs="ml2"
+RDEPENDS_python-codecs="python-core"
+FILES_python-codecs="/usr/lib/python2.4/codecs.* /usr/lib/python2.4/encodings /usr/lib/python2.4/locale.* /usr/lib/python2.4/lib-dynload/_locale.so /usr/lib/python2.4/lib-dynload/unicodedata.so /usr/lib/python2.4/gettext.* /usr/lib/python2.4/xdrlib.* "
+
+DESCRIPTION_python-threading="Python Threading & Synchronization Support"
+PR_python-threading="ml2"
+RDEPENDS_python-threading="python-core python-lang"
+FILES_python-threading="/usr/lib/python2.4/bisect.* /usr/lib/python2.4/threading.* /usr/lib/python2.4/Queue.* "
+
+DESCRIPTION_python-distutils="Python Distribution Utility"
+PR_python-distutils="ml2"
+RDEPENDS_python-distutils="python-core"
+FILES_python-distutils="/usr/lib/python2.4/distutils "
+
+DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
+PR_python-textutils="ml2"
+RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
+FILES_python-textutils="/usr/lib/python2.4/lib-dynload/_csv.so /usr/lib/python2.4/csv.* /usr/lib/python2.4/optparse.* /usr/lib/python2.4/textwrap.* "
+
+DESCRIPTION_python-curses="Python Curses Support"
+PR_python-curses="ml2"
+RDEPENDS_python-curses="python-core libncurses5"
+FILES_python-curses="/usr/lib/python2.4/curses /usr/lib/python2.4/lib-dynload/_curses.so /usr/lib/python2.4/lib-dynload/_curses_panel.so "
+
+DESCRIPTION_python-pickle="Python Persistence Support"
+PR_python-pickle="ml2"
+RDEPENDS_python-pickle="python-core python-re"
+FILES_python-pickle="/usr/lib/python2.4/pickle.* /usr/lib/python2.4/shelve.* /usr/lib/python2.4/lib-dynload/cPickle.so "
+
+DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
+PR_python-core="ml2"
+RDEPENDS_python-core=""
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+
+DESCRIPTION_python-io="Python Low-Level I/O"
+PR_python-io="ml2"
+RDEPENDS_python-io="python-core python-math"
+FILES_python-io="/usr/lib/python2.4/lib-dynload/_socket.so /usr/lib/python2.4/lib-dynload/select.so /usr/lib/python2.4/lib-dynload/termios.so /usr/lib/python2.4/lib-dynload/cStringIO.so /usr/lib/python2.4/pipes.* /usr/lib/python2.4/socket.* /usr/lib/python2.4/tempfile.* /usr/lib/python2.4/StringIO.* "
+
+DESCRIPTION_python-compression="Python High Level Compression Support"
+PR_python-compression="ml2"
+RDEPENDS_python-compression="python-core python-zlib"
+FILES_python-compression="/usr/lib/python2.4/gzip.* /usr/lib/python2.4/zipfile.* "
+
+DESCRIPTION_python-re="Python Regular Expression APIs"
+PR_python-re="ml2"
+RDEPENDS_python-re="python-core python-stringold"
+FILES_python-re="/usr/lib/python2.4/re.* /usr/lib/python2.4/sre.* /usr/lib/python2.4/sre_compile.* /usr/lib/python2.4/sre_constants* /usr/lib/python2.4/sre_parse.* "
+
+DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
+PR_python-xmlrpc="ml2"
+RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
+FILES_python-xmlrpc="/usr/lib/python2.4/xmlrpclib.* /usr/lib/python2.4/SimpleXMLRPCServer.* "
+
+DESCRIPTION_python-terminal="Python Terminal Controlling Support"
+PR_python-terminal="ml2"
+RDEPENDS_python-terminal="python-core python-io"
+FILES_python-terminal="/usr/lib/python2.4/pty.* /usr/lib/python2.4/tty.* "
+
+DESCRIPTION_python-email="Python Email Support"
+PR_python-email="ml2"
+RDEPENDS_python-email="python-core python-io python-re"
+FILES_python-email="/usr/lib/python2.4/email "
+
+DESCRIPTION_python-image="Python Graphical Image Handling"
+PR_python-image="ml2"
+RDEPENDS_python-image="python-core"
+FILES_python-image="/usr/lib/python2.4/colorsys.* /usr/lib/python2.4/imghdr.* /usr/lib/python2.4/lib-dynload/imageop.so /usr/lib/python2.4/lib-dynload/rgbimg.so "
+
+DESCRIPTION_python-resource="Python Resource Control Interface"
+PR_python-resource="ml2"
+RDEPENDS_python-resource="python-core"
+FILES_python-resource="/usr/lib/python2.4/lib-dynload/resource.so "
+
+DESCRIPTION_python-math="Python Math Support"
+PR_python-math="ml2"
+RDEPENDS_python-math="python-core"
+FILES_python-math="/usr/lib/python2.4/lib-dynload/cmath.so /usr/lib/python2.4/lib-dynload/math.so /usr/lib/python2.4/lib-dynload/_random.so /usr/lib/python2.4/random.* "
+
+DESCRIPTION_python-hotshot="Python Hotshot Profiler"
+PR_python-hotshot="ml2"
+RDEPENDS_python-hotshot="python-core"
+FILES_python-hotshot="/usr/lib/python2.4/hotshot /usr/lib/python2.4/lib-dynload/_hotshot.so "
+
+DESCRIPTION_python-unixadmin="Python Unix Administration Support"
+PR_python-unixadmin="ml2"
+RDEPENDS_python-unixadmin="python-core"
+FILES_python-unixadmin="/usr/lib/python2.4/lib-dynload/nis.so /usr/lib/python2.4/lib-dynload/grp.so /usr/lib/python2.4/lib-dynload/pwd.so /usr/lib/python2.4/getpass.* "
+
+DESCRIPTION_python-gdbm="Python GNU Database Support"
+PR_python-gdbm="ml2"
+RDEPENDS_python-gdbm="python-core libgdbm3"
+FILES_python-gdbm="/usr/lib/python2.4/lib-dynload/gdbm.so "
+
+DESCRIPTION_python-fcntl="Python's fcntl Interface"
+PR_python-fcntl="ml2"
+RDEPENDS_python-fcntl="python-core"
+FILES_python-fcntl="/usr/lib/python2.4/lib-dynload/fcntl.so "
+
+DESCRIPTION_python-netclient="Python Internet Protocol Clients"
+PR_python-netclient="ml2"
+RDEPENDS_python-netclient="python-core python-io python-mime"
+FILES_python-netclient="/usr/lib/python2.4/base64.* /usr/lib/python2.4/ftplib.* /usr/lib/python2.4/gopherlib.* /usr/lib/python2.4/hmac.* /usr/lib/python2.4/httplib.* /usr/lib/python2.4/mimetypes.* /usr/lib/python2.4/nntplib.* /usr/lib/python2.4/poplib.* /usr/lib/python2.4/smtplib.* /usr/lib/python2.4/telnetlib.* /usr/lib/python2.4/urllib.* /usr/lib/python2.4/urllib2.* /usr/lib/python2.4/urlparse.* "
+
+DESCRIPTION_python-pprint="Python Pretty-Print Support"
+PR_python-pprint="ml2"
+RDEPENDS_python-pprint="python-core"
+FILES_python-pprint="/usr/lib/python2.4/pprint.* "
+
+DESCRIPTION_python-netserver="Python Internet Protocol Servers"
+PR_python-netserver="ml2"
+RDEPENDS_python-netserver="python-core python-netclient"
+FILES_python-netserver="/usr/lib/python2.4/cgi.* /usr/lib/python2.4/BaseHTTPServer.* /usr/lib/python2.4/SimpleHTTPServer.* /usr/lib/python2.4/SocketServer.* "
+
+DESCRIPTION_python-compiler="Python Compiler Support"
+PR_python-compiler="ml2"
+RDEPENDS_python-compiler="python-core"
+FILES_python-compiler="/usr/lib/python2.4/compiler "
+
+DESCRIPTION_python-syslog="Python's syslog Interface"
+PR_python-syslog="ml2"
+RDEPENDS_python-syslog="python-core"
+FILES_python-syslog="/usr/lib/python2.4/lib-dynload/syslog.so "
+
+DESCRIPTION_python-html="Python HTML Processing"
+PR_python-html="ml2"
+RDEPENDS_python-html="python-core"
+FILES_python-html="/usr/lib/python2.4/formatter.* /usr/lib/python2.4/htmlentitydefs.* /usr/lib/python2.4/htmllib.* /usr/lib/python2.4/markupbase.* /usr/lib/python2.4/sgmllib.* "
+
+DESCRIPTION_python-readline="Python Readline Support"
+PR_python-readline="ml2"
+RDEPENDS_python-readline="python-core libreadline4"
+FILES_python-readline="/usr/lib/python2.4/lib-dynload/readline.so /usr/lib/python2.4/rlcompleter.* "
+
+DESCRIPTION_python-pydoc="Python Interactive Help Support"
+PR_python-pydoc="ml2"
+RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
+FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
+
+DESCRIPTION_python-xml="Python basic XML support."
+PR_python-xml="ml2"
+RDEPENDS_python-xml="python-core python-re"
+FILES_python-xml="/usr/lib/python2.4/lib-dynload/pyexpat.so /usr/lib/python2.4/xml /usr/lib/python2.4/xmllib.* "
+
+DESCRIPTION_python-mime="Python MIME Handling APIs"
+PR_python-mime="ml2"
+RDEPENDS_python-mime="python-core python-io"
+FILES_python-mime="/usr/lib/python2.4/mimetools.* /usr/lib/python2.4/rfc822.* "
+
+DESCRIPTION_python-unittest="Python Unit Testing Framework"
+PR_python-unittest="ml2"
+RDEPENDS_python-unittest="python-core python-stringold python-lang"
+FILES_python-unittest="/usr/lib/python2.4/unittest.* "
+
+DESCRIPTION_python-stringold="Python Deprecated String APIs"
+PR_python-stringold="ml2"
+RDEPENDS_python-stringold="python-core"
+FILES_python-stringold="/usr/lib/python2.4/lib-dynload/strop.so /usr/lib/python2.4/string.* "
+
+DESCRIPTION_python-compile="Python Bytecode Compilation Support"
+PR_python-compile="ml2"
+RDEPENDS_python-compile="python-core"
+FILES_python-compile="/usr/lib/python2.4/py_compile.* /usr/lib/python2.4/compileall.* "
+
+DESCRIPTION_python-shell="Python Shell-Like Functionality"
+PR_python-shell="ml2"
+RDEPENDS_python-shell="python-core python-re"
+FILES_python-shell="/usr/lib/python2.4/commands.* /usr/lib/python2.4/dircache.* /usr/lib/python2.4/fnmatch.* /usr/lib/python2.4/glob.* /usr/lib/python2.4/popen2.* /usr/lib/python2.4/shutil.* "
+
+DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
+PR_python-mmap="ml2"
+RDEPENDS_python-mmap="python-core python-io"
+FILES_python-mmap="/usr/lib/python2.4/lib-dynload/mmap.so "
+
+DESCRIPTION_python-zlib="Python zlib Support."
+PR_python-zlib="ml3"
+RDEPENDS_python-zlib="python-core libz1"
+FILES_python-zlib="/usr/lib/python2.4/lib-dynload/zlib.so "
+
+DESCRIPTION_python-db="Python File-Based Database Support"
+PR_python-db="ml2"
+RDEPENDS_python-db="python-core"
+FILES_python-db="/usr/lib/python2.4/anydbm.* /usr/lib/python2.4/dumbdbm.* /usr/lib/python2.4/whichdb.* "
+
+DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
+PR_python-crypt="ml2"
+RDEPENDS_python-crypt="python-core"
+FILES_python-crypt="/usr/lib/python2.4/lib-dynload/crypt.so /usr/lib/python2.4/lib-dynload/md5.so /usr/lib/python2.4/lib-dynload/rotor.so /usr/lib/python2.4/lib-dynload/sha.so "
+
+DESCRIPTION_python-lang="Python Low-Level Language Support"
+PR_python-lang="ml2"
+RDEPENDS_python-lang="python-core"
+FILES_python-lang="/usr/lib/python2.4/lib-dynload/array.so /usr/lib/python2.4/lib-dynload/parser.so /usr/lib/python2.4/lib-dynload/operator.so /usr/lib/python2.4/lib-dynload/_weakref.so /usr/lib/python2.4/atexit.* /usr/lib/python2.4/code.* /usr/lib/python2.4/codeop.* /usr/lib/python2.4/dis.* /usr/lib/python2.4/inspect.* /usr/lib/python2.4/keyword.* /usr/lib/python2.4/opcode.* /usr/lib/python2.4/repr.* /usr/lib/python2.4/token.* /usr/lib/python2.4/tokenize.* /usr/lib/python2.4/traceback.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/weakref.* "
+
+DESCRIPTION_python-audio="Python Audio Handling"
+PR_python-audio="ml2"
+RDEPENDS_python-audio="python-core"
+FILES_python-audio="/usr/lib/python2.4/wave.* /usr/lib/python2.4/chunk.* /usr/lib/python2.4/lib-dynload/ossaudiodev.so /usr/lib/python2.4/lib-dynload/audioop.so "
+
+
+
diff --git a/packages/python/python24-2.4.0/autohell.patch b/packages/python/python-2.4.0/autohell.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python24-2.4.0/autohell.patch
+++ b/packages/python/python-2.4.0/autohell.patch
diff --git a/packages/python/python24-2.4.0/bindir-libdir.patch b/packages/python/python-2.4.0/bindir-libdir.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python24-2.4.0/bindir-libdir.patch
+++ b/packages/python/python-2.4.0/bindir-libdir.patch
diff --git a/packages/python/python24-2.4.0/crosscompile.patch b/packages/python/python-2.4.0/crosscompile.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python24-2.4.0/crosscompile.patch
+++ b/packages/python/python-2.4.0/crosscompile.patch
diff --git a/packages/python/python-ao_0.82.bb b/packages/python/python-ao_0.82.bb
index e69de29bb2..6c23a87b96 100644
--- a/packages/python/python-ao_0.82.bb
+++ b/packages/python/python-ao_0.82.bb
@@ -0,0 +1,21 @@
+LICENSE = GPL
+DESCRIPTION = "Python AO Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "libao"
+SRCNAME = "pyao"
+
+SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_configure_prepend() {
+	touch Setup
+	echo "ao_libs = ao" >>Setup
+	echo "ao_lib_dir = ${STAGING_LIBDIR}" >>Setup
+	echo "ao_include_dir = ${STAGING_INCDIR}" >>Setup
+}
+
+
diff --git a/packages/python/python-imdbpy_1.4.bb b/packages/python/python-imdbpy_1.4.bb
index e69de29bb2..5e098478b2 100644
--- a/packages/python/python-imdbpy_1.4.bb
+++ b/packages/python/python-imdbpy_1.4.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database."
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+SRCNAME = "imdbpy"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/IMDbPY-${PV}"
+
+inherit distutils
+
diff --git a/packages/python/python-m2crypto-0.13.1/0.13p1.patch b/packages/python/python-m2crypto-0.13.1/0.13p1.patch
index e69de29bb2..d938f7969e 100644
--- a/packages/python/python-m2crypto-0.13.1/0.13p1.patch
+++ b/packages/python/python-m2crypto-0.13.1/0.13p1.patch
@@ -0,0 +1,42 @@
+--- M2Crypto/SSL/Connection.py.org	Wed Mar 31 08:49:57 2004
++++ M2Crypto/SSL/Connection.py	Wed Mar 31 08:50:45 2004
+@@ -143,11 +143,11 @@
+         """Set this connection's underlying socket to _mode_."""
+         self.socket.setblocking(mode)
+         if mode:
+-            self.send = self.write = self._write_bio
+-            self.recv = self.read = self._read_bio
++            self.send = self.write = Connection._write_bio
++            self.recv = self.read = Connection._read_bio
+         else:
+-            self.send = self.write = self._write_nbio
+-            self.recv = self.read = self._read_nbio
++            self.send = self.write = Connection._write_nbio
++            self.recv = self.read = Connection._read_nbio
+ 
+     def fileno(self):
+         return self.socket.fileno()
+--- M2Crypto/DSA.py.org	Wed Mar 31 08:53:16 2004
++++ M2Crypto/DSA.py	Wed Mar 31 08:53:35 2004
+@@ -35,7 +35,7 @@
+ 
+     def __getattr__(self, name):
+         if name in ['p', 'q', 'g', 'pub', 'priv']:
+-            method = getattr(m2, 'm2.dsa_get_%s' % (name,))
++            method = getattr(m2, 'dsa_get_%s' % (name,))
+             assert m2.dsa_type_check(self.dsa), "'dsa' type error"
+             return method(self.dsa)
+         else:
+--- M2Crypto/_version.py.org	Wed Mar 31 12:25:21 2004
++++ M2Crypto/_version.py	Wed Mar 31 12:24:18 2004
+@@ -1,8 +1,8 @@
+ """M2Crypto Version Info"""
+ 
+-RCS_id='$Id$'
++RCS_id='$Id$'
+ 
+ import string
+-version_info = (0, 13)
++version_info = (0, 13, 1)
+ version = string.join(map(lambda x: "%s" % x, version_info), ".")
+ 
diff --git a/packages/python/python-native-2.3.3/bindir-libdir.patch b/packages/python/python-native-2.3.3/bindir-libdir.patch
index e69de29bb2..999bddc449 100644
--- a/packages/python/python-native-2.3.3/bindir-libdir.patch
+++ b/packages/python/python-native-2.3.3/bindir-libdir.patch
@@ -0,0 +1,18 @@
+
+#
+# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Python-2.3.1/Makefile.pre.in~bindir-libdir	2003-09-20 12:50:28.000000000 +0200
++++ Python-2.3.1/Makefile.pre.in	2003-11-02 19:53:17.000000000 +0100
+@@ -78,8 +78,8 @@
+ exec_prefix=	@exec_prefix@
+ 
+ # Expanded directories
+-BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++BINDIR=		@bindir@
++LIBDIR=		@libdir@
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
diff --git a/packages/python/python-native-2.3.3/cross-distutils.patch b/packages/python/python-native-2.3.3/cross-distutils.patch
index e69de29bb2..76ae883c1d 100644
--- a/packages/python/python-native-2.3.3/cross-distutils.patch
+++ b/packages/python/python-native-2.3.3/cross-distutils.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils	2003-02-10 15:02:33.000000000 +0100
++++ Python-2.3.3/Lib/distutils/sysconfig.py	2004-03-02 20:15:05.000000000 +0100
+@@ -19,8 +19,8 @@
+ from errors import DistutilsPlatformError
+ 
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
++EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
+ 
+ # python_build: (Boolean) if true, we're either building Python or
+ # building an extension with an un-installed Python, so we use
+@@ -192,7 +192,8 @@
+     else:
+         # The name of the config.h file changed in 2.2
+         config_h = 'pyconfig.h'
+-    return os.path.join(inc_dir, config_h)
++    print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
++    return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
+ 
+ 
+ def get_makefile_filename():
+@@ -200,7 +201,8 @@
+     if python_build:
+         return os.path.join(os.path.dirname(sys.executable), "Makefile")
+     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+-    return os.path.join(lib_dir, "config", "Makefile")
++    print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
++    return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
+ 
+ 
+ def parse_config_h(fp, g=None):
diff --git a/packages/python/python24-native-2.4.0/bindir-libdir.patch b/packages/python/python-native-2.4.0/bindir-libdir.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python24-native-2.4.0/bindir-libdir.patch
+++ b/packages/python/python-native-2.4.0/bindir-libdir.patch
diff --git a/packages/python/python24-native-2.4.0/cross-distutils.patch b/packages/python/python-native-2.4.0/cross-distutils.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python24-native-2.4.0/cross-distutils.patch
+++ b/packages/python/python-native-2.4.0/cross-distutils.patch
diff --git a/packages/python-sip/python-sip_4.1.1.bb b/packages/python/python-native_2.4.0.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/python-sip/python-sip_4.1.1.bb
+++ b/packages/python/python-native_2.4.0.bb
diff --git a/packages/python/python-numeric/no-lapack.patch b/packages/python/python-numeric/no-lapack.patch
index e69de29bb2..d27c666ff4 100644
--- a/packages/python/python-numeric/no-lapack.patch
+++ b/packages/python/python-numeric/no-lapack.patch
@@ -0,0 +1,36 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Numeric-23.3/setup.py~no-lapack
++++ Numeric-23.3/setup.py
+@@ -32,22 +32,22 @@
+     mathlibs = []
+ 
+ # delete all but the first one in this list if using your own LAPACK/BLAS
+-sourcelist = [os.path.join('Src', 'lapack_litemodule.c'),
++sourcelist = [] # os.path.join('Src', 'lapack_litemodule.c'),
+ #              os.path.join('Src', 'blas_lite.c'), 
+ #              os.path.join('Src', 'f2c_lite.c'), 
+ #              os.path.join('Src', 'zlapack_lite.c'),
+ #              os.path.join('Src', 'dlapack_lite.c')
+-             ]
++             
+ # set these to use your own BLAS;
+ 
+-library_dirs_list = ['/usr/lib/atlas']
+-libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] 
++library_dirs_list = [] # '/usr/lib/atlas']
++libraries_list = [] # 'lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] 
+                    # if you also set `use_dotblas` (see below), you'll need:
+                    # ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c']
+ 
+ # set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct
+-use_dotblas = 1
+-include_dirs = ['/usr/include/atlas']  # You may need to set this to find cblas.h
++use_dotblas = 0
++include_dirs = [] # '/usr/include/atlas']  # You may need to set this to find cblas.h
+                    #  e.g. on UNIX using ATLAS this should be ['/usr/include/atlas'] 
+ 
+ # The packages are split in this way to allow future optional inclusion
diff --git a/packages/python/python-pycodes-1.1/no-docs.patch b/packages/python/python-pycodes-1.1/no-docs.patch
index e69de29bb2..5d41e8c03f 100644
--- a/packages/python/python-pycodes-1.1/no-docs.patch
+++ b/packages/python/python-pycodes-1.1/no-docs.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- pycodes/setup.py~no-docs	2004-01-25 01:01:33.000000000 +0100
++++ pycodes/setup.py	2004-04-04 03:24:53.000000000 +0200
+@@ -43,9 +43,7 @@
+                   'pycodes.tests.quantization',
+                   'pycodes.tests.quantization.BSC',
+                   'pycodes.tests.quantization.BEC'],
+-      data_files=([('doc',
+-                   map(lambda x: os.path.join('doc',x),
+-                       ['pycodes.html','pycodes.info']))]),
++      data_files=(),
+       ext_modules = [
+     Extension('pycodes.pyLDPC',
+               map(lambda x: os.path.join(pyLDPCdir,x),pyLDPCsrc) +
diff --git a/packages/python/python-pygame-1.6/Setup b/packages/python/python-pygame-1.6/Setup
index e69de29bb2..c4558b39bb 100644
--- a/packages/python/python-pygame-1.6/Setup
+++ b/packages/python/python-pygame-1.6/Setup
@@ -0,0 +1,57 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
+#build a correct Setup file for you based on your system settings.
+#If not, the format is simple enough to edit by hand. First change
+#the needed commandline flags for each dependency, then comment out
+#any unavailable optional modules in the first optional section.
+
+#SDL = ???
+
+FONT = -lSDL_ttf-2.0
+IMAGE = -lSDL_image-1.2
+MIXER = -lSDL_mixer-1.2
+SMPEG = -lsmpeg $(SDL)
+NUMERIC = -I.
+
+
+
+#the following modules are optional. you will want to compile
+#everything you can, but you can ignore ones you don't have
+#dependencies for, just comment them out
+
+imageext src/imageext.c $(SDL) $(IMAGE)
+font src/font.c $(SDL) $(FONT)
+mixer src/mixer.c $(SDL) $(MIXER)
+mixer_music src/music.c $(SDL) $(MIXER)
+movie src/movie.c $(SDL) $(SMPEG)
+surfarray src/surfarray.c $(SDL) $(NUMERIC)
+sndarray src/sndarray.c $(SDL) $(NUMERIC) $(MIXER)
+
+
+
+#these modules are required for pygame to run. they only require
+#SDL as a dependency. these should not be altered
+
+base src/base.c $(SDL)
+cdrom src/cdrom.c $(SDL)
+constants src/constants.c $(SDL)
+display src/display.c $(SDL)
+event src/event.c $(SDL)
+key src/key.c $(SDL)
+mouse src/mouse.c $(SDL)
+rect src/rect.c $(SDL)
+rwobject src/rwobject.c $(SDL)
+surface src/surface.c src/alphablit.c $(SDL)
+surflock src/surflock.c $(SDL)
+time src/time.c $(SDL)
+joystick src/joystick.c $(SDL)
+draw src/draw.c $(SDL)
+image src/image.c $(SDL)
+transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL)
+
+
+#the following are placeholders. setup.py can use them to help
+#auto-copy needed DLLs into the pygame installation folder.
+#you can simply ignore these lines under non-windows, no need to
+#comment out.
+COPYLIB_smpeg $(SDL) $(SMPEG)
diff --git a/packages/python/python-pygame-1.6/qpe.patch b/packages/python/python-pygame-1.6/qpe.patch
index e69de29bb2..b4d3c01a2f 100644
--- a/packages/python/python-pygame-1.6/qpe.patch
+++ b/packages/python/python-pygame-1.6/qpe.patch
@@ -0,0 +1,37 @@
+--- ./src/base.c~qpe.patch	2003-10-16 15:43:22.000000000 +0930
++++ ./src/base.c	2004-05-11 02:09:14.000000000 +0930
+@@ -37,6 +37,12 @@
+ #include<windows.h>
+ extern int SDL_RegisterApp(char*, Uint32, void*);
+ #endif
++#ifdef QWS
++
++int SDL_main(int argc, char *argv[]) { return 0; };
++
++extern void initQCop(int argc, char *argv[]);
++#endif
+ 
+ #if defined(macintosh)
+ #if(!defined(__MWERKS__) && !TARGET_API_MAC_CARBON)
+@@ -691,7 +697,10 @@
+ {
+ 	PyObject *module, *dict, *apiobj;
+ 	static void* c_api[PYGAMEAPI_BASE_NUMSLOTS];
+-
++#ifdef QWS
++	char *args[] = {"pygame", NULL};
++#endif
++	
+     /* create the module */
+ 	module = Py_InitModule3("base", init__builtins__, doc_pygame_MODULE);
+ 	dict = PyModule_GetDict(module);
+@@ -722,6 +731,9 @@
+ 	/*some intiialization*/
+ 	Py_AtExit(atexit_quit);
+ 	install_parachute();
++#ifdef QWS
++	initQCop(1, args);
++#endif
+ #ifdef MS_WIN32
+ 	SDL_RegisterApp("pygame", 0, GetModuleHandle(NULL));
+ #endif
diff --git a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al b/packages/python/python-pygtk-0.6.12/remove-imlib-et-al
index e69de29bb2..94bb164f67 100644
--- a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al
+++ b/packages/python/python-pygtk-0.6.12/remove-imlib-et-al
@@ -0,0 +1,31 @@
+remove checking for imlib, pixbuf, gtkgl and libglade
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- pygtk-0.6.12/configure.in~remove-imlib-et-al
++++ pygtk-0.6.12/configure.in
+@@ -45,17 +45,14 @@
+ fi
+ 
+ AM_PATH_GTK(gtk_required_version,,,$extra_mods)
+-AM_PATH_GDK_IMLIB(imlib_required_version, build_imlib=true, build_imlib=false)
+-AM_CONDITIONAL(BUILD_IMLIB, $build_imlib)
+ 
+-AM_PATH_GDK_PIXBUF(pixbuf_required_version, build_pixbuf=true, build_pixbuf=false)
+-AM_CONDITIONAL(BUILD_PIXBUF, $build_pixbuf)
++AM_CONDITIONAL(BUILD_IMLIB, false)
+ 
+-AM_PATH_GTKGL(build_gtkgl=true, build_gtkgl=false)
+-AM_CONDITIONAL(BUILD_GTKGL, $build_gtkgl)
++AM_CONDITIONAL(BUILD_PIXBUF, false)
+ 
+-AM_PATH_LIBGLADE(build_libglade=true, build_libglade=false)
+-AM_CONDITIONAL(BUILD_LIBGLADE, $build_libglade)
++AM_CONDITIONAL(BUILD_GTKGL, false)
++
++AM_CONDITIONAL(BUILD_LIBGLADE, false)
+ 
+ 
+ AC_ARG_ENABLE(numpy,
diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk-0_0.6.12.bb
index e69de29bb2..87029ec897 100644
--- a/packages/python/python-pygtk-0_0.6.12.bb
+++ b/packages/python/python-pygtk-0_0.6.12.bb
@@ -0,0 +1,30 @@
+LICENSE = LGPL
+DESCRIPTION = "Python GTK+ 1.2 Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
+DEPENDS = "gtk+-1.2 python"
+RDEPENDS = "python-core python-shell python-re"
+SRCNAME = "pygtk"
+PR = "r4"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/python-pygtk-${PV}"
+
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
+           file://remove-imlib-et-al;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${libdir}/python2.3/"
+
+do_configure_prepend() {
+	echo ${LDFLAGS} > /tmp/ldflags
+	rm aclocal.m4
+}
+
+do_stage() {
+	autotools_stage_includes
+}
+
diff --git a/packages/python/python-pygtk/acinclude.m4 b/packages/python/python-pygtk/acinclude.m4
index e69de29bb2..eec3758afc 100644
--- a/packages/python/python-pygtk/acinclude.m4
+++ b/packages/python/python-pygtk/acinclude.m4
@@ -0,0 +1,84 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
diff --git a/packages/python/python-pylinda/honor-datadir.patch b/packages/python/python-pylinda/honor-datadir.patch
index e69de29bb2..9035804592 100644
--- a/packages/python/python-pylinda/honor-datadir.patch
+++ b/packages/python/python-pylinda/honor-datadir.patch
@@ -0,0 +1,29 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linda-0.4/setup.py~honor-datadir.patch
++++ linda-0.4/setup.py
+@@ -74,7 +74,7 @@
+ class myinstall(install):
+     def run(self):
+         install.run(self)
+-
++	return
+         print "PyLinda's post-install options"
+ 
+         # the following is taken from the install_scripts standard command
+@@ -123,9 +123,9 @@
+                      Topic :: System :: Distributed Computing""".split("\n"),
+       version="0.4",
+       scripts=["linda_server.py"],
+-      data_files=[(root_path+"/examples", glob.glob("examples/*.py")),
+-                  (root_path+"/doc", glob.glob("doc/html/*")),
+-                  (root_path, ["README"])],
++      data_files=[("examples", glob.glob("examples/*.py")),
++                  ("doc", glob.glob("doc/html/*")),
++                  (".", ["README"])],
+       ext_modules=ext,
+       packages=["linda"],
+       package_dir={"linda": ""},
diff --git a/packages/python/python-pyode_1.0.0.bb b/packages/python/python-pyode_1.0.0.bb
index e69de29bb2..2d70f848b5 100644
--- a/packages/python/python-pyode_1.0.0.bb
+++ b/packages/python/python-pyode_1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \
+an open-source physics engine. PyODE also includes an XODE parser."
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "LGPL"
+SRCNAME = "PyODE"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_configure_prepend() {
+	ln -s ${STAGING_LIBDIR}/.. ../ode
+}
+
diff --git a/packages/python/python-pyqt-3.13/features b/packages/python/python-pyqt-3.13/features
index e69de29bb2..6fe74cafe4 100644
--- a/packages/python/python-pyqt-3.13/features
+++ b/packages/python/python-pyqt-3.13/features
@@ -0,0 +1,31 @@
+-x Qt_THREAD_SUPPORT
+-x Qt_CODECS
+-x Qt_COLORDIALOG
+-x Qt_DIAL
+-x Qt_DOM
+-x Qt_DRAGANDDROP
+-x Qt_IMAGE_TEXT
+-x Qt_INPUTDIALOG
+-x Qt_FILEDIALOG
+-x Qt_FONTDIALOG
+-x Qt_MIMECLIPBOARD
+-x Qt_NETWORKPROTOCOL
+-x Qt_NETWORKPROTOCOL_FTP
+-x Qt_NETWORKPROTOCOL_HTTP
+-x Qt_PICTURE
+-x Qt_PRINTDIALOG
+-x Qt_PRINTER
+-x Qt_PROGRESSDIALOG
+-x Qt_PROPERTIES
+-x Qt_SEMIMODAL
+-x Qt_SIZEGRIP
+-x Qt_SPLITTER
+-x Qt_STYLE_CDE
+-x Qt_STYLE_INTERLACE
+-x Qt_STYLE_MOTIF
+-x Qt_STYLE_MOTIFPLUS
+-x Qt_STYLE_PLATINUM
+-x Qt_STYLE_SGI
+-x Qt_TRANSFORMATIONS
+-x Qt_WIZARD
+-x Qt_WORKSPACE
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index e69de29bb2..0dcc3f32a4 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings"
+HOMEPAGE = "http://www.vanille.de/projects/python.spy"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "python-core python-sip"
+DEPENDS = "virtual/libqte2 virtual/libqpe"
+SRCNAME = "pyqt"
+PR = "ml1"
+
+SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
+           file://features"
+S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
+
+inherit qmake sip
+
+QMAKE_PROFILES = "pyqt.pro"
+EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+SIP_MODULES = "qt qtcanvas qttable qtpe"
+SIP_FEATURES = "${WORKDIR}/features"
+EXTRA_OEMAKE = " MAKEFLAGS= "
+
+EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
+                         CONFIG=qt CONFIG+=warn_on CONFIG+=release \
+                         DESTDIR= VERSION=1.0.0 \
+                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \
+                         INCLUDEPATH=. \
+                         INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+                         INCLUDEPATH+=${STAGING_INCDIR} \
+                         LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \
+                         LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
+
+do_configure_prepend() {
+    echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro
+}
+
+do_stage() {
+    install -d ${STAGING_SIPDIR}/qt/
+    for module in ${SIP_MODULES}
+    do
+        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
+	install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so
+    done
+}
+
+do_install() {
+    install -d ${D}/${libdir}/python2.3/site-packages/
+    for module in ${SIP_MODULES}
+    do
+	install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so
+    done
+}
+
+FILES_${PN} = "${libdir}/python2.3/site-packages"
diff --git a/packages/python/python-pyqwt-3.10/features b/packages/python/python-pyqwt-3.10/features
index e69de29bb2..56eab20b69 100644
--- a/packages/python/python-pyqwt-3.10/features
+++ b/packages/python/python-pyqwt-3.10/features
@@ -0,0 +1,30 @@
+-x Qt_THREAD_SUPPORT
+-x Qt_CODECS
+-x Qt_COLORDIALOG
+-x Qt_DIAL
+-x Qt_DOM
+-x Qt_DRAGANDDROP
+-x Qt_IMAGE_TEXT
+-x Qt_INPUTDIALOG
+-x Qt_FILEDIALOG
+-x Qt_FONTDIALOG
+-x Qt_MIMECLIPBOARD
+-x Qt_NETWORKPROTOCOL
+-x Qt_NETWORKPROTOCOL_FTP
+-x Qt_PICTURE
+-x Qt_PRINTDIALOG
+-x Qt_PRINTER
+-x Qt_PROGRESSDIALOG
+-x Qt_PROPERTIES
+-x Qt_SEMIMODAL
+-x Qt_SIZEGRIP
+-x Qt_SPLITTER
+-x Qt_STYLE_CDE
+-x Qt_STYLE_INTERLACE
+-x Qt_STYLE_MOTIF
+-x Qt_STYLE_MOTIFPLUS
+-x Qt_STYLE_PLATINUM
+-x Qt_STYLE_SGI
+-x Qt_TRANSFORMATIONS
+-x Qt_WIZARD
+-x Qt_WORKSPACE
diff --git a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch b/packages/python/python-pyqwt-3.10/qt2.x-compat.patch
index e69de29bb2..249ff4a5ee 100644
--- a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch
+++ b/packages/python/python-pyqwt-3.10/qt2.x-compat.patch
@@ -0,0 +1,28 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- PyQwt-20040118/sip/qwtarray.sip~add-missing-feature-tests	2003-12-14 16:54:29.000000000 +0100
++++ PyQwt-20040118/sip/qwtarray.sip	2004-01-29 18:31:21.000000000 +0100
+@@ -34,11 +34,10 @@
+ // educational versions of Qt, PyQt and sip, PyQwt becomes a free plug-in
+ // for a non-free program.
+ 
+-
+ %MappedType QwtArray<long>
+ {
+ %TypeHeaderCode
+-#include <qmemarray.h>
++//#include <qmemarray.h>
+ %End
+ 
+ %ConvertFromTypeCode
+@@ -339,7 +338,6 @@
+ %End // ConvertToTypeCode
+ }; // QwtArray<QwtEventPattern::MousePattern>
+ 
+-
+ // Local Variables:
+ // mode: C++
+ // c-file-style: "stroustrup"
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index e69de29bb2..1f41ab0459 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "Python QWT Bindings, QtE edition"
+HOMEPAGE = "http://www.vanille.de/projects/python.spy"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt"
+DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
+SRCNAME = "pyqwt"
+PR = "ml2"
+
+SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
+           file://qt2.x-compat.patch;patch=1 \
+           file://features"
+S = "${WORKDIR}/PyQwt-20040118"
+
+inherit qmake sip
+
+QMAKE_PROFILES = "pyqwt.pro"
+EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+SIP_MODULES = "qwt"
+SIP_FEATURES = "${WORKDIR}/features"   
+EXTRA_OEMAKE = " MAKEFLAGS= "
+
+EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \
+                         TARGET=qwt DESTDIR= VERSION=1.0.0 \
+                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \
+                         INCLUDEPATH+=../numpy \
+                         INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+                         INCLUDEPATH+=${STAGING_INCDIR} \
+                         LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \
+                         LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
+
+do_generate_prepend() {
+    echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro
+    
+    echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip
+    echo "TEMPLATE=lib" >>sip/qwtmod.sip
+    echo 'SOURCES = $B' >>sip/qwtmod.sip
+    echo 'HEADERS = $H' >>sip/qwtmod.sip
+    echo "%End" >>sip/qwtmod.sip
+
+    mkdir -p sip/qwt/
+    mv sip/*.* sip/qwt/
+}
+
+do_stage() {
+    install -d ${STAGING_SIPDIR}/qt/
+    for module in ${SIP_MODULES}
+    do
+        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
+        install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so
+    done
+}
+
+do_install() {
+    install -d ${D}/${libdir}/python2.3/site-packages/
+    for module in ${SIP_MODULES}
+    do
+        install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so
+    done
+}
+
+FILES_${PN} = "/usr/lib/python2.3/site-packages"
diff --git a/packages/python/python-pyro/pyro-unattended-install.patch b/packages/python/python-pyro/pyro-unattended-install.patch
index e69de29bb2..aefabacbf0 100644
--- a/packages/python/python-pyro/pyro-unattended-install.patch
+++ b/packages/python/python-pyro/pyro-unattended-install.patch
@@ -0,0 +1,16 @@
+
+--- setup.cfg~pyro-unattended-install
++++ setup.cfg
+@@ -4,9 +4,9 @@
+ ### Enable the following two items for unattended install.
+ ### The scripts location is mandatory. Change it so something sensible.
+ 
+-#[install-options]
+-#unattended=1
++[install-options]
++unattended=1
+ 
+ [install]
+ optimize=1
+-#install-scripts=/foo/bar
++install-scripts= ../image/usr/lib/python2.3
diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_0.9.17.bb
index e69de29bb2..3a42abe794 100644
--- a/packages/python/python-scapy_0.9.17.bb
+++ b/packages/python/python-scapy_0.9.17.bb
@@ -0,0 +1,21 @@
+LICENSE = GPL
+DESCRIPTION = "Scapy is a powerful interactive packet manipulation tool, \
+packet generator, network scanner, network discovery, packet sniffer, etc. \
+It can for the moment replace hping, 85% of nmap, arpspoof, arp-sk, arping, \
+tcpdump, tethereal, p0f, ...."
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+RDEPENDS = "python-core python-netclient python-netserver"
+SRCNAME = "scapy"
+
+SRC_URI = "http://www.cartel-securite.fr/pbiondi/python/scapy-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+do_install() {
+	install -d ${D}/${libdir}/python2.3
+	install -m 0755 ${S}/scapy.py ${D}/${libdir}/python2.3/
+}
+
+FILES_${PN} = "${libdir}/python2.3/"
+
diff --git a/packages/python/python24_2.4.0.bb b/packages/python/python-sip_4.1.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python24_2.4.0.bb
+++ b/packages/python/python-sip_4.1.1.bb
diff --git a/packages/python/python-soappy-0.11.3/fpconst.py b/packages/python/python-soappy-0.11.3/fpconst.py
index e69de29bb2..3509a139bb 100644
--- a/packages/python/python-soappy-0.11.3/fpconst.py
+++ b/packages/python/python-soappy-0.11.3/fpconst.py
@@ -0,0 +1,111 @@
+"""Utilities for handling IEEE 754 floating point special values
+
+This python module implements constants and functions for working with
+IEEE754 double-precision special values.  It provides constants for
+Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
+(NegInf), as well as functions to test for these values.
+
+The code is implemented in pure python by taking advantage of the
+'struct' standard module. Care has been taken to generate proper
+results on both big-endian and little-endian machines. Some efficiency
+could be gained by translating the core routines into C.
+
+See <http://babbage.cs.qc.edu/courses/cs341/IEEE-754references.html>
+for reference material on the IEEE 754 floating point standard.
+
+Further information on this package is available at
+<http://software.biostat.washington.edu/statsoft/snake/fpconst>.
+
+Author:    Gregory R. Warnes <gregory_r_warnes@groton.pfizer.com>
+Date::     2003-04-08
+Copyright: (c) 2003, Pfizer, Inc.
+"""
+
+__version__ = "0.6.0"
+ident = "$Id$"
+
+import struct
+
+# check endianess
+_big_endian = struct.pack('i',1)[0] != '\x01'
+
+# and define appropriate constants
+if(_big_endian): 
+    _HW = 0
+    _LW = 1
+    
+    NaN = struct.unpack('d', '\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF')[0]
+    PosInf = struct.unpack('d', '\x7F\xF0\x00\x00\x00\x00\x00\x00')[0]
+    NegInf = -PosInf
+    
+else:
+    _HW = 1
+    _LW = 0
+
+    NaN = struct.unpack('d', '\x00\x00\x00\x00\x00\x00\xf8\xff')[0]
+    PosInf = struct.unpack('d', '\x00\x00\x00\x00\x00\x00\xf0\x7f')[0]
+    NegInf = -PosInf
+
+def _double_as_longs(dval):
+    "Use struct.unpack to decode a double precision float into two longs"
+    tmp = struct.unpack('ll',struct.pack('d', dval))
+    return (tmp[_HW], tmp[_LW])
+
+
+##
+## Functions to extract components of the IEEE 754 floating point format
+##
+
+def _sign(dval):
+    "Extract the sign bit from a double-precision floating point value"
+    ll = _double_as_longs(dval)
+    return ll[0] >> 31 & 0x01 
+
+def _exponent(dval):
+    """Extract the exponentent bits from a double-precision floating
+    point value.
+
+    Note that for normalized values, the exponentdent bits have an offset
+    of 1023. As a consequence, the actual exponentent is obtained
+    by subtracting 1023 for the value returned by this function
+    """
+    ll = _double_as_longs(dval)
+    return (ll[0] >> 20) & 0x7ff
+
+def _mantissa(dval):
+    """Extract the _mantissa bits from a double-precision floating
+    point value."""
+
+    ll = _double_as_longs(dval)
+    mantissa0 = (ll[0] & 0x000fffffL) << 32
+    mantissa1 = ll[1] 
+    return mantissa0 + mantissa1
+
+##
+## Functions to test for IEEE 754 special values
+##
+
+def isNaN(value):
+    "Determine if the argument is a IEEE 754 NaN (Not a Number) value."
+    return (_exponent(value)==0x7ff and _mantissa(value)!=0) 
+
+def isInf(value):
+    """Determine if the argument is an infinite IEEE 754 value (positive
+    or negative inifinity)"""
+    return (_exponent(value)==0x7ff and _mantissa(value)== 0)
+
+def isFinite(value):
+    """Determine if the argument is an finite IEEE 754 value (i.e., is
+    not NaN, positive or negative inifinity)"""
+    return (_exponent(value)!=0x7ff)
+
+
+def isPosInf(value):
+    "Determine if the argument is a IEEE 754 positive infinity value"
+    return (_sign(value)==0 and _exponent(value)==0x7ff and \
+            _mantissa(value)== 0) 
+
+def isNegInf(value):
+    "Determine if the argument is a IEEE 754 negative infinity value"
+    return (_sign(value)==1 and _exponent(value)==0x7ff and \
+            _mantissa(value)== 0) 
diff --git a/packages/python/python-vorbis-1.3/disable-oggcheck.patch b/packages/python/python-vorbis-1.3/disable-oggcheck.patch
index e69de29bb2..2555169759 100644
--- a/packages/python/python-vorbis-1.3/disable-oggcheck.patch
+++ b/packages/python/python-vorbis-1.3/disable-oggcheck.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- pyvorbis-1.3/setup.py~disable-oggcheck	2003-08-15 10:42:02.000000000 +0200
++++ pyvorbis-1.3/setup.py	2004-01-21 16:32:56.000000000 +0100
+@@ -16,7 +16,7 @@
+     print '''You must have the Ogg Python bindings
+ installed in order to build and install
+ these bindings. Import of ogg._ogg failed.'''
+-    sys.exit(1)
++    #sys.exit(1)
+ 
+ def get_setup():
+     data = {}
diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb
deleted file mode 100644
index 1fba9a2557..0000000000
--- a/packages/python/python24-native_2.4.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Python Programming Language"
-HOMEPAGE = "http://www.python.org"
-LICENSE = "PSF"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = ""
-PR = "r0"
-
-EXCLUDE_FROM_WORLD = "1"
-
-SRC_URI = "ftp://www.python.org/pub/python/2.4/Python-2.4.tar.bz2 \
-           file://bindir-libdir.patch;patch=1             \
-	   file://cross-distutils.patch;patch=1"
-S = "${WORKDIR}/Python-2.4"
-
-inherit autotools native
-
-EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \
-		--with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
-EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
-
-do_configure () {
-	oe_runconf
-}
-
-do_stage_append() {
-	# install pgen for later usage with non-native builds
-	install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
-}
-
diff --git a/packages/python/python_2.3.4.bb b/packages/python/python_2.3.4.bb
index e69de29bb2..853375bd11 100644
--- a/packages/python/python_2.3.4.bb
+++ b/packages/python/python_2.3.4.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "Python Programming Language"
+HOMEPAGE = "http://www.python.org"
+LICENSE = "PSF"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "python-native zlib gdbm"
+PR = "ml4"
+
+SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
+	   file://bindir-libdir.patch;patch=1 \
+	   file://crosscompile.patch;patch=1"
+S = "${WORKDIR}/Python-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions"
+
+#
+# copy config.h and an appropriate Makefile for distutils.sysconfig
+# which laters uses the information out of these to compile extensions
+#
+do_compile_prepend() {
+	install -d ${STAGING_INCDIR}/python2.3/
+	install -d ${STAGING_LIBDIR}/python2.3/config/
+	install -m 0644 pyconfig.h ${STAGING_INCDIR}/python2.3/
+	install -m 0644 Makefile Makefile.orig
+	install -m 0644 Makefile Makefile.backup
+	sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile
+	install -m 0644 Makefile Makefile.backup
+	sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
+	install -m 0644 Makefile ${STAGING_LIBDIR}/python2.3/config/
+}
+
+do_compile() {
+	oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
+		   HOSTPYTHON=${STAGING_BINDIR}/python \
+		   STAGING_LIBDIR=${STAGING_LIBDIR} \
+		   STAGING_INCDIR=${STAGING_INCDIR} \
+		   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS}
+}
+
+do_stage() {
+	install -m 0644 Include/*.h ${STAGING_INCDIR}/python2.3/
+}
+
+do_install() {
+	install -m 0644 Makefile.orig Makefile
+        oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
+                   HOSTPYTHON=${STAGING_BINDIR}/python \
+                   STAGING_LIBDIR=${STAGING_LIBDIR} \
+                   STAGING_INCDIR=${STAGING_INCDIR} \
+		   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+		   DESTDIR=${D} install
+}
+
+include python-${PV}-manifest.inc
diff --git a/packages/sip/sip4-native_4.2rc1.bb b/packages/python/python_2.4.0.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/sip/sip4-native_4.2rc1.bb
+++ b/packages/python/python_2.4.0.bb
diff --git a/packages/sip/sip-native_4.0.1.bb b/packages/sip/sip-native_4.0.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sip/sip-native_4.0.1.bb
diff --git a/packages/sip/sip-native_4.2rc1.bb b/packages/sip/sip-native_4.2rc1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sip/sip-native_4.2rc1.bb
diff --git a/packages/sip/sip4-native_4.0.1.bb b/packages/sip/sip4-native_4.0.1.bb
deleted file mode 100644
index 7963c2fa23..0000000000
--- a/packages/sip/sip4-native_4.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "SIP - A Python Wrapper Generator"
-SECTION = "base"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-
-SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
-S = "${WORKDIR}/sip-${PV}/sipgen"
-
-inherit qmake native
-
-EXTRA_QMAKEVARS_POST = "DESTDIR=${STAGING_BINDIR} CONFIG=console"
-
-do_configure_prepend() {
-	cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
-}
-