merge of '1d06736abd89e6b42d2eaf5918fcd17ad518fcb3'

     and '3601bc2cdb1e980ccaf4f1de781d948df8d45545'

13 files changed, 121 insertions, 6 deletions

diff --git a/packages/python/python-2.5.2/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py
index 4c0ba3f0da..ec626b4b63 100644
--- a/packages/python/python-2.5.2/sitecustomize.py
+++ b/packages/python/python-2.5.2/sitecustomize.py
@@ -37,9 +37,8 @@ import sys
 try:
     import rlcompleter, readline
 except ImportError:
-    sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] )
+    pass
 else:
     __enableDefaultEncoding()
     __registerExitHandler()
     __enableReadlineSupport()
-    sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] )
diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb
index c17f1c766b..8e80882a30 100644
--- a/packages/python/python-dbus_0.82.4.bb
+++ b/packages/python/python-dbus_0.82.4.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
@@ -18,3 +18,4 @@ do_stage() {
 	autotools_stage_all
 }
 
+FILES_${PN}-dev += "${libdir}/pkgconfig 
diff --git a/packages/python/python-egenix-mx-base_3.0.0.bb b/packages/python/python-egenix-mx-base_3.0.0.bb
new file mode 100644
index 0000000000..8452ca6e7f
--- /dev/null
+++ b/packages/python/python-egenix-mx-base_3.0.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \
+tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \
+processing, date/time processing and web site programming."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "EGENIX"
+SRCNAME = "egenix-mx-base"
+PR = "r0"
+
+SRC_URI = "http://downloads.egenix.com/python/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}"
+export LIB = "${STAGING_LIBDIR}"
+
+FILES_${PN} += "${datadir}"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/mx/*/*/.debug"
diff --git a/packages/python/python-gst_0.10.10.bb b/packages/python/python-gst_0.10.10.bb
index cc1a19574e..59cc6ad268 100644
--- a/packages/python/python-gst_0.10.10.bb
+++ b/packages/python/python-gst_0.10.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python Gstreamer bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
@@ -21,6 +21,12 @@ do_stage() {
 	autotools_stage_all
 }
 
+PACKAGES =+ "${PN}-examples"
+
 FILES_${PN} += "${datadir}/gst-python"
-FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dev += "\
+  ${datadir}/gst-python/0.10/defs \
+  ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/*.la \
+"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
+FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"
diff --git a/packages/python/python-m2crypto/.mtn2git_empty b/packages/python/python-m2crypto/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-m2crypto/.mtn2git_empty
diff --git a/packages/python/python-m2crypto/install.patch b/packages/python/python-m2crypto/install.patch
new file mode 100644
index 0000000000..6c70ccf516
--- /dev/null
+++ b/packages/python/python-m2crypto/install.patch
@@ -0,0 +1,24 @@
+Index: m2crypto-0.18.2/setup.py
+===================================================================
+--- m2crypto-0.18.2.orig/setup.py
++++ m2crypto-0.18.2/setup.py
+@@ -38,7 +38,7 @@ class _M2CryptoBuildExt(build_ext.build_
+             self.openssl = 'c:\\pkg'
+         else:
+             self.libraries = ['ssl', 'crypto']
+-            self.openssl = '/usr'
++            self.openssl = os.environ.get( "STAGING_DIR" )
+        
+     
+     def finalize_options(self):
+@@ -47,8 +47,8 @@ class _M2CryptoBuildExt(build_ext.build_
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        opensslIncludeDir = os.path.join(self.openssl, 'include')
+-        opensslLibraryDir = os.path.join(self.openssl, 'lib')
++        opensslIncludeDir = os.environ.get( "STAGING_INCDIR" )
++        opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" )
+         
+         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+                           [opensslIncludeDir]]
diff --git a/packages/python/python-m2crypto_0.18.2.bb b/packages/python/python-m2crypto_0.18.2.bb
new file mode 100644
index 0000000000..c83a2ec076
--- /dev/null
+++ b/packages/python/python-m2crypto_0.18.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A Python crypto and SSL toolkit"
+SECTION = "devel/python"
+PRIORITY = "optional"
+DEPENDS = "openssl swig-native"
+LICENSE = "BSD"
+SRCNAME = "M2Crypto"
+PR = "ml0"
+
+SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \
+           file://install.patch;patch=1"
+S = "${WORKDIR}/m2crypto-0.18.2"
+
+inherit setuptools
+
+export STAGING_DIR := "${STAGING_DIR}"
+export STAGING_INCDIR := "${STAGING_INCDIR}"
+export STAGING_LIBDIR := "${STAGING_LIBDIR}"
+
diff --git a/packages/python/python-pycap_0.1.6.bb b/packages/python/python-pycap_0.1.6.bb
new file mode 100644
index 0000000000..48e62c4e91
--- /dev/null
+++ b/packages/python/python-pycap_0.1.6.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Python Packet Capture Library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+RDEPENDS = "python-core"
+DEPENDS = "libpcap-0.7.2 libnet-1.1.1"
+SRCNAME = "pycap"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-pyode/.mtn2git_empty b/packages/python/python-pyode/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pyode/.mtn2git_empty
diff --git a/packages/python/python-pyode/install.patch b/packages/python/python-pyode/install.patch
new file mode 100644
index 0000000000..6f230972c7
--- /dev/null
+++ b/packages/python/python-pyode/install.patch
@@ -0,0 +1,16 @@
+Index: PyODE-1.2.0/setup.py
+===================================================================
+--- PyODE-1.2.0.orig/setup.py
++++ PyODE-1.2.0/setup.py
+@@ -39,11 +39,6 @@ if sys.platform=="win32":
+ # Linux (and other) specific settings
+ ######################################################################
+ else:
+-
+-   for base in ["/usr", "/usr/local", "/opt/local"]:
+-      INC_DIRS += [os.path.join(base, "include")]
+-      LIB_DIRS += [os.path.join(base, "lib")]
+-
+    LIBS += ["ode", "stdc++"]
+ 
+ 
diff --git a/packages/python/python-pyode_1.2.0.bb b/packages/python/python-pyode_1.2.0.bb
new file mode 100644
index 0000000000..3c67db9fe5
--- /dev/null
+++ b/packages/python/python-pyode_1.2.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \
+an open-source physics engine. PyODE also includes an XODE parser."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "ode"
+SRCNAME = "PyODE"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \
+           file://install.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_configure_prepend() {
+	ln -s ${STAGING_LIBDIR}/.. ../ode
+}
+
diff --git a/packages/python/python-sword_1.5.10.bb b/packages/python/python-sword_1.5.10.bb
index a18cf89466..4769a8814f 100644
--- a/packages/python/python-sword_1.5.10.bb
+++ b/packages/python/python-sword_1.5.10.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.
 
 S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
 
-EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 inherit distutils autotools
 
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index 24b49f37ed..e6667cc04b 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -82,8 +82,11 @@ do_install() {
 
 require python-${PYTHON_MAJMIN}-manifest.inc
 
+# manual additions
 RPROVIDES_python-core = "python"
 RRECOMMENDS_python-core = "python-readline"
+RRECOMMENDS_python-crypt = "openssl"
+PR_python-crypt = "ml1"
 
 # add sitecustomize
 FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"