Another pass of .oe cleanups.

BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ

35 files changed, 73 insertions, 68 deletions

diff --git a/python/python-ao_0.82.oe b/python/python-ao_0.82.oe
index 1f463a8dc4..e1ca1e04e4 100644
--- a/python/python-ao_0.82.oe
+++ b/python/python-ao_0.82.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 libao"
 DEPENDS = "virtual/libc libao"
 SRCNAME = "pyao"
 
-SRC_URI = http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-constraint_0.2.3.oe b/python/python-constraint_0.2.3.oe
index 0eb3ba0c73..48349b5ace 100644
--- a/python/python-constraint_0.2.3.oe
+++ b/python/python-constraint_0.2.3.oe
@@ -1,5 +1,7 @@
-DESCRIPTION = "The constraint package is a constraint satisfaction problem solver written in 100% pure Python, using \
-constraint propagation algorithms. So far, facilities are provided to work with finite domains only.
+DESCRIPTION = "The constraint package is a constraint \
+satisfaction problem solver written in 100% pure Python, using \
+constraint propagation algorithms. So far, facilities are \
+provided to work with finite domains only."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -7,7 +9,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "constraint"
 
-SRC_URI = ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-crypto_1.9a6.oe b/python/python-crypto_1.9a6.oe
index c78edfd794..cce137afbb 100644
--- a/python/python-crypto_1.9a6.oe
+++ b/python/python-crypto_1.9a6.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core gmp"
 DEPENDS = "virtual/libc gmp"
 SRCNAME = "pycrypto"
 
-SRC_URI = http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-curl_7.11.0.oe b/python/python-curl_7.11.0.oe
index 624af645d5..bea5795e82 100644
--- a/python/python-curl_7.11.0.oe
+++ b/python/python-curl_7.11.0.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core curl (${PV})"
 DEPENDS = "virtual/libc curl-${PV}"
 SRCNAME = "pycurl"
 
-SRC_URI = http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-fnorb_1.3.oe b/python/python-fnorb_1.3.oe
index 88dc806f64..35752b2de0 100644
--- a/python/python-fnorb_1.3.oe
+++ b/python/python-fnorb_1.3.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "Fnorb"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/fnorb/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/fnorb/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-fpconst_0.6.0.oe b/python/python-fpconst_0.6.0.oe
index a73c960e94..08b0485a9b 100644
--- a/python/python-fpconst_0.6.0.oe
+++ b/python/python-fpconst_0.6.0.oe
@@ -1,6 +1,8 @@
-DESCRIPTION = "This python module implements constants and functions for working with IEEE754 double-precision special values. \
-It provides constants for Not-a-Number (NaN), Positive Infinity (Inf), and Negative Infinity (-Inf), as well as functions   \
-to test for these values. 
+DESCRIPTION = "This python module implements constants and \
+functions for working with IEEE754 double-precision special values. \
+It provides constants for Not-a-Number (NaN), Positive Infinity \
+(Inf), and Negative Infinity (-Inf), as well as functions \
+to test for these values."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -8,7 +10,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "fpconst"
 
-SRC_URI = http://ftp.iasi.roedu.net/mirrors/gentoo.org/distfiles/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://ftp.iasi.roedu.net/mirrors/gentoo.org/distfiles/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-gnosis_1.1.1.oe b/python/python-gnosis_1.1.1.oe
index b6692c72fe..6e8680bb9b 100644
--- a/python/python-gnosis_1.1.1.oe
+++ b/python/python-gnosis_1.1.1.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "Gnosis_Utils"
 
-SRC_URI = http://gnosis.cx/download/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://gnosis.cx/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-hmm_0.4.oe b/python/python-hmm_0.4.oe
index f7890a4a18..fad4dd6ead 100644
--- a/python/python-hmm_0.4.oe
+++ b/python/python-hmm_0.4.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Hmm is a python module providing an implementation of Hidden Markov \
-Model and associated algorithms (Viterbi and Baum-Welsh). It uses Numeric       \
-Python to speed up the computations.
+Model and associated algorithms (Viterbi and Baum-Welsh). It uses Numeric \
+Python to speed up the computations."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -8,7 +8,7 @@ RDEPENDS = "libc6 python-core python-numeric"
 DEPENDS = "virtual/libc"
 SRCNAME = "hmm"
 
