merge of 1b2e21b185da17a194d778853f848c2e86a2d31a

     and 649d3cf23ceed3a98c61de4cfc356bb3848b9cf3

77 files changed, 702 insertions, 1712 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9c1ba1f47c..7893fd75cf 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -150,6 +150,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
 STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
 STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
 STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
+STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 
 DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
diff --git a/packages/e17/e-wm_0.16.999.026.bb b/packages/e17/e-wm_0.16.999.027.bb
index df78fbdcd0..df78fbdcd0 100644
--- a/packages/e17/e-wm_0.16.999.026.bb
+++ b/packages/e17/e-wm_0.16.999.027.bb
diff --git a/packages/efl/e_0.16.999.026.bb b/packages/efl/e_0.16.999.027.bb
index 5078c71365..5078c71365 100644
--- a/packages/efl/e_0.16.999.026.bb
+++ b/packages/efl/e_0.16.999.027.bb
diff --git a/packages/efl/ecore-fb_0.9.9.026.bb b/packages/efl/ecore-fb_0.9.9.027.bb
index a957c5dd8c..a957c5dd8c 100644
--- a/packages/efl/ecore-fb_0.9.9.026.bb
+++ b/packages/efl/ecore-fb_0.9.9.027.bb
diff --git a/packages/efl/ecore-native_0.9.9.026.bb b/packages/efl/ecore-native_0.9.9.027.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.026.bb
+++ b/packages/efl/ecore-native_0.9.9.027.bb
diff --git a/packages/efl/ecore-x11_0.9.9.026.bb b/packages/efl/ecore-x11_0.9.9.027.bb
index 3a88ad229b..3a88ad229b 100644
--- a/packages/efl/ecore-x11_0.9.9.026.bb
+++ b/packages/efl/ecore-x11_0.9.9.027.bb
diff --git a/packages/efl/edje-native_0.5.0.026.bb b/packages/efl/edje-native_0.5.0.027.bb
index 5eb077922a..5eb077922a 100644
--- a/packages/efl/edje-native_0.5.0.026.bb
+++ b/packages/efl/edje-native_0.5.0.027.bb
diff --git a/packages/efl/edje-utils_0.5.0.026.bb b/packages/efl/edje-utils_0.5.0.027.bb
index f8eb917e4d..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.026.bb
+++ b/packages/efl/edje-utils_0.5.0.027.bb
diff --git a/packages/efl/edje_0.5.0.026.bb b/packages/efl/edje_0.5.0.027.bb
index d51dd119e4..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.026.bb
+++ b/packages/efl/edje_0.5.0.027.bb
diff --git a/packages/efl/eet-native_0.9.10.026.bb b/packages/efl/eet-native_0.9.10.027.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.026.bb
+++ b/packages/efl/eet-native_0.9.10.027.bb
diff --git a/packages/efl/eet_0.9.10.026.bb b/packages/efl/eet_0.9.10.027.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.026.bb
+++ b/packages/efl/eet_0.9.10.027.bb
diff --git a/packages/efl/embryo-native_0.9.1.026.bb b/packages/efl/embryo-native_0.9.1.027.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.026.bb
+++ b/packages/efl/embryo-native_0.9.1.027.bb
diff --git a/packages/efl/embryo-utils_0.9.1.026.bb b/packages/efl/embryo-utils_0.9.1.027.bb
index d507c53cce..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.026.bb
+++ b/packages/efl/embryo-utils_0.9.1.027.bb
diff --git a/packages/efl/embryo_0.9.1.026.bb b/packages/efl/embryo_0.9.1.027.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.026.bb
+++ b/packages/efl/embryo_0.9.1.027.bb
diff --git a/packages/efl/evas-fb_0.9.9.026.bb b/packages/efl/evas-fb_0.9.9.027.bb
index 3f7847874c..3f7847874c 100644
--- a/packages/efl/evas-fb_0.9.9.026.bb
+++ b/packages/efl/evas-fb_0.9.9.027.bb
diff --git a/packages/efl/evas-native_0.9.9.026.bb b/packages/efl/evas-native_0.9.9.027.bb
index cbcbe304e9..cbcbe304e9 100644
--- a/packages/efl/evas-native_0.9.9.026.bb
+++ b/packages/efl/evas-native_0.9.9.027.bb
diff --git a/packages/efl/evas-x11_0.9.9.026.bb b/packages/efl/evas-x11_0.9.9.027.bb
index e130923816..e130923816 100644
--- a/packages/efl/evas-x11_0.9.9.026.bb
+++ b/packages/efl/evas-x11_0.9.9.027.bb
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index e93803982e..4577535aaa 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -12,7 +12,7 @@ inherit efl
 export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
