From c09fa7252df8731fb5f7a4e5b573a34921bf0318 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 23 Jan 2008 21:38:08 +0000
Subject: python-dbus: remove dbus-python, add staging for python-dbus

---
 packages/python/python-dbus_0.81.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'packages/python')

diff --git a/packages/python/python-dbus_0.81.1.bb b/packages/python/python-dbus_0.81.1.bb
index ad3b1c177b..86628bad26 100644
--- a/packages/python/python-dbus_0.81.1.bb
+++ b/packages/python/python-dbus_0.81.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
 RDEPENDS = "dbus 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 \
            file://allow-older-autotools.patch;patch=1 \
@@ -16,3 +16,7 @@ inherit distutils-base autotools
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
+do_stage() {
+	autotools_stage_all
+}
+
-- 
cgit v1.2.3


From 6b23e923fddee891ca94cb9dee5c74346bdafda4 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 23 Jan 2008 21:39:24 +0000
Subject: python-edbus: remove BROKENness, now that python-dbus stages its
 includes python-efl: RDEPEND on python-edbus, now that it builds

---
 packages/python/python-edbus_cvs.bb | 3 +--
 packages/python/python-efl.bb       | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index 7a4d53762f..652cf919cd 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,8 +1,7 @@
 require python-efl.inc
-# broken until someone adds dbus 1.1.x
 DEPENDS += "edbus dbus-1.1"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb
index ec5e9cd7e2..1c7f23a1eb 100644
--- a/packages/python/python-efl.bb
+++ b/packages/python/python-efl.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
-RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon"
-PR = "ml1"
+RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon python-edbus"
+PR = "ml2"
 
 ALLOW_EMPTY = "1"
-- 
cgit v1.2.3


From ca2dd4565504ad3239ca73c5cf23c234d57a71b8 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 24 Jan 2008 16:55:05 +0000
Subject: python-edbus: fix dbus dependency

---
 packages/python/python-edbus_cvs.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index 652cf919cd..06a5a45c06 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
-DEPENDS += "edbus dbus-1.1"
+DEPENDS += "edbus dbus"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
-- 
cgit v1.2.3


From a9a239b1b486b9355f0d92422594e135680b05a5 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 28 Jan 2008 11:05:14 +0000
Subject: divers: delete 22 empty directories * skipping packages/netbase/
 since those seem to be used albeit incorrectly

---
 packages/python/python-formencode/.mtn2git_empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 packages/python/python-formencode/.mtn2git_empty

(limited to 'packages/python')

diff --git a/packages/python/python-formencode/.mtn2git_empty b/packages/python/python-formencode/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3


From c13773acfc8d0aae1cf60b93bd129f0452752695 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 2 Feb 2008 14:04:45 +0000
Subject: python-edbus: fix dependency

---
 packages/python/python-edbus_cvs.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index 06a5a45c06..544a6f347f 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
-DEPENDS += "edbus dbus"
+DEPENDS += "edbus python-dbus"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
-- 
cgit v1.2.3


From 182065fd7d66b9eb9480913c99f39428ef657c9a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 6 Feb 2008 22:37:08 +0000
Subject: python 2.5.1 sitecustomize.py now saves the history in $HOME, not in
 /tmp

---
 packages/python/python-2.5.1/sitecustomize.py | 6 +++---
 packages/python/python_2.5.1.bb               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-2.5.1/sitecustomize.py b/packages/python/python-2.5.1/sitecustomize.py
index b5e78d3200..4c0ba3f0da 100644
--- a/packages/python/python-2.5.1/sitecustomize.py
+++ b/packages/python/python-2.5.1/sitecustomize.py
@@ -7,11 +7,11 @@
 # * load command line history on startup
 # * save command line history on exit 
 
-HISTORY_FILENAME = "/tmp/python-history-file.txt"
+import os
 
 def __exithandler():
     try:
-        readline.write_history_file( HISTORY_FILENAME )
+        readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
     except IOError:
         pass
 
@@ -22,7 +22,7 @@ def __registerExitHandler():
 def __enableReadlineSupport():
     readline.parse_and_bind("tab: complete")
     try:
-        readline.read_history_file( "/tmp/python-history-file.txt" )
+        readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
     except IOError:
         pass
 
diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb
index b274b0d7f9..668c2a7833 100644
--- a/packages/python/python_2.5.1.bb
+++ b/packages/python/python_2.5.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 
 # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml7"
+PR = "ml8"
 
 PYTHON_MAJMIN = "2.5"
 
-- 
cgit v1.2.3