-SRC_URI = ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-irclib_0.4.3.oe b/python/python-irclib_0.4.3.oe
index 175b3dc44e..e0c4a325a1 100644
--- a/python/python-irclib_0.4.3.oe
+++ b/python/python-irclib_0.4.3.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "pyirclib"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-logilab_0.4.4.oe b/python/python-logilab_0.4.4.oe
index d83051c7dd..462874cc8c 100644
--- a/python/python-logilab_0.4.4.oe
+++ b/python/python-logilab_0.4.4.oe
@@ -1,6 +1,8 @@
-DESCRIPTION = "This package contains some modules used by different projects released by Logilab, including abstract syntax \
-tree manipulation tools, database helper functions, HTML generation, command line argument parsing, logging, and process \
-daemonization.
+DESCRIPTION = "This package contains some modules used by different \
+projects released by Logilab, including abstract syntax \
+tree manipulation tools, database helper functions, HTML generation, \
+command line argument parsing, logging, and process \
+daemonization."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -8,7 +10,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "common"
 
-SRC_URI = ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-mad_0.5.1.oe b/python/python-mad_0.5.1.oe
index 08072f732b..b112b8d05b 100644
--- a/python/python-mad_0.5.1.oe
+++ b/python/python-mad_0.5.1.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core libmad"
 DEPENDS = "virtual/libc libmad"
 SRCNAME = "pymad"
 
-SRC_URI = http://spacepants.org/src/pymad/download/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://spacepants.org/src/pymad/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-native_2.3.3.oe b/python/python-native_2.3.3.oe
index 88d829c280..e61a9a385b 100644
--- a/python/python-native_2.3.3.oe
+++ b/python/python-native_2.3.3.oe
@@ -2,17 +2,16 @@ DESCRIPTION = "Python Programming Language"
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+DEPENDS = "patcher-native"
 
-SRC_URI = ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
-          file://${FILESDIR}/bindir-libdir.patch;patch=1             \
-	  file://${FILESDIR}/cross-distutils.patch;patch=1
+SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
+           file://${FILESDIR}/bindir-libdir.patch;patch=1             \
+	   file://${FILESDIR}/cross-distutils.patch;patch=1"
 S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools native
 