-           file://fix-configure-${PV}.patch;patch=1 \
+           file://fix-configure.patch;patch=1 \
            ${E_CVS};module=e17/libs/evas/m4;date=20060101"
 
 S = "${WORKDIR}/evas-${PV}"
diff --git a/packages/efl/evas/fix-configure-0.9.9.026.patch b/packages/efl/evas/fix-configure.patch
index 61e2446c24..61e2446c24 100644
--- a/packages/efl/evas/fix-configure-0.9.9.026.patch
+++ b/packages/efl/evas/fix-configure.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch b/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
index 0f1edb7d42..7f3622ea4c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
@@ -819,7 +819,7 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.h
  class SDL_QWin : public QWidget
  {
    void QueueKey(QKeyEvent *e, int pressed);
-+  int SDL_QWin::ApplyKeyRotation(int key);
++  int ApplyKeyRotation(int key);
   public:
    SDL_QWin(const QSize& size);
    virtual ~SDL_QWin();
diff --git a/packages/python/python-2.3.4-manifest.inc b/packages/python/python-2.3.4-manifest.inc
deleted file mode 100644
index e2344f2029..0000000000
--- a/packages/python/python-2.3.4-manifest.inc
+++ /dev/null
@@ -1,210 +0,0 @@
-### 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="${libdir}/python2.3/codecs.* ${libdir}/python2.3/encodings ${libdir}/python2.3/locale.* ${libdir}/python2.3/lib-dynload/_locale.so ${libdir}/python2.3/lib-dynload/unicodedata.so ${libdir}/python2.3/gettext.* ${libdir}/python2.3/xdrlib.* "
-
-DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml2"
-RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="${libdir}/python2.3/bisect.* ${libdir}/python2.3/threading.* ${libdir}/python2.3/Queue.* "
-
-DESCRIPTION_python-distutils="Python Distribution Utility"
-PR_python-distutils="ml2"
-RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="${libdir}/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="${libdir}/python2.3/lib-dynload/_csv.so ${libdir}/python2.3/csv.* ${libdir}/python2.3/optparse.* ${libdir}/python2.3/textwrap.* "
-
-DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml2"
-RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="${libdir}/python2.3/curses ${libdir}/python2.3/lib-dynload/_curses.so ${libdir}/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="${libdir}/python2.3/pickle.* ${libdir}/python2.3/shelve.* ${libdir}/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="${libdir}/python2.3/__future__.* ${libdir}/python2.3/copy.* ${libdir}/python2.3/copy_reg.* ${libdir}/python2.3/ConfigParser.py ${libdir}/python2.3/getopt.* ${libdir}/python2.3/new.* ${libdir}/python2.3/os.* ${libdir}/python2.3/posixpath.* ${libdir}/python2.3/warnings.* ${libdir}/python2.3/site.* ${libdir}/python2.3/stat.* ${libdir}/python2.3/UserDict.* ${libdir}/python2.3/lib-dynload/binascii.so ${libdir}/python2.3/lib-dynload/struct.so ${libdir}/python2.3/lib-dynload/time.so ${libdir}/python2.3/lib-dynload/xreadlines.so ${libdir}/python2.3/types.* ${bindir}/python "
-
-DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml2"
-RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.3/lib-dynload/_socket.so ${libdir}/python2.3/lib-dynload/select.so ${libdir}/python2.3/lib-dynload/termios.so ${libdir}/python2.3/lib-dynload/cStringIO.so ${libdir}/python2.3/pipes.* ${libdir}/python2.3/socket.* ${libdir}/python2.3/tempfile.* ${libdir}/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="${libdir}/python2.3/gzip.* ${libdir}/python2.3/zipfile.* "
-
-DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml2"
-RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="${libdir}/python2.3/re.* ${libdir}/python2.3/sre.* ${libdir}/python2.3/sre_compile.* ${libdir}/python2.3/sre_constants* ${libdir}/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="${libdir}/python2.3/xmlrpclib.* ${libdir}/python2.3/SimpleXMLRPCServer.* "
-
-DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml2"
-RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="${libdir}/python2.3/pty.* ${libdir}/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="${libdir}/python2.3/email "
-
-DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml2"
-RDEPENDS_python-image="python-core"
-FILES_python-image="${libdir}/python2.3/colorsys.* ${libdir}/python2.3/imghdr.* ${libdir}/python2.3/lib-dynload/imageop.so ${libdir}/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="${libdir}/python2.3/lib-dynload/resource.so "
-
-DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml2"
-RDEPENDS_python-math="python-core"
-FILES_python-math="${libdir}/python2.3/lib-dynload/cmath.so ${libdir}/python2.3/lib-dynload/math.so ${libdir}/python2.3/lib-dynload/_random.so ${libdir}/python2.3/random.* "
-
-DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml2"
-RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="${libdir}/python2.3/hotshot ${libdir}/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="${libdir}/python2.3/lib-dynload/nis.so ${libdir}/python2.3/lib-dynload/grp.so ${libdir}/python2.3/lib-dynload/pwd.so ${libdir}/python2.3/getpass.* "
-
-DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml2"
-RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="${libdir}/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="${libdir}/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="${libdir}/python2.3/base64.* ${libdir}/python2.3/ftplib.* ${libdir}/python2.3/gopherlib.* ${libdir}/python2.3/hmac.* ${libdir}/python2.3/httplib.* ${libdir}/python2.3/mimetypes.* ${libdir}/python2.3/nntplib.* ${libdir}/python2.3/poplib.* ${libdir}/python2.3/smtplib.* ${libdir}/python2.3/telnetlib.* ${libdir}/python2.3/urllib.* ${libdir}/python2.3/urllib2.* ${libdir}/python2.3/urlparse.* "
-
-DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml2"
-RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="${libdir}/python2.3/pprint.* "
-
-DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml2"
-RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="${libdir}/python2.3/cgi.* ${libdir}/python2.3/BaseHTTPServer.* ${libdir}/python2.3/SimpleHTTPServer.* ${libdir}/python2.3/SocketServer.* "
-
-DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml2"
-RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="${libdir}/python2.3/compiler "
-
-DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml2"
-RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="${libdir}/python2.3/lib-dynload/syslog.so "
-
-DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml2"
-RDEPENDS_python-html="python-core"
-FILES_python-html="${libdir}/python2.3/formatter.* ${libdir}/python2.3/htmlentitydefs.* ${libdir}/python2.3/htmllib.* ${libdir}/python2.3/markupbase.* ${libdir}/python2.3/sgmllib.* "
-
-DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml2"
-RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="${libdir}/python2.3/lib-dynload/readline.so ${libdir}/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="${bindir}/pydoc ${libdir}/python2.3/pydoc.* "
-
-DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml2"
-RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="${libdir}/python2.3/lib-dynload/pyexpat.so ${libdir}/python2.3/xml ${libdir}/python2.3/xmllib.* "
-
-DESCRIPTION_python-mime="Python MIME Handling APIs"
-PR_python-mime="ml2"
-RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="${libdir}/python2.3/mimetools.* ${libdir}/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="${libdir}/python2.3/unittest.* "
-
-DESCRIPTION_python-stringold="Python Deprecated String APIs"
-PR_python-stringold="ml2"
-RDEPENDS_python-stringold="python-core"
-FILES_python-stringold="${libdir}/python2.3/lib-dynload/strop.so ${libdir}/python2.3/string.* "
-
-DESCRIPTION_python-compile="Python Bytecode Compilation Support"
-PR_python-compile="ml2"
-RDEPENDS_python-compile="python-core"
-FILES_python-compile="${libdir}/python2.3/py_compile.* ${libdir}/python2.3/compileall.* "
-
-DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml2"
-RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="${libdir}/python2.3/commands.* ${libdir}/python2.3/dircache.* ${libdir}/python2.3/fnmatch.* ${libdir}/python2.3/glob.* ${libdir}/python2.3/popen2.* ${libdir}/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="${libdir}/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="${libdir}/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="${libdir}/python2.3/anydbm.* ${libdir}/python2.3/dumbdbm.* ${libdir}/python2.3/whichdb.* "
-
-DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-PR_python-crypt="ml2"
-RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="${libdir}/python2.3/lib-dynload/crypt.so ${libdir}/python2.3/lib-dynload/md5.so ${libdir}/python2.3/lib-dynload/rotor.so ${libdir}/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="${libdir}/python2.3/lib-dynload/array.so ${libdir}/python2.3/lib-dynload/parser.so ${libdir}/python2.3/lib-dynload/operator.so ${libdir}/python2.3/lib-dynload/_weakref.so ${libdir}/python2.3/atexit.* ${libdir}/python2.3/code.* ${libdir}/python2.3/codeop.* ${libdir}/python2.3/dis.* ${libdir}/python2.3/inspect.* ${libdir}/python2.3/keyword.* ${libdir}/python2.3/opcode.* ${libdir}/python2.3/repr.* ${libdir}/python2.3/token.* ${libdir}/python2.3/tokenize.* ${libdir}/python2.3/traceback.* ${libdir}/python2.3/linecache.* ${libdir}/python2.3/weakref.* "
-
-DESCRIPTION_python-audio="Python Audio Handling"
-PR_python-audio="ml2"
-RDEPENDS_python-audio="python-core"
-FILES_python-audio="${libdir}/python2.3/wave.* ${libdir}/python2.3/chunk.* ${libdir}/python2.3/lib-dynload/ossaudiodev.so ${libdir}/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
deleted file mode 100644
index b0eebb9ce8..0000000000
--- a/packages/python/python-2.3.4/autohell.patch
+++ /dev/null
@@ -1,1209 +0,0 @@
---- 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: 1.427.4.10 $)
--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
deleted file mode 100644
index 999bddc449..0000000000
--- a/packages/python/python-2.3.4/bindir-libdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# 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
deleted file mode 100644
index 371399fba4..0000000000
--- a/packages/python/python-2.3.4/crosscompile.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-
-#
-# 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-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch
deleted file mode 100644
index 032824e39d..0000000000
--- a/packages/python/python-pyqt4/optional-features.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch
-+++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip
-@@ -21,7 +21,7 @@
- // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
--
-+%If (SessionManager)
- class QSessionManager : QObject
- {
- %TypeHeaderCode
-@@ -58,3 +58,4 @@
-     bool isPhase2() const;
-     void requestPhase2();
- };
-+%End
---- PyQt4-gpl-4.0beta1/sip/QtGui/qapplication.sip~optional-features.patch
-+++ PyQt4-gpl-4.0beta1/sip/QtGui/qapplication.sip
-@@ -20,7 +20,7 @@
- // You should have received a copy of the GNU General Public License along with
- // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-+%Feature SessionManager
- 
- // QApplication *qApp
- QApplication *qApp;
-@@ -101,7 +101,9 @@
-             {sipName_QStandardItemModel,	&sipClass_QStandardItemModel,	-1, 8},
-             {sipName_QLayout,	&sipClass_QLayout,	27, 9},
-             {sipName_QTextObject,	&sipClass_QTextObject,	32, 10},
-+#ifndef QT_NO_SESSIONMANAGER
-             {sipName_QSessionManager,	&sipClass_QSessionManager,	-1, 11},
-+#endif
-             {sipName_QWidget,	&sipClass_QWidget,	36, 12},
-             {sipName_QMovie,	&sipClass_QMovie,	-1, 13},
-             {sipName_QAbstractProxyModel,	&sipClass_QAbstractProxyModel,	100, 14},
-@@ -357,11 +359,13 @@
-     static bool isLeftToRight();
-     static bool isEffectEnabled(Qt::UIEffect);
-     static void setEffectEnabled(Qt::UIEffect, bool enable = true);
-+%If (SessionManager)
-     bool isSessionRestored() const;
-     QString sessionId() const;
-     QString sessionKey() const;
-     virtual void commitData(QSessionManager &sm);
-     virtual void saveState(QSessionManager &sm);
-+%End
-     void setInputContext(QInputContext *);
-     QInputContext *inputContext() const;
-     static int exec() /PostHook=__pyQtPostEventLoopHook__, PreHook=__pyQtPreEventLoopHook__, PyName=exec_, ReleaseGIL/;
---- PyQt4-gpl-4.0beta1/sip/QtGui/qwidget.sip~optional-features.patch
-+++ PyQt4-gpl-4.0beta1/sip/QtGui/qwidget.sip
-@@ -20,7 +20,10 @@
- // You should have received a copy of the GNU General Public License along with
- // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-+%Feature Accessibility
-+%Feature ToolTips
-+%Feature StatusTips
-+%Feature WhatsThis
- 
- class QWidget : QObject, QPaintDevice
- {
-@@ -128,16 +131,24 @@
-     void setWindowOpacity(qreal level);
-     qreal windowOpacity() const;
-     bool isWindowModified() const;
-+%If (ToolTips)
-     void setToolTip(const QString &);
-     QString toolTip() const;
-+%End
-+%If (StatusTips)
-     void setStatusTip(const QString &);
-     QString statusTip() const;
-+%End
-+%If (WhatsThis)
-     void setWhatsThis(const QString &);
-     QString whatsThis() const;
-+%End
-+%If (Accessibility)
-     QString accessibleName() const;
-     void setAccessibleName(const QString &name);
-     QString accessibleDescription() const;
-     void setAccessibleDescription(const QString &description);
-+%End
-     void setLayoutDirection(Qt::LayoutDirection direction);
-     Qt::LayoutDirection layoutDirection() const;
-     void unsetLayoutDirection();
diff --git a/packages/python/python-pyqt4_0.9.2.bb b/packages/python/python-pyqt4_4.0.bb
index 7af85af51c..6cd91e68ec 100644
--- a/packages/python/python-pyqt4_0.9.2.bb
+++ b/packages/python/python-pyqt4_4.0.bb
@@ -7,19 +7,18 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
-PR = "ml2"
+PR = "ml0"
 
-SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \
-           file://cross-compile.patch;patch=1 \
-           file://optional-features.patch;patch=1"
-S = "${WORKDIR}/PyQt4-gpl-4.0beta1"
+SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
+           file://cross-compile.patch;patch=1"
+S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 inherit qmake qt4x11 sip4 distutils-base
 
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xSessionManager -xAccessibility"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
diff --git a/packages/python/python-sip4_4.4.3.bb b/packages/python/python-sip4_4.4.5.bb
index 4bdc8ed769..4bdc8ed769 100644
--- a/packages/python/python-sip4_4.4.3.bb
+++ b/packages/python/python-sip4_4.4.5.bb
diff --git a/packages/python/python_2.3.4.bb b/packages/python/python_2.3.4.bb
deleted file mode 100644
index e6da09e48f..0000000000
--- a/packages/python/python_2.3.4.bb
+++ /dev/null
@@ -1,58 +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 = "python-native zlib gdbm"
-PR = "ml5"
-
-SRC_URI = "http://www.python.org/ftp/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
-RPROVIDES_python-core = "python"
diff --git a/packages/sip/sip4-native_4.4.3.bb b/packages/sip/sip4-native_4.4.5.bb
index f7858a3b79..f7858a3b79 100644
--- a/packages/sip/sip4-native_4.4.3.bb
+++ b/packages/sip/sip4-native_4.4.5.bb
diff --git a/packages/smpeg/smpeg/compile.patch b/packages/smpeg/smpeg/compile.patch
index 083e6c5994..86ec4fca45 100644
--- a/packages/smpeg/smpeg/compile.patch
+++ b/packages/smpeg/smpeg/compile.patch
@@ -14,3 +14,15 @@
  
  bin_SCRIPTS = smpeg-config
  
+--- smpeg/MPEGaudio.h~compile	2006-06-10 22:41:41.000000000 +0200
++++ smpeg/MPEGaudio.h	2006-06-10 22:41:51.000000000 +0200
+@@ -34,6 +34,9 @@
+ 
+ class MPEGstream;
+ 
++int Decode_MPEGaudio(void *udata);
++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++
+ /* MPEG/WAVE Sound library
+ 
+    (C) 1997 by Woo-jae Jung */
diff --git a/packages/sylpheed/sylpheed_2.2.6.bb b/packages/sylpheed/sylpheed_2.2.6.bb
new file mode 100644
index 0000000000..3ea47c44dd
--- /dev/null
+++ b/packages/sylpheed/sylpheed_2.2.6.bb
@@ -0,0 +1,33 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \
+	file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \
+	file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \
+	file://sylpheed-gnutls_2.2.4.patch;patch=1"
+
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+	mkdir -p m4
+}
+
+inherit autotools 
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+
diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..747c525535
--- /dev/null
+++ b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+PROVIDES += "libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+	    file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/packages/xlibs/files/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/packages/xlibs/libx11/fix-utf8-wrong-define.patch
+++ b/packages/xlibs/files/fix-utf8-wrong-define.patch
diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xlibs/libfontenc_1.0.2.bb
new file mode 100644
index 0000000000..b67c4a0e38
--- /dev/null
+++ b/packages/xlibs/libfontenc_1.0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xlibs/libice_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..a1e92b66fa
--- /dev/null
+++ b/packages/xlibs/libice_X11R7.1-1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libICE"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty
+++ /dev/null
diff --git a/packages/python/python-2.3.4/.mtn2git_empty b/packages/xlibs/liblbxutil/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-2.3.4/.mtn2git_empty
+++ b/packages/xlibs/liblbxutil/.mtn2git_empty
diff --git a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch b/packages/xlibs/liblbxutil/mkg3states.patch
index 58463db46b..58463db46b 100644
--- a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch
+++ b/packages/xlibs/liblbxutil/mkg3states.patch
diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xlibs/liblbxutil_1.0.1.bb
new file mode 100644
index 0000000000..795cd4555d
--- /dev/null
+++ b/packages/xlibs/liblbxutil_1.0.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \
+	   file://mkg3states.patch;patch=1"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..468b014165
--- /dev/null
+++ b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.1"
+
+DEPENDS = "libx11 libice util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libSM"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..6836c872bd
--- /dev/null
+++ b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+XORG_PN = "libX11"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	)
+	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xlibs/libxau_1.0.1.bb
new file mode 100644
index 0000000000..39e2f88b95
--- /dev/null
+++ b/packages/xlibs/libxau_1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXau"
+
+include xorg-xlibs.inc
+
diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..7fb68385a1
--- /dev/null
+++ b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXaw"
+
+include xorg-xlibs.inc
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
new file mode 100644
index 0000000000..2847ada716
--- /dev/null
+++ b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcomposite"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \
+	   file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xlibs/libxcursor_1.1.6.bb
new file mode 100644
index 0000000000..20f44bfb41
--- /dev/null
+++ b/packages/xlibs/libxcursor_1.1.6.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcursor"
+
+include xorg-xlibs.inc
+
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xlibs/libxdamage_1.0.3.bb
new file mode 100644
index 0000000000..b97e01cfb0
--- /dev/null
+++ b/packages/xlibs/libxdamage_1.0.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdamage"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xlibs/libxdmcp_1.0.1.bb
new file mode 100644
index 0000000000..d9cfadbf7b
--- /dev/null
+++ b/packages/xlibs/libxdmcp_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdmcp"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xlibs/libxext_1.0.1.bb
new file mode 100644
index 0000000000..5ee1d82990
--- /dev/null
+++ b/packages/xlibs/libxext_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 util-macros"
+PROVIDES = "xext"
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXext"
+
+include xorg-xlibs.inc
+
diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xlibs/libxfixes_4.0.1.bb
new file mode 100644
index 0000000000..5b8881e0b8
--- /dev/null
+++ b/packages/xlibs/libxfixes_4.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfixes"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..d17359dc29
--- /dev/null
+++ b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
+PROVIDES = "xfont"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfont"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
index 20a29e094a..4e357cde7c 100644
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "X Input extension library."
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 
-DEPENDS = "xproto libx11 xext"
+DEPENDS = "xproto libx11 libxext"
 
 XORG_PN = "libXi"
 
diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..d698f04ee1
--- /dev/null
+++ b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXi"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xlibs/libxkbfile_1.0.3.bb
new file mode 100644
index 0000000000..36e3e5f600
--- /dev/null
+++ b/packages/xlibs/libxkbfile_1.0.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xlibs/libxkbui_1.0.2.bb
new file mode 100644
index 0000000000..a914f1e0ef
--- /dev/null
+++ b/packages/xlibs/libxkbui_1.0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxt libxkbfile"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xlibs/libxmu_1.0.1.bb
new file mode 100644
index 0000000000..cc06d2a671
--- /dev/null
+++ b/packages/xlibs/libxmu_1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xlibs/libxpm_3.5.5.bb
new file mode 100644
index 0000000000..397be2faf4
--- /dev/null
+++ b/packages/xlibs/libxpm_3.5.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+
+DEPENDS = "xproto libx11 util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXpm"
+
+include xorg-xlibs.inc
+
+do_stage () {
+	install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+	oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xlibs/libxrandr_1.1.1.bb
new file mode 100644
index 0000000000..0c7978945a
--- /dev/null
+++ b/packages/xlibs/libxrandr_1.1.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrandr"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xlibs/libxrender_0.9.1.bb
new file mode 100644
index 0000000000..1ee518645b
--- /dev/null
+++ b/packages/xlibs/libxrender_0.9.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrender"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..e2ac5aee7b
--- /dev/null
+++ b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libxext"
+PROVIDES = "xres"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXres"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xlibs/libxt_1.0.2.bb
new file mode 100644
index 0000000000..69c74343a4
--- /dev/null
+++ b/packages/xlibs/libxt_1.0.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE =  "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros"
+PROVIDES = "xt"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXt"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+	)
+	oe_runmake
+}
diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xlibs/libxxf86dga_1.0.1.bb
new file mode 100644
index 0000000000..2842c2c458
--- /dev/null
+++ b/packages/xlibs/libxxf86dga_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86dga"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+	oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xlibs/libxxf86misc_1.0.1.bb
new file mode 100644
index 0000000000..2544f91ab1
--- /dev/null
+++ b/packages/xlibs/libxxf86misc_1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86misc"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xlibs/libxxf86vm_1.0.1.bb
new file mode 100644
index 0000000000..0ab206a0df
--- /dev/null
+++ b/packages/xlibs/libxxf86vm_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86vm"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xlibs/util-macros_1.0.2.bb
new file mode 100644
index 0000000000..76101b0345
--- /dev/null
+++ b/packages/xlibs/util-macros_1.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+XORG_PN = "${PN}"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"
diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc
index 1a89d35363..8fb46777b0 100644
--- a/packages/xlibs/xorg-xlibs.inc
+++ b/packages/xlibs/xorg-xlibs.inc
@@ -1,7 +1,10 @@
-XORG_PV = "${@['X11R7.0-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:8]=='X11R7.0-']}"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
+XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}"
+XORG_RELEASE ?= "X11R7.0"
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
 