From b51da514a70049ce0ef6d1a3e44481dd921a986f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 8 Feb 2008 19:27:02 +0000
Subject: * add lightmediascanner * add python-lightmediascanner

---
 packages/python/python-lightmediascanner_svn.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/python/python-lightmediascanner_svn.bb

(limited to 'packages/python')

diff --git a/packages/python/python-lightmediascanner_svn.bb b/packages/python/python-lightmediascanner_svn.bb
new file mode 100644
index 0000000000..27d0bb62f1
--- /dev/null
+++ b/packages/python/python-lightmediascanner_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python bindings to the Lightweight media scanner"
+SECTION = "devel/python"
+HOMEPAGE = "http://lms.garage.maemo.org/"
+AUTHOR = "Gustavo Barbieri"
+LICENSE = "LGPL"
+DEPENDS = "lightmediascanner"
+PV = "0.1.0+svn${SRCREV}"
+
+SRC_URI = "svn://garage.maemo.org/svn/lms/;module=python-lightmediascanner;proto=https"
+S = "${WORKDIR}/python-lightmediascanner"
+
+inherit distutils
-- 
cgit v1.2.3


From 0cfbcb13cbe1d8ef115c6d54e4a307b8dd1b89fc Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 10 Feb 2008 12:14:08 +0000
Subject: sqlalchemy: initial commit (bb file modeled after python-simplejson
 which also uses setuptools)

---
 packages/python/python-sqlalchemy_0.4.2p3.bb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 packages/python/python-sqlalchemy_0.4.2p3.bb

(limited to 'packages/python')

diff --git a/packages/python/python-sqlalchemy_0.4.2p3.bb b/packages/python/python-sqlalchemy_0.4.2p3.bb
new file mode 100644
index 0000000000..c14a9a6e35
--- /dev/null
+++ b/packages/python/python-sqlalchemy_0.4.2p3.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL"
+HOMEPAGE = "http://www.sqlalchemy.org/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"          
+DEPENDS = "python-setuptools"
+#RDEPENDS = ""
+SRCNAME = "sqlalchemy"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/SQLAlchemy-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+#inherit distutils
-- 
cgit v1.2.3


From ed138a503d660dfdb8f1a09beced0b1d1ca86c98 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 10 Feb 2008 14:55:05 +0000
Subject: python-pyqt: add python-sip and sip-native as DEPENDS to ensure
 successful compilation from scratch.

---
 packages/python/python-pyqt_4.3.3.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/python')

diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index 2fd6fcc38b..9dd2040a5b 100644
--- a/packages/python/python-pyqt_4.3.3.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -4,6 +4,7 @@ AUTHOR = "Phil Thomson @ riverbank.co.uk"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "sip-native python-sip"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
 PR = "ml1"
-- 
cgit v1.2.3


From 05b83348e95642fa03c8da2d5142076357199e64 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 10 Feb 2008 15:13:37 +0000
Subject: python-sqlalchemy: use setuptools, add to task-python-everything

---
 packages/python/python-sqlalchemy_0.4.2p3.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-sqlalchemy_0.4.2p3.bb b/packages/python/python-sqlalchemy_0.4.2p3.bb
index c14a9a6e35..2a797eb439 100644
--- a/packages/python/python-sqlalchemy_0.4.2p3.bb
+++ b/packages/python/python-sqlalchemy_0.4.2p3.bb
@@ -3,12 +3,10 @@ HOMEPAGE = "http://www.sqlalchemy.org/"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"          
-DEPENDS = "python-setuptools"
-#RDEPENDS = ""
-SRCNAME = "sqlalchemy"
+SRCNAME = "SQLAlchemy"
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/SQLAlchemy-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-#inherit distutils
+inherit setuptools
-- 
cgit v1.2.3


From 7117809d3b752b53a273ee3579b28f249b5fa3ee Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 10 Feb 2008 22:56:03 +0000
Subject: python-gst: update to 0.10.10

---
 packages/python/python-gst/python-path.patch | 35 +++++++++++++++++-----------
 packages/python/python-gst_0.10.10.bb        | 26 +++++++++++++++++++++
 packages/python/python-gst_0.10.8.bb         | 26 ---------------------
 3 files changed, 48 insertions(+), 39 deletions(-)
 create mode 100644 packages/python/python-gst_0.10.10.bb
 delete mode 100644 packages/python/python-gst_0.10.8.bb

(limited to 'packages/python')