-DEPENDS = "patcher-native"
-
-EXTRA_OECONF = '--with-threads --with-pymalloc --with-cyclic-gc --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/build'
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/build"
 
 do_configure () {
 	oe_runconf
diff --git a/python/python-numeric_23.1.oe b/python/python-numeric_23.1.oe
index e4ea464531..706fef177c 100644
--- a/python/python-numeric_23.1.oe
+++ b/python/python-numeric_23.1.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz"
 S = "${WORKDIR}/Numeric-${PV}"
 
 inherit distutils
diff --git a/python/python-ogg_1.3.oe b/python/python-ogg_1.3.oe
index ae27176741..a9171ddebc 100644
--- a/python/python-ogg_1.3.oe
+++ b/python/python-ogg_1.3.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core libogg"
 DEPENDS = "virtual/libc libogg"
 SRCNAME = "pyogg"
 
-SRC_URI = http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pexpect_0.99.oe b/python/python-pexpect_0.99.oe
index e969a6d3e1..6a18180433 100644
--- a/python/python-pexpect_0.99.oe
+++ b/python/python-pexpect_0.99.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core python-io python-terminal python-resource python-f
 DEPENDS = "virtual/libc"
 SRCNAME = "pexpect"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tgz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tgz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pycap_0.1.6.oe b/python/python-pycap_0.1.6.oe
index 2a4cab54ce..c24135a0a0 100644
--- a/python/python-pycap_0.1.6.oe
+++ b/python/python-pycap_0.1.6.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core libnet (1.1.1) libpcap (0.7.2)"
 DEPENDS = "virtual/libc libpcap-0.7.2 libnet-1.1.1"
 SRCNAME = "pycap"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pychecker_0.8.13.oe b/python/python-pychecker_0.8.13.oe
index 7a5dbb5c3f..15d664545c 100644
--- a/python/python-pychecker_0.8.13.oe
+++ b/python/python-pychecker_0.8.13.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "pychecker"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pygame_1.6.oe b/python/python-pygame_1.6.oe
index 5a8e1b328e..fe5ae6f0d0 100644
--- a/python/python-pygame_1.6.oe
+++ b/python/python-pygame_1.6.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core python-numeric libsdl libsdl-image libsdl-mixer li
 DEPENDS = "virtual/libc virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
 SRCNAME = "pygame"
 
-SRC_URI = http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pygoogle_0.6.oe b/python/python-pygoogle_0.6.oe
index 4599cc4b69..03be8576ec 100644
--- a/python/python-pygoogle_0.6.oe
+++ b/python/python-pygoogle_0.6.oe
@@ -1,5 +1,6 @@
 DESCRIPTION = "This module is a wrapper for the Google Web APIs. \
-It allows you to do Google searches, retrieve pages from the Google cache, and ask Google for spelling suggestions.
+It allows you to do Google searches, retrieve pages from the \
+Google cache, and ask Google for spelling suggestions."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -7,7 +8,7 @@ RDEPENDS = "libc6 python-core python-soappy"
 DEPENDS = "virtual/libc"
 SRCNAME = "pygoogle"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pygtk_2.2.0.oe b/python/python-pygtk_2.2.0.oe
index aead2ee17d..66616ac41a 100644
--- a/python/python-pygtk_2.2.0.oe
+++ b/python/python-pygtk_2.2.0.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 gtk+ libglade"
 DEPENDS = "virtual/libc gtk+ libglade"
 SRCNAME = "pygtk"
 
-SRC_URI = ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.2/${SRCNAME}-${PV}.tar.bz2
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.2/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils pkgconfig
diff --git a/python/python-pylint_0.3.3.oe b/python/python-pylint_0.3.3.oe
index 1c1ed7cb41..fc67c1bace 100644
--- a/python/python-pylint_0.3.3.oe
+++ b/python/python-pylint_0.3.3.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Pylint is a python tool that checks if a module satisfy a coding standard. Pylint can be seen as another     \
 pychecker since nearly all tests you can do with PyChecker can also be done with Pylint. But Pylint offers some more     \
 features, like checking line-code's length, checking if variable names are well-formed according to your coding standard,\
-or checking if declared interfaces are truly implemented, and much more.
+or checking if declared interfaces are truly implemented, and much more."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -9,7 +9,7 @@ RDEPENDS = "libc6 python-core python-logilab"
 DEPENDS = "virtual/libc"
 SRCNAME = "pylint"
 
-SRC_URI = ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index 0b5a0a2a8f..6e609fcab9 100644
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -7,15 +7,15 @@ RDEPENDS = "python-core libqte2 libqpe1"
 DEPENDS = "virtual/libc virtual/libqte2 virtual/libqpe libsip sip-native"
 SRCNAME = "pyqt"
 
-SRC_URI = http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz
+SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz"
 
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 inherit qmake
 
-export QTDIR=${STAGING_DIR}/target
+export QTDIR = "${STAGING_LIBDIR}/.."
 
-EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
+EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
                          CONFIG=qte CONFIG+=warn_on CONFIG+=release \
                          DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
                          DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \
@@ -23,7 +23,7 @@ EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
                          INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
                          INCLUDEPATH+=${STAGING_INCDIR} \
                          LIBS=-L${STAGING_LIBDIR}/python2.3/site-packages \
-                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip '
+                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip "
 
 PYTHON = "${STAGING_BINDIR}/python"
 SIP = "${STAGING_BINDIR}/sip"
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index c1d917a379..e1ecf3054b 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -7,14 +7,14 @@ RDEPENDS = "python-core python-pyqt (${PV}) python-numeric qwt"
 DEPENDS = "virtual/libc virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
 
-SRC_URI = http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
-          file://${FILESDIR}/qt2.x-compat.patch;patch=1               \
-          file://${FILESDIR}/qtmod-sip-staging.patch;patch=1
+SRC_URI = "http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
+           file://${FILESDIR}/qt2.x-compat.patch;patch=1               \
+           file://${FILESDIR}/qtmod-sip-staging.patch;patch=1"
 S = "${WORKDIR}/PyQwt-20040118"
 
-export QTDIR=${STAGING_DIR}/target
+export QTDIR = "${STAGING_LIBDIR}/.."
 
-EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
+EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
                          CONFIG=qte CONFIG+=warn_on CONFIG+=release \
                          DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
                          DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC\
@@ -22,7 +22,7 @@ EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
                          INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
                          INCLUDEPATH+=${STAGING_INCDIR}/ \
                          LIBS=-L${STAGING_LIBDIR}/python2.3/site-packages \
-                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip '
+                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip "
 
 PYTHON = "${STAGING_BINDIR}/python"
 SIP = "${STAGING_BINDIR}/sip"
diff --git a/python/python-pyreverse_0.5.0.oe b/python/python-pyreverse_0.5.0.oe
index 427453326c..a45c152758 100644
--- a/python/python-pyreverse_0.5.0.oe
+++ b/python/python-pyreverse_0.5.0.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "PyReverse is a set of tools for reverse engineering Python code. So far, it features dependency analysis \
 tools, documentation generation, and XMI generation for importation in a UML modeling tool. A special module can be  \
-used to generate files readable by Argo UML.
+used to generate files readable by Argo UML."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -8,7 +8,7 @@ RDEPENDS = "libc6 python-core python-logilab python-pyxml"
 DEPENDS = "virtual/libc"
 SRCNAME = "pyreverse"
 
-SRC_URI = ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pyserial_2.0.oe b/python/python-pyserial_2.0.oe
index a072141056..f930e833ed 100644
--- a/python/python-pyserial_2.0.oe
+++ b/python/python-pyserial_2.0.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "pyserial"
 
-SRC_URI = http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2
+SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pyxml_0.8.3.oe b/python/python-pyxml_0.8.3.oe
index 73ba393ccd..001541ee93 100644
--- a/python/python-pyxml_0.8.3.oe
+++ b/python/python-pyxml_0.8.3.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core python-xml python-netclient"
 DEPENDS = "virtual/libc"
 SRCNAME = "pyxml"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz"
 S = "${WORKDIR}/PyXML-${PV}"
 
 inherit distutils
diff --git a/python/python-pyxmlrpc_0.8.8.3.oe b/python/python-pyxmlrpc_0.8.8.3.oe
index bce427b49f..0ce3b61734 100644
--- a/python/python-pyxmlrpc_0.8.8.3.oe
+++ b/python/python-pyxmlrpc_0.8.8.3.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "py-xmlrpc"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-sgmlop_1.1.oe b/python/python-sgmlop_1.1.oe
index b5885e1432..aae6cc535d 100644
--- a/python/python-sgmlop_1.1.oe
+++ b/python/python-sgmlop_1.1.oe
@@ -6,8 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "sgmlop"
 
-SRC_URI = http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2
+SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-
diff --git a/python/python-snmplib_0.1.1.oe b/python/python-snmplib_0.1.1.oe
index beb2d6b42f..79dc69a4fd 100644
--- a/python/python-snmplib_0.1.1.oe
+++ b/python/python-snmplib_0.1.1.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "libsnmp"
 
-SRC_URI = http://seafelt.unicity.com.au/downloads/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://seafelt.unicity.com.au/downloads/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-soappy_0.11.3.oe b/python/python-soappy_0.11.3.oe
index 7d8fdee9a8..c641225b40 100644
--- a/python/python-soappy_0.11.3.oe
+++ b/python/python-soappy_0.11.3.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core python-xml python-fpconst"
 DEPENDS = "virtual/libc"
 SRCNAME = "SOAPpy"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-sqlite_0.5.0.oe b/python/python-sqlite_0.5.0.oe
index 1ed3d8b382..ee23f7d06a 100644
--- a/python/python-sqlite_0.5.0.oe
+++ b/python/python-sqlite_0.5.0.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core python-re python-lang sqlite"
 DEPENDS = "virtual/libc sqlite"
 SRCNAME = "pysqlite"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
diff --git a/python/python-tlslite_0.2.1.oe b/python/python-tlslite_0.2.1.oe
index 340006507c..02df4aed1b 100644
--- a/python/python-tlslite_0.2.1.oe
+++ b/python/python-tlslite_0.2.1.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0. TLS Lite supports non-traditional \
 authentication methods such as SRP, shared keys, and cryptoIDs, in addition to X.509 certificates. TLS Lite is pure  \
-Python, however it can access OpenSSL or cryptlib for faster crypto operations. 
+Python, however it can access OpenSSL or cryptlib for faster crypto operations."
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
@@ -8,7 +8,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "tlslite"
 
-SRC_URI = http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-vmaps_1.1.oe b/python/python-vmaps_1.1.oe
index eef7837cbd..f461f6ef92 100644
--- a/python/python-vmaps_1.1.oe
+++ b/python/python-vmaps_1.1.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6 python-core"
 DEPENDS = "virtual/libc"
 SRCNAME = "vmaps"
 
-SRC_URI = http://snafu.freedom.org/Vmaps/Vmaps-${PV}.tgz
+SRC_URI = "http://snafu.freedom.org/Vmaps/Vmaps-${PV}.tgz"
 S = "${WORKDIR}/Vmaps-${PV}"
 
 inherit distutils
diff --git a/python/python-vorbis_1.3.oe b/python/python-vorbis_1.3.oe
index c133ecef57..3ae65d7eec 100644
--- a/python/python-vorbis_1.3.oe
+++ b/python/python-vorbis_1.3.oe
@@ -6,8 +6,8 @@ RDEPENDS = "libc6 python-core libvorbis python-ogg"
 DEPENDS = "virtual/libc libvorbis python-ogg"
 SRCNAME = "pyvorbis"
 
-SRC_URI = http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz \
-          file://${FILESDIR}/disable-oggcheck.patch;patch=1
+SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz \
+           file://${FILESDIR}/disable-oggcheck.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python_2.3.3.oe b/python/python_2.3.3.oe
index 5c9303b075..5d8001b0f5 100644
--- a/python/python_2.3.3.oe
+++ b/python/python_2.3.3.oe
@@ -5,10 +5,10 @@ MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 RDEPENDS = "libc6"
 DEPENDS = "virtual/libc python-native"
 
-SRC_URI = ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
-	  file://${FILESDIR}/bindir-libdir.patch;patch=1 \
-	  file://${FILESDIR}/crosscompile.patch;patch=1 \
-	  file://${FILESDIR}/autohell.patch;patch=1
+SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
+	   file://${FILESDIR}/bindir-libdir.patch;patch=1 \
+	   file://${FILESDIR}/crosscompile.patch;patch=1 \
+	   file://${FILESDIR}/autohell.patch;patch=1"
 #	  file://${FILESDIR}/crosscompile-hotshot.patch;patch=1 \
 #	  file://${FILESDIR}/crosscompile-socket.patch;patch=1
 
@@ -16,7 +16,7 @@ S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = --with-threads --with-pymalloc --with-cyclic-gc
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc"
 
 #
 # copy config.h and an appropriate Makefile for distutils.sysconfig