+
 inherit autotools pkgconfig
 
 do_stage() {
diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xproto/compositeproto_0.3.1.bb
new file mode 100644
index 0000000000..bb55a2022e
--- /dev/null
+++ b/packages/xproto/compositeproto_0.3.1.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "compositeext"
diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xproto/fixesproto_4.0.bb
new file mode 100644
index 0000000000..8e552e6bc5
--- /dev/null
+++ b/packages/xproto/fixesproto_4.0.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "fixesext"
diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xproto/glproto_1.4.7.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/glproto_1.4.7.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
index f35a791171..65dfd4207a 100644
--- a/packages/xproto/proto-common.inc
+++ b/packages/xproto/proto-common.inc
@@ -3,9 +3,11 @@ SECTION = "x11/libs"
 LICENSE= "MIT-X"
 #MAINTAINER = ""
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
 
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
+
+XORG_RELEASE ?= "X11R7.0"
 
 inherit autotools pkgconfig
 
diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xproto/scrnsaverproto_1.1.0.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/scrnsaverproto_1.1.0.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xproto/xproto_7.0.5.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/xproto_7.0.5.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
new file mode 100644
index 0000000000..9c43e52ead
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
@@ -0,0 +1,37 @@
+--- git/configure.ac.orig	2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac	2006-06-10 15:10:14.000000000 +0200
+@@ -505,7 +505,11 @@
+ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+ 
+ dnl Core modules for most extensions, et al.
++if test "$KDRIVE" = yes; then
++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto"
++else
+ REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
++fi
+ REQUIRED_LIBS="xfont xau fontenc"
+ 
+ AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+@@ -1514,7 +1526,9 @@
+ AC_SUBST(XKB_COMPILED_DIR)
+ 
+ dnl and the rest of these are generic, so they're in config.h
++if test ! x"$KDRIVE" = xyes; then
+ AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
++fi
+ AC_DEFINE(XResExtension, 1, [Build XRes extension])
+ 
+ dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
+@@ -1534,10 +1548,12 @@
+ 
+ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+ 
++if test ! "x$KDRIVE" = xyes ; then
+ dnl xorgconfig CLI configuration utility
+ PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
+ AC_SUBST(XORGCONFIG_DEP_CFLAGS)
+ AC_SUBST(XORGCONFIG_DEP_LIBS)
++fi
+ 
+ dnl xorgcfg GUI configuration utility
+ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], 
diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
new file mode 100644
index 0000000000..13a6c2c954
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
@@ -0,0 +1,12 @@
+--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig	2006-06-08 14:49:12.158684250 +0200
++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c	2006-06-08 14:49:52.493205000 +0200
+@@ -52,8 +52,8 @@
+ /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
+ 
+ #define NEED_REPLIES
+ #ifdef HAVE_DIX_CONFIG_H
+-#include <dix-config.h>
++#include <kdrive-config.h>
+ #endif
+ 
+ #include <X11/X.h>
diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xserver/xserver-kdrive/enable-tslib.patch
new file mode 100644
index 0000000000..e488657b74
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/enable-tslib.patch
@@ -0,0 +1,23 @@
+--- git/configure.ac.orig	2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac	2006-06-10 15:10:14.000000000 +0200
+@@ -1438,6 +1446,10 @@
+     fi
+     
+-    # tslib...
++    AC_CHECK_HEADERS([tslib.h])
++    if test "$ac_cv_header_tslib_h" = yes; then
++        AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support])
++        AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support])
++    fi
+ 
+     # damage shadow extension glx (NOTYET) fb mi
+     KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+@@ -1467,7 +1479,7 @@
+ AC_SUBST(KDRIVE_CFLAGS)
+ AC_SUBST(KDRIVE_PURE_LIBS)
+ AC_SUBST(KDRIVE_LIBS)
+-AM_CONDITIONAL(TSLIB, false)
++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes])
+ AM_CONDITIONAL(H3600_TS, false)
+ AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xserver/xserver-kdrive/optional-xkb.patch
new file mode 100644
index 0000000000..d9ef51c5ba
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/optional-xkb.patch
@@ -0,0 +1,54 @@
+--- git/Makefile.am.orig	2006-06-09 16:01:51.000000000 +0200
++++ git/Makefile.am	2006-06-09 16:02:59.000000000 +0200
+@@ -35,6 +35,10 @@
+ XINPUT_DIR=Xi
+ endif
+ 
++if XKB
++XKB_DIR=xkb
++endif
++
+ if DBE
+ DBE_DIR=dbe
+ endif
+@@ -51,7 +55,7 @@
+ 	randr \
+ 	render  \
+ 	$(XINPUT_DIR) \
+-	xkb \
++	$(XKB_DIR) \
+ 	$(DBE_DIR) \
+ 	$(MFB_DIR) \
+ 	$(AFB_DIR) \
+--- git/configure.ac.orig	2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac	2006-06-10 15:10:14.000000000 +0200
+@@ -418,6 +418,7 @@
+ AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
+ AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
+ AC_ARG_ENABLE(xinput,         AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
++AC_ARG_ENABLE(xkb,            AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
+ 
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -739,12 +740,15 @@
+ 
+ AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+ 
+-AC_DEFINE(XKB, 1, [Build XKB])
+-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
++if test "x$XKB" = xyes; then
++	AC_DEFINE(XKB, 1, [Build XKB])
++	AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
++	AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
++	REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
++	XKB_LIB='$(top_builddir)/xkb/libxkb.la'
++	XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++fi
+ 
+ AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+                                         [Do not have `strcasecmp'.]))
diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..fd7a323eee
--- /dev/null
+++ b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -0,0 +1,44 @@
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
+	file://kmode.patch;patch=1 \
+	file://disable-apm.patch;patch=1 \
+	file://no-serial-probing.patch;patch=1 \
+	file://kdrive-evdev.patch;patch=1  \
+	file://kdrive-use-evdev.patch;patch=1  \
+	file://fbdev-not-fix.patch;patch=1  \
+	file://enable-builtin-fonts.patch;patch=1 \
+	file://optional-xkb.patch;patch=1 \
+	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+	file://enable-tslib.patch;patch=1"
+
+SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+		--disable-dga --disable-dri --disable-xinerama \
+		--disable-xf86misc --disable-xf86vidmode \
+		--disable-xorg --disable-xorgcfg \
+		--disable-xkb --disable-xnest --disable-xvfb \
+		--disable-xevie --disable-xprint --disable-xtrap \
+		--with-default-font-path=built-ins \
+		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xserver/xserver-kdrive_git.bb
new file mode 100644
index 0000000000..1f42cc159c
--- /dev/null
+++ b/packages/xserver/xserver-kdrive_git.bb
@@ -0,0 +1,47 @@
+PV = "0.0+git"
+DEFAULT_PREFERENCE = "-2"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
+	file://kmode.patch;patch=1 \
+	file://disable-apm.patch;patch=1 \
+	file://no-serial-probing.patch;patch=1 \
+	file://kdrive-evdev.patch;patch=1  \
+	file://kdrive-use-evdev.patch;patch=1  \
+	file://fbdev-not-fix.patch;patch=1  \
+	file://enable-builtin-fonts.patch;patch=1 \
+	file://optional-xkb.patch;patch=1 \
+	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+	file://enable-tslib.patch;patch=1"
+
+SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+		--disable-dga --disable-dri --disable-xinerama \
+		--disable-xf86misc --disable-xf86vidmode \
+		--disable-xorg --disable-xorgcfg \
+		--disable-xkb --disable-xnest --disable-xvfb \
+		--disable-xevie --disable-xprint --disable-xtrap \
+		--with-default-font-path=built-ins \
+		ac_cv_file__usr_share_X11_sgml_defs_ent=no"