diff --git a/packages/python/python-gst/python-path.patch b/packages/python/python-gst/python-path.patch
index 465d5b180a..6cbad8cc5f 100644
--- a/packages/python/python-gst/python-path.patch
+++ b/packages/python/python-gst/python-path.patch
@@ -1,24 +1,33 @@
-Index: gst-python-0.10.7/acinclude.m4
+Index: gst-python-0.10.10/acinclude.m4
 ===================================================================
---- gst-python-0.10.7.orig/acinclude.m4	2007-03-02 14:10:28.652128590 +0100
-+++ gst-python-0.10.7/acinclude.m4	2007-03-02 14:41:00.106728708 +0100
-@@ -43,12 +43,19 @@
+--- gst-python-0.10.10.orig/acinclude.m4
++++ gst-python-0.10.10/acinclude.m4
+@@ -43,16 +43,20 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
  [AC_REQUIRE([AM_PATH_PYTHON])
  AC_MSG_CHECKING(for headers required to compile python extensions)
  dnl deduce PYTHON_INCLUDES
+-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-if $PYTHON-config --help 2>/dev/null; then
+-  PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
 +
 +AC_ARG_WITH(python-includes,
-+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
++       [  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
 +if test x$py_exec_prefix != x; then
-+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+else
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++ PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ else
+-  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-  if test "$py_prefix" != "$py_exec_prefix"; then
+-    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-  fi
++ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
++ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
++ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++if test "$py_prefix" != "$py_exec_prefix"; then
++   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++ fi
  fi
-+fi
++
  AC_SUBST(PYTHON_INCLUDES)
  dnl check if the headers exist:
  save_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/python/python-gst_0.10.10.bb b/packages/python/python-gst_0.10.10.bb
new file mode 100644
index 0000000000..cc1a19574e
--- /dev/null
+++ b/packages/python/python-gst_0.10.10.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Python Gstreamer bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "gstreamer gst-plugins-base python-pygobject"
+PR = "ml0"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
+           file://python-path.patch;patch=1"
+S = "${WORKDIR}/gst-python-${PV}"
+
+inherit autotools distutils-base pkgconfig
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+    install -d ${S}/m4
+    install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gst-python"
+FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
diff --git a/packages/python/python-gst_0.10.8.bb b/packages/python/python-gst_0.10.8.bb
deleted file mode 100644
index 224d24b59a..0000000000
--- a/packages/python/python-gst_0.10.8.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Python Gstreamer bindings"
-SECTION = "devel/python"
-LICENSE = "LGPL"
-DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml1"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-           file://python-path.patch;patch=1"
-S = "${WORKDIR}/gst-python-${PV}"
-
-inherit autotools distutils-base pkgconfig
-
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-do_configure_prepend() {
-    install -d ${S}/m4
-    install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
-}
-
-do_stage() {
-	autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/gst-python"
-FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
-FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
-- 
cgit v1.2.3


From ee705b5424ac031a689a321dd7636a60a9910871 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 13 Feb 2008 17:21:23 +0000
Subject: python 2.5.1 provide ncurses through PACKAGES_DYNAMIC

---
 packages/python/python_2.5.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/python')

diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb
index 668c2a7833..5b15634dd0 100644
--- a/packages/python/python_2.5.1.bb
+++ b/packages/python/python_2.5.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 
 # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml8"
+PR = "ml9"
 
 PYTHON_MAJMIN = "2.5"
 
@@ -103,3 +103,5 @@ FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
 PACKAGES += "python-man"
 FILES_python-man = "${datadir}/man"
 
+PACKAGES_DYNAMIC += "python-ncurses"
+
-- 
cgit v1.2.3


From 16de56e20ea575bd81dab5b8868a18fbf2679777 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Feb 2008 13:24:03 +0000
Subject: gpsd: remove python-ncurses dependency from gspd, it's actually
 python-curses we depend on

---
 packages/python/python_2.5.1.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb
index 5b15634dd0..ecfedf15fe 100644
--- a/packages/python/python_2.5.1.bb
+++ b/packages/python/python_2.5.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 
 # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml9"
+PR = "ml10"
 
 PYTHON_MAJMIN = "2.5"
 
@@ -103,5 +103,3 @@ FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
 PACKAGES += "python-man"
 FILES_python-man = "${datadir}/man"
 
-PACKAGES_DYNAMIC += "python-ncurses"
-
-- 
cgit v1.2.3


From a30a065aa1974fbc8c1fab60dfa403485f44f17d Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Feb 2008 16:21:49 +0000
Subject: (python-)efl cvs update and catch up with upstream version changes,
 add missing dependency in python-ecore

---
 packages/python/python-ecore_cvs.bb    |  5 +++--
 packages/python/python-edbus_cvs.bb    |  4 ++--
 packages/python/python-edje_cvs.bb     |  3 ++-
 packages/python/python-efl-examples.bb | 10 ----------
 packages/python/python-efl.bb          |  7 -------
 packages/python/python-efl.inc         |  1 -
 packages/python/python-emotion_cvs.bb  |  3 ++-
 packages/python/python-epsilon_cvs.bb  |  3 ++-
 packages/python/python-evas_cvs.bb     |  3 ++-
 9 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 packages/python/python-efl-examples.bb
 delete mode 100644 packages/python/python-efl.bb

(limited to 'packages/python')

diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb
index 0ec598f5a0..73c4b7ea00 100644
--- a/packages/python/python-ecore_cvs.bb
+++ b/packages/python/python-ecore_cvs.bb
@@ -1,6 +1,7 @@
 require python-efl.inc
-DEPENDS += "ecore"
-PR = "r5"
+DEPENDS += "python-evas ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
 
 do_stage() {
     distutils_stage_all
diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index 544a6f347f..dc4b09cee8 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
 DEPENDS += "edbus python-dbus"
-
-PR = "r3"
+PV = "0.1.1+cvs${SRCDATE}"
+PR = "r0"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb
index 1205e7ec84..3ee4b1decd 100644
--- a/packages/python/python-edje_cvs.bb
+++ b/packages/python/python-edje_cvs.bb
@@ -1,4 +1,5 @@
 require python-efl.inc
 DEPENDS += "edje python-evas"
-PR = "r5"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
 
diff --git a/packages/python/python-efl-examples.bb b/packages/python/python-efl-examples.bb
deleted file mode 100644
index 0a4e32097f..0000000000
--- a/packages/python/python-efl-examples.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
-LICENSE = "MIT"
-SECTION = "devel/python"
-RDEPENDS = "\
-  python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \
-  python-math python-textutils \
-"
-PR = "ml2"
-
-ALLOW_EMPTY = "1"
diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb
deleted file mode 100644
index 1c7f23a1eb..0000000000
--- a/packages/python/python-efl.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
-LICENSE = "MIT"
-SECTION = "devel/python"
-RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon python-edbus"
-PR = "ml2"
-
-ALLOW_EMPTY = "1"
diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc
index e6cc62df5e..1cbec65fa5 100644
--- a/packages/python/python-efl.inc
+++ b/packages/python/python-efl.inc
@@ -6,7 +6,6 @@ HOMEPAGE = "http://www.enlightenment.org"
 # does not compile unless pyrex has been built
 DEPENDS = "python-cython-native python-pyrex-native python-numeric"
 RDEPENDS += "python-lang"
-PV = "0.1.1+cvs${SRCDATE}"
 
 inherit setuptools
 
diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb
index d3f5109d86..cc79ad51e6 100644
--- a/packages/python/python-emotion_cvs.bb
+++ b/packages/python/python-emotion_cvs.bb
@@ -1,3 +1,4 @@
 require python-efl.inc
 DEPENDS += "emotion python-evas"
-PR = "r4"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb
index 204dd95610..f979159b49 100644
--- a/packages/python/python-epsilon_cvs.bb
+++ b/packages/python/python-epsilon_cvs.bb
@@ -1,3 +1,4 @@
 require python-efl.inc
 DEPENDS += "epsilon python-ecore"
-PR = "r4"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb
index e0de4569bd..92f4466a24 100644
--- a/packages/python/python-evas_cvs.bb
+++ b/packages/python/python-evas_cvs.bb
@@ -1,6 +1,7 @@
 require python-efl.inc
 DEPENDS += "evas"
-PR = "r4"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
 
 do_stage() {
 	distutils_stage_all
-- 
cgit v1.2.3


From 3c93cedf7c10f7751de0209cd33338cca8005c11 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 00:24:34 +0000
Subject: python-dbus 0.81.1 update to 0.82.4, patches no longer necessary

---
 packages/python/python-dbus/.mtn2git_empty         |  0
 .../python/python-dbus/allow-older-autotools.patch | 27 ----------------------
 packages/python/python-dbus/python-path.patch      | 21 -----------------
 packages/python/python-dbus_0.81.1.bb              | 22 ------------------
 packages/python/python-dbus_0.82.4.bb              | 20 ++++++++++++++++
 5 files changed, 20 insertions(+), 70 deletions(-)
 delete mode 100644 packages/python/python-dbus/.mtn2git_empty
 delete mode 100644 packages/python/python-dbus/allow-older-autotools.patch
 delete mode 100644 packages/python/python-dbus/python-path.patch
 delete mode 100644 packages/python/python-dbus_0.81.1.bb
 create mode 100644 packages/python/python-dbus_0.82.4.bb

(limited to 'packages/python')

diff --git a/packages/python/python-dbus/.mtn2git_empty b/packages/python/python-dbus/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/python/python-dbus/allow-older-autotools.patch b/packages/python/python-dbus/allow-older-autotools.patch
deleted file mode 100644
index 7595f70e5d..0000000000
--- a/packages/python/python-dbus/allow-older-autotools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# so it looks like dbus-python really doesn't make use of any 2.59c features
-# Signed-Off: mickey@openmoko.org
-#
-Index: dbus-python-0.81.1/configure.ac
-===================================================================
---- dbus-python-0.81.1.orig/configure.ac	2007-06-04 13:17:10.000000000 +0000
-+++ dbus-python-0.81.1/configure.ac	2007-06-11 06:57:20.000000000 +0000
-@@ -1,5 +1,5 @@
- -*- mode: m4 -*-
--AC_PREREQ(2.59c)
-+AC_PREREQ(2.59)
- 
- dnl If not 1, append datestamp to the version number
- m4_define(dbus_python_released, 1)
-Index: dbus-python-0.81.1/Makefile.am
-===================================================================
---- dbus-python-0.81.1.orig/Makefile.am	2007-05-09 09:44:40.000000000 +0000
-+++ dbus-python-0.81.1/Makefile.am	2007-06-11 06:59:23.000000000 +0000
-@@ -38,6 +38,7 @@
- 
- TXT_RSTDOCS = doc/tutorial.txt doc/API_CHANGES.txt doc/HACKING.txt
- RSTDOCS = README NEWS TODO
-+docdir=foo
- dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS)
- 
- maintainer-update-website: _maintainer-update-apidocs \
diff --git a/packages/python/python-dbus/python-path.patch b/packages/python/python-dbus/python-path.patch
deleted file mode 100644
index 6bdbd19d03..0000000000
--- a/packages/python/python-dbus/python-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- dbus-python-0.81.1/m4.orig/am-check-python-headers.m4
-+++ dbus-python-0.81.1/m4/am-check-python-headers.m4
-@@ -7214,12 +7214,18 @@
- [AC_REQUIRE([AM_PATH_PYTHON])
- AC_MSG_CHECKING(for headers required to compile python extensions)
- dnl deduce PYTHON_INCLUDES
-+AC_ARG_WITH(python-includes,
-+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
-+if test x$py_exec_prefix != x; then
-+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+else
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
- fi
-+fi
- AC_SUBST(PYTHON_INCLUDES)
- dnl check if the headers exist:
- save_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/python/python-dbus_0.81.1.bb b/packages/python/python-dbus_0.81.1.bb
deleted file mode 100644
index 86628bad26..0000000000
--- a/packages/python/python-dbus_0.81.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
-SECTION = "devel/python"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
-RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml2"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
-           file://allow-older-autotools.patch;patch=1 \
-	   file://python-path.patch;patch=1"
-
-S = "${WORKDIR}/dbus-python-${PV}"
-
-inherit distutils-base autotools
-
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-do_stage() {
-	autotools_stage_all
-}
-
diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb
new file mode 100644
index 0000000000..9f00c64701
--- /dev/null
+++ b/packages/python/python-dbus_0.82.4.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "MIT"
+DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
+RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
+PR = "ml0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
+S = "${WORKDIR}/dbus-python-${PV}"
+
+inherit distutils-base autotools
+
+export BUILD_SYS := "${BUILD_SYS}"
+export HOST_SYS := "${HOST_SYS}"
+
+do_stage() {
+	autotools_stage_all
+}
+
-- 
cgit v1.2.3


From 999226341f32a3237d4efe6b74cebbb779d3e43e Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 26 Feb 2008 13:21:59 +0000
Subject: python-dbus: add dependency to dbus-glib (thanks Emdete)

---
 packages/python/python-dbus_0.82.4.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb
index 9f00c64701..c17f1c766b 100644
--- a/packages/python/python-dbus_0.82.4.bb
+++ b/packages/python/python-dbus_0.82.4.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for i
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
-DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
-RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml0"
+DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
+RDEPENDS = "python-threading python-io python-stringold python-logging"
+PR = "ml1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
-- 
cgit v1.2.3