Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w

9 files changed, 23 insertions, 19 deletions

diff --git a/python/python-native_2.3.3.oe b/python/python-native_2.3.3.oe
index 51d1b997f9..5740f1a552 100644
--- a/python/python-native_2.3.3.oe
+++ b/python/python-native_2.3.3.oe
@@ -5,8 +5,8 @@ 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"
+           file://bindir-libdir.patch;patch=1             \
+	   file://cross-distutils.patch;patch=1"
 S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools native
diff --git a/python/python-pycodes_1.1.oe b/python/python-pycodes_1.1.oe
index 050de75ef3..07fe517376 100644
--- a/python/python-pycodes_1.1.oe
+++ b/python/python-pycodes_1.1.oe
@@ -11,7 +11,7 @@ DEPENDS = "virtual/libc"
 SRCNAME = "pycodes"
 
 SRC_URI = "http://www.csua.berkeley.edu/~emin/source_code/pycodes/pycodes-1-1.tar.gz \
-           file://${FILESDIR}/no-docs.patch;patch=1"
+           file://no-docs.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
diff --git a/python/python-pygame_1.6.oe b/python/python-pygame_1.6.oe
index dd2dd42431..9b164886cf 100644
--- a/python/python-pygame_1.6.oe
+++ b/python/python-pygame_1.6.oe
@@ -7,12 +7,13 @@ DEPENDS = "virtual/libc virtual/libsdl libsdl-image libsdl-mixer libsdl-net libs
 SRCNAME = "pygame"
 
 SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz \
-			file://${FILESDIR}/qpe.patch;patch=1"
+           file://qpe.patch;patch=1 \
+           file://Setup"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
 do_configure_prepend() {
 	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
-        cat ${FILESDIR}/Setup >>Setup
+        cat ${WORKDIR}/Setup >>Setup
 }
diff --git a/python/python-pylinda_0.1.oe b/python/python-pylinda_0.1.oe
index 33700a3d31..6c9d8acacd 100644
--- a/python/python-pylinda_0.1.oe
+++ b/python/python-pylinda_0.1.oe
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libc"
 SRCNAME = "linda"
 
 SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/linda-${PV}.tar.gz \
-	   file://${FILESDIR}/honor-datadir.patch;patch=1"
+	   file://honor-datadir.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index 68ce59bb44..b4c6d5ef1f 100644
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -9,7 +9,8 @@ DEPENDS = "virtual/libqte2 virtual/libqpe"
 SRCNAME = "pyqt"
 PR = "2"
 
-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 \
+           file://features"
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 inherit qmake sip
@@ -17,7 +18,7 @@ inherit qmake sip
 QMAKE_PROFILES = "pyqt.pro"
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
 SIP_MODULES = "qt qtcanvas qttable qtpe"
-SIP_FEATURES = "${FILESDIR}/features"
+SIP_FEATURES = "${WORKDIR}/features"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index 32a295003c..5d0ef8ff47 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -8,8 +8,9 @@ DEPENDS = "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"
+           file://qt2.x-compat.patch;patch=1 \
+           file://qtmod-sip-staging.patch;patch=1 \
+           file://features"
 S = "${WORKDIR}/PyQwt-20040118"
 
 inherit qmake sip
@@ -17,7 +18,7 @@ inherit qmake sip
 QMAKE_PROFILES = "pyqwt.pro"
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
 SIP_MODULES = "qwt"
-SIP_FEATURES = "${FILESDIR}/features"   
+SIP_FEATURES = "${WORKDIR}/features"   
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
diff --git a/python/python-soappy_0.11.3.oe b/python/python-soappy_0.11.3.oe
index e15168cfa7..dcff9e2a47 100644
--- a/python/python-soappy_0.11.3.oe
+++ b/python/python-soappy_0.11.3.oe
@@ -6,7 +6,8 @@ RDEPENDS = "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 \
+           file://fpconst.py"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -14,5 +15,5 @@ inherit distutils
 # *cough*, yes this is a bit hackish.. but for now ;)
 
 do_compile_prepend() {
-	install -m 0644 ${FILESDIR}/fpconst.py ${S}/SOAPpy/fpconst.py
+	install -m 0644 ${WORKDIR}/fpconst.py ${S}/SOAPpy/fpconst.py
 }
diff --git a/python/python-vorbis_1.3.oe b/python/python-vorbis_1.3.oe
index d09f29b5a7..c255fc84cc 100644
--- a/python/python-vorbis_1.3.oe
+++ b/python/python-vorbis_1.3.oe
@@ -7,7 +7,7 @@ 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"
+           file://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 55fe3efa90..f64669432e 100644
--- a/python/python_2.3.3.oe
+++ b/python/python_2.3.3.oe
@@ -5,11 +5,11 @@ MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 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"
-#	  file://${FILESDIR}/crosscompile-hotshot.patch;patch=1 \
-#	  file://${FILESDIR}/crosscompile-socket.patch;patch=1
+	   file://bindir-libdir.patch;patch=1 \
+	   file://crosscompile.patch;patch=1 \
+	   file://autohell.patch;patch=1"
+#	  file://crosscompile-hotshot.patch;patch=1 \
+#	  file://crosscompile-socket.patch;patch=1
 
 S = "${WORKDIR}/Python-${PV}"