diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-16 12:52:11 +0000 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-16 12:52:11 +0000 |
| commit | 06a32233c469a3628048d39bc8c79a864b51c1e0 (patch) | |
| tree | 70cda69865cc8b546c4acc1b517efaa57e7b97c6 | |
| parent | 7b84d457f3f70bb814385e83bd0e001591389104 (diff) | |
| parent | 1fc87ab9a7b9684565785ce5996aba6f5c03fe53 (diff) | |
Merge branch 'mickey/python26' into org.openembedded.dev
216 files changed, 507 insertions, 6777 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a8cb7f189..a2fffdf88d 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -54,7 +54,6 @@ SRCDATE_gtkhtml2 ?= "20060323" SRCDATE_aufs ?= "20081203" SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" -SRCDATE_python-pydirectfb = "20071210" SRCDATE_dvbstream ?= "20060814" SRCDATE_dvbtraffic ?= "20060814" SRCDATE_dvbtune ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a2d3e92b90..d25bd9e738 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -90,7 +90,6 @@ SRCREV_pn-librfid ?= "2094" SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" -SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1085" @@ -195,9 +194,8 @@ SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" SRCREV_pn-python-connexion ?= "1439" SRCREV_pn-python-formencode ?= "3148" SRCREV_pn-python-gsmd ?= "148" -SRCREV_pn-python-lightmediascanner ?= "68" SRCREV_pn-python-pyrtc ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" -SRCREV_pn-python-pyyaml ?= "294" +SRCREV_pn-python-pyyaml ?= "344" QEMUSRCREV ?= "4242" SRCREV_pn-tslib ?= "53" SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" @@ -236,7 +234,7 @@ SRCREV_pn-zhone ?= "cf48d98b8e994d6a7698fbc6f0689126892895f9" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "38521" +EFL_SRCREV ?= "38544" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/packages/bitbake/bitbake_1.6.2.bb b/packages/bitbake/bitbake_1.6.2.bb deleted file mode 100644 index 6a6fffcfef..0000000000 --- a/packages/bitbake/bitbake_1.6.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require bitbake.inc - -PR = "r1" - -SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz" - -S = "${WORKDIR}/bitbake-${PV}" diff --git a/packages/bitbake/bitbake_1.8.6.bb b/packages/bitbake/bitbake_1.8.12.bb index a2cd3899a1..ed74704d2f 100644 --- a/packages/bitbake/bitbake_1.8.6.bb +++ b/packages/bitbake/bitbake_1.8.12.bb @@ -1,7 +1,5 @@ require bitbake.inc - PR = "r0" SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz" - S = "${WORKDIR}/bitbake-${PV}" diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb index 247140b6c6..ab85dc85ab 100644 --- a/packages/bitbake/bitbake_svn.bb +++ b/packages/bitbake/bitbake_svn.bb @@ -1,11 +1,10 @@ require bitbake.inc PV = "1.9.0+svn${SRCDATE}" -PR = "r0" +PR = "r1" # Don't use the tip of svn by default DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.berlios.de/bitbake/trunk;module=bitbake" - S = "${WORKDIR}/bitbake" diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb index 71b8fc15b3..4d8e77d3c5 100644 --- a/packages/boost/boost_1.33.1.bb +++ b/packages/boost/boost_1.33.1.bb @@ -1,5 +1,5 @@ include boost.inc -PR = "r3" +PR = "r4" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb index 8a3978c5b5..fbfc97cd71 100644 --- a/packages/boost/boost_1.34.1.bb +++ b/packages/boost/boost_1.34.1.bb @@ -10,7 +10,7 @@ LICENSE = "Boost Software License" DEPENDS = "python boost-jam-native zlib bzip2" -PR = "r3" +PR = "r4" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index 697267dce1..77d99e4fda 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -2,7 +2,7 @@ include boost-36.inc DEFAULT_PREFERENCE = "-1" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb index 3878829ce5..eff2e2e5b9 100644 --- a/packages/dtnrg/dtn_2.5.0.bb +++ b/packages/dtnrg/dtn_2.5.0.bb @@ -3,11 +3,14 @@ HOMEPAGE = "http://www.dtnrg.org/wiki" SECTION = "libs" DEPENDS = "db openssl python-native xerces-c" LICENSE = "Apache" -SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \ - file://configure_fix.patch;patch=1" -PR = "r3" +PR = "r4" -inherit autotools +SRC_URI = "\ + http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \ + file://configure_fix.patch;patch=1 \ +" + +inherit autotools distutils-base EXTRA_OECONF = "\ --with-python=${STAGING_BINDIR_NATIVE}/python \ @@ -29,22 +32,8 @@ EXTRA_OECONF = "\ --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \ " -def dtn_python_dir(d): - import os, bb - staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) - if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" - if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" - if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" - raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" - -PYTHON_DIR = "${@dtn_python_dir(d)}" - -# use this syntax once everyone has at least bitbake 1.8.9 -#export BUILD_SYS -#export HOST_SYS - -export BUILD_SYS:="${BUILD_SYS}" -export HOST_SYS:="${HOST_SYS}" +export BUILD_SYS +export HOST_SYS do_configure_prepend() { for i in aclocal/*.ac oasys/aclocal/*.ac; do @@ -62,7 +51,7 @@ PACKAGES =+ "${PN}-lib" FILES_${PN}-lib = "${libdir}/*.so*" PACKAGES += "python-dtn" DESCRIPTION_python-dtn = "Python bindings to the DTN API" -PR_python-dtn = "ml2" +PR_python-dtn = "ml3" FILES_python-dtn = "${libdir}/${PYTHON_DIR}" RDEPENDS_python-dtn = "python-core dtn-lib" FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb index 0f339c30c1..9bf605b982 100644 --- a/packages/gnuradio/gnuradio_3.0.4.bb +++ b/packages/gnuradio/gnuradio_3.0.4.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb index a49f1c468d..62e5f3cdc7 100644 --- a/packages/gnuradio/gnuradio_3.1.2.bb +++ b/packages/gnuradio/gnuradio_3.1.2.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gnuradio/gnuradio_3.1.3.bb b/packages/gnuradio/gnuradio_3.1.3.bb index 9c41b9b2f8..b6b7d4a041 100644 --- a/packages/gnuradio/gnuradio_3.1.3.bb +++ b/packages/gnuradio/gnuradio_3.1.3.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ # file://gnuradio-libusb.patch;patch=1 \ diff --git a/packages/gpsd/gpsd_2.37.bb b/packages/gpsd/gpsd_2.37.bb index 885a41dbda..726ba42481 100644 --- a/packages/gpsd/gpsd_2.37.bb +++ b/packages/gpsd/gpsd_2.37.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r1" +PR = "r2" diff --git a/packages/libao/libao-0.8.4/configure.patch b/packages/libao/libao-0.8.4/configure.patch deleted file mode 100644 index b24c0f95c4..0000000000 --- a/packages/libao/libao-0.8.4/configure.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libao-0.8.4/configure.in~configure -+++ libao-0.8.4/configure.in -@@ -174,9 +174,8 @@ - - if test "$BUILD_ESD" = "yes"; then - AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no) -- AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes) - fi -- -+AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes) - - dnl Check for OSS - diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb deleted file mode 100644 index c6fda2dbef..0000000000 --- a/packages/libao/libao-alsa_0.8.6.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library. This is the ALSA plugin." -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "alsa-lib libao" -PR = "r2" - -SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" -S = "${WORKDIR}/libao-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-oss \ - --enable-alsa09 --enable-alsa09-mmap \ - --disable-arts --disable-nas" - -do_stage() { - oe_libinstall -so -C src libao ${STAGING_LIBDIR} -} - -PACKAGES = "${PN}-dbg libao-alsa-plugin libao-alsa-plugin-dev" -FILES_libao-alsa-plugin= "${libdir}/ao/plugins-2/libalsa*.so" -FILES_libao-alsa-plugin-dev += "${libdir}/ao/plugins-2/libalsa*.la" diff --git a/packages/libao/libao-plugin-alsa_0.8.6.bb b/packages/libao/libao-plugin-alsa_0.8.6.bb deleted file mode 100644 index 94727ad5c7..0000000000 --- a/packages/libao/libao-plugin-alsa_0.8.6.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library. This is the ALSA plugin." -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "alsa-lib libao" -PROVIDES = "libao-alsa" -PACKAGES = "${PN}-dbg libao-alsa libao-alsa-dev" -PR = "r3" - -SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" -S = "${WORKDIR}/libao-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-oss \ - --enable-alsa09 --enable-alsa09-mmap \ - --disable-arts --disable-nas" - -do_stage() { - install -d ${STAGING_LIBDIR}/ao - install -d ${STAGING_LIBDIR}/ao/plugins-2 - oe_libinstall -so -C src/plugins/alsa09/.libs libalsa09 ${STAGING_LIBDIR}/ao/plugins-2 -} - -FILES_libao-alsa = "${libdir}/ao/plugins-2/libalsa*.so" -FILES_libao-alsa-dev = "${libdir}/ao/plugins-2/libalsa*.la" diff --git a/packages/libao/libao_0.8.4.bb b/packages/libao/libao_0.8.4.bb deleted file mode 100644 index d77391fcb9..0000000000 --- a/packages/libao/libao_0.8.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library" -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -PR = "r1" - -SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-alsa --disable-alsa09 \ - --disable-arts --disable-nas" - -do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN} += "${libdir}/ao/plugins-2/*.so" diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb deleted file mode 100644 index 7bc44c0fc8..0000000000 --- a/packages/libao/libao_0.8.6.bb +++ /dev/null @@ -1,26 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library" -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -PR = "r2" - -SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-alsa --disable-alsa09 \ - --disable-arts --disable-nas" - -do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN} += "${libdir}/ao/plugins-2/*.so" diff --git a/packages/libao/libao_0.8.8.bb b/packages/libao/libao_0.8.8.bb index 88f7c898ec..0d143c45c3 100644 --- a/packages/libao/libao_0.8.8.bb +++ b/packages/libao/libao_0.8.8.bb @@ -1,39 +1,41 @@ -LICENSE = "GPL" DESCRIPTION = "A cross platform audio library" +LICENSE = "GPL" HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" +SECTION = "libs/multimedia" DEPENDS = "alsa-lib pulseaudio" PROVIDES = "libao-alsa libao-alsa-plugin" -PR = "r0" +PR = "r1" SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" inherit autotools pkgconfig -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-alsa --enable-alsa09 \ - --disable-arts --disable-nas \ - --enable-pulse" +EXTRA_OECONF = "\ + --enable-oss \ + --disable-esd \ + --disable-esdtest \ + --disable-alsa \ + --enable-alsa09 \ + --disable-arts \ + --disable-nas \ + --enable-pulse \ +" do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } -PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev ${PN}-pulse ${PN}-pulse-dev" + + +PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev ${PN}-pulse ${PN}-pulse-dev ${PN}-oss ${PN}-oss-dev" FILES_${PN}-alsa = "${libdir}/ao/plugins-2/libalsa*.so" FILES_${PN}-alsa-dev = "${libdir}/ao/plugins-2/libalsa*.la" FILES_${PN}-pulse = "${libdir}/ao/plugins-2/libpulse*.so" FILES_${PN}-pulse-dev = "${libdir}/ao/plugins-2/libpulse*.la" +FILES_${PN}-oss = "${libdir}/ao/plugins-2/liboss*.so" +FILES_${PN}-oss-dev = "${libdir}/ao/plugins-2/liboss*.la" FILES_${PN} += "${libdir}/ao/plugins-2/*.so" FILES_${PN}-dev += "${libdir}/ao/plugins-2/*.la" FILES_${PN}-dbg += "${libdir}/ao/plugins-2/.debug" - diff --git a/packages/libyaml/libyaml_0.1.1.bb b/packages/libyaml/libyaml_0.1.2.bb index 4279f50b94..0ab816bd33 100644 --- a/packages/libyaml/libyaml_0.1.1.bb +++ b/packages/libyaml/libyaml_0.1.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "LibYAML is a YAML 1.1 parser and emitter written in C." +DESCRIPTION = "LibYAML is a YAML parser and emitter written in C." HOMEPAGE = "http://pyyaml.org/wiki/LibYAML" SECTION = "libs/devel" LICENSE = "MIT" diff --git a/packages/lightmediascanner/lightmediascanner_svn.bb b/packages/lightmediascanner/lightmediascanner_0.2.0.0.bb index 145d2c15a4..791a91acb5 100644 --- a/packages/lightmediascanner/lightmediascanner_svn.bb +++ b/packages/lightmediascanner/lightmediascanner_0.2.0.0.bb @@ -1,14 +1,11 @@ DESCRIPTION = "Lightweight media scanner meant to be used in not-so-powerful devices" SECTION = "libs/multimedia" -HOMEPAGE = "http://lms.garage.maemo.org/" -AUTHOR = "Gustavo Barbieri" +AUTHOR = "Profusion" LICENSE = "LGPL" DEPENDS = "sqlite3" -PV = "0.1.0+svnr${SRCREV}" PE = "1" -SRC_URI = "svn://garage.maemo.org/svn/lms/;module=lightmediascanner;proto=https" -S = "${WORKDIR}/lightmediascanner" +SRC_URI = "https://garage.maemo.org/frs/download.php/4626/lightmediascanner-0.2.0.0.tar.bz2" inherit autotools pkgconfig @@ -17,4 +14,3 @@ FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug" do_stage() { autotools_stage_all } - diff --git a/packages/moin/moin_1.5.8.bb b/packages/moin/moin_1.8.1.bb index 7efe66eb14..427455d48c 100644 --- a/packages/moin/moin_1.5.8.bb +++ b/packages/moin/moin_1.8.1.bb @@ -5,7 +5,11 @@ HOMEPAGE = "http://moinmoin.wikiwikiweb.de/" PRIORITY = "optional" PR = "ml0" -SRC_URI = "${SOURCEFORGE_MIRROR}/moin/moin-${PV}.tar.gz" +SRC_URI = "http://static.moinmo.in/files/moin-${PV}.tar.gz" inherit distutils +do_install_append() { + mv -f ${D}${datadir}/share/* ${D}${datadir}/ +} + diff --git a/packages/python/python-lxml_1.3.3.bb b/packages/nonworking/python-lxml_2.1.5.bb index 7ead15b2a0..de0566e38f 100644 --- a/packages/python/python-lxml_1.3.3.bb +++ b/packages/nonworking/python-lxml_2.1.5.bb @@ -3,10 +3,9 @@ HOMEPAGE = "http://codespeak.net/lxml/" AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev" LICENSE = "BSD" DEPENDS = "libxml2 libxslt" -PR = "ml1" +PR = "ml0" -SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz \ - file://use-pkgconfig-to-detect.patch;patch=1" +SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz" S = "${WORKDIR}/lxml-${PV}" inherit distutils diff --git a/packages/python/python-itools_0.16.5.bb b/packages/nonworking/python/python-itools_0.50.1.bb index 7879c6415e..7879c6415e 100644 --- a/packages/python/python-itools_0.16.5.bb +++ b/packages/nonworking/python/python-itools_0.50.1.bb diff --git a/packages/python/python-lightmediascanner_svn.bb b/packages/nonworking/python/python-lightmediascanner_0.2.0.bb index 3d81c625de..c2a337d793 100644 --- a/packages/python/python-lightmediascanner_svn.bb +++ b/packages/nonworking/python/python-lightmediascanner_0.2.0.bb @@ -1,13 +1,10 @@ DESCRIPTION = "Python bindings to the Lightweight media scanner" SECTION = "devel/python" -HOMEPAGE = "http://lms.garage.maemo.org/" AUTHOR = "Gustavo Barbieri" LICENSE = "LGPL" DEPENDS = "lightmediascanner python-cython-native" -PV = "0.1.0+svnr${SRCREV}" PE = "1" -SRC_URI = "svn://garage.maemo.org/svn/lms/;module=python-lightmediascanner;proto=https" -S = "${WORKDIR}/python-lightmediascanner" +SRC_URI = "https://garage.maemo.org/frs/download.php/4627/python-lightmediascanner-${PV}.tar.gz" inherit distutils diff --git a/packages/python/python-mysqldb/mysqlpath.patch b/packages/nonworking/python/python-mysqldb/mysqlpath.patch index 3f471a1703..3f471a1703 100644 --- a/packages/python/python-mysqldb/mysqlpath.patch +++ b/packages/nonworking/python/python-mysqldb/mysqlpath.patch diff --git a/packages/python/python-mysqldb/site.patch b/packages/nonworking/python/python-mysqldb/site.patch index c99ee3bc0d..c99ee3bc0d 100644 --- a/packages/python/python-mysqldb/site.patch +++ b/packages/nonworking/python/python-mysqldb/site.patch diff --git a/packages/python/python-mysqldb_1.2.1.bb b/packages/nonworking/python/python-mysqldb_1.2.1.bb index 0f305c93a6..9a9ca0fe56 100644 --- a/packages/python/python-mysqldb_1.2.1.bb +++ b/packages/nonworking/python/python-mysqldb_1.2.1.bb @@ -7,10 +7,11 @@ SRCNAME = "MySQL-python" inherit distutils -SRC_URI = "${SOURCEFORGE_MIRROR}/mysql-python/MySQL-python-${PV}_p2.tar.gz \ -file://mysqlpath.patch;patch=1 \ -file://site.patch;patch=1" - +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/mysql-python/MySQL-python-${PV}_p2.tar.gz \ + file://mysqlpath.patch;patch=1 \ + file://site.patch;patch=1 \ +" S = "${WORKDIR}/${SRCNAME}-${PV}_p2" do_install_append() { diff --git a/packages/python/python-sword_1.5.10.bb b/packages/nonworking/python/python-sword_1.5.10.bb index 4769a8814f..4769a8814f 100644 --- a/packages/python/python-sword_1.5.10.bb +++ b/packages/nonworking/python/python-sword_1.5.10.bb diff --git a/packages/sword/gnomesword_2.1.2.bb b/packages/nonworking/sword/gnomesword_2.1.2.bb index a4ec60d040..a4ec60d040 100644 --- a/packages/sword/gnomesword_2.1.2.bb +++ b/packages/nonworking/sword/gnomesword_2.1.2.bb diff --git a/packages/sword/sword-1.5.9/gcc-visibility.patch b/packages/nonworking/sword/sword-1.5.9/gcc-visibility.patch index f23a66767f..f23a66767f 100644 --- a/packages/sword/sword-1.5.9/gcc-visibility.patch +++ b/packages/nonworking/sword/sword-1.5.9/gcc-visibility.patch diff --git a/packages/sword/sword_1.5.10.bb b/packages/nonworking/sword/sword_1.5.10.bb index 151bba366d..151bba366d 100644 --- a/packages/sword/sword_1.5.10.bb +++ b/packages/nonworking/sword/sword_1.5.10.bb diff --git a/packages/sword/sword_1.5.9.bb b/packages/nonworking/sword/sword_1.5.9.bb index 303d7f9fcc..303d7f9fcc 100644 --- a/packages/sword/sword_1.5.9.bb +++ b/packages/nonworking/sword/sword_1.5.9.bb diff --git a/packages/plone/plone_2.1.2.bb b/packages/plone/plone_3.1.7.bb index 4d56a9a597..8d431f0ee4 100644 --- a/packages/plone/plone_2.1.2.bb +++ b/packages/plone/plone_3.1.7.bb @@ -1,14 +1,17 @@ DESCRIPTION = "Plone, a user friendly and powerful Content Management System based on the Zope Web Application Server" SECTION = "network/cms" PRIORITY = "optional" -RDEPENDS = "zope" LICENSE = "GPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/plone/Plone-${PV}.tar.gz" + +SRC_URI = "http://launchpad.net/plone/3.1/${PV}/+download/Plone-${PV}.tar.gz" S = "${WORKDIR}/Plone-${PV}" +inherit distutils + do_install() { install -d ${D}${libdir}/python/Products/ cp -pPR ${S}/* ${D}${libdir}/python/Products/ } +RDEPENDS = "zope" FILES_${PN} = "${libdir}/python/Products/" diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc deleted file mode 100644 index 5ca6f83859..0000000000 --- a/packages/python/python-2.5-manifest.inc +++ /dev/null @@ -1,325 +0,0 @@ -# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: './generate-manifest-2.5.py' Version 20081209 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy - - - -PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " - -PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-modules" - -DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml0" -RDEPENDS_python-profile="python-core python-textutils" -FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* ${libdir}/python2.5/cProfile.* ${libdir}/python2.5/lib-dynload/_lsprof.so " - -DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml0" -RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " - -DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml0" -RDEPENDS_python-distutils="python-core" -FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " - -DESCRIPTION_python-doctest="Python framework for running examples in docstrings." -PR_python-doctest="ml0" -RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib" -FILES_python-doctest="${libdir}/python2.5/doctest.* " - -DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml0" -RDEPENDS_python-codecs="python-core python-lang" -FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " - -DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml0" -RDEPENDS_python-ctypes="python-core" -FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " - -DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml0" -RDEPENDS_python-pickle="python-core python-codecs python-io python-re" -FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " - -DESCRIPTION_python-bzip2="Python bzip2 support" -PR_python-bzip2="ml0" -RDEPENDS_python-bzip2="python-core" -FILES_python-bzip2="${libdir}/python2.5/lib-dynload/bz2.so " - -DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml0" -RDEPENDS_python-datetime="python-core python-codecs" -FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " - -DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml0" -RDEPENDS_python-core="" -FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " - -DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml0" -RDEPENDS_python-io="python-core python-math" -FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " - -DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml0" -RDEPENDS_python-compiler="python-core" -FILES_python-compiler="${libdir}/python2.5/compiler " - -DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml0" -RDEPENDS_python-compression="python-core python-zlib" -FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* ${libdir}/python2.5/tarfile.* " - -DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml0" -RDEPENDS_python-re="python-core" -FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " - -DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml0" -RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" -FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " - -DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml0" -RDEPENDS_python-terminal="python-core python-io" -FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " - -DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml0" -RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" -FILES_python-email="${libdir}/python2.5/email " - -DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml0" -RDEPENDS_python-image="python-core" -FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " - -DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml0" -RDEPENDS_python-tests="python-core" -FILES_python-tests="${libdir}/python2.5/test " - -DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml0" -RDEPENDS_python-core-dbg="python-core" -FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " - -DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml0" -RDEPENDS_python-resource="python-core" -FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " - -DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml0" -RDEPENDS_python-devel="python-core" -FILES_python-devel="${includedir} ${libdir}/python2.5/config " - -DESCRIPTION_python-difflib="Python helpers for computing deltas between objects." -PR_python-difflib="ml0" -RDEPENDS_python-difflib="python-lang python-re" -FILES_python-difflib="${libdir}/python2.5/difflib.* " - -DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml0" -RDEPENDS_python-math="python-core" -FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " - -DESCRIPTION_python-syslog="Python's Syslog Interface" -PR_python-syslog="ml0" -RDEPENDS_python-syslog="python-core" -FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " - -DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml0" -RDEPENDS_python-hotshot="python-core" -FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " - -DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml0" -RDEPENDS_python-unixadmin="python-core" -FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " - -DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml0" -RDEPENDS_python-textutils="python-core python-io python-re python-stringold" -FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " - -DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml0" -RDEPENDS_python-tkinter="python-core" -FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " - -DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml0" -RDEPENDS_python-gdbm="python-core" -FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " - -DESCRIPTION_python-elementtree="Python elementree" -PR_python-elementtree="ml0" -RDEPENDS_python-elementtree="python-core" -FILES_python-elementtree="${libdir}/python2.5/lib-dynload/_elementtree.so " - -DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml0" -RDEPENDS_python-fcntl="python-core" -FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " - -DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml0" -RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" -FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* ${libdir}/python2.5/uuid.* " - -DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml0" -RDEPENDS_python-pprint="python-core" -FILES_python-pprint="${libdir}/python2.5/pprint.* " - -DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml0" -RDEPENDS_python-netserver="python-core python-netclient" -FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " - -DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml0" -RDEPENDS_python-curses="python-core" -FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " - -DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml0" -RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" -FILES_python-smtpd="${bindir}/smtpd.* " - -DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml0" -RDEPENDS_python-html="python-core" -FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " - -DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml0" -RDEPENDS_python-readline="python-core" -FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " - -DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml0" -RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" -FILES_python-subprocess="${libdir}/python2.5/subprocess.* " - -DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml0" -RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" -FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " - -DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml0" -RDEPENDS_python-logging="python-core python-io python-lang python-pickle python-stringold" -FILES_python-logging="${libdir}/python2.5/logging " - -DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml0" -RDEPENDS_python-mailbox="python-core python-mime" -FILES_python-mailbox="${libdir}/python2.5/mailbox.* " - -DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml0" -RDEPENDS_python-xml="python-core python-re" -FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " - -DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml0" -RDEPENDS_python-mime="python-core python-io" -FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " - -DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml0" -RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib" -FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* " - -DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests" -PR_python-sqlite3-tests="ml0" -RDEPENDS_python-sqlite3-tests="python-core python-sqlite3" -FILES_python-sqlite3-tests="${libdir}/python2.5/sqlite3/test " - -DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml0" -RDEPENDS_python-unittest="python-core python-stringold python-lang" -FILES_python-unittest="${libdir}/python2.5/unittest.* " - -DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml0" -RDEPENDS_python-stringold="python-core python-re" -FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " - -DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml0" -RDEPENDS_python-robotparser="python-core python-netclient" -FILES_python-robotparser="${libdir}/python2.5/robotparser.* " - -DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml0" -RDEPENDS_python-compile="python-core" -FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " - -DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml0" -RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell python-pprint" -FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " - -DESCRIPTION_python-pkgutil="Python Package Extension Utility Support" -PR_python-pkgutil="ml0" -RDEPENDS_python-pkgutil="python-core" -FILES_python-pkgutil="${libdir}/python2.5/pkgutil.* " - -DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml0" -RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shlex.* ${libdir}/python2.5/shutil.* " - -DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml0" -RDEPENDS_python-bsddb="python-core" -FILES_python-bsddb="${libdir}/python2.5/bsddb ${libdir}/python2.5/lib-dynload/_bsddb.so " - -DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml0" -RDEPENDS_python-mmap="python-core python-io" -FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " - -DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml0" -RDEPENDS_python-zlib="python-core" -FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " - -DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml0" -RDEPENDS_python-db="python-core" -FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " - -DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml0" -RDEPENDS_python-crypt="python-core" -FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " - -DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml0" -RDEPENDS_python-idle="python-core python-tkinter" -FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " - -DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml0" -RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/symbol.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " - -DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml0" -RDEPENDS_python-audio="python-core" -FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " - -DESCRIPTION_python-modules="All Python modules" -RDEPENDS_python-modules="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -ALLOW_EMPTY_python-modules = "1" - - diff --git a/packages/python/python-2.5.2/05-install.patch b/packages/python/python-2.5.2/05-install.patch deleted file mode 100644 index c3e249db1c..0000000000 --- a/packages/python/python-2.5.2/05-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: python/Lib/distutils/command/install.py -=================================================================== ---- python.orig/Lib/distutils/command/install.py 2007-03-06 17:15:43.000000000 -0300 -+++ python/Lib/distutils/command/install.py 2007-03-06 17:16:04.000000000 -0300 -@@ -601,7 +601,7 @@ - ('install_headers', has_headers), - ('install_scripts', has_scripts), - ('install_data', has_data), -- ('install_egg_info', lambda self:True), -+ ('install_egg_info', lambda self:False), - ] - - # class install diff --git a/packages/python/python-2.5.2/06-fix-urllib-exception.patch b/packages/python/python-2.5.2/06-fix-urllib-exception.patch deleted file mode 100644 index d096ee9402..0000000000 --- a/packages/python/python-2.5.2/06-fix-urllib-exception.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: python/Lib/urllib.py -=================================================================== ---- python.orig/Lib/urllib.py 2007-03-06 17:16:49.000000000 -0300 -+++ python/Lib/urllib.py 2007-03-06 17:17:05.000000000 -0300 -@@ -358,7 +358,7 @@ - """Default error handler: close the connection and raise IOError.""" - void = fp.read() - fp.close() -- raise IOError, ('http error', errcode, errmsg, headers) -+ raise IOError, ('http error', errcode, errmsg) - - if hasattr(socket, "ssl"): - def open_https(self, url, data=None): diff --git a/packages/python/python-2.5.2/13-set-wakeup-fix.patch b/packages/python/python-2.5.2/13-set-wakeup-fix.patch deleted file mode 100644 index 807014b7a7..0000000000 --- a/packages/python/python-2.5.2/13-set-wakeup-fix.patch +++ /dev/null @@ -1,87 +0,0 @@ -Index: python-2.5.2/Modules/signalmodule.c -=================================================================== ---- python-2.5.2.orig/Modules/signalmodule.c 2008-02-23 13:10:12.000000000 -0300 -+++ python-2.5.2/Modules/signalmodule.c 2008-02-23 13:10:48.000000000 -0300 -@@ -12,6 +12,8 @@ - - #include <signal.h> - -+#include <sys/stat.h> -+ - #ifndef SIG_ERR - #define SIG_ERR ((PyOS_sighandler_t)(-1)) - #endif -@@ -75,6 +77,8 @@ - PyObject *func; - } Handlers[NSIG]; - -+static sig_atomic_t wakeup_fd = -1; -+ - /* Speed up sigcheck() when none tripped */ - static volatile sig_atomic_t is_tripped = 0; - -@@ -113,6 +117,7 @@ - static void - signal_handler(int sig_num) - { -+ const char dummy_byte = '\0'; - #ifdef WITH_THREAD - #ifdef WITH_PTH - if (PyThread_get_thread_ident() != main_thread) { -@@ -128,6 +133,8 @@ - cleared in PyErr_CheckSignals() before .tripped. */ - is_tripped = 1; - Py_AddPendingCall(checksignals_witharg, NULL); -+ if (wakeup_fd != -1) -+ write(wakeup_fd, &dummy_byte, 1); - #ifdef WITH_THREAD - } - #endif -@@ -267,6 +274,39 @@ - anything else -- the callable Python object used as a handler"); - - -+static PyObject * -+signal_set_wakeup_fd(PyObject *self, PyObject *args) -+{ -+ struct stat buf; -+ int fd, old_fd; -+ if (!PyArg_ParseTuple(args, "i:set_wakeup_fd", &fd)) -+ return NULL; -+#ifdef WITH_THREAD -+ if (PyThread_get_thread_ident() != main_thread) { -+ PyErr_SetString(PyExc_ValueError, -+ "set_wakeup_fd only works in main thread"); -+ return NULL; -+ } -+#endif -+ if (fd != -1 && fstat(fd, &buf) != 0) { -+ PyErr_SetString(PyExc_ValueError, "invalid fd"); -+ return NULL; -+ } -+ old_fd = wakeup_fd; -+ wakeup_fd = fd; -+ return PyLong_FromLong(old_fd); -+} -+ -+PyDoc_STRVAR(set_wakeup_fd_doc, -+"set_wakeup_fd(fd) -> fd\n\ -+\n\ -+Sets the fd to be written to (with '\\0') when a signal\n\ -+comes in. A library can use this to wakeup select or poll.\n\ -+The previous fd is returned.\n\ -+\n\ -+The fd must be non-blocking."); -+ -+ - /* List of functions defined in the module */ - static PyMethodDef signal_methods[] = { - #ifdef HAVE_ALARM -@@ -274,6 +314,7 @@ - #endif - {"signal", signal_signal, METH_VARARGS, signal_doc}, - {"getsignal", signal_getsignal, METH_VARARGS, getsignal_doc}, -+ {"set_wakeup_fd", signal_set_wakeup_fd, METH_VARARGS, set_wakeup_fd_doc}, - #ifdef HAVE_PAUSE - {"pause", (PyCFunction)signal_pause, - METH_NOARGS,pause_doc}, diff --git a/packages/python/python-2.5.2/14-encodings-oriental.patch b/packages/python/python-2.5.2/14-encodings-oriental.patch deleted file mode 100644 index 4c942f1b75..0000000000 --- a/packages/python/python-2.5.2/14-encodings-oriental.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: python-2.5.2/debian/rules -=================================================================== ---- python-2.5.2.orig/debian/rules 2008-02-26 14:15:36.000000000 -0300 -+++ python-2.5.2/debian/rules 2008-02-26 14:17:42.000000000 -0300 -@@ -134,6 +134,8 @@ - ) - find $(d_dev)/$(scriptdir) -name "*.pyo" -type f | grep -v -f $(only_dev_list) | xargs rm -f - -+ find $(d_dev)/$(scriptdir)/encodings | grep -f $(only_dev_list) | xargs -i mv '{}' $(d_dev)/$(scriptdir)/encodings_orient -+ - # move the interpreter - mv $(d_dev)/usr/bin/python2.5 $(d_base)/usr/bin/python2.5 - -Index: python-2.5.2/Lib/encodings/__init__.py -=================================================================== ---- python-2.5.2.orig/Lib/encodings/__init__.py 2008-02-26 14:15:07.000000000 -0300 -+++ python-2.5.2/Lib/encodings/__init__.py 2008-02-26 14:17:42.000000000 -0300 -@@ -99,6 +99,14 @@ - pass - else: - break -+ -+ try: -+ mod = __import__('encodings_orient.' + modname, -+ globals(), locals(), _import_tail) -+ except ImportError: -+ pass -+ else: -+ break - else: - mod = None - -Index: python-2.5.2/Makefile.pre.in -=================================================================== ---- python-2.5.2.orig/Makefile.pre.in 2008-02-26 14:15:07.000000000 -0300 -+++ python-2.5.2/Makefile.pre.in 2008-02-26 14:17:42.000000000 -0300 -@@ -717,7 +717,7 @@ - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages - LIBSUBDIRS= lib-tk site-packages test test/output test/data \ - test/decimaltestdata \ -- encodings compiler hotshot \ -+ encodings encodings_orient compiler hotshot \ - email email/mime email/test email/test/data \ - sqlite3 sqlite3/test \ - logging bsddb bsddb/test csv wsgiref \ -Index: python-2.5.2/debian/onlysdk -=================================================================== ---- python-2.5.2.orig/debian/onlysdk 2008-02-26 14:15:07.000000000 -0300 -+++ python-2.5.2/debian/onlysdk 2008-02-26 14:17:42.000000000 -0300 -@@ -1,7 +1,6 @@ - distutils - compile --encodings/cp --encodings/mac -+encodings_orient - doctest - unittest - hotshot -Index: python-2.5.2/Lib/encodings_orient/__init__.py -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ python-2.5.2/Lib/encodings_orient/__init__.py 2008-02-26 14:17:42.000000000 -0300 -@@ -0,0 +1 @@ -+#Dummy diff --git a/packages/python/python-2.5.2/16-bug1179-imageop.patch b/packages/python/python-2.5.2/16-bug1179-imageop.patch deleted file mode 100644 index 895d4e0a17..0000000000 --- a/packages/python/python-2.5.2/16-bug1179-imageop.patch +++ /dev/null @@ -1,219 +0,0 @@ -Index: python-2.5.2/Modules/imageop.c -=================================================================== ---- python-2.5.2.orig/Modules/imageop.c 2006-01-19 03:09:39.000000000 -0300 -+++ python-2.5.2/Modules/imageop.c 2008-04-07 16:29:09.000000000 -0300 -@@ -78,7 +78,7 @@ - char *cp, *ncp; - short *nsp; - Py_Int32 *nlp; -- int len, size, x, y, newx1, newx2, newy1, newy2; -+ int len, size, x, y, newx1, newx2, newy1, newy2, nlen; - int ix, iy, xstep, ystep; - PyObject *rv; - -@@ -90,13 +90,19 @@ - PyErr_SetString(ImageopError, "Size should be 1, 2 or 4"); - return 0; - } -- if ( len != size*x*y ) { -+ if (( len != size*x*y ) || -+ ( size != ((len / x) / y) )) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } - xstep = (newx1 < newx2)? 1 : -1; - ystep = (newy1 < newy2)? 1 : -1; - -+ nlen = (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size; -+ if ( size != ((nlen / (abs(newx2-newx1)+1)) / (abs(newy2-newy1)+1)) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - rv = PyString_FromStringAndSize(NULL, - (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size); - if ( rv == 0 ) -@@ -132,7 +138,7 @@ - char *cp, *ncp; - short *nsp; - Py_Int32 *nlp; -- int len, size, x, y, newx, newy; -+ int len, size, x, y, newx, newy, nlen; - int ix, iy; - int oix, oiy; - PyObject *rv; -@@ -145,12 +151,18 @@ - PyErr_SetString(ImageopError, "Size should be 1, 2 or 4"); - return 0; - } -- if ( len != size*x*y ) { -+ if ( ( len != size*x*y ) || -+ ( size != ((len / x) / y) ) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } -+ nlen = newx*newy*size; -+ if ( size != ((nlen / newx) / newy) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } - -- rv = PyString_FromStringAndSize(NULL, newx*newy*size); -+ rv = PyString_FromStringAndSize(NULL, nlen); - if ( rv == 0 ) - return 0; - ncp = (char *)PyString_AsString(rv); -@@ -190,7 +202,8 @@ - PyErr_SetString(ImageopError, "Size should be 1 or 4"); - return 0; - } -- if ( maxx*maxy*width != len ) { -+ if ( ( maxx*maxy*width != len ) || -+ ( maxx != ((len / maxy) / width) ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -240,7 +253,8 @@ - if ( !PyArg_ParseTuple(args, "s#iii", &cp, &len, &x, &y, &tres) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -281,7 +295,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -320,7 +335,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -358,7 +374,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -404,7 +421,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -443,7 +461,11 @@ - if ( !PyArg_ParseTuple(args, "s#iiii", &cp, &len, &x, &y, &v0, &v1) ) - return 0; - -- nlen = x*y; -+ nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( (nlen+7)/8 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -481,6 +503,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( (nlen+3)/4 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -517,6 +543,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( (nlen+1)/2 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -554,6 +584,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen*4 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -598,6 +632,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -648,6 +686,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen*4 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -693,6 +735,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -Index: python-2.5.2/Modules/rgbimgmodule.c -=================================================================== ---- python-2.5.2.orig/Modules/rgbimgmodule.c 2008-02-14 08:26:18.000000000 -0300 -+++ python-2.5.2/Modules/rgbimgmodule.c 2008-04-07 16:29:10.000000000 -0300 -@@ -299,6 +299,11 @@ - xsize = image.xsize; - ysize = image.ysize; - zsize = image.zsize; -+ tablen = xsize * ysize * zsize * sizeof(Py_Int32); -+ if (xsize != (((tablen / ysize) / zsize) / sizeof(Py_Int32))) { -+ PyErr_NoMemory(); -+ goto finally; -+ } - if (rle) { - tablen = ysize * zsize * sizeof(Py_Int32); - rlebuflen = (int) (1.05 * xsize +10); diff --git a/packages/python/python-2.5.2/autohell.patch b/packages/python/python-2.5.2/autohell.patch deleted file mode 100644 index 32977955d4..0000000000 --- a/packages/python/python-2.5.2/autohell.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: Python-2.5.2/configure.in -=================================================================== ---- Python-2.5.2.orig/configure.in -+++ Python-2.5.2/configure.in -@@ -3410,45 +3410,6 @@ esac - - - --AC_MSG_CHECKING(for %zd printf() format support) --AC_TRY_RUN([#include <stdio.h> --#include <stddef.h> --#include <string.h> -- --#ifdef HAVE_SYS_TYPES_H --#include <sys/types.h> --#endif -- --#ifdef HAVE_SSIZE_T --typedef ssize_t Py_ssize_t; --#elif SIZEOF_VOID_P == SIZEOF_LONG --typedef long Py_ssize_t; --#else --typedef int Py_ssize_t; --#endif -- --int main() --{ -- char buffer[256]; -- -- if(sprintf(buffer, "%zd", (size_t)123) < 0) -- return 1; -- -- if (strcmp(buffer, "123")) -- return 1; -- -- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) -- return 1; -- -- if (strcmp(buffer, "-123")) -- return 1; -- -- return 0; --}], --[AC_MSG_RESULT(yes) -- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], -- AC_MSG_RESULT(no)) -- - AC_CHECK_TYPE(socklen_t,, - AC_DEFINE(socklen_t,int, - Define to `int' if <sys/socket.h> does not define.),[ diff --git a/packages/python/python-2.5.2/bindir-libdir.patch b/packages/python/python-2.5.2/bindir-libdir.patch deleted file mode 100644 index 047c358a55..0000000000 --- a/packages/python/python-2.5.2/bindir-libdir.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/Makefile.pre.in -=================================================================== ---- Python-2.5.1.orig/Makefile.pre.in -+++ Python-2.5.1/Makefile.pre.in -@@ -83,8 +83,8 @@ prefix= @prefix@ - 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.5.2/crosscompile.patch b/packages/python/python-2.5.2/crosscompile.patch deleted file mode 100644 index f1b1c6f3e0..0000000000 --- a/packages/python/python-2.5.2/crosscompile.patch +++ /dev/null @@ -1,110 +0,0 @@ -# -# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# -Index: Python-2.5.2/Makefile.pre.in -=================================================================== ---- Python-2.5.2.orig/Makefile.pre.in -+++ Python-2.5.2/Makefile.pre.in -@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON) - # 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 - - # Build static library -@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth - - $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) - -@ mkdir Include -- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib - 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 'bad_coding|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 'bad_coding|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 - -@@ -894,7 +895,7 @@ libainstall: all - # 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) \ -Index: Python-2.5.2/setup.py -=================================================================== ---- Python-2.5.2.orig/setup.py -+++ Python-2.5.2/setup.py -@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): - 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 -@@ -244,8 +245,8 @@ class PyBuildExt(build_ext): - - 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') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -342,6 +343,9 @@ class PyBuildExt(build_ext): - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] -+ - # - # The following modules are all pretty straightforward, and compile - # on pretty much any POSIXish platform. diff --git a/packages/python/python-2.5.2/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch deleted file mode 100644 index 072bf0b059..0000000000 --- a/packages/python/python-2.5.2/default-is-optimized.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: Python-2.5.2/Python/compile.c -=================================================================== ---- Python-2.5.2.orig/Python/compile.c -+++ Python-2.5.2/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - /* - ISSUES: -Index: Python-2.5.2/Modules/main.c -=================================================================== ---- Python-2.5.2.orig/Modules/main.c -+++ Python-2.5.2/Modules/main.c -@@ -40,7 +40,7 @@ static char **orig_argv; - static int orig_argc; - - /* command line options */ --#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?" -+#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?" - - #ifndef RISCOS - #define PROGRAM_OPTS BASE_OPTS -@@ -68,8 +68,7 @@ Options and arguments (and corresponding - "; - static char *usage_2 = "\ - -m mod : run library module as a script (terminates option list)\n\ ---O : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\ ---OO : remove doc-strings in addition to the -O optimizations\n\ -+-N : do NOT optimize generated bytecode\n\ - -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ - -S : don't imply 'import site' on initialization\n\ - -t : issue warnings about inconsistent tab usage (-tt: issue errors)\n\ -@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv) - break; - - case 'O': -- Py_OptimizeFlag++; -+ fprintf(stderr, "-O is already default in this version. Ignoring\n"); -+ -+ case 'N': -+ Py_OptimizeFlag=0; - break; - - case 'S': diff --git a/packages/python/python-2.5.2/enable-ctypes-module.patch b/packages/python/python-2.5.2/enable-ctypes-module.patch deleted file mode 100644 index dd5adaf0e7..0000000000 --- a/packages/python/python-2.5.2/enable-ctypes-module.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py ---- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200 -+++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100 -@@ -1321,16 +1329,16 @@ - ffi_configfile): - from distutils.dir_util import mkpath - mkpath(ffi_builddir) -- config_args = [] -+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ -+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): -- print "Failed to configure _ctypes module" -+ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, ) - return False - - fficonfig = {} -diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c ---- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200 -+++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100 -@@ -273,11 +273,13 @@ - PyErr_NoMemory(); - return NULL; - } -+#if FFI_CLOSURES - p->pcl = MallocClosure(); - if (p->pcl == NULL) { - PyErr_NoMemory(); - goto error; - } -+#endif - - for (i = 0; i < nArgs; ++i) { - PyObject *cnv = PySequence_GetItem(converters, i); -@@ -315,12 +317,14 @@ - "ffi_prep_cif failed with %d", result); - goto error; - } -+#if FFI_CLOSURES - result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); - if (result != FFI_OK) { - PyErr_Format(PyExc_RuntimeError, - "ffi_prep_closure failed with %d", result); - goto error; - } -+#endif - - p->converters = converters; - p->callable = callable; -@@ -328,8 +332,10 @@ - - error: - if (p) { -+#if FFI_CLOSURES - if (p->pcl) - FreeClosure(p->pcl); -+#endif - PyMem_Free(p); - } - return NULL; -diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c ---- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100 -+++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100 -@@ -3419,7 +3419,9 @@ - Py_CLEAR(self->paramflags); - - if (self->thunk) { -+#if FFI_CLOSURES - FreeClosure(self->thunk->pcl); -+#endif - PyMem_Free(self->thunk); - self->thunk = NULL; - } -diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h ---- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200 -+++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100 -@@ -68,7 +68,9 @@ - }; - - typedef struct { -+#if FFI_CLOSURES - ffi_closure *pcl; /* the C callable */ -+#endif - ffi_cif cif; - PyObject *converters; - PyObject *callable; -diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c ---- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200 -+++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100 -@@ -27,7 +27,9 @@ - /******************************************************************/ - - typedef union _tagITEM { -+#if FFI_CLOSURES - ffi_closure closure; -+#endif - union _tagITEM *next; - } ITEM; - diff --git a/packages/python/python-2.5.2/fix-tkinter-detection.patch b/packages/python/python-2.5.2/fix-tkinter-detection.patch deleted file mode 100644 index 93bd343381..0000000000 --- a/packages/python/python-2.5.2/fix-tkinter-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py -+++ Python-2.5.1/setup.py -@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/packages/python/python-2.5.2/sitebranding.patch b/packages/python/python-2.5.2/sitebranding.patch deleted file mode 100644 index c6e486ae97..0000000000 --- a/packages/python/python-2.5.2/sitebranding.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/Lib/site.py -=================================================================== ---- Python-2.5.1.orig/Lib/site.py -+++ Python-2.5.1/Lib/site.py -@@ -323,8 +323,9 @@ def setcopyright(): - "Jython is maintained by the Jython developers (www.jython.org).") - else: - __builtin__.credits = _Printer("credits", """\ -- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands -- for supporting Python development. See www.python.org for more information.""") -+ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). -+ It is a part of the Python-For-Embedded-Systems initiative which is maintained by -+ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") - here = os.path.dirname(os.__file__) - __builtin__.license = _Printer( - "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python-2.5.2/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py deleted file mode 100644 index 273901898a..0000000000 --- a/packages/python/python-2.5.2/sitecustomize.py +++ /dev/null @@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.set_history_length( 1000 ) - readline.parse_and_bind( "tab: complete" ) - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport() diff --git a/packages/python/python-ao_0.82.bb b/packages/python/python-ao_0.82.bb index e83bd5de11..98c8af40e0 100644 --- a/packages/python/python-ao_0.82.bb +++ b/packages/python/python-ao_0.82.bb @@ -1,9 +1,10 @@ -LICENSE = "GPL" -DESCRIPTION = "Python AO Bindings" +DESCRIPTION = "Python Bindings for libao" SECTION = "devel/python" PRIORITY = "optional" +LICENSE = "GPL" DEPENDS = "libao" SRCNAME = "pyao" +PR = "ml1" SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -16,5 +17,3 @@ do_configure_prepend() { echo "ao_lib_dir = ${STAGING_LIBDIR}" >>Setup echo "ao_include_dir = ${STAGING_INCDIR}" >>Setup } - - diff --git a/packages/python/python-cheetah_1.0.bb b/packages/python/python-cheetah_1.0.bb deleted file mode 100644 index 20fe083d81..0000000000 --- a/packages/python/python-cheetah_1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "template engine and code generation tool" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "MIT-like" -RDEPENDS = "" -SRCNAME = "Cheetah" - -SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -PR = "r0" - -inherit distutils - diff --git a/packages/python/python-cheetah_2.0.1.bb b/packages/python/python-cheetah_2.0.1.bb index 55f0b37b00..8777aaf719 100644 --- a/packages/python/python-cheetah_2.0.1.bb +++ b/packages/python/python-cheetah_2.0.1.bb @@ -1,11 +1,13 @@ -DESCRIPTION = "template engine and code generation tool" +DESCRIPTION = "Python template engine and code generation tool" SECTION = "devel/python" PRIORITY = "optional" -LICENSE = "MIT-like" -RDEPENDS = "python-pickle python-pprint" +LICENSE = "MIT" SRCNAME = "Cheetah" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +RDEPENDS = "python-pickle python-pprint" diff --git a/packages/python/python-constraint_1.1.bb b/packages/python/python-constraint_1.1.bb index 5218b368ac..06c6a909a4 100644 --- a/packages/python/python-constraint_1.1.bb +++ b/packages/python/python-constraint_1.1.bb @@ -5,7 +5,7 @@ provided to work with finite domains only." SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" -PR = "ml0" +PR = "ml1" SRC_URI = "http://labix.org/download/python-constraint/python-constraint-${PV}.tar.bz2" diff --git a/packages/python/python-cython-native_0.9.8.bb b/packages/python/python-cython-native_0.10.3.bb index a5c78cebe2..a5c78cebe2 100644 --- a/packages/python/python-cython-native_0.9.8.bb +++ b/packages/python/python-cython-native_0.10.3.bb diff --git a/packages/python/python-cython_0.9.8.bb b/packages/python/python-cython_0.10.3.bb index 69d73fe969..f78ba38e87 100644 --- a/packages/python/python-cython_0.9.8.bb +++ b/packages/python/python-cython_0.10.3.bb @@ -5,10 +5,9 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "Cython" -PR = "ml1" +PR = "ml0" SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils - diff --git a/packages/python/python-pythondaap_0.4.bb b/packages/python/python-daap_0.7.1.bb index 2cec3d3e3b..e3ddde1116 100644 --- a/packages/python/python-pythondaap_0.4.bb +++ b/packages/python/python-daap_0.7.1.bb @@ -1,11 +1,12 @@ DESCRIPTION = "A pure Python DAAP client implementation" SECTION = "devel/python" PRIORITY = "optional" -RDEPENDS = "python-compression" LICENSE = "LGPL" inherit distutils SRC_URI = "http://jerakeen.org/files/PythonDaap-${PV}.tar.gz" - S = "${WORKDIR}/PythonDaap-${PV}" + +RDEPENDS = "python-compression" + diff --git a/packages/python/python-dbus_0.83.0.bb b/packages/python/python-dbus_0.83.0.bb index 4ccecc0aa1..7bc81f0396 100644 --- a/packages/python/python-dbus_0.83.0.bb +++ b/packages/python/python-dbus_0.83.0.bb @@ -3,19 +3,20 @@ SECTION = "devel/python" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" -RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" -PR = "ml0" +PR = "ml1" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools pkgconfig -export BUILD_SYS := "${BUILD_SYS}" -export HOST_SYS := "${HOST_SYS}" +export BUILD_SYS +export HOST_SYS do_stage() { autotools_stage_all } +RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" + FILES_${PN}-dev += "${libdir}/pkgconfig diff --git a/packages/python/python-dialog_2.7.bb b/packages/python/python-dialog_2.7.bb index fa54a5a7f3..9d66d297e0 100644 --- a/packages/python/python-dialog_2.7.bb +++ b/packages/python/python-dialog_2.7.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "LGPL" SRCNAME = "pythondialog" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-django_1.0.2.bb b/packages/python/python-django_1.0.2.bb new file mode 100644 index 0000000000..0c572eeeda --- /dev/null +++ b/packages/python/python-django_1.0.2.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Python Web framework" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "Django" +PR = "ml0" + +SRC_URI = "http://media.djangoproject.com/releases/${PV}/${SRCNAME}-${PV}-final.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}-final" + +inherit distutils + +DISTUTILS_INSTALL_ARGS = "--root=${D} --prefix=${prefix}" + +# TODO: huge package, increase granularity + +RDEPENDS_${PN} = "\ + python-email \ + python-netserver \ + python-pickle \ + python-pprint \ + python-shell \ + python-sqlite \ + python-textutils \ + python-threading \ + python-unixadmin \ + python-xml \ +" diff --git a/packages/python/python-django_1.0.bb b/packages/python/python-django_1.0.bb deleted file mode 100644 index 06816778b0..0000000000 --- a/packages/python/python-django_1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Python Web framework" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "BSD" -RDEPENDS = "python-email python-netserver python-pickle python-pprint \ - python-shell python-textutils python-threading python-unixadmin \ - python-xml" -RRECOMMENDS = "python-pysqlite2" -SRCNAME = "Django" - -SRC_URI = "http://media.djangoproject.com/releases/1.0/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -DISTUTILS_INSTALL_ARGS = "--root=${D} --prefix=${prefix}" diff --git a/packages/python/python-docutils_0.5.bb b/packages/python/python-docutils_0.5.bb index 488811e658..2fc7184b83 100644 --- a/packages/python/python-docutils_0.5.bb +++ b/packages/python/python-docutils_0.5.bb @@ -1,9 +1,10 @@ -DESCRIPTION = "text processing system" +DESCRIPTION = "Text processing system" +HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" -PR = "0" +LICENSE = "PSF" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" - S = "${WORKDIR}/docutils-${PV}" inherit distutils diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb index 1b02bf77df..9907b27262 100644 --- a/packages/python/python-ecore_svn.bb +++ b/packages/python/python-ecore_svn.bb @@ -1,8 +1,6 @@ require python-efl.inc DEPENDS += "python-evas ecore" RDEPENDS += "python-evas" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" do_stage() { distutils_stage_all diff --git a/packages/python/python-edbus_svn.bb b/packages/python/python-edbus_svn.bb index 3299cfee88..6a9b61e441 100644 --- a/packages/python/python-edbus_svn.bb +++ b/packages/python/python-edbus_svn.bb @@ -1,8 +1,6 @@ require python-efl.inc DEPENDS += "edbus python-dbus" RDEPENDS += "python-dbus" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http" S = "${WORKDIR}/python-e_dbus" diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb index 4e33847dae..5b429b4922 100644 --- a/packages/python/python-edje_svn.bb +++ b/packages/python/python-edje_svn.bb @@ -1,7 +1,5 @@ require python-efl.inc DEPENDS += "edje python-evas" RDEPENDS += "python-evas" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1" diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index f726477c32..acd1660f08 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -7,6 +7,8 @@ HOMEPAGE = "http://www.enlightenment.org" # the extension modules. DEPENDS = "python-cython-native python-pyrex-native python-numeric eina" RDEPENDS += "python-lang" +PV = "0.3.1+svnr${SRCREV}" +PR = "ml0" inherit setuptools diff --git a/packages/python/python-egenix-mx-base_3.0.0.bb b/packages/python/python-egenix-mx-base_3.1.1.bb index 8452ca6e7f..aba3a710c7 100644 --- a/packages/python/python-egenix-mx-base_3.0.0.bb +++ b/packages/python/python-egenix-mx-base_3.1.1.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "EGENIX" SRCNAME = "egenix-mx-base" -PR = "r0" +PR = "ml0" SRC_URI = "http://downloads.egenix.com/python/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-elementary_svn.bb b/packages/python/python-elementary_svn.bb index 409bd8c6cc..44c5613edf 100644 --- a/packages/python/python-elementary_svn.bb +++ b/packages/python/python-elementary_svn.bb @@ -1,8 +1,8 @@ require python-efl.inc DEPENDS += "elementary" RDEPENDS += "python-evas python-ecore python-edje" -PV = "0.0.0+svnr${SRCREV}" -PR = "r0" +PV = "0.1+svnr${SRCREV}" +PR = "ml0" do_stage() { distutils_stage_all diff --git a/packages/python/python-emotion_svn.bb b/packages/python/python-emotion_svn.bb index ceb60870eb..9a9628ef50 100644 --- a/packages/python/python-emotion_svn.bb +++ b/packages/python/python-emotion_svn.bb @@ -1,5 +1,3 @@ require python-efl.inc DEPENDS += "emotion python-evas" RDEPENDS += "python-ecore" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" diff --git a/packages/python/python-epsilon_svn.bb b/packages/python/python-epsilon_svn.bb index 00fbcf5ce6..97b06609c1 100644 --- a/packages/python/python-epsilon_svn.bb +++ b/packages/python/python-epsilon_svn.bb @@ -1,5 +1,4 @@ require python-efl.inc DEPENDS += "epsilon python-ecore" RDEPENDS += "python-ecore" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" + diff --git a/packages/python/python-etk_svn.bb b/packages/python/python-etk_svn.bb index 14d530911f..90e06ac8b3 100644 --- a/packages/python/python-etk_svn.bb +++ b/packages/python/python-etk_svn.bb @@ -1,8 +1,8 @@ require python-efl.inc DEPENDS += "etk" RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk-themes" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" +PV = "0.1.1+svnr${SRCREV}" +PR = "ml0" do_stage() { distutils_stage_all diff --git a/packages/python/python-evas_svn.bb b/packages/python/python-evas_svn.bb index 6f53bf7e8d..8a95b4418c 100644 --- a/packages/python/python-evas_svn.bb +++ b/packages/python/python-evas_svn.bb @@ -1,7 +1,5 @@ require python-efl.inc DEPENDS += "evas" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" do_stage() { distutils_stage_all diff --git a/packages/python/python-fam_1.1.1.bb b/packages/python/python-fam_1.1.1.bb index cf74265aa3..0a49402973 100644 --- a/packages/python/python-fam_1.1.1.bb +++ b/packages/python/python-fam_1.1.1.bb @@ -4,9 +4,11 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "fam" -RDEPENDS = "fam python-core python-io" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" inherit distutils +RDEPENDS = "fam python-core python-io" + diff --git a/packages/python/python-flup_1.0.bb b/packages/python/python-flup_1.0.1.bb index 963c1ca6c2..d5f865da11 100644 --- a/packages/python/python-flup_1.0.bb +++ b/packages/python/python-flup_1.0.1.bb @@ -3,6 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "BSD" SRCNAME = "flup" +PR = "ml0" SRC_URI = "http://pypi.python.org/packages/source/f/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-fnorb_1.3.bb b/packages/python/python-fnorb_1.3.bb index dffe42e47f..e6844de81f 100644 --- a/packages/python/python-fnorb_1.3.bb +++ b/packages/python/python-fnorb_1.3.bb @@ -1,11 +1,16 @@ -DESCRIPTION = "A Pure Python CORBA Package" +DESCRIPTION = "A Pure Python CORBA 2.0 Package" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "FNORB" SRCNAME = "Fnorb" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/fnorb/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils +do_install_append() { + mv -f ${D}/usr/share/share/* ${D}/usr/share/ + rm -rf ${D}/usr/share/share/ +} diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_1.2.1.bb index 97dd5be64b..99d0537e78 100644 --- a/packages/python/python-formencode_svn.bb +++ b/packages/python/python-formencode_1.2.1.bb @@ -2,13 +2,10 @@ DESCRIPTION = "HTML form validation, generation, and conversion package" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "sqlite3" SRCNAME = "FormEncode" -PV = "0.4+svnr${SRCREV}" -PR = "ml1" +PR = "ml0" inherit setuptools -SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http" - -S = "${WORKDIR}/trunk" +SRC_URI = "http://pypi.python.org/packages/source/F/FormEncode/FormEncode-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-fpconst_0.6.0.bb b/packages/python/python-fpconst_0.7.2.bb index 8a359adb4f..13e2377e02 100644 --- a/packages/python/python-fpconst_0.6.0.bb +++ b/packages/python/python-fpconst_0.7.2.bb @@ -7,8 +7,9 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "fpconst" +PR = "ml0" -SRC_URI = "http://ftp.iasi.roedu.net/mirrors/gentoo.org/distfiles/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "http://pypi.python.org/packages/source/f/fpconst/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils diff --git a/packages/python/python-fugrep_0.50.bb b/packages/python/python-fugrep_0.50.bb index 150cb84130..9df257388d 100644 --- a/packages/python/python-fugrep_0.50.bb +++ b/packages/python/python-fugrep_0.50.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.j-raedler.de/pages/software/fugrep.php" SECTION = "devel/python" LICENSE = "${PN}" SRCNAME = "FuGrep" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.j-raedler.de/media/Software/FuGrep-${PV}.zip" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-fuse_cvs.bb b/packages/python/python-fuse_0.2.bb index d017e28536..099a0e386a 100644 --- a/packages/python/python-fuse_cvs.bb +++ b/packages/python/python-fuse_0.2.bb @@ -1,15 +1,13 @@ DESCRIPTION = "FUSE Python bindings." +SECTION = "devel/python" LICENSE = "GPLv2" DEPENDS = "fuse" +SRCNAME = "fuse-python" +PR = "ml0" -PV = "0.0+cvs${SRCDATE}" - -PR = "r1" - -SRC_URI = "cvs://anonymous@fuse.cvs.sourceforge.net/cvsroot/fuse;module=python" +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils -S = "${WORKDIR}/python" - FILES_${PN}-dbg += "${libdir}/python*/site-packages/fuseparts/.debu*" diff --git a/packages/python/python-fusil_1.1.bb b/packages/python/python-fusil_1.1.bb index f6ec3d8d6d..f67612eb45 100644 --- a/packages/python/python-fusil_1.1.bb +++ b/packages/python/python-fusil_1.1.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://fusil.hachoir.org/" SECTION = "devel/python" LICENSE = "GPLv2" SRCNAME = "fusil" +PR = "r1" SRC_URI = "http://pypi.python.org/packages/source/f/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-gammu_0.26.bb b/packages/python/python-gammu_0.26.bb index f8989d9181..13e5484171 100644 --- a/packages/python/python-gammu_0.26.bb +++ b/packages/python/python-gammu_0.26.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cihar.com/gammu/python" SECTION = "devel/python" DEPENDS = "gammu" LICENSE = "GPL" -PR = "ml0" +PR = "ml1" SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" diff --git a/packages/python/python-gmpy_1.0.1.bb b/packages/python/python-gmpy_1.0.1.bb index b216836785..a5f064261b 100644 --- a/packages/python/python-gmpy_1.0.1.bb +++ b/packages/python/python-gmpy_1.0.1.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gmp" SRCNAME = "gmpy" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-sources-101.zip" S = "${WORKDIR}/${SRCNAME}" diff --git a/packages/python/python-gnosis_1.2.2.bb b/packages/python/python-gnosis_1.2.2.bb index e5a4f0056f..c4ee333990 100644 --- a/packages/python/python-gnosis_1.2.2.bb +++ b/packages/python/python-gnosis_1.2.2.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPLv2" SRCNAME = "Gnosis_Utils" -PR = "ml0" +PR = "ml1" SRC_URI = "http://gnosis.cx/download/Gnosis_Utils.More/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-gsmd_svn.bb b/packages/python/python-gsmd_svn.bb deleted file mode 100644 index 927dff01d4..0000000000 --- a/packages/python/python-gsmd_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Python bindings for the libgsmd" -SRCNAME = "python-gsmd" -AUTHOR = "Sudharshan S" -SECTION = "devel/python" -LICENSE = "LGPL" -DEPENDS = "libgsmd" -PV = "0.02+svnr${SRCREV}" -PR = "r0" - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/python-openmoko/trunk;module=python-gsmd;proto=http" -S = "${WORKDIR}/python-gsmd" - -inherit distutils diff --git a/packages/python/python-gst_0.10.10.bb b/packages/python/python-gst_0.10.10.bb index ea2b10095a..faef7cb5f1 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 = "ml2" +PR = "ml3" SRC_URI = "\ http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ @@ -33,4 +33,3 @@ FILES_${PN}-dev += "\ " 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-hmm_0.4.bb b/packages/python/python-hmm_0.4.bb deleted file mode 100644 index b5f75b42c2..0000000000 --- a/packages/python/python-hmm_0.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -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." -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-numeric" -DEPENDS = "python-numeric" -SRCNAME = "hmm" - -SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - diff --git a/packages/python/python-imaging_1.1.6.bb b/packages/python/python-imaging_1.1.6.bb index 9f3b6323dd..03e0330e1c 100644 --- a/packages/python/python-imaging_1.1.6.bb +++ b/packages/python/python-imaging_1.1.6.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "freetype jpeg tiff" RDEPENDS = "python-lang python-stringold" SRCNAME = "Imaging" -PR = "ml0" +PR = "ml1" SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ file://path.patch;patch=1" diff --git a/packages/python/python-imdbpy_3.1.bb b/packages/python/python-imdby_3.9.bb index 72d30fb89b..72d30fb89b 100644 --- a/packages/python/python-imdbpy_3.1.bb +++ b/packages/python/python-imdby_3.9.bb diff --git a/packages/python/python-inotify_0.1.0.bb b/packages/python/python-inotify_0.1.0.bb index 941194abd6..13031d31a7 100644 --- a/packages/python/python-inotify_0.1.0.bb +++ b/packages/python/python-inotify_0.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Python Linux Inotify Wrapper" SECTION = "devel/python" HOMEPAGE = "http://rudd-o.com/projects/python-inotify/" LICENSE = "GPL" -PR = "ml0" +PR = "ml1" SRC_URI = "http://rudd-o.com/wp-content/uploads/projects/files/python-inotify/python-inotify-${PV}.tar.gz" diff --git a/packages/python/python-irclib_0.4.6.bb b/packages/python/python-irclib_0.4.6.bb index 5e274c2c1e..e416156e92 100644 --- a/packages/python/python-irclib_0.4.6.bb +++ b/packages/python/python-irclib_0.4.6.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" HOMEPAGE = "http://python-irclib.sourceforge.net/" PRIORITY = "optional" LICENSE = "LGPL" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/python-irclib/python-irclib-${PV}.tar.gz" diff --git a/packages/python/python-libgmail_0.1.6.bb b/packages/python/python-libgmail_0.1.11.bb index aeb08113ea..b0fcb1f83f 100644 --- a/packages/python/python-libgmail_0.1.6.bb +++ b/packages/python/python-libgmail_0.1.11.bb @@ -3,7 +3,6 @@ SECTION = "devel/python" HOMEPAGE = "http://libgmail.sourceforge.net/" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "python-core python-netclient python-email python-mime python-pprint python-re python-pickle" SRCNAME = "libgmail" PR = "ml0" @@ -19,3 +18,14 @@ do_install() { install -m 0755 ${file} ${D}${libdir}/${PYTHON_DIR} done } + +RDEPENDS = "\ + python-core \ + python-netclient \ + python-email \ + python-mime \ + python-pprint \ + python-re \ + python-pickle \ +" + diff --git a/packages/python/python-logilab-common_0.9.3.bb b/packages/python/python-logilab-common_0.37.1.bb index 87c9a25f53..1f8c41e883 100644 --- a/packages/python/python-logilab-common_0.9.3.bb +++ b/packages/python/python-logilab-common_0.37.1.bb @@ -1,17 +1,14 @@ 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." +command line argument parsing, logging, and process daemonization." SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" -SRCNAME = "common" +SRCNAME = "logilab-common" PR = "ml0" -SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz \ - file://fix-future-in-setup.patch;patch=1" +SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils - diff --git a/packages/python/python-m2crypto_0.18.2.bb b/packages/python/python-m2crypto_0.18.2.bb index c83a2ec076..fb11aa0890 100644 --- a/packages/python/python-m2crypto_0.18.2.bb +++ b/packages/python/python-m2crypto_0.18.2.bb @@ -4,15 +4,16 @@ PRIORITY = "optional" DEPENDS = "openssl swig-native" LICENSE = "BSD" SRCNAME = "M2Crypto" -PR = "ml0" +PR = "ml1" -SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \ - file://install.patch;patch=1" +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}" - +export STAGING_DIR +export STAGING_INCDIR +export STAGING_LIBDIR diff --git a/packages/python/python-mad_0.6.bb b/packages/python/python-mad_0.6.bb index e62b8c88d6..7ae43779e9 100644 --- a/packages/python/python-mad_0.6.bb +++ b/packages/python/python-mad_0.6.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libmad" SRCNAME = "pymad" -PR = "ml0" +PR = "ml1" SRC_URI = "http://spacepants.org/src/pymad/download/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-mako_0.2.2.bb b/packages/python/python-mako_0.2.2.bb index 718e58a09b..6b1b9595af 100644 --- a/packages/python/python-mako_0.2.2.bb +++ b/packages/python/python-mako_0.2.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "MIT" HOMEPAGE = "http://www.makotemplates.org/" SRCNAME = "Mako" -PR = "ml0" +PR = "ml1" SRC_URI = "http://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb deleted file mode 100644 index 6be228ab86..0000000000 --- a/packages/python/python-native_2.5.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "The Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -DEPENDS = "openssl-native bzip2-full-native zlib-native" -SECTION = "devel/python" -PRIORITY = "optional" -PR = "ml6" - -EXCLUDE_FROM_WORLD = "1" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1 \ - file://dont-modify-shebang-line.patch;patch=1 \ - file://default-is-optimized.patch;patch=1 \ - file://catchup-with-swig.patch;patch=1 \ - file://fix-staging.patch;patch=1 \ -" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools native - -prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ - --without-cxx --with-signal-module --with-wctype-functions" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE}' - -do_stage_append() { - install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ -} diff --git a/packages/python/python-netfilter_0.5.4.bb b/packages/python/python-netfilter_0.5.5.bb index 5468245a6b..17f3aaada0 100644 --- a/packages/python/python-netfilter_0.5.4.bb +++ b/packages/python/python-netfilter_0.5.5.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "iptables iptables-utils python-logging python-shell python-subprocess" SRCNAME = "python-netfilter" +PR = "ml0" SRC_URI = "http://opensource.bolloretelecom.eu/files/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-numarray_1.1.1.bb b/packages/python/python-numarray_1.1.1.bb index e4ff40849f..4e02294ebc 100644 --- a/packages/python/python-numarray_1.1.1.bb +++ b/packages/python/python-numarray_1.1.1.bb @@ -3,12 +3,11 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PYRAF" SRCNAME = "numarray" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils -# *sigh* FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/numarray/examples/*/.debug" diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb index bd6934d711..eab7371a1c 100644 --- a/packages/python/python-numeric_23.7.bb +++ b/packages/python/python-numeric_23.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \ file://no-lapack.patch;patch=1" diff --git a/packages/python/python-ogg_1.3.bb b/packages/python/python-ogg_1.3.bb index 0a0e89b96e..d2d1d9e2ba 100644 --- a/packages/python/python-ogg_1.3.bb +++ b/packages/python/python-ogg_1.3.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libogg" SRCNAME = "pyogg" +PR = "r1" SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-opendir_1.0.bb b/packages/python/python-opendir_1.0.bb index 88f22a1d9a..324f5aca2a 100644 --- a/packages/python/python-opendir_1.0.bb +++ b/packages/python/python-opendir_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "PD" HOMEPAGE = "http://rabenfrost.net/mokopedia/opendir/" DEPENDS = "python-pyrex-native python-cython-native" -PR = "ml0" +PR = "ml1" SRC_URI = "\ file://opendir.pyx \ diff --git a/packages/python/python-openmoko/python-path.patch b/packages/python/python-openmoko/python-path.patch deleted file mode 100644 index f43260cd0e..0000000000 --- a/packages/python/python-openmoko/python-path.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- python.orig/m4/python.m4 -+++ python/m4/python.m4 -@@ -43,12 +43,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-openmoko_0.1.bb b/packages/python/python-openmoko_0.1.bb deleted file mode 100644 index b55794598a..0000000000 --- a/packages/python/python-openmoko_0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Python Bindings for the Openmoko Platform" -AUTHOR = "Holger 'Zecke' Freyther" -LICENSE = "LGPL" -DEPENDS = "python-pygtk libmokoui2 libmokojournal2 libmokogsmd2" -SECTION = "devel/python" -PR = "r1" - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/bindings;module=python;proto=http \ - file://python-path.patch;patch=1;maxdate=20070829" - -S = "${WORKDIR}/python" - -inherit autotools distutils-base - -EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" diff --git a/packages/python/python-pexpect_2.1.bb b/packages/python/python-pexpect_2.3.bb index ae0fa2aabf..2195d8d5eb 100644 --- a/packages/python/python-pexpect_2.1.bb +++ b/packages/python/python-pexpect_2.3.bb @@ -2,10 +2,19 @@ DESCRIPTION = "A Pure Python Expect like Module for Python" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" -RDEPENDS = "python-core python-io python-terminal python-resource python-fcntl" SRCNAME = "pexpect" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +RDEPENDS = "\ + python-core \ + python-io \ + python-terminal \ + python-resource \ + python-fcntl \ +" + diff --git a/packages/python/python-ptrace_0.3.2.bb b/packages/python/python-ptrace_0.3.2.bb deleted file mode 100644 index a039476c39..0000000000 --- a/packages/python/python-ptrace_0.3.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "python-ptrace is a debugger using ptrace." -HOMEPAGE = "http://fusil.hachoir.org/trac/wiki/python-ptrace" -SECTION = "devel/python" -LICENSE = "GPLv2" -PR = "ml0" - -SRC_URI = "http://pypi.python.org/packages/source/p/ptrace/ptrace-${PV}.tar.gz" -S = "${WORKDIR}/ptrace-${PV}" - -inherit distutils diff --git a/packages/python/python-ptrace_0.5.bb b/packages/python/python-ptrace_0.5.bb new file mode 100644 index 0000000000..55ec70f9dd --- /dev/null +++ b/packages/python/python-ptrace_0.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "python-ptrace is a debugger using ptrace." +HOMEPAGE = "http://python-ptrace.hachoir.org/trac" +SECTION = "devel/python" +LICENSE = "GPLv2" +PR = "ml0" + +SRC_URI = "http://pypi.python.org/packages/source/p/python-ptrace/python-ptrace-${PV}.tar.gz" + +inherit distutils diff --git a/packages/python/python-pyalsa_1.0.16.bb b/packages/python/python-pyalsa_1.0.16.bb index f98e144c75..24bd27c242 100644 --- a/packages/python/python-pyalsa_1.0.16.bb +++ b/packages/python/python-pyalsa_1.0.16.bb @@ -4,7 +4,7 @@ DEPENDS = "alsa-lib" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "pyalsa" -PR = "ml0" +PR = "ml1" SRC_URI = "ftp://ftp.alsa-project.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyalsaaudio_0.3.bb b/packages/python/python-pyalsaaudio_0.4.bb index 42b15ce5be..42b15ce5be 100644 --- a/packages/python/python-pyalsaaudio_0.3.bb +++ b/packages/python/python-pyalsaaudio_0.4.bb diff --git a/packages/python/python-pybluez_0.13.bb b/packages/python/python-pybluez_0.13.bb deleted file mode 100644 index 2e7e282ddc..0000000000 --- a/packages/python/python-pybluez_0.13.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python bindings for the Linux Bluetooth stack" -SECTION = "devel/python" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "ml0" - -SRC_URI = "http://org.csail.mit.edu/pybluez/release/pybluez-src-${PV}.tar.gz" -S = "${WORKDIR}/pybluez-${PV}" - -inherit distutils diff --git a/packages/python/python-pybluez_0.10.bb b/packages/python/python-pybluez_0.15.bb index 2e7e282ddc..17ffd385fc 100644 --- a/packages/python/python-pybluez_0.10.bb +++ b/packages/python/python-pybluez_0.15.bb @@ -4,7 +4,7 @@ DEPENDS = "bluez-libs" LICENSE = "GPL" PR = "ml0" -SRC_URI = "http://org.csail.mit.edu/pybluez/release/pybluez-src-${PV}.tar.gz" -S = "${WORKDIR}/pybluez-${PV}" +SRC_URI = "http://pybluez.googlecode.com/files/PyBluez-0.15.tar.gz" +S = "${WORKDIR}/PyBluez-${PV}" inherit distutils diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb index bd3c1a7aa0..db628a5b0e 100644 --- a/packages/python/python-pycairo_1.4.0.bb +++ b/packages/python/python-pycairo_1.4.0.bb @@ -3,7 +3,7 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" -PR = "ml2" +PR = "ml3" SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ file://fix-setup-py.patch;patch=1" diff --git a/packages/python/python-pycairo_1.8.0.bb b/packages/python/python-pycairo_1.8.0.bb new file mode 100644 index 0000000000..fdcb6521f9 --- /dev/null +++ b/packages/python/python-pycairo_1.8.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Python Bindings for the Cairo canvas library" +SECTION = "python-devel" +HOMEPAGE = "http://cairographics.org/pycairo" +LICENSE = "LGPL MPL" +# cairo >= 1.8.0 +DEPENDS = "cairo" +PR = "ml0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ + file://fix-setup-py.patch;patch=1" +S = "${WORKDIR}/pycairo-${PV}" + +inherit distutils pkgconfig + +do_configure_append() { + sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc +} + +do_stage() { + install -d ${STAGING_INCDIR} + install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} +} diff --git a/packages/python/python-pycap_0.1.6.bb b/packages/python/python-pycap_0.1.6.bb index 2857ab98ac..63e19a4399 100644 --- a/packages/python/python-pycap_0.1.6.bb +++ b/packages/python/python-pycap_0.1.6.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" RDEPENDS = "python-core" DEPENDS = "libpcap libnet" SRCNAME = "pycap" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pychecker_0.8.17.bb b/packages/python/python-pychecker_0.8.18.bb index 1b39b588ce..1b39b588ce 100644 --- a/packages/python/python-pychecker_0.8.17.bb +++ b/packages/python/python-pychecker_0.8.18.bb diff --git a/packages/python/python-pycodes_1.2.bb b/packages/python/python-pycodes_1.2.bb index 6cf94a6902..ce2cb17594 100644 --- a/packages/python/python-pycodes_1.2.bb +++ b/packages/python/python-pycodes_1.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://web.mit.edu/~emin/www/source_code/pycodes/index.html" PRIORITY = "optional" LICENSE = "PYCODES" SRCNAME = "pycodes" -PR = "ml0" +PR = "ml1" SRC_URI = "http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-2.tar.gz \ file://no-docs.patch;patch=1" diff --git a/packages/python/python-pycrypto_2.0.1.bb b/packages/python/python-pycrypto_2.0.1.bb index 4a58b6930e..7300bbd60b 100644 --- a/packages/python/python-pycrypto_2.0.1.bb +++ b/packages/python/python-pycrypto_2.0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "gmp" SRCNAME = "pycrypto" LICENSE = "pycrypto" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pycurl_7.18.2.bb b/packages/python/python-pycurl_7.18.2.bb index 406add10c8..5105e90cf5 100644 --- a/packages/python/python-pycurl_7.18.2.bb +++ b/packages/python/python-pycurl_7.18.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "curl-${PV}" SRCNAME = "pycurl" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \ diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb deleted file mode 100644 index e730f0f8ba..0000000000 --- a/packages/python/python-pydirectfb_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "DirectFB Bindings" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "directfb" -SRCNAME = "pydirectfb" -PV = "0.0.0+cvs${SRCDATE}" -PR = "ml0" - -SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \ - file://fix-directfb-detection.patch;patch=1" -S = "${WORKDIR}/${SRCNAME}" - -inherit distutils - diff --git a/packages/python/python-pyephem_3.7.2a.bb b/packages/python/python-pyephem_3.7.3.3.bb index c5d3e111a8..885f285225 100644 --- a/packages/python/python-pyephem_3.7.2a.bb +++ b/packages/python/python-pyephem_3.7.3.3.bb @@ -5,8 +5,7 @@ LICENSE = "PSF" AUTHOR = "Brandon Craig Rhodes" PR = "ml0" -SRC_URI = "http://www.rhodesmill.org/brandon/projects/pyephem-${PV}.tar.gz" +SRC_URI = "http://pypi.python.org/packages/source/p/pyephem/pyephem-${PV}.tar.gz" S = "${WORKDIR}/pyephem-${PV}" inherit distutils - diff --git a/packages/python/python-pyfits_1.1.bb b/packages/python/python-pyfits_1.3.bb index 9eb3d63969..cc874e1394 100644 --- a/packages/python/python-pyfits_1.1.bb +++ b/packages/python/python-pyfits_1.3.bb @@ -1,13 +1,12 @@ DESCRIPTION = "PyFITS provides an interface to FITS formatted files under the Python scripting language." HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits" AUTHOR = "Space Telescope Science Institute" -# Warning: pyfits will require python-numpy in 2008 -RDEPENDS = "python-numarray" +RDEPENDS = "python-numpy" SECTION = "devel/python" LICENSE = "AURA" PR = "ml0" SRC_URI = "http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-${PV}.tar.gz" -S = "${WORKDIR}/pyfits" +S = "${WORKDIR}/pyfits-${PV}" inherit distutils diff --git a/packages/python/python-pyflakes_0.2.1.bb b/packages/python/python-pyflakes_0.2.1.bb index 306c6d64e9..8be6d54478 100644 --- a/packages/python/python-pyflakes_0.2.1.bb +++ b/packages/python/python-pyflakes_0.2.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://divmod.org/projects/pyflakes" PRIORITY = "optional" LICENSE = "BSD" SRCNAME = "pyflakes" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb index 5ce4ea6fff..95191ce350 100644 --- a/packages/python/python-pygame_1.8.1.bb +++ b/packages/python/python-pygame_1.8.1.bb @@ -5,11 +5,12 @@ LICENSE = "LGPL" DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}" SRCNAME = "pygame" -PR = "ml3" +PR = "ml4" SRC_URI = "\ ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \ - file://Setup" + file://Setup \ +" S = "${WORKDIR}/${SRCNAME}-${PV}release" inherit distutils diff --git a/packages/python/python-pygobject_2.14.2.bb b/packages/python/python-pygobject_2.14.2.bb index 87623c39c0..ed64a37645 100644 --- a/packages/python/python-pygobject_2.14.2.bb +++ b/packages/python/python-pygobject_2.14.2.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" LICENSE = "LGPL" DEPENDS = "python-pygobject-native" PE = "1" -PR = "r2" +PR = "r3" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" diff --git a/packages/python/python-pygobject_2.15.4.bb b/packages/python/python-pygobject_2.16.0.bb index 95b226a4d7..af581f1c81 100644 --- a/packages/python/python-pygobject_2.15.4.bb +++ b/packages/python/python-pygobject_2.16.0.bb @@ -4,6 +4,8 @@ LICENSE = "LGPL" DEPENDS = "python-pygobject-native" PR = "ml0" +DEFAULT_PREFERENCE = "-1" + MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "\ @@ -17,8 +19,8 @@ FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files" inherit autotools distutils-base pkgconfig # necessary to let the call for python-config succeed -export BUILD_SYS := "${BUILD_SYS}" -export HOST_SYS := "${HOST_SYS}" +export BUILD_SYS +export HOST_SYS do_stage() { autotools_stage_all diff --git a/packages/python/python-pygoogle_0.6.bb b/packages/python/python-pygoogle_0.6.bb index 2682d4ffd8..e3dee68706 100644 --- a/packages/python/python-pygoogle_0.6.bb +++ b/packages/python/python-pygoogle_0.6.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" LICENSE = "PSF" RDEPENDS = "python-soappy" SRCNAME = "pygoogle" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb index a974a2471d..502c4cde39 100644 --- a/packages/python/python-pygtk-1.2_0.6.12.bb +++ b/packages/python/python-pygtk-1.2_0.6.12.bb @@ -5,20 +5,17 @@ LICENSE = "LGPL" DEPENDS = "gtk+-1.2" RDEPENDS = "python-shell python-re" SRCNAME = "pygtk" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \ file://remove-imlib-et-al.patch;patch=1 \ file://acinclude.m4" - S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools pkgconfig distutils-base EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" -#FILES_${PN} = "${libdir}/${PYTHON_DIR}/" - do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ echo ${LDFLAGS} > /tmp/ldflags diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 87f31cbc58..3f0e593c98 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -6,7 +6,7 @@ RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml9" +PR = "ml10" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ diff --git a/packages/python/python-pygtk_2.6.3.bb b/packages/python/python-pygtk_2.6.3.bb index 7856e196e2..01c50f9a52 100644 --- a/packages/python/python-pygtk_2.6.3.bb +++ b/packages/python/python-pygtk_2.6.3.bb @@ -4,7 +4,7 @@ DEPENDS = "gtk+-2.6.10 libglade" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml0" +PR = "ml1" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ diff --git a/packages/python/python-pygtk_2.8.6.bb b/packages/python/python-pygtk_2.8.6.bb index 9f602e7200..4e7e22b159 100644 --- a/packages/python/python-pygtk_2.8.6.bb +++ b/packages/python/python-pygtk_2.8.6.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk+-2.8.16 libglade" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "r1" +PR = "r2" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ diff --git a/packages/python/python-pyid3lib_0.5.1.bb b/packages/python/python-pyid3lib_0.5.1.bb index 0eeca38d2d..bf7e3d0a2f 100644 --- a/packages/python/python-pyid3lib_0.5.1.bb +++ b/packages/python/python-pyid3lib_0.5.1.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "id3lib" SRCNAME = "pyid3lib" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/pyid3lib/${SRCNAME}-${PV}.tar.bz2" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyiw_0.3.3.bb b/packages/python/python-pyiw_0.3.3.bb deleted file mode 100644 index aaa18c7ee9..0000000000 --- a/packages/python/python-pyiw_0.3.3.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "PyIW is a simple Python extension module written in C \ -that interfaces with libiw and provides a very 'pythonic' API to programmers." -HOMEPAGE = "http://www.emperorlinux.com/etc/contrib/?page=pyiw" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "wireless-tools" -RDEPENDS = "python-core" -PR = "ml0" - -inherit autotools pkgconfig distutils-base - -CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}" - -SRC_URI = "http://downloads.emperorlinux.com/contrib/pyiw/pyiw-${PV}.tbz2 \ - file://Makefile" -S = "${WORKDIR}/pyiw-${PV}" - -do_unpack_real () { - tar jxvf ${DL_DIR}/pyiw-${PV}.tbz2 - cp Makefile pyiw-${PV}/ -} -do_unpack_real[dirs] = "${WORKDIR}" -addtask unpack_real before do_patch after do_unpack - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install -m 0755 pyiw.so ${D}${libdir}/${PYTHON_DIR}/site-packages/pyiw.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/pyiw.so" diff --git a/packages/python/python-pylinda_0.6.bb b/packages/python/python-pylinda_0.6.bb index 082f74ac47..3c7124f2ac 100644 --- a/packages/python/python-pylinda_0.6.bb +++ b/packages/python/python-pylinda_0.6.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www-users.cs.york.ac.uk/~aw/pylinda/" PRIORITY = "optional" LICENSE = "LGPL" SRCNAME = "linda" +PR = "r1" SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-${PV}.tar.gz \ file://honor-datadir.patch;patch=1" diff --git a/packages/python/python-pylint_0.13.2.bb b/packages/python/python-pylint_0.15.2.bb index d0640607f0..d0640607f0 100644 --- a/packages/python/python-pylint_0.13.2.bb +++ b/packages/python/python-pylint_0.15.2.bb diff --git a/packages/python/python-pylirc_0.0.5.bb b/packages/python/python-pylirc_0.0.5.bb index fc5e8af430..5760c7682d 100644 --- a/packages/python/python-pylirc_0.0.5.bb +++ b/packages/python/python-pylirc_0.0.5.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "lirc" LICENSE = "LGPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/pylirc/pylirc-${PV}.tar.gz" S = "${WORKDIR}/pylirc-${PV}" diff --git a/packages/python/python-pymetar_0.11.bb b/packages/python/python-pymetar_0.14.bb index a73a17e516..a22404dd21 100644 --- a/packages/python/python-pymetar_0.11.bb +++ b/packages/python/python-pymetar_0.14.bb @@ -2,10 +2,14 @@ DESCRIPTION = "Access NOAA's METAR weather reports" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "python-core" SRCNAME = "pymetar" +PR = "ml0" SRC_URI = "http://www.schwarzvogel.de/pkgs/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +do_install_append() { + mv -f ${D}/${datadir}/share/* ${D}/${datadir}/ +} diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb index a6d205dd5d..371c662098 100644 --- a/packages/python/python-pymp3_0.3.4.bb +++ b/packages/python/python-pymp3_0.3.4.bb @@ -3,15 +3,16 @@ SECTION = "console/multimedia" PRIORITY = "optional" RDEPENDS = "python-core python-curses python-pyid3lib python-mad python-ao" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz" S = "${WORKDIR}/PyMP3-0.3.4" +inherit distutils-base + PY_FILES = "box_info.py layer.py sound_ctrl.py stack.py txt_tools.py" do_install() { - install -d ${D}${libdir} install -d ${D}${libdir}/${PYTHON_DIR} install -d ${D}${libdir}/${PYTHON_DIR}/site-packages diff --git a/packages/python/python-pyode_1.2.0.bb b/packages/python/python-pyode_1.2.0.bb index 3c67db9fe5..be4b38acd5 100644 --- a/packages/python/python-pyode_1.2.0.bb +++ b/packages/python/python-pyode_1.2.0.bb @@ -5,6 +5,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "ode" SRCNAME = "PyODE" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \ file://install.patch;patch=1" diff --git a/packages/python/python-pyopenssl_0.6.bb b/packages/python/python-pyopenssl_0.8.bb index f3e6835a24..b89d68f00d 100644 --- a/packages/python/python-pyopenssl_0.6.bb +++ b/packages/python/python-pyopenssl_0.8.bb @@ -4,9 +4,12 @@ PRIORITY = "optional" LICENSE = "LGPL" SRCNAME = "pyOpenSSL" DEPENDS = "openssl" -RDEPENDS = "python-threading" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +RDEPENDS = "python-threading" + diff --git a/packages/python/python-pyqt_4.4.3.bb b/packages/python/python-pyqt_4.4.3.bb index 0758cc5039..08a8fc6683 100644 --- a/packages/python/python-pyqt_4.4.3.bb +++ b/packages/python/python-pyqt_4.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "sip-native python-sip" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml3" +PR = "ml4" PYQT_OE_VERSION = "Qt_4_4_1" diff --git a/packages/python/python-pyrad_0.8.bb b/packages/python/python-pyrad_0.8.bb deleted file mode 100644 index 6e5e08bb77..0000000000 --- a/packages/python/python-pyrad_0.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python Radius Client and Server" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "BSD" -SRCNAME = "pyrad" - -SRC_URI = "http://www.wiggy.net/files/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils diff --git a/packages/python/python-pyrad_1.1.bb b/packages/python/python-pyrad_1.1.bb index 9b452d9b0f..a6b8e15fb3 100644 --- a/packages/python/python-pyrad_1.1.bb +++ b/packages/python/python-pyrad_1.1.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "BSD" RDEPENDS = "python-crypt" SRCNAME = "pyrad" +PR = "r1" SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyraf_1.4.bb b/packages/python/python-pyraf_1.7.bb index af267cfa9e..d5f92e6c3e 100644 --- a/packages/python/python-pyraf_1.4.bb +++ b/packages/python/python-pyraf_1.7.bb @@ -1,13 +1,14 @@ DESCRIPTION = "PyRAF is a Python-based interface to IRAF." -HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits" +HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyraf" AUTHOR = "Space Telescope Science Institute" -RDEPENDS = "python-numarray" SECTION = "devel/python" LICENSE = "AURA" PR = "ml0" -SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/v2.5/pyraf-${PV}.tar.gz" -S = "${WORKDIR}/pyraf" +SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/release/pyraf-${PV}.tar.gz" +S = "${WORKDIR}/pyraf-${PV}" inherit distutils +RDEPENDS = "python-numarray" + diff --git a/packages/python/python-pyreverse_0.5.2.bb b/packages/python/python-pyreverse_0.5.2.bb deleted file mode 100644 index 9194df5a4a..0000000000 --- a/packages/python/python-pyreverse_0.5.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -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." -SECTION = "devel/python" -HOMEPAGE = "http://www.logilab.org/2560" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core python-logilab-common python-pyxml" -SRCNAME = "pyreverse" -PR = "ml0" - -SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - file://fix-future.patch;patch=1" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils diff --git a/packages/python/python-pyrex-native_0.9.8.4.bb b/packages/python/python-pyrex-native_0.9.8.5.bb index 4405212040..4405212040 100644 --- a/packages/python/python-pyrex-native_0.9.8.4.bb +++ b/packages/python/python-pyrex-native_0.9.8.5.bb diff --git a/packages/python/python-pyrex_0.9.8.4.bb b/packages/python/python-pyrex_0.9.8.5.bb index 318c6cfe42..94db79341e 100644 --- a/packages/python/python-pyrex_0.9.8.4.bb +++ b/packages/python/python-pyrex_0.9.8.5.bb @@ -5,13 +5,12 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "Pyrex" -PR = "ml2" +PR = "ml0" SRC_URI = "\ http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ file://pyrex-fix-optimized-mode.patch;patch=1 \ " - S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils diff --git a/packages/python/python-pyro_3.7.bb b/packages/python/python-pyro_3.8.1.bb index 80875af5c5..695d8fb7aa 100644 --- a/packages/python/python-pyro_3.7.bb +++ b/packages/python/python-pyro_3.8.1.bb @@ -6,12 +6,26 @@ HOMEPAGE = "http://pyro.sourceforge.net" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -RDEPENDS = "python-crypt python-io python-lang python-math python-netserver python-pickle \ -python-re python-shell python-stringold python-threading" PR = "ml0" -SRC_URI = "cvs://anonymous:@pyro.cvs.sourceforge.net/cvsroot/pyro;module=Pyro;method=pserver;tag=pyro3_7 \ - file://pyro-unattended-install.patch;patch=1;pnum=0" -S="${WORKDIR}/Pyro" +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pyro/Pyro-${PV}.tar.gz \ + file://pyro-unattended-install.patch;patch=1;pnum=0 \ +" +S = "${WORKDIR}/Pyro-${PV}" inherit distutils + +RDEPENDS = "\ + python-crypt \ + python-io \ + python-lang \ + python-math \ + python-netserver \ + python-pickle \ + python-re \ + python-shell \ + python-stringold \ + python-threading \ +" + diff --git a/packages/python/python-pyrtc_git.bb b/packages/python/python-pyrtc_git.bb index e8532711af..af3bcfd5e4 100644 --- a/packages/python/python-pyrtc_git.bb +++ b/packages/python/python-pyrtc_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" SRCNAME = "pyrtc" DEPENDS = "python-cython-native" PV = "1.0.0+gitr${SRCREV}" -PR = "ml0" +PR = "ml1" SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git/${SRCNAME}" diff --git a/packages/python/python-pyserial_2.2.bb b/packages/python/python-pyserial_2.4.bb index 57d184fcc3..3d4eaaa52c 100644 --- a/packages/python/python-pyserial_2.2.bb +++ b/packages/python/python-pyserial_2.4.bb @@ -3,13 +3,17 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" SRCNAME = "pyserial" -RDEPENDS = "python-fcntl python-io python-stringold" -PR = "r2" +PR = "ml0" -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.zip" +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils # FIXME might stop packaging serialwin32 and serialjava files +RDEPENDS = "\ + python-fcntl \ + python-io \ + python-stringold \ +" diff --git a/packages/python/python-pysqlite2_2.4.0.bb b/packages/python/python-pysqlite2_2.4.0.bb index 50adcba006..24b2668ec4 100644 --- a/packages/python/python-pysqlite2_2.4.0.bb +++ b/packages/python/python-pysqlite2_2.4.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "BSD" DEPENDS = "sqlite3" SRCNAME = "pysqlite" -PR = "ml1" +PR = "ml2" SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \ file://fix-setup.patch;patch=1" diff --git a/packages/python/python-pytester_0.6.0.bb b/packages/python/python-pytester_0.6.0.bb index bc7953b73e..8c9927f530 100644 --- a/packages/python/python-pytester_0.6.0.bb +++ b/packages/python/python-pytester_0.6.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://oss.wxnet.org/pytester/index.html" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "pytester" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyusb_0.4.1.bb b/packages/python/python-pyusb_0.4.1.bb index d449208fe1..9ed3955c2e 100644 --- a/packages/python/python-pyusb_0.4.1.bb +++ b/packages/python/python-pyusb_0.4.1.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "BSD" DEPENDS = "libusb" SRCNAME = "pyusb" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyvisa_1.1.bb b/packages/python/python-pyvisa_1.3.bb index 1bb185829e..90bb00ef73 100644 --- a/packages/python/python-pyvisa_1.1.bb +++ b/packages/python/python-pyvisa_1.3.bb @@ -10,4 +10,6 @@ PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/pyvisa/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils +inherit setuptools + +export HOME=/tmp/foo diff --git a/packages/python/python-pyweather_0.7.0.bb b/packages/python/python-pyweather_0.7.0.bb index 5c643fa5c0..9b98804ba3 100644 --- a/packages/python/python-pyweather_0.7.0.bb +++ b/packages/python/python-pyweather_0.7.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "weather" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pywpa-0.3.4/Makefile b/packages/python/python-pywpa-0.3.4/Makefile deleted file mode 100644 index 0206f1c229..0000000000 --- a/packages/python/python-pywpa-0.3.4/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Simple Makefile - -NAME = pywpa/_pywpa -CFLAGS += -Iwpactrl -OBJS = pywpa.o - -%.o: %.c - @echo "Compiling $(<)" - @$(CC) $(CFLAGS) -c $(<) -o $(@) - -$(NAME).so: objects libwpactrl - @echo "Statically Linking $(NAME)" - @$(CC) $(CFLAGS) $(OBJS) wpactrl/wpa_ctrl.o -shared -o $(NAME).so - -main: objects libwpactrl - @echo "Creating test" - @$(CC) $(CFLAGS) $(OBJS) wpactrl/wpa_ctrl.o -o test -lpython2.4 - -objects: $(OBJS) - -libwpactrl: - @make -C wpactrl > /dev/null - -clean: - @rm -rf *.o - @rm -rf $(NAME).so - @rm -rf $(NAME).so.t* - @make -C wpactrl clean 2>/dev/null diff --git a/packages/python/python-pywpa-0.3.4/Makefile.wpactrl b/packages/python/python-pywpa-0.3.4/Makefile.wpactrl deleted file mode 100644 index b956e0e015..0000000000 --- a/packages/python/python-pywpa-0.3.4/Makefile.wpactrl +++ /dev/null @@ -1,8 +0,0 @@ -# Simple Makefile - -libwpa: wpa_ctrl.c wpa_ctrl.h - @echo "Building our small WPA Control Library..." - $(CC) -c -W -Wall -g wpa_ctrl.c - -clean: - @rm -rf *.o diff --git a/packages/python/python-pywpa_0.3.4.bb b/packages/python/python-pywpa_0.3.4.bb deleted file mode 100644 index e8886625b6..0000000000 --- a/packages/python/python-pywpa_0.3.4.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "PyWPA is another Python extension module written in C \ - that interfaces with wpa_supplicant" -HOMEPAGE = "http://www.emperorlinux.com/etc/contrib/?page=pywpa" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core" -PR = "ml0" - -SRC_URI = "http://downloads.emperorlinux.com/contrib/pywpa/pywpa-${PV}.tbz2 \ - file://Makefile \ - file://Makefile.wpactrl" - -S="${WORKDIR}/pywpa-${PV}" - -do_unpack_real () { - tar jxvf pywpa-${PV}.tbz2 - cp Makefile pywpa-${PV}/ - cp Makefile.wpactrl pywpa-${PV}/wpactrl/Makefile -} -do_unpack_real[dirs] = "${WORKDIR}" -addtask unpack_real before do_patch after do_unpack - -inherit autotools pkgconfig distutils-base - -CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}" - -do_compile() { - cd ${S}/wpactrl - oe_runmake HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" - cd ${S} - oe_runmake HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/pywpa - install -m 0755 pywpa/__init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/pywpa/__init__.py - install -m 0755 pywpa/_pywpa.so ${D}${libdir}/${PYTHON_DIR}/site-packages/pywpa/_pywpa.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/pywpa/__init__.py ${libdir}/${PYTHON_DIR}/site-packages/pywpa/_pywpa.so" diff --git a/packages/python/python-pyxdg_0.15.bb b/packages/python/python-pyxdg_0.15.bb index d660b8eb87..31c6f21ab4 100644 --- a/packages/python/python-pyxdg_0.15.bb +++ b/packages/python/python-pyxdg_0.15.bb @@ -1,6 +1,7 @@ DESCRIPTION = "PyXDG is a python library to access freedesktop.org standards" SECTION = "devel/python" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://www.freedesktop.org/~lanius/pyxdg-${PV}.tar.gz" S = "${WORKDIR}/pyxdg-${PV}" diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index 34b5cbfd0c..68eb7a3bb4 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -2,12 +2,13 @@ DESCRIPTION = "A sophisticated XML Processing Package for Python" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" -RDEPENDS = "python-xml python-netclient" SRCNAME = "pyxml" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" inherit distutils +RDEPENDS = "python-xml python-netclient" + diff --git a/packages/python/python-pyxmlrpc_0.8.8.3.bb b/packages/python/python-pyxmlrpc_0.8.8.3.bb index 406e9af2b0..dea1989994 100644 --- a/packages/python/python-pyxmlrpc_0.8.8.3.bb +++ b/packages/python/python-pyxmlrpc_0.8.8.3.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Fast Python XMLRPC Library" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "LGPL" -RDEPENDS = "python-core" SRCNAME = "py-xmlrpc" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-pyyaml_svn.bb b/packages/python/python-pyyaml_svn.bb index 3f316cff82..0aed0b0e62 100644 --- a/packages/python/python-pyyaml_svn.bb +++ b/packages/python/python-pyyaml_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.pyyaml.org" SECTION = "devel/python" LICENSE = "MIT" DEPENDS = "libyaml python-cython-native" -PV = "3.05+svnr${SRCREV}" +PV = "3.08+svnr${SRCREV}" PR = "ml0" SRC_URI = "\ diff --git a/packages/python/python-pyzeroconf_0.12.bb b/packages/python/python-pyzeroconf_0.12.bb index a5e439feb6..4a8a9b018e 100644 --- a/packages/python/python-pyzeroconf_0.12.bb +++ b/packages/python/python-pyzeroconf_0.12.bb @@ -2,15 +2,14 @@ DESCRIPTION = "A pure Python implementation of Zeroconf" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "LGPL" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/pyzeroconf/pyzeroconf-${PV}.tgz" - S = "${WORKDIR}/pyzeroconf-${PV}" inherit distutils-base do_install() { - install -d ${D}${libdir} install -d ${D}${libdir}/${PYTHON_DIR} install -d ${D}${libdir}/${PYTHON_DIR}/site-packages diff --git a/packages/python/python-rpyc_3.00.bb b/packages/python/python-rpyc_3.00.bb deleted file mode 100644 index b11856b713..0000000000 --- a/packages/python/python-rpyc_3.00.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "RPyC is a Remote Procedure Call Package for Python" -SECTION = "devel/python" -HOMEPAGE = "http://rpyc.wikizone.com" -LICENSE = "GPL" -SRCNAME = "rpyc" -PR = "ml0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/rpyc/${SRCNAME}-${PV}-dev.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}-dev/build" - -inherit distutils - -do_configure_prepend() { - cd .. - rm -rf build - mkdir build - mkdir build/rpyc - - cp README build - cp setup.py build - cp __init__.py build/rpyc - cp license.py build/rpyc - cp -r core build/rpyc/ - cp -r servers build/rpyc/ - cp -r utils build/rpyc/ - - cd build - find . -name "*.pyc" | xargs rm -f -} - diff --git a/packages/python/python-rpyc_3.02.bb b/packages/python/python-rpyc_3.02.bb new file mode 100644 index 0000000000..d79f0d00a5 --- /dev/null +++ b/packages/python/python-rpyc_3.02.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "RPyC is a Remote Procedure Call Package for Python" +SECTION = "devel/python" +HOMEPAGE = "http://rpyc.wikizone.com" +LICENSE = "GPL" +SRCNAME = "rpyc" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rpyc/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-scapy_1.1.1.bb b/packages/python/python-scapy_2.0.0.9.bb index be97582e2d..616b905564 100644 --- a/packages/python/python-scapy_1.1.1.bb +++ b/packages/python/python-scapy_2.0.0.9.bb @@ -6,8 +6,8 @@ SECTION = "devel/python" HOMEPAGE = "http://www.secdev.org/projects/scapy/" LICENSE = "GPL" PRIORITY = "optional" -RDEPENDS = "python-netclient python-netserver" SRCNAME = "scapy" +PR = "ml0" SRC_URI = "http://www.secdev.org/projects/scapy/files/scapy-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -17,4 +17,9 @@ do_install() { install -m 0755 ${S}/scapy.py ${D}${libdir}/${PYTHON_DIR}/ } +RDEPENDS = "\ + python-netclient \ + python-netserver \ +" + FILES_${PN} = "${libdir}/${PYTHON_DIR}/" diff --git a/packages/python/python-scons-native_0.97.bb b/packages/python/python-scons-native_1.2.0.bb index 31bce5583d..31bce5583d 100644 --- a/packages/python/python-scons-native_0.97.bb +++ b/packages/python/python-scons-native_1.2.0.bb diff --git a/packages/python/python-scons_0.97.bb b/packages/python/python-scons_1.2.0.bb index dc5b40243e..dc5b40243e 100644 --- a/packages/python/python-scons_0.97.bb +++ b/packages/python/python-scons_1.2.0.bb diff --git a/packages/python/python-setuptools-native_0.6c8.bb b/packages/python/python-setuptools-native_0.6c9.bb index 0bbf9c32fc..0bbf9c32fc 100644 --- a/packages/python/python-setuptools-native_0.6c8.bb +++ b/packages/python/python-setuptools-native_0.6c9.bb diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c9.bb index 5409c8a7bc..179129eb60 100644 --- a/packages/python/python-setuptools_0.6c8.bb +++ b/packages/python/python-setuptools_0.6c9.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages" HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools" SECTION = "devel/python" PRIORITY = "optional" -LICENSE = "MIT-like" +LICENSE = "MIT" RDEPENDS = "python-distutils python-compression" SRCNAME = "setuptools" -PR = "ml2" +PR = "ml0" SRC_URI = "\ http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\ @@ -18,3 +18,8 @@ inherit distutils do_install_prepend() { install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages } + +RDEPENDS = "\ + python-distutils \ + python-compression \ +" diff --git a/packages/python/python-sgmlop_1.1.bb b/packages/python/python-sgmlop_1.1.bb index 7e2fc5adff..dab075cc3b 100644 --- a/packages/python/python-sgmlop_1.1.bb +++ b/packages/python/python-sgmlop_1.1.bb @@ -2,8 +2,9 @@ DESCRIPTION = "Pythonware Fast SGML Parser for Python" SECTION = "devel/python" PRIORITY = "optional" SRCNAME = "sgmlop" -LICENSE = "python-sgmlop" -SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2" -S = "${WORKDIR}/${SRCNAME}-${PV}" +LICENSE = "${PN}" inherit distutils + +SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2" +S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-simplejson_1.7.1.bb b/packages/python/python-simplejson_2.0.7.bb index 67270f2df1..7bfa44eb8e 100644 --- a/packages/python/python-simplejson_1.7.1.bb +++ b/packages/python/python-simplejson_2.0.7.bb @@ -3,13 +3,18 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -# python-netserver is needed for cgi stuff -# python-zlib is needed to unpack egg created by setuptools -RDEPENDS = "python-core python-re python-io python-netserver python-zlib" SRCNAME = "simplejson" -PR = "r2" +PR = "ml0" SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools + +RDEPENDS = "\ + python-core \ + python-re \ + python-io \ + python-netserver \ +" + diff --git a/packages/python/python-sip_4.7.3.bb b/packages/python/python-sip_4.7.3.bb deleted file mode 100644 index 81386e20c2..0000000000 --- a/packages/python/python-sip_4.7.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-sip.inc -PR = "ml1" diff --git a/packages/python/python-sip_4.7.8.bb b/packages/python/python-sip_4.7.9.bb index db88ba974b..db88ba974b 100644 --- a/packages/python/python-sip_4.7.8.bb +++ b/packages/python/python-sip_4.7.9.bb diff --git a/packages/python/python-snmplib_0.1.1.bb b/packages/python/python-snmplib_0.1.1.bb deleted file mode 100644 index 1af8ebbe51..0000000000 --- a/packages/python/python-snmplib_0.1.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "A Pure Python SNMP Package" -SECTION = "devel/python" -PRIORITY = "optional" -RDEPENDS = "python-core" -SRCNAME = "libsnmp" -LICENSE = "LGPL" -SRC_URI = "http://seafelt.unicity.com.au/downloads/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - diff --git a/packages/python/python-soappy_0.11.6.bb b/packages/python/python-soappy_0.11.6.bb index 2f156acc06..fc7c49912c 100644 --- a/packages/python/python-soappy_0.11.6.bb +++ b/packages/python/python-soappy_0.11.6.bb @@ -5,6 +5,7 @@ PRIORITY = "optional" LICENSE = "BSD" RDEPENDS = "python-xml python-fpconst" SRCNAME = "SOAPpy" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz \ file://fix-future.patch;patch=1 \ diff --git a/packages/python/python-sphinx_0.5.1.bb b/packages/python/python-sphinx_0.5.1.bb index 06fa5e9e27..a1bc9dd9f7 100644 --- a/packages/python/python-sphinx_0.5.1.bb +++ b/packages/python/python-sphinx_0.5.1.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Python documentation generator" SECTION = "devel/python" LICENSE = "BSD" -PR = "0" +PR = "ml0" SRC_URI = "http://pypi.python.org/packages/source/S/Sphinx/Sphinx-${PV}.tar.gz" - S = "${WORKDIR}/Sphinx-${PV}" inherit distutils diff --git a/packages/python/python-sphinxsearch_0.1.bb b/packages/python/python-sphinxsearch_0.1.bb index 6c1afdcbe6..dff93bc106 100644 --- a/packages/python/python-sphinxsearch_0.1.bb +++ b/packages/python/python-sphinxsearch_0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.sphinxsearch.com/" SRCNAME = "sphinxsearch" -PR = "ml0" +PR = "ml1" SRC_URI = "http://pypi.python.org/packages/source/s/sphinxsearch/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-spydi_0.9.7.bb b/packages/python/python-spydi_0.9.7.bb index 17283a981e..434b31d1d1 100644 --- a/packages/python/python-spydi_0.9.7.bb +++ b/packages/python/python-spydi_0.9.7.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.spyron.org/spydi.html" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -PR = "ml0" +PR = "ml1" SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-${PV}.tar.gz" S = "${WORKDIR}/SPyDI-${PV}" diff --git a/packages/python/python-spyro_0.9.22.bb b/packages/python/python-spyro_0.9.22.bb index 9d5a583147..9cafd883a4 100644 --- a/packages/python/python-spyro_0.9.22.bb +++ b/packages/python/python-spyro_0.9.22.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.spyron.org/" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -PR = "ml0" +PR = "ml1" SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyRO-${PV}.tar.gz" S="${WORKDIR}/SPyRO-${PV}" diff --git a/packages/python/python-sqlalchemy_0.4.2p3.bb b/packages/python/python-sqlalchemy_0.5.0.bb index 2a797eb439..5cba5b3a3d 100644 --- a/packages/python/python-sqlalchemy_0.4.2p3.bb +++ b/packages/python/python-sqlalchemy_0.5.0.bb @@ -1,10 +1,11 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL" +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" SRCNAME = "SQLAlchemy" -PR = "r0" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/python/python-sqlobject_0.9.1.bb b/packages/python/python-sqlobject_0.10.4.bb index 90c88a4650..464cdd2c84 100644 --- a/packages/python/python-sqlobject_0.9.1.bb +++ b/packages/python/python-sqlobject_0.10.4.bb @@ -5,11 +5,12 @@ SECTION = "devel/python" HOMEPAGE = "http://www.sqlobject.org/" PRIORITY = "optional" LICENSE = "LGPL" -RDEPENDS = "python-formencode" SRCNAME = "SQLObject" -PR = "ml1" +PR = "ml0" SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools + +RDEPENDS = "python-formencode" diff --git a/packages/python/python-tlslite_0.3.8.bb b/packages/python/python-tlslite_0.3.8.bb index d21d5cda38..ae2d73c527 100644 --- a/packages/python/python-tlslite_0.3.8.bb +++ b/packages/python/python-tlslite_0.3.8.bb @@ -6,10 +6,9 @@ HOMEPAGE = "http://trevp.net/tlslite/" PRIORITY = "optional" LICENSE = "PD" SRCNAME = "tlslite" -PR = "ml0" +PR = "ml1" SRC_URI = "http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils - diff --git a/packages/python/python-traits/fix-import-pyface.diff b/packages/python/python-traits/fix-import-pyface.diff deleted file mode 100644 index 969a18ef30..0000000000 --- a/packages/python/python-traits/fix-import-pyface.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -r -u Traits-3.0.2.orig/enthought/traits/ui/ui_traits.py Traits-3.0.2/enthought/traits/ui/ui_traits.py ---- Traits-3.0.2.orig/enthought/traits/ui/ui_traits.py 2008-09-15 13:15:58.000000000 -0700 -+++ Traits-3.0.2/enthought/traits/ui/ui_traits.py 2008-11-27 14:55:05.000000000 -0800 -@@ -147,8 +147,6 @@ - """ - global image_resource_cache - -- from enthought.pyface.image_resource import ImageResource -- - if not isinstance( value, basestring ): - return value - -@@ -168,7 +166,12 @@ - except: - result = None - else: -- result = ImageResource( value, search_path = [ search_path ] ) -+ try: -+ from enthought.pyface.image_resource import ImageResource -+ except ImportError: -+ result = None -+ else: -+ result = ImageResource( value, search_path = [ search_path ] ) - - image_resource_cache[ key ] = result - diff --git a/packages/python/python-traits_3.0.2.bb b/packages/python/python-traits_3.0.2.bb deleted file mode 100644 index 901ecc115a..0000000000 --- a/packages/python/python-traits_3.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Explicitly typed attributes for Python" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "BSD" -PR = "as0" - -SRC_URI = "http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz \ - file://fix-import-pyface.diff;patch=1 \ - " - -S = "${WORKDIR}/Traits-${PV}" - -RDEPENDS = "python-netclient" - -inherit setuptools - -FILES_${PN}-dbg += "/usr/lib/python2.5/site-packages/enthought/traits/.debug" -FILES_${PN}-dbg += "/usr/lib/python2.5/site-packages/enthought/traits/protocols/.debug" diff --git a/packages/python/python-traits_3.0.3.bb b/packages/python/python-traits_3.0.3.bb new file mode 100644 index 0000000000..9482a1b242 --- /dev/null +++ b/packages/python/python-traits_3.0.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Explicitly typed attributes for Python" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "ml0" + +inherit setuptools + +SRC_URI = "\ + http://pypi.python.org/packages/source/T/Traits/Traits-${PV}.tar.gz \ +# file://fix-import-pyface.diff;patch=1 \ +" +S = "${WORKDIR}/Traits-${PV}" + +RDEPENDS = "python-netclient" + +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/.debug" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/protocols/.debug" diff --git a/packages/python/python-twisted_2.5.0.bb b/packages/python/python-twisted_2.5.0.bb index b9a59f8844..331acf991e 100644 --- a/packages/python/python-twisted_2.5.0.bb +++ b/packages/python/python-twisted_2.5.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.twistedmatrix.com" SECTION = "console/network" PRIORITY = "optional" LICENSE = "LGPL" -PR = "r8" +PR = "r9" SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \ file://remove-zope-check.patch;patch=1" diff --git a/packages/python/python-urwid_0.9.8.1.bb b/packages/python/python-urwid_0.9.8.1.bb deleted file mode 100644 index 75c3c84701..0000000000 --- a/packages/python/python-urwid_0.9.8.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "A Python Widget library based on python-curses." -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "LGPL" -RDEPENDS = "python-curses" -SRCNAME = "urwid" -PR = "ml0" - -SRC_URI = "http://excess.org/urwid/urwid-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils diff --git a/packages/python/python-vmaps_1.1.bb b/packages/python/python-vmaps_1.1.bb deleted file mode 100644 index 3cbdec4245..0000000000 --- a/packages/python/python-vmaps_1.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python Arrays on mmap()" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -SRCNAME = "vmaps" - -SRC_URI = "http://snafu.freedom.org/Vmaps/Vmaps-${PV}.tgz" -S = "${WORKDIR}/Vmaps-${PV}" - -inherit distutils diff --git a/packages/python/python-vorbis-1.3/disable-oggcheck.patch b/packages/python/python-vorbis/disable-oggcheck.patch index 2555169759..2555169759 100644 --- a/packages/python/python-vorbis-1.3/disable-oggcheck.patch +++ b/packages/python/python-vorbis/disable-oggcheck.patch diff --git a/packages/python/python-vorbis_1.3.bb b/packages/python/python-vorbis_1.4.bb index dd4b115709..69a341f4f8 100644 --- a/packages/python/python-vorbis_1.3.bb +++ b/packages/python/python-vorbis_1.4.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libvorbis python-ogg" SRCNAME = "pyvorbis" +PR = "ml0" SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz \ file://disable-oggcheck.patch;patch=1" diff --git a/packages/python/python-webpy/web.py b/packages/python/python-webpy/web.py deleted file mode 100644 index 2761fa30a0..0000000000 --- a/packages/python/python-webpy/web.py +++ /dev/null @@ -1,2349 +0,0 @@ -#!/usr/bin/env python -"""web.py: makes web apps (http://webpy.org)""" -__version__ = "0.1381" -__revision__ = "$Rev: 72 $" -__license__ = "public domain" -__author__ = "Aaron Swartz <me@aaronsw.com>" -__contributors__ = "see http://webpy.org/changes" - -from __future__ import generators - -# long term todo: -# - new form system -# - new templating system -# - unit tests? - -# todo: -# - get rid of upvars -# - break up into separate files -# - provide an option to use .write() -# - allow people to do $self.id from inside a reparam -# - add sqlite support -# - convert datetimes, floats in WebSafe -# - locks around memoize -# - fix memoize to use cacheify style techniques -# - merge curval query with the insert -# - figure out how to handle squid, etc. for web.ctx.ip - -import os, os.path, sys, time, types, traceback, threading -import cgi, re, urllib, urlparse, Cookie, pprint -from threading import currentThread -from tokenize import tokenprog -iters = (list, tuple) -if hasattr(__builtins__, 'set') or ( - hasattr(__builtins__, 'has_key') and __builtins__.has_key('set')): - iters += (set,) -try: - from sets import Set - iters += (Set,) -except ImportError: - pass -try: - import datetime, itertools -except ImportError: - pass -try: - from Cheetah.Compiler import Compiler - from Cheetah.Filters import Filter - _hasTemplating = True -except ImportError: - _hasTemplating = False - -try: - from DBUtils.PooledDB import PooledDB - _hasPooling = True -except ImportError: - _hasPooling = False - -# hack for compatibility with Python 2.3: -if not hasattr(traceback, 'format_exc'): - from cStringIO import StringIO - def format_exc(limit=None): - strbuf = StringIO() - traceback.print_exc(limit, strbuf) - return strbuf.getvalue() - traceback.format_exc = format_exc - -## General Utilities - -def _strips(direction, text, remove): - if direction == 'l': - if text.startswith(remove): - return text[len(remove):] - elif direction == 'r': - if text.endswith(remove): - return text[:-len(remove)] - else: - raise ValueError, "Direction needs to be r or l." - return text - -def rstrips(text, remove): - """removes the string `remove` from the right of `text`""" - return _strips('r', text, remove) - -def lstrips(text, remove): - """removes the string `remove` from the left of `text`""" - return _strips('l', text, remove) - -def strips(text, remove): - """removes the string `remove` from the both sides of `text`""" - return rstrips(lstrips(text, remove), remove) - -def autoassign(self, locals): - """ - Automatically assigns local variables to `self`. - Generally used in `__init__` methods, as in: - - def __init__(self, foo, bar, baz=1): autoassign(self, locals()) - """ - #locals = sys._getframe(1).f_locals - #self = locals['self'] - for (key, value) in locals.iteritems(): - if key == 'self': - continue - setattr(self, key, value) - -class Storage(dict): - """ - A Storage object is like a dictionary except `obj.foo` can be used - instead of `obj['foo']`. Create one by doing `storage({'a':1})`. - """ - def __getattr__(self, key): - if self.has_key(key): - return self[key] - raise AttributeError, repr(key) - def __setattr__(self, key, value): - self[key] = value - def __repr__(self): - return '<Storage ' + dict.__repr__(self) + '>' - -storage = Storage - -def storify(mapping, *requireds, **defaults): - """ - Creates a `storage` object from dictionary `mapping`, raising `KeyError` if - d doesn't have all of the keys in `requireds` and using the default - values for keys found in `defaults`. - - For example, `storify({'a':1, 'c':3}, b=2, c=0)` will return the equivalent of - `storage({'a':1, 'b':2, 'c':3})`. - - If a `storify` value is a list (e.g. multiple values in a form submission), - `storify` returns the last element of the list, unless the key appears in - `defaults` as a list. Thus: - - >>> storify({'a':[1, 2]}).a - 2 - >>> storify({'a':[1, 2]}, a=[]).a - [1, 2] - >>> storify({'a':1}, a=[]).a - [1] - >>> storify({}, a=[]).a - [] - - Similarly, if the value has a `value` attribute, `storify will return _its_ - value, unless the key appears in `defaults` as a dictionary. - - >>> storify({'a':storage(value=1)}).a - 1 - >>> storify({'a':storage(value=1)}, a={}).a - <Storage {'value': 1}> - >>> storify({}, a={}).a - {} - - """ - def getvalue(x): - if hasattr(x, 'value'): - return x.value - else: - return x - - stor = Storage() - for key in requireds + tuple(mapping.keys()): - value = mapping[key] - if isinstance(value, list): - if isinstance(defaults.get(key), list): - value = [getvalue(x) for x in value] - else: - value = value[-1] - if not isinstance(defaults.get(key), dict): - value = getvalue(value) - if isinstance(defaults.get(key), list) and not isinstance(value, list): - value = [value] - setattr(stor, key, value) - - for (key, value) in defaults.iteritems(): - result = value - if hasattr(stor, key): - result = stor[key] - if value == () and not isinstance(result, tuple): - result = (result,) - setattr(stor, key, result) - - return stor - -class Memoize: - """ - 'Memoizes' a function, caching its return values for each input. - """ - def __init__(self, func): - self.func = func - self.cache = {} - def __call__(self, *args, **keywords): - key = (args, tuple(keywords.items())) - if key not in self.cache: - self.cache[key] = self.func(*args, **keywords) - return self.cache[key] -memoize = Memoize - -re_compile = memoize(re.compile) #@@ threadsafe? -re_compile.__doc__ = """ -A memoized version of re.compile. -""" - -class _re_subm_proxy: - def __init__(self): - self.match = None - def __call__(self, match): - self.match = match - return '' - -def re_subm(pat, repl, string): - """Like re.sub, but returns the replacement _and_ the match object.""" - compiled_pat = re_compile(pat) - proxy = _re_subm_proxy() - compiled_pat.sub(proxy.__call__, string) - return compiled_pat.sub(repl, string), proxy.match - -def group(seq, size): - """ - Returns an iterator over a series of lists of length size from iterable. - - For example, `list(group([1,2,3,4], 2))` returns `[[1,2],[3,4]]`. - """ - if not hasattr(seq, 'next'): - seq = iter(seq) - while True: - yield [seq.next() for i in xrange(size)] - -class IterBetter: - """ - Returns an object that can be used as an iterator - but can also be used via __getitem__ (although it - cannot go backwards -- that is, you cannot request - `iterbetter[0]` after requesting `iterbetter[1]`). - """ - def __init__(self, iterator): - self.i, self.c = iterator, 0 - def __iter__(self): - while 1: - yield self.i.next() - self.c += 1 - def __getitem__(self, i): - #todo: slices - if i > self.c: - raise IndexError, "already passed "+str(i) - try: - while i < self.c: - self.i.next() - self.c += 1 - # now self.c == i - self.c += 1 - return self.i.next() - except StopIteration: - raise IndexError, str(i) -iterbetter = IterBetter - -def dictreverse(mapping): - """Takes a dictionary like `{1:2, 3:4}` and returns `{2:1, 4:3}`.""" - return dict([(value, key) for (key, value) in mapping.iteritems()]) - -def dictfind(dictionary, element): - """ - Returns a key whose value in `dictionary` is `element` - or, if none exists, None. - """ - for (key, value) in dictionary.iteritems(): - if element is value: - return key - -def dictfindall(dictionary, element): - """ - Returns the keys whose values in `dictionary` are `element` - or, if none exists, []. - """ - res = [] - for (key, value) in dictionary.iteritems(): - if element is value: - res.append(key) - return res - -def dictincr(dictionary, element): - """ - Increments `element` in `dictionary`, - setting it to one if it doesn't exist. - """ - dictionary.setdefault(element, 0) - dictionary[element] += 1 - return dictionary[element] - -def dictadd(dict_a, dict_b): - """ - Returns a dictionary consisting of the keys in `a` and `b`. - If they share a key, the value from b is used. - """ - result = {} - result.update(dict_a) - result.update(dict_b) - return result - -sumdicts = dictadd # deprecated - -def listget(lst, ind, default=None): - """Returns `lst[ind]` if it exists, `default` otherwise.""" - if len(lst)-1 < ind: - return default - return lst[ind] - -def intget(integer, default=None): - """Returns `integer` as an int or `default` if it can't.""" - try: - return int(integer) - except (TypeError, ValueError): - return default - -def datestr(then, now=None): - """Converts a (UTC) datetime object to a nice string representation.""" - def agohence(n, what, divisor=None): - if divisor: n = n // divisor - - out = str(abs(n)) + ' ' + what # '2 day' - if abs(n) != 1: out += 's' # '2 days' - out += ' ' # '2 days ' - if n < 0: - out += 'from now' - else: - out += 'ago' - return out # '2 days ago' - - oneday = 24 * 60 * 60 - - if not now: now = datetime.datetime.utcnow() - delta = now - then - deltaseconds = int(delta.days * oneday + delta.seconds + delta.microseconds * 1e-06) - deltadays = abs(deltaseconds) // oneday - if deltaseconds < 0: deltadays *= -1 # fix for oddity of floor - - if deltadays: - if abs(deltadays) < 4: - return agohence(deltadays, 'day') - - out = then.strftime('%B %e') # e.g. 'June 13' - if then.year != now.year or deltadays < 0: - out += ', %s' % then.year - return out - - if int(deltaseconds): - if abs(deltaseconds) > (60 * 60): - return agohence(deltaseconds, 'hour', 60 * 60) - elif abs(deltaseconds) > 60: - return agohence(deltaseconds, 'minute', 60) - else: - return agohence(deltaseconds, 'second') - - deltamicroseconds = delta.microseconds - if delta.days: deltamicroseconds = int(delta.microseconds - 1e6) # datetime oddity - if abs(deltamicroseconds) > 1000: - return agohence(deltamicroseconds, 'millisecond', 1000) - - return agohence(deltamicroseconds, 'microsecond') - -def upvars(level=2): - """Guido van Rossum doesn't want you to use this function.""" - return dictadd( - sys._getframe(level).f_globals, - sys._getframe(level).f_locals) - -class CaptureStdout: - """ - Captures everything func prints to stdout and returns it instead. - - **WARNING:** Not threadsafe! - """ - def __init__(self, func): - self.func = func - def __call__(self, *args, **keywords): - from cStringIO import StringIO - # Not threadsafe! - out = StringIO() - oldstdout = sys.stdout - sys.stdout = out - try: - self.func(*args, **keywords) - finally: - sys.stdout = oldstdout - return out.getvalue() -capturestdout = CaptureStdout - -class Profile: - """ - Profiles `func` and returns a tuple containing its output - and a string with human-readable profiling information. - """ - def __init__(self, func): - self.func = func - def __call__(self, *args): ##, **kw): kw unused - import hotshot, hotshot.stats, tempfile ##, time already imported - temp = tempfile.NamedTemporaryFile() - prof = hotshot.Profile(temp.name) - - stime = time.time() - result = prof.runcall(self.func, *args) - stime = time.time() - stime - - prof.close() - stats = hotshot.stats.load(temp.name) - stats.strip_dirs() - stats.sort_stats('time', 'calls') - x = '\n\ntook '+ str(stime) + ' seconds\n' - x += capturestdout(stats.print_stats)(40) - x += capturestdout(stats.print_callers)() - return result, x -profile = Profile - -def tryall(context, prefix=None): - """ - Tries a series of functions and prints their results. - `context` is a dictionary mapping names to values; - the value will only be tried if it's callable. - - For example, you might have a file `test/stuff.py` - with a series of functions testing various things in it. - At the bottom, have a line: - - if __name__ == "__main__": tryall(globals()) - - Then you can run `python test/stuff.py` and get the results of - all the tests. - """ - context = context.copy() # vars() would update - results = {} - for (key, value) in context.iteritems(): - if not hasattr(value, '__call__'): - continue - if prefix and not key.startswith(prefix): - continue - print key + ':', - try: - r = value() - dictincr(results, r) - print r - except: - print 'ERROR' - dictincr(results, 'ERROR') - print ' ' + '\n '.join(traceback.format_exc().split('\n')) - - print '-'*40 - print 'results:' - for (key, value) in results.iteritems(): - print ' '*2, str(key)+':', value - -class ThreadedDict: - """ - Takes a dictionary that maps threads to objects. - When a thread tries to get or set an attribute or item - of the threadeddict, it passes it on to the object - for that thread in dictionary. - """ - def __init__(self, dictionary): - self.__dict__['_ThreadedDict__d'] = dictionary - def __getattr__(self, attr): - return getattr(self.__d[currentThread()], attr) - def __getitem__(self, item): - return self.__d[currentThread()][item] - def __setattr__(self, attr, value): - if attr == '__doc__': - self.__dict__[attr] = value - else: - return setattr(self.__d[currentThread()], attr, value) - def __setitem__(self, item, value): - self.__d[currentThread()][item] = value - def __hash__(self): - return hash(self.__d[currentThread()]) -threadeddict = ThreadedDict - -## IP Utilities - -def validipaddr(address): - """returns True if `address` is a valid IPv4 address""" - try: - octets = address.split('.') - assert len(octets) == 4 - for x in octets: - assert 0 <= int(x) <= 255 - except (AssertionError, ValueError): - return False - return True - -def validipport(port): - """returns True if `port` is a valid IPv4 port""" - try: - assert 0 <= int(port) <= 65535 - except (AssertionError, ValueError): - return False - return True - -def validip(ip, defaultaddr="0.0.0.0", defaultport=8080): - """returns `(ip_address, port)` from string `ip_addr_port`""" - addr = defaultaddr - port = defaultport - - ip = ip.split(":", 1) - if len(ip) == 1: - if not ip[0]: - pass - elif validipaddr(ip[0]): - addr = ip[0] - elif validipport(ip[0]): - port = int(ip[0]) - else: - raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' - elif len(ip) == 2: - addr, port = ip - if not validipaddr(addr) and validipport(port): - raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' - port = int(port) - else: - raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' - return (addr, port) - -def validaddr(string_): - """returns either (ip_address, port) or "/path/to/socket" from string_""" - if '/' in string_: - return string_ - else: - return validip(string_) - -## URL Utilities - -def prefixurl(base=''): - """ - Sorry, this function is really difficult to explain. - Maybe some other time. - """ - url = ctx.path.lstrip('/') - for i in xrange(url.count('/')): - base += '../' - if not base: - base = './' - return base - -def urlquote(x): return urllib.quote(websafe(x).encode('utf-8')) - -## Formatting - -try: - from markdown import markdown # http://webpy.org/markdown.py -except ImportError: - pass - -r_url = re_compile('(?<!\()(http://(\S+))') -def safemarkdown(text): - """ - Converts text to HTML following the rules of Markdown, but blocking any - outside HTML input, so that only the things supported by Markdown - can be used. Also converts raw URLs to links. - - (requires [markdown.py](http://webpy.org/markdown.py)) - """ - if text: - text = text.replace('<', '<') - # TODO: automatically get page title? - text = r_url.sub(r'<\1>', text) - text = markdown(text) - return text - -## Databases - -class _ItplError(ValueError): - """String Interpolation Error - from <http://lfw.org/python/Itpl.py> - (cf. below for license) - """ - def __init__(self, text, pos): - ValueError.__init__(self) - self.text = text - self.pos = pos - def __str__(self): - return "unfinished expression in %s at char %d" % ( - repr(self.text), self.pos) - -def _interpolate(format): - """ - Takes a format string and returns a list of 2-tuples of the form - (boolean, string) where boolean says whether string should be evaled - or not. - - from <http://lfw.org/python/Itpl.py> (public domain, Ka-Ping Yee) - """ - def matchorfail(text, pos): - match = tokenprog.match(text, pos) - if match is None: - raise _ItplError(text, pos) - return match, match.end() - - namechars = "abcdefghijklmnopqrstuvwxyz" \ - "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"; - chunks = [] - pos = 0 - - while 1: - dollar = format.find("$", pos) - if dollar < 0: - break - nextchar = format[dollar + 1] - - if nextchar == "{": - chunks.append((0, format[pos:dollar])) - pos, level = dollar + 2, 1 - while level: - match, pos = matchorfail(format, pos) - tstart, tend = match.regs[3] - token = format[tstart:tend] - if token == "{": - level = level + 1 - elif token == "}": - level = level - 1 - chunks.append((1, format[dollar + 2:pos - 1])) - - elif nextchar in namechars: - chunks.append((0, format[pos:dollar])) - match, pos = matchorfail(format, dollar + 1) - while pos < len(format): - if format[pos] == "." and \ - pos + 1 < len(format) and format[pos + 1] in namechars: - match, pos = matchorfail(format, pos + 1) - elif format[pos] in "([": - pos, level = pos + 1, 1 - while level: - match, pos = matchorfail(format, pos) - tstart, tend = match.regs[3] - token = format[tstart:tend] - if token[0] in "([": - level = level + 1 - elif token[0] in ")]": - level = level - 1 - else: - break - chunks.append((1, format[dollar + 1:pos])) - - else: - chunks.append((0, format[pos:dollar + 1])) - pos = dollar + 1 + (nextchar == "$") - - if pos < len(format): - chunks.append((0, format[pos:])) - return chunks - -def sqlors(left, lst): - """ - `left is a SQL clause like `tablename.arg = ` - and `lst` is a list of values. Returns a reparam-style - pair featuring the SQL that ORs together the clause - for each item in the lst. - - For example: - - web.sqlors('foo =', [1,2,3]) - - would result in: - - foo = 1 OR foo = 2 OR foo = 3 - """ - if isinstance(lst, iters): - lst = list(lst) - ln = len(lst) - if ln == 0: - return ("2+2=5", []) - if ln == 1: - lst = lst[0] - - if isinstance(lst, iters): - return '(' + left + \ - (' OR ' + left).join([aparam() for param in lst]) + ")", lst - else: - return left + aparam(), [lst] - -class UnknownParamstyle(Exception): - """raised for unsupported db paramstyles - - Currently supported: qmark,numeric, format, pyformat - """ - pass - -def aparam(): - """Use in a SQL string to make a spot for a db value.""" - style = ctx.db_module.paramstyle - if style == 'qmark': - return '?' - elif style == 'numeric': - return ':1' - elif style in ['format', 'pyformat']: - return '%s' - raise UnknownParamstyle, style - -def reparam(string_, dictionary): - """ - Takes a string and a dictionary and interpolates the string - using values from the dictionary. Returns a 2-tuple containing - the a string with `aparam()`s in it and a list of the matching values. - - You can pass this sort of thing as a clause in any db function. - Otherwise, you can pass a dictionary to the keyword argument `vars` - and the function will call reparam for you. - """ - vals = [] - result = [] - for live, chunk in _interpolate(string_): - if live: - result.append(aparam()) - vals.append(eval(chunk, dictionary)) - else: result.append(chunk) - return ''.join(result), vals - -class UnknownDB(Exception): - """raised for unsupported dbms""" - pass -def connect(dbn, **keywords): - """ - Connects to the specified database. - db currently must be "postgres" or "mysql". - If DBUtils is installed, connection pooling will be used. - """ - if dbn == "postgres": - try: - import psycopg2 as db - except ImportError: - try: - import psycopg as db - except ImportError: - import pgdb as db - keywords['password'] = keywords['pw'] - del keywords['pw'] - keywords['database'] = keywords['db'] - del keywords['db'] - elif dbn == "mysql": - import MySQLdb as db - keywords['passwd'] = keywords['pw'] - del keywords['pw'] - db.paramstyle = 'pyformat' # it's both, like psycopg - elif dbn == "sqlite": - try: ## try first sqlite3 version - from pysqlite2 import dbapi2 as db - db.paramstyle = 'qmark' - except ImportError: ## else try sqlite2 - import sqlite as db - keywords['database'] = keywords['db'] - del keywords['db'] - else: - raise UnknownDB, dbn - ctx.db_name = dbn - ctx.db_module = db - ctx.db_transaction = False - if _hasPooling: - if 'db' not in globals(): - globals()['db'] = PooledDB(dbapi=db, **keywords) - ctx.db = globals()['db'].connection() - else: - ctx.db = db.connect(**keywords) - ctx.dbq_count = 0 - if globals().get('db_printing'): - def db_execute(cur, sql_query, d=None): - """executes an sql query""" - - def sqlquote(obj): - """converts `obj` to its proper SQL version""" - - # because `1 == True and hash(1) == hash(True)` - # we have to do this the hard way... - - if obj is None: - return 'NULL' - elif obj is True: - return "'t'" - elif obj is False: - return "'f'" - elif isinstance(obj, datetime.datetime): - return repr(obj.isoformat()) - else: - return repr(obj) - - ctx.dbq_count += 1 - try: - outq = sql_query % tuple(map(sqlquote, d)) - except TypeError: - outq = sql_query - print >> debug, str(ctx.dbq_count)+':', outq - a = time.time() - out = cur.execute(sql_query, d) - b = time.time() - print >> debug, '(%s)' % round(b - a, 2) - return out - ctx.db_execute = db_execute - else: - ctx.db_execute = lambda cur, sql_query, d=None: \ - cur.execute(sql_query, d) - return ctx.db - -def transact(): - """Start a transaction.""" - # commit everything up to now, so we don't rollback it later - ctx.db.commit() - ctx.db_transaction = True - -def commit(): - """Commits a transaction.""" - ctx.db.commit() - ctx.db_transaction = False - -def rollback(): - """Rolls back a transaction.""" - ctx.db.rollback() - ctx.db_transaction = False - -def query(sql_query, vars=None, processed=False): - """ - Execute SQL query `sql_query` using dictionary `vars` to interpolate it. - If `processed=True`, `vars` is a `reparam`-style list to use - instead of interpolating. - """ - if vars is None: - vars = {} - db_cursor = ctx.db.cursor() - - if not processed: - sql_query, vars = reparam(sql_query, vars) - ctx.db_execute(db_cursor, sql_query, vars) - if db_cursor.description: - names = [x[0] for x in db_cursor.description] - def iterwrapper(): - row = db_cursor.fetchone() - while row: - yield Storage(dict(zip(names, row))) - row = db_cursor.fetchone() - out = iterbetter(iterwrapper()) - out.__len__ = lambda: int(db_cursor.rowcount) - out.list = lambda: [Storage(dict(zip(names, x))) \ - for x in db_cursor.fetchall()] - else: - out = db_cursor.rowcount - - if not ctx.db_transaction: - ctx.db.commit() - return out - -def sqllist(lst): - """ - If a list, converts it to a comma-separated string. - Otherwise, returns the string. - """ - if isinstance(lst, str): - return lst - else: return ', '.join(lst) - -def sqlwhere(dictionary): - """ - Converts a `dictionary` to an SQL WHERE clause in - `reparam` format. Thus, - - {'cust_id': 2, 'order_id':3} - - would result in the equivalent of: - - 'cust_id = 2 AND order_id = 3' - - but properly quoted. - """ - - return ' AND '.join([ - '%s = %s' % (k, aparam()) for k in dictionary.keys() - ]), dictionary.values() - -def select(tables, vars=None, what='*', where=None, order=None, group=None, - limit=None, offset=None): - """ - Selects `what` from `tables` with clauses `where`, `order`, - `group`, `limit`, and `offset. Uses vars to interpolate. - Otherwise, each clause can take a reparam-style list. - """ - if vars is None: - vars = {} - values = [] - qout = "" - - for (sql, val) in ( - ('SELECT', what), - ('FROM', sqllist(tables)), - ('WHERE', where), - ('GROUP BY', group), - ('ORDER BY', order), - ('LIMIT', limit), - ('OFFSET', offset)): - if isinstance(val, (int, long)): - if sql == 'WHERE': - nquery, nvalue = 'id = '+aparam(), [val] - else: - nquery, nvalue = str(val), () - elif isinstance(val, (list, tuple)) and len(val) == 2: - nquery, nvalue = val - elif val: - nquery, nvalue = reparam(val, vars) - else: - continue - qout += " " + sql + " " + nquery - values.extend(nvalue) - return query(qout, values, processed=True) - -def insert(tablename, seqname=None, **values): - """ - Inserts `values` into `tablename`. Returns current sequence ID. - Set `seqname` to the ID if it's not the default, or to `False` - if there isn't one. - """ - db_cursor = ctx.db.cursor() - - if values: - sql_query, v = "INSERT INTO %s (%s) VALUES (%s)" % ( - tablename, - ", ".join(values.keys()), - ', '.join([aparam() for x in values]) - ), values.values() - else: - sql_query, v = "INSERT INTO %s DEFAULT VALUES" % tablename, None - - if seqname is False: - pass - elif ctx.db_name == "postgres": - if seqname is None: - seqname = tablename + "_id_seq" - sql_query += "; SELECT currval('%s')" % seqname - elif ctx.db_name == "mysql": - ctx.db_execute(db_cursor, sql_query, v) - sql_query = "SELECT last_insert_id()" - v = () - elif ctx.db_name == "sqlite": - ctx.db_execute(db_cursor, sql_query, v) - # not really the same... - sql_query = "SELECT last_insert_rowid()" - v = () - - ctx.db_execute(db_cursor, sql_query, v) - try: - out = db_cursor.fetchone()[0] - except Exception: - out = None - - if not ctx.db_transaction: - ctx.db.commit() - - return out - -def update(tables, where, vars=None, **values): - """ - Update `tables` with clause `where` (interpolated using `vars`) - and setting `values`. - """ - if vars is None: - vars = {} - if isinstance(where, (int, long)): - vars = [where] - where = "id = " + aparam() - elif isinstance(where, (list, tuple)) and len(where) == 2: - where, vars = where - else: - where, vars = reparam(where, vars) - - db_cursor = ctx.db.cursor() - ctx.db_execute(db_cursor, "UPDATE %s SET %s WHERE %s" % ( - sqllist(tables), - ', '.join([k + '=' + aparam() for k in values.keys()]), - where), - values.values() + vars) - - if not ctx.db_transaction: - ctx.db.commit() - return db_cursor.rowcount - -def delete(table, where, using=None, vars=None): - """ - Deletes from `table` with clauses `where` and `using`. - """ - if vars is None: - vars = {} - db_cursor = ctx.db.cursor() - - if isinstance(where, (int, long)): - vars = [where] - where = "id = " + aparam() - elif isinstance(where, (list, tuple)) and len(where) == 2: - where, vars = where - else: - where, vars = reparam(where, vars) - q = 'DELETE FROM %s WHERE %s' % (table, where) - if using: - q += ' USING ' + sqllist(using) - ctx.db_execute(db_cursor, q, vars) - - if not ctx.db_transaction: - ctx.db.commit() - return db_cursor.rowcount - -## Request Handlers - -def handle(mapping, fvars=None): - """ - Call the appropriate function based on the url to function mapping in `mapping`. - If no module for the function is specified, look up the function in `fvars`. If - `fvars` is empty, using the caller's context. - - `mapping` should be a tuple of paired regular expressions with function name - substitutions. `handle` will import modules as necessary. - """ - for url, ofno in group(mapping, 2): - if isinstance(ofno, tuple): - ofn, fna = ofno[0], list(ofno[1:]) - else: - ofn, fna = ofno, [] - fn, result = re_subm('^' + url + '$', ofn, ctx.path) - if result: # it's a match - if fn.split(' ', 1)[0] == "redirect": - url = fn.split(' ', 1)[1] - if ctx.method == "GET": - x = ctx.env.get('QUERY_STRING', '') - if x: - url += '?' + x - return redirect(url) - elif '.' in fn: - x = fn.split('.') - mod, cls = '.'.join(x[:-1]), x[-1] - mod = __import__(mod, globals(), locals(), [""]) - cls = getattr(mod, cls) - else: - cls = fn - mod = fvars or upvars() - if isinstance(mod, types.ModuleType): - mod = vars(mod) - try: - cls = mod[cls] - except KeyError: - return notfound() - - meth = ctx.method - if meth == "HEAD": - if not hasattr(cls, meth): - meth = "GET" - if not hasattr(cls, meth): - return nomethod(cls) - tocall = getattr(cls(), meth) - args = list(result.groups()) - for d in re.findall(r'\\(\d+)', ofn): - args.pop(int(d) - 1) - return tocall(*([urllib.unquote(x) for x in args] + fna)) - - return notfound() - -def autodelegate(prefix=''): - """ - Returns a method that takes one argument and calls the method named prefix+arg, - calling `notfound()` if there isn't one. Example: - - urls = ('/prefs/(.*)', 'prefs') - - class prefs: - GET = autodelegate('GET_') - def GET_password(self): pass - def GET_privacy(self): pass - - `GET_password` would get called for `/prefs/password` while `GET_privacy` for - `GET_privacy` gets called for `/prefs/privacy`. - - If a user visits `/prefs/password/change` then `GET_password(self, '/change')` - is called. - """ - def internal(self, arg): - if '/' in arg: - first, rest = arg.split('/', 1) - func = prefix + first - args = ['/' + rest] - else: - func = prefix + arg - args = [] - - if hasattr(self, func): - try: - return getattr(self, func)(*args) - except TypeError: - return notfound() - else: - return notfound() - return internal - -def background(func): - """A function decorator to run a long-running function as a background thread.""" - def internal(*a, **kw): - data() # cache it - ctx = _context[currentThread()] - _context[currentThread()] = storage(ctx.copy()) - - def newfunc(): - _context[currentThread()] = ctx - func(*a, **kw) - - t = threading.Thread(target=newfunc) - background.threaddb[id(t)] = t - t.start() - ctx.headers = [] - return seeother(changequery(_t=id(t))) - return internal -background.threaddb = {} - -def backgrounder(func): - def internal(*a, **kw): - i = input(_method='get') - if '_t' in i: - try: - t = background.threaddb[int(i._t)] - except KeyError: - return notfound() - _context[currentThread()] = _context[t] - return - else: - return func(*a, **kw) - return internal - -## HTTP Functions - -def httpdate(date_obj): - """Formats a datetime object for use in HTTP headers.""" - return date_obj.strftime("%a, %d %b %Y %H:%M:%S GMT") - -def parsehttpdate(string_): - """Parses an HTTP date into a datetime object.""" - try: - t = time.strptime(string_, "%a, %d %b %Y %H:%M:%S %Z") - except ValueError: - return None - return datetime.datetime(*t[:6]) - -def expires(delta): - """ - Outputs an `Expires` header for `delta` from now. - `delta` is a `timedelta` object or a number of seconds. - """ - try: - datetime - except NameError: - raise Exception, "requires Python 2.3 or later" - if isinstance(delta, (int, long)): - delta = datetime.timedelta(seconds=delta) - date_obj = datetime.datetime.utcnow() + delta - header('Expires', httpdate(date_obj)) - -def lastmodified(date_obj): - """Outputs a `Last-Modified` header for `datetime`.""" - header('Last-Modified', httpdate(date_obj)) - -def modified(date=None, etag=None): - n = ctx.env.get('HTTP_IF_NONE_MATCH') - m = parsehttpdate(ctx.env.get('HTTP_IF_MODIFIED_SINCE', '').split(';')[0]) - validate = False - if etag: - raise NotImplementedError, "no etag support yet" - # should really be a warning - if date and m: - # we subtract a second because - # HTTP dates don't have sub-second precision - if date-datetime.timedelta(seconds=1) <= m: - validate = True - - if validate: ctx.status = '304 Not Modified' - return not validate - -""" -By default, these all return simple error messages that send very short messages -(like "bad request") to the user. They can and should be overridden -to return nicer ones. -""" -def redirect(url, status='301 Moved Permanently'): - """ - Returns a `status` redirect to the new URL. - `url` is joined with the base URL so that things like - `redirect("about") will work properly. - """ - newloc = urlparse.urljoin(ctx.home + ctx.path, url) - ctx.status = status - ctx.output = '' - header('Content-Type', 'text/html') - header('Location', newloc) - # seems to add a three-second delay for some reason: - # output('<a href="'+ newloc + '">moved permanently</a>') - -def found(url): - """A `302 Found` redirect.""" - return redirect(url, '302 Found') - -def seeother(url): - """A `303 See Other` redirect.""" - return redirect(url, '303 See Other') - -def tempredirect(url): - """A `307 Temporary Redirect` redirect.""" - return redirect(url, '307 Temporary Redirect') - -def badrequest(): - """Return a `400 Bad Request` error.""" - ctx.status = '400 Bad Request' - header('Content-Type', 'text/html') - return output('bad request') - -def notfound(): - """Returns a `404 Not Found` error.""" - ctx.status = '404 Not Found' - header('Content-Type', 'text/html') - return output('not found') - -def nomethod(cls): - """Returns a `405 Method Not Allowed` error for `cls`.""" - ctx.status = '405 Method Not Allowed' - header('Content-Type', 'text/html') - header('Allow', \ - ', '.join([method for method in \ - ['GET', 'HEAD', 'POST', 'PUT', 'DELETE'] \ - if hasattr(cls, method)])) - - # commented out for the same reason redirect is - # return output('method not allowed') - -def gone(): - """Returns a `410 Gone` error.""" - ctx.status = '410 Gone' - header('Content-Type', 'text/html') - return output("gone") - -def internalerror(): - """Returns a `500 Internal Server` error.""" - ctx.status = "500 Internal Server Error" - ctx.headers = [('Content-Type', 'text/html')] - ctx.output = "internal server error" - - -# adapted from Django <djangoproject.com> -# Copyright (c) 2005, the Lawrence Journal-World -# Used under the modified BSD license: -# http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5 - -DJANGO_500_PAGE = """#import inspect -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="en"> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <meta name="robots" content="NONE,NOARCHIVE" /> - <title>$exception_type at $ctx.path</title> - <style type="text/css"> - html * { padding:0; margin:0; } - body * { padding:10px 20px; } - body * * { padding:0; } - body { font:small sans-serif; } - body>div { border-bottom:1px solid #ddd; } - h1 { font-weight:normal; } - h2 { margin-bottom:.8em; } - h2 span { font-size:80%; color:#666; font-weight:normal; } - h3 { margin:1em 0 .5em 0; } - h4 { margin:0 0 .5em 0; font-weight: normal; } - table { - border:1px solid #ccc; border-collapse: collapse; background:white; } - tbody td, tbody th { vertical-align:top; padding:2px 3px; } - thead th { - padding:1px 6px 1px 3px; background:#fefefe; text-align:left; - font-weight:normal; font-size:11px; border:1px solid #ddd; } - tbody th { text-align:right; color:#666; padding-right:.5em; } - table.vars { margin:5px 0 2px 40px; } - table.vars td, table.req td { font-family:monospace; } - table td.code { width:100%;} - table td.code div { overflow:hidden; } - table.source th { color:#666; } - table.source td { - font-family:monospace; white-space:pre; border-bottom:1px solid #eee; } - ul.traceback { list-style-type:none; } - ul.traceback li.frame { margin-bottom:1em; } - div.context { margin: 10px 0; } - div.context ol { - padding-left:30px; margin:0 10px; list-style-position: inside; } - div.context ol li { - font-family:monospace; white-space:pre; color:#666; cursor:pointer; } - div.context ol.context-line li { color:black; background-color:#ccc; } - div.context ol.context-line li span { float: right; } - div.commands { margin-left: 40px; } - div.commands a { color:black; text-decoration:none; } - #summary { background: #ffc; } - #summary h2 { font-weight: normal; color: #666; } - #explanation { background:#eee; } - #template, #template-not-exist { background:#f6f6f6; } - #template-not-exist ul { margin: 0 0 0 20px; } - #traceback { background:#eee; } - #requestinfo { background:#f6f6f6; padding-left:120px; } - #summary table { border:none; background:transparent; } - #requestinfo h2, #requestinfo h3 { position:relative; margin-left:-100px; } - #requestinfo h3 { margin-bottom:-1em; } - .error { background: #ffc; } - .specific { color:#cc3300; font-weight:bold; } - </style> - <script type="text/javascript"> - //<!-- - function getElementsByClassName(oElm, strTagName, strClassName){ - // Written by Jonathan Snook, http://www.snook.ca/jon; - // Add-ons by Robert Nyman, http://www.robertnyman.com - var arrElements = (strTagName == "*" && document.all)? document.all : - oElm.getElementsByTagName(strTagName); - var arrReturnElements = new Array(); - strClassName = strClassName.replace(/\-/g, "\\-"); - var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$)"); - var oElement; - for(var i=0; i<arrElements.length; i++){ - oElement = arrElements[i]; - if(oRegExp.test(oElement.className)){ - arrReturnElements.push(oElement); - } - } - return (arrReturnElements) - } - function hideAll(elems) { - for (var e = 0; e < elems.length; e++) { - elems[e].style.display = 'none'; - } - } - window.onload = function() { - hideAll(getElementsByClassName(document, 'table', 'vars')); - hideAll(getElementsByClassName(document, 'ol', 'pre-context')); - hideAll(getElementsByClassName(document, 'ol', 'post-context')); - } - function toggle() { - for (var i = 0; i < arguments.length; i++) { - var e = document.getElementById(arguments[i]); - if (e) { - e.style.display = e.style.display == 'none' ? 'block' : 'none'; - } - } - return false; - } - function varToggle(link, id) { - toggle('v' + id); - var s = link.getElementsByTagName('span')[0]; - var uarr = String.fromCharCode(0x25b6); - var darr = String.fromCharCode(0x25bc); - s.innerHTML = s.innerHTML == uarr ? darr : uarr; - return false; - } - //--> - </script> -</head> -<body> - -<div id="summary"> - <h1>$exception_type at $ctx.path</h1> - <h2>$exception_value</h2> - <table><tr> - <th>Python</th> - <td>$lastframe.filename in $lastframe.function, line $lastframe.lineno</td> - </tr><tr> - <th>Web</th> - <td>$ctx.method $ctx.home$ctx.path</td> - </tr></table> -</div> -<div id="traceback"> - <h2>Traceback <span>(innermost first)</span></h2> - <ul class="traceback"> - #for frame in $frames - <li class="frame"> - <code>$frame.filename</code> in <code>$frame.function</code> - - #if $frame.context_line - <div class="context" id="c$frame.id"> - #if $frame.pre_context - <ol start="$frame.pre_context_lineno" class="pre-context" id="pre$frame.id">#for line in $frame.pre_context#<li onclick="toggle('pre$frame.id', 'post$frame.id')">$line</li>#end for#</ol> - #end if - <ol start="$frame.lineno" class="context-line"><li onclick="toggle('pre$frame.id', 'post$frame.id')">$frame.context_line <span>...</span></li></ol> - #if $frame.post_context - <ol start='$(frame.lineno+1)' class="post-context" id="post$frame.id">#for line in $frame.post_context#<li onclick="toggle('pre$frame.id', 'post$frame.id')">$line</li>#end for#</ol> - #end if - </div> - #end if - - #if $frame.vars - <div class="commands"> - <a href='#' onclick="return varToggle(this, '$frame.id')"><span>▶</span> Local vars</a>## $inspect.formatargvalues(*inspect.getargvalues(frame['tb'].tb_frame)) - </div> - <table class="vars" id="v$frame.id"> - <thead> - <tr> - <th>Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - #set frameitems = $frame.vars - #silent frameitems.sort(lambda x,y: cmp(x[0], y[0])) - #for (key, val) in frameitems - <tr> - <td>$key</td> - <td class="code"><div>$prettify(val)</div></td> - </tr> - #end for - </tbody> - </table> - #end if - </li> - #end for - </ul> -</div> - -<div id="requestinfo"> - #if $context_.output or $context_.headers - <h2>Response so far</h2> - <h3>HEADERS</h3> - #if $ctx.headers - <p class="req"><code> - #for (k, v) in $context_.headers - $k: $v<br /> - #end for - - </code></p> - #else - <p>No headers.</p> - #end if - <h3>BODY</h3> - <p class="req" style="padding-bottom: 2em"><code> - $context_.output - </code></p> - #end if - - <h2>Request information</h2> - - <h3>INPUT</h3> - #if $input_ - <table class="req"> - <thead> - <tr> - <th>Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - #set myitems = $input_.items() - #silent myitems.sort(lambda x,y: cmp(x[0], y[0])) - #for (key, val) in myitems - <tr> - <td>$key</td> - <td class="code"><div>$val</div></td> - </tr> - #end for - </tbody> - </table> - #else - <p>No input data.</p> - #end if - - <h3 id="cookie-info">COOKIES</h3> - #if $cookies_ - <table class="req"> - <thead> - <tr> - <th>Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - #for (key, val) in $cookies_.items() - <tr> - <td>$key</td> - <td class="code"><div>$val</div></td> - </tr> - #end for - </tbody> - </table> - #else - <p>No cookie data</p> - #end if - - <h3 id="meta-info">META</h3> - <table class="req"> - <thead> - <tr> - <th>Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - #set myitems = $context_.items() - #silent myitems.sort(lambda x,y: cmp(x[0], y[0])) - #for (key, val) in $myitems - #if not $key.startswith('_') and $key not in ['env', 'output', 'headers', 'environ', 'status', 'db_execute'] - <tr> - <td>$key</td> - <td class="code"><div>$prettify($val)</div></td> - </tr> - #end if - #end for - </tbody> - </table> - - <h3 id="meta-info">ENVIRONMENT</h3> - <table class="req"> - <thead> - <tr> - <th>Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - #set myitems = $context_.env.items() - #silent myitems.sort(lambda x,y: cmp(x[0], y[0])) - #for (key, val) in $myitems - <tr> - <td>$key</td> - <td class="code"><div>$prettify($val)</div></td> - </tr> - #end for - </tbody> - </table> - -</div> - -<div id="explanation"> - <p> - You're seeing this error because you have <code>web.internalerror</code> - set to <code>web.debugerror</code>. Change that if you want a different one. - </p> -</div> - -</body> -</html>""" - -def djangoerror(): - def _get_lines_from_file(filename, lineno, context_lines): - """ - Returns context_lines before and after lineno from file. - Returns (pre_context_lineno, pre_context, context_line, post_context). - """ - try: - source = open(filename).readlines() - lower_bound = max(0, lineno - context_lines) - upper_bound = lineno + context_lines - - pre_context = \ - [line.strip('\n') for line in source[lower_bound:lineno]] - context_line = source[lineno].strip('\n') - post_context = \ - [line.strip('\n') for line in source[lineno + 1:upper_bound]] - - return lower_bound, pre_context, context_line, post_context - except (OSError, IOError): - return None, [], None, [] - - exception_type, exception_value, tback = sys.exc_info() - frames = [] - while tback is not None: - filename = tback.tb_frame.f_code.co_filename - function = tback.tb_frame.f_code.co_name - lineno = tback.tb_lineno - 1 - pre_context_lineno, pre_context, context_line, post_context = \ - _get_lines_from_file(filename, lineno, 7) - frames.append({ - 'tback': tback, - 'filename': filename, - 'function': function, - 'lineno': lineno, - 'vars': tback.tb_frame.f_locals.items(), - 'id': id(tback), - 'pre_context': pre_context, - 'context_line': context_line, - 'post_context': post_context, - 'pre_context_lineno': pre_context_lineno, - }) - tback = tback.tb_next - lastframe = frames[-1] - frames.reverse() - urljoin = urlparse.urljoin - input_ = input() - cookies_ = cookies() - context_ = ctx - def prettify(x): - try: - out = pprint.pformat(x) - except Exception, e: - out = '[could not display: <' + e.__class__.__name__ + \ - ': '+str(e)+'>]' - return out - return render(DJANGO_500_PAGE, asTemplate=True, isString=True) - -def debugerror(): - """ - A replacement for `internalerror` that presents a nice page with lots - of debug information for the programmer. - - (Based on the beautiful 500 page from [Django](http://djangoproject.com/), - designed by [Wilson Miner](http://wilsonminer.com/).) - - Requires [Cheetah](http://cheetahtemplate.org/). - """ - # need to do django first, so it can get the old stuff - if _hasTemplating: - out = str(djangoerror()) - else: - # Cheetah isn't installed - out = """<p>You've set web.py to use the fancier debugerror error -messages, but these messages require you install the Cheetah template -system. For more information, see -<a href="http://webpy.org/">the web.py website</a>.</p> - -<p>In the meantime, here's a plain old error message:</p> - -<pre>%s</pre> - -<p>(If it says something about 'Compiler', then it's probably -because you're trying to use templates and you haven't -installed Cheetah. See above.)</p> -""" % htmlquote(traceback.format_exc()) - ctx.status = "500 Internal Server Error" - ctx.headers = [('Content-Type', 'text/html')] - ctx.output = out - - -## Rendering - -r_include = re_compile(r'(?!\\)#include \"(.*?)\"($|#)', re.M) -def __compiletemplate(template, base=None, isString=False): - if isString: - text = template - else: - text = open('templates/'+template).read() - # implement #include at compile-time - def do_include(match): - text = open('templates/'+match.groups()[0]).read() - return text - while r_include.findall(text): - text = r_include.sub(do_include, text) - - execspace = _compiletemplate.bases.copy() - tmpl_compiler = Compiler(source=text, mainClassName='GenTemplate') - tmpl_compiler.addImportedVarNames(execspace.keys()) - exec str(tmpl_compiler) in execspace - if base: - _compiletemplate.bases[base] = execspace['GenTemplate'] - - return execspace['GenTemplate'] - -_compiletemplate = memoize(__compiletemplate) -_compiletemplate.bases = {} - -def htmlquote(text): - """Encodes `text` for raw use in HTML.""" - text = text.replace("&", "&") # Must be done first! - text = text.replace("<", "<") - text = text.replace(">", ">") - text = text.replace("'", "'") - text = text.replace('"', """) - return text - -def websafe(val): - """ - Converts `val` so that it's safe for use in HTML. - - HTML metacharacters are encoded, - None becomes the empty string, and - unicode is converted to UTF-8. - """ - if val is None: return '' - if not isinstance(val, unicode): val = str(val) - return htmlquote(val) - -if _hasTemplating: - class WebSafe(Filter): - def filter(self, val, **keywords): - return websafe(val) - -def render(template, terms=None, asTemplate=False, base=None, - isString=False): - """ - Renders a template, caching where it can. - - `template` is the name of a file containing the a template in - the `templates/` folder, unless `isString`, in which case it's the - template itself. - - `terms` is a dictionary used to fill the template. If it's None, then - the caller's local variables are used instead, plus context, if it's not - already set, is set to `context`. - - If asTemplate is False, it `output`s the template directly. Otherwise, - it returns the template object. - - If the template is a potential base template (that is, something other templates) - can extend, then base should be a string with the name of the template. The - template will be cached and made available for future calls to `render`. - - Requires [Cheetah](http://cheetahtemplate.org/). - """ - # terms=['var1', 'var2'] means grab those variables - if isinstance(terms, list): - new = {} - old = upvars() - for k in terms: - new[k] = old[k] - terms = new - # default: grab all locals - elif terms is None: - terms = {'context': context, 'ctx':ctx} - terms.update(sys._getframe(1).f_locals) - # terms=d means use d as the searchList - if not isinstance(terms, tuple): - terms = (terms,) - - if not isString and template.endswith('.html'): - header('Content-Type','text/html; charset=utf-8', unique=True) - - compiled_tmpl = _compiletemplate(template, base=base, isString=isString) - compiled_tmpl = compiled_tmpl(searchList=terms, filter=WebSafe) - if asTemplate: - return compiled_tmpl - else: - return output(str(compiled_tmpl)) - -## Input Forms - -def input(*requireds, **defaults): - """ - Returns a `storage` object with the GET and POST arguments. - See `storify` for how `requireds` and `defaults` work. - """ - from cStringIO import StringIO - def dictify(fs): return dict([(k, fs[k]) for k in fs.keys()]) - - _method = defaults.pop('_method', 'both') - - e = ctx.env.copy() - out = {} - if _method.lower() in ['both', 'post']: - a = {} - if e['REQUEST_METHOD'] == 'POST': - a = cgi.FieldStorage(fp = StringIO(data()), environ=e, - keep_blank_values=1) - a = dictify(a) - out = dictadd(out, a) - - if _method.lower() in ['both', 'get']: - e['REQUEST_METHOD'] = 'GET' - a = dictify(cgi.FieldStorage(environ=e, keep_blank_values=1)) - out = dictadd(out, a) - - try: - return storify(out, *requireds, **defaults) - except KeyError: - badrequest() - raise StopIteration - -def data(): - """Returns the data sent with the request.""" - if 'data' not in ctx: - cl = intget(ctx.env.get('CONTENT_LENGTH'), 0) - ctx.data = ctx.env['wsgi.input'].read(cl) - return ctx.data - -def changequery(**kw): - """ - Imagine you're at `/foo?a=1&b=2`. Then `changequery(a=3)` will return - `/foo?a=3&b=2` -- the same URL but with the arguments you requested - changed. - """ - query = input(_method='get') - for k, v in kw.iteritems(): - if v is None: - query.pop(k, None) - else: - query[k] = v - out = ctx.path - if query: - out += '?' + urllib.urlencode(query) - return out - -## Cookies - -def setcookie(name, value, expires="", domain=None): - """Sets a cookie.""" - if expires < 0: - expires = -1000000000 - kargs = {'expires': expires, 'path':'/'} - if domain: - kargs['domain'] = domain - # @@ should we limit cookies to a different path? - cookie = Cookie.SimpleCookie() - cookie[name] = value - for key, val in kargs.iteritems(): - cookie[name][key] = val - header('Set-Cookie', cookie.items()[0][1].OutputString()) - -def cookies(*requireds, **defaults): - """ - Returns a `storage` object with all the cookies in it. - See `storify` for how `requireds` and `defaults` work. - """ - cookie = Cookie.SimpleCookie() - cookie.load(ctx.env.get('HTTP_COOKIE', '')) - try: - return storify(cookie, *requireds, **defaults) - except KeyError: - badrequest() - raise StopIteration - -## WSGI Sugar - -def header(hdr, value, unique=False): - """ - Adds the header `hdr: value` with the response. - - If `unique` is True and a header with that name already exists, - it doesn't add a new one. If `unique` is None and a header with - that name already exists, it replaces it with this one. - """ - if unique is True: - for h, v in ctx.headers: - if h == hdr: return - elif unique is None: - ctx.headers = [h for h in ctx.headers if h[0] != hdr] - - ctx.headers.append((hdr, value)) - -def output(string_): - """Appends `string_` to the response.""" - if isinstance(string_, unicode): string_ = string_.encode('utf8') - if ctx.get('flush'): - ctx._write(string_) - else: - ctx.output += str(string_) - -def flush(): - ctx.flush = True - return flush - -def write(cgi_response): - """ - Converts a standard CGI-style string response into `header` and - `output` calls. - """ - cgi_response = str(cgi_response) - cgi_response.replace('\r\n', '\n') - head, body = cgi_response.split('\n\n', 1) - lines = head.split('\n') - - for line in lines: - if line.isspace(): - continue - hdr, value = line.split(":", 1) - value = value.strip() - if hdr.lower() == "status": - ctx.status = value - else: - header(hdr, value) - - output(body) - -def webpyfunc(inp, fvars=None, autoreload=False): - """If `inp` is a url mapping, returns a function that calls handle.""" - if not fvars: - fvars = upvars() - if not hasattr(inp, '__call__'): - if autoreload: - # black magic to make autoreload work: - mod = \ - __import__( - fvars['__file__'].split(os.path.sep).pop().split('.')[0]) - #@@probably should replace this with some inspect magic - name = dictfind(fvars, inp) - func = lambda: handle(getattr(mod, name), mod) - else: - func = lambda: handle(inp, fvars) - else: - func = inp - return func - -def wsgifunc(func, *middleware): - """Returns a WSGI-compatible function from a webpy-function.""" - middleware = list(middleware) - if reloader in middleware: - relr = reloader(None) - relrcheck = relr.check - middleware.remove(reloader) - else: - relr = None - relrcheck = lambda: None - - def wsgifunc(env, start_resp): - _load(env) - relrcheck() - try: - result = func() - except StopIteration: - result = None - - is_generator = result and hasattr(result, 'next') - if is_generator: - # wsgi requires the headers first - # so we need to do an iteration - # and save the result for later - try: - firstchunk = result.next() - except StopIteration: - firstchunk = '' - - status, headers, output = ctx.status, ctx.headers, ctx.output - ctx._write = start_resp(status, headers) - - # and now, the fun: - - def cleanup(): - # we insert this little generator - # at the end of our itertools.chain - # so that it unloads the request - # when everything else is done - - yield '' # force it to be a generator - _unload() - - # result is the output of calling the webpy function - # it could be a generator... - - if is_generator: - if firstchunk is flush: - # oh, it's just our special flush mode - # ctx._write is set up, so just continue execution - try: - result.next() - except StopIteration: - pass - - _unload() - return [] - else: - return itertools.chain([firstchunk], result, cleanup()) - - # ... but it's usually just None - # - # output is the stuff in ctx.output - # it's usually a string... - if isinstance(output, str): #@@ other stringlikes? - _unload() - return [output] - # it could be a generator... - elif hasattr(output, 'next'): - return itertools.chain(output, cleanup()) - else: - _unload() - raise Exception, "Invalid web.ctx.output" - - for mw_func in middleware: - wsgifunc = mw_func(wsgifunc) - - if relr: - relr.func = wsgifunc - return wsgifunc - return wsgifunc - -def run(inp, *middleware): - """ - Starts handling requests. If called in a CGI or FastCGI context, it will follow - that protocol. If called from the command line, it will start an HTTP - server on the port named in the first command line argument, or, if there - is no argument, on port 8080. - - `input` is a callable, then it's called with no arguments. - Otherwise, it's a `mapping` object to be passed to `handle(...)`. - - **Caveat:** So that `reloader` will work correctly, input has to be a variable, - it can't be a tuple passed in directly. - - `middleware` is a list of WSGI middleware which is applied to the resulting WSGI - function. - """ - autoreload = reloader in middleware - fvars = upvars() - return runwsgi(wsgifunc(webpyfunc(inp, fvars, autoreload), *middleware)) - -def runwsgi(func): - """ - Runs a WSGI-compatible function using FCGI, SCGI, or a simple web server, - as appropriate. - """ - #@@ improve detection - if os.environ.has_key('SERVER_SOFTWARE'): # cgi - os.environ['FCGI_FORCE_CGI'] = 'Y' - - if (os.environ.has_key('PHP_FCGI_CHILDREN') #lighttpd fastcgi - or os.environ.has_key('SERVER_SOFTWARE') - or 'fcgi' in sys.argv or 'fastcgi' in sys.argv): - return runfcgi(func) - - if 'scgi' in sys.argv: - return runscgi(func) - - # command line: - return runsimple(func, validip(listget(sys.argv, 1, ''))) - -def runsimple(func, server_address=("0.0.0.0", 8080)): - """ - Runs a simple HTTP server hosting WSGI app `func`. The directory `static/` - is hosted statically. - - Based on [WsgiServer][ws] from [Colin Stewart][cs]. - - [ws]: http://www.owlfish.com/software/wsgiutils/documentation/wsgi-server-api.html - [cs]: http://www.owlfish.com/ - """ - # Copyright (c) 2004 Colin Stewart (http://www.owlfish.com/) - # Modified somewhat for simplicity - # Used under the modified BSD license: - # http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5 - - import SimpleHTTPServer, SocketServer, BaseHTTPServer, urlparse - import socket, errno - import traceback - - class WSGIHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): - def run_wsgi_app(self): - protocol, host, path, parameters, query, fragment = \ - urlparse.urlparse('http://dummyhost%s' % self.path) - # we only use path, query - env = {'wsgi.version': (1, 0) - ,'wsgi.url_scheme': 'http' - ,'wsgi.input': self.rfile - ,'wsgi.errors': sys.stderr - ,'wsgi.multithread': 1 - ,'wsgi.multiprocess': 0 - ,'wsgi.run_once': 0 - ,'REQUEST_METHOD': self.command - ,'REQUEST_URI': self.path - ,'PATH_INFO': path - ,'QUERY_STRING': query - ,'CONTENT_TYPE': self.headers.get('Content-Type', '') - ,'CONTENT_LENGTH': self.headers.get('Content-Length', '') - ,'REMOTE_ADDR': self.client_address[0] - ,'SERVER_NAME': self.server.server_address[0] - ,'SERVER_PORT': str(self.server.server_address[1]) - ,'SERVER_PROTOCOL': self.request_version - } - - for http_header, http_value in self.headers.items(): - env ['HTTP_%s' % http_header.replace('-', '_').upper()] = \ - http_value - - # Setup the state - self.wsgi_sent_headers = 0 - self.wsgi_headers = [] - - try: - # We have there environment, now invoke the application - result = self.server.app(env, self.wsgi_start_response) - try: - try: - for data in result: - if data: - self.wsgi_write_data(data) - finally: - if hasattr(result, 'close'): - result.close() - except socket.error, socket_err: - # Catch common network errors and suppress them - if (socket_err.args[0] in \ - (errno.ECONNABORTED, errno.EPIPE)): - return - except socket.timeout, socket_timeout: - return - except: - print >> debug, traceback.format_exc(), - internalerror() - if not self.wsgi_sent_headers: - self.wsgi_start_response(ctx.status, ctx.headers) - self.wsgi_write_data(ctx.output) - - if (not self.wsgi_sent_headers): - # We must write out something! - self.wsgi_write_data(" ") - return - - do_POST = run_wsgi_app - do_PUT = run_wsgi_app - do_DELETE = run_wsgi_app - - def do_GET(self): - if self.path.startswith('/static/'): - SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) - else: - self.run_wsgi_app() - - def wsgi_start_response(self, response_status, response_headers, - exc_info=None): - if (self.wsgi_sent_headers): - raise Exception \ - ("Headers already sent and start_response called again!") - # Should really take a copy to avoid changes in the application.... - self.wsgi_headers = (response_status, response_headers) - return self.wsgi_write_data - - def wsgi_write_data(self, data): - if (not self.wsgi_sent_headers): - status, headers = self.wsgi_headers - # Need to send header prior to data - status_code = status [:status.find(' ')] - status_msg = status [status.find(' ') + 1:] - self.send_response(int(status_code), status_msg) - for header, value in headers: - self.send_header(header, value) - self.end_headers() - self.wsgi_sent_headers = 1 - # Send the data - self.wfile.write(data) - - class WSGIServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): - def __init__(self, func, server_address): - BaseHTTPServer.HTTPServer.__init__(self, - server_address, - WSGIHandler) - self.app = func - self.serverShuttingDown = 0 - - print "Launching server: http://%s:%d/" % server_address - WSGIServer(func, server_address).serve_forever() - -def makeserver(wsgi_server): - """Updates a flup-style WSGIServer with web.py-style error support.""" - class MyServer(wsgi_server): - def error(self, req): - w = req.stdout.write - internalerror() - w('Status: ' + ctx.status + '\r\n') - for (h, v) in ctx.headers: - w(h + ': ' + v + '\r\n') - w('\r\n' + ctx.output) - - return MyServer - -def runfcgi(func): - """Runs a WSGI-function with a FastCGI server.""" - from flup.server.fcgi import WSGIServer - if len(sys.argv) > 2: # progname, scgi - args = sys.argv[:] - if 'fastcgi' in args: args.remove('fastcgi') - elif 'fcgi' in args: args.remove('fcgi') - hostport = validaddr(args[1]) - elif len(sys.argv) > 1: - hostport = ('localhost', 8000) - else: - hostport = None - return makeserver(WSGIServer)(func, multiplexed=True, bindAddress=hostport).run() - -def runscgi(func): - """Runs a WSGI-function with an SCGI server.""" - from flup.server.scgi import WSGIServer - my_server = makeserver(WSGIServer) - if len(sys.argv) > 2: # progname, scgi - args = sys.argv[:] - args.remove('scgi') - hostport = validaddr(args[1]) - else: - hostport = ('localhost', 4000) - return my_server(func, bindAddress=hostport).run() - -## Debugging - -def debug(*args): - """ - Prints a prettyprinted version of `args` to stderr. - """ - try: - out = ctx.environ['wsgi.errors'] - except: - out = sys.stderr - for arg in args: - print >> out, pprint.pformat(arg) - return '' - -def debugwrite(x): - """writes debug data to error stream""" - try: - out = ctx.environ['wsgi.errors'] - except: - out = sys.stderr - out.write(x) -debug.write = debugwrite - -class Reloader: - """ - Before every request, checks to see if any loaded modules have changed on - disk and, if so, reloads them. - """ - def __init__(self, func): - self.func = func - self.mtimes = {} - global _compiletemplate - b = _compiletemplate.bases - _compiletemplate = globals()['__compiletemplate'] - _compiletemplate.bases = b - - def check(self): - for mod in sys.modules.values(): - try: - mtime = os.stat(mod.__file__).st_mtime - except (AttributeError, OSError, IOError): - continue - if mod.__file__.endswith('.pyc') and \ - os.path.exists(mod.__file__[:-1]): - mtime = max(os.stat(mod.__file__[:-1]).st_mtime, mtime) - if mod not in self.mtimes: - self.mtimes[mod] = mtime - elif self.mtimes[mod] < mtime: - try: - reload(mod) - except ImportError: - pass - return True - - def __call__(self, e, o): - self.check() - return self.func(e, o) -reloader = Reloader - -def profiler(app): - """Outputs basic profiling information at the bottom of each response.""" - def profile_internal(e, o): - out, result = profile(app)(e, o) - return out + ['<pre>' + result + '</pre>'] #@@encode - return profile_internal - -## Context - -class _outputter: - """Wraps `sys.stdout` so that print statements go into the response.""" - def write(self, string_): - if hasattr(ctx, 'output'): - return output(string_) - else: - _oldstdout.write(string_) - def flush(self): - return _oldstdout.flush() - def close(self): - return _oldstdout.close() - -_context = {currentThread():Storage()} -ctx = context = threadeddict(_context) - -ctx.__doc__ = """ -A `storage` object containing various information about the request: - -`environ` (aka `env`) - : A dictionary containing the standard WSGI environment variables. - -`host` - : The domain (`Host` header) requested by the user. - -`home` - : The base path for the application. - -`ip` - : The IP address of the requester. - -`method` - : The HTTP method used. - -`path` - : The path request. - -`fullpath` - : The full path requested, including query arguments. - -### Response Data - -`status` (default: "200 OK") - : The status code to be used in the response. - -`headers` - : A list of 2-tuples to be used in the response. - -`output` - : A string to be used as the response. -""" - -if not '_oldstdout' in globals(): - _oldstdout = sys.stdout - sys.stdout = _outputter() - -loadhooks = {} - -def load(): - """ - Loads a new context for the thread. - - You can ask for a function to be run at loadtime by - adding it to the dictionary `loadhooks`. - """ - _context[currentThread()] = Storage() - ctx.status = '200 OK' - ctx.headers = [] - if 'db_parameters' in globals(): - connect(**db_parameters) - - for x in loadhooks.values(): x() - -def _load(env): - load() - ctx.output = '' - ctx.environ = ctx.env = env - ctx.host = env.get('HTTP_HOST') - ctx.home = 'http://' + env.get('HTTP_HOST', '[unknown]') + \ - os.environ.get('REAL_SCRIPT_NAME', env.get('SCRIPT_NAME', '')) - ctx.ip = env.get('REMOTE_ADDR') - ctx.method = env.get('REQUEST_METHOD') - ctx.path = env.get('PATH_INFO') - # http://trac.lighttpd.net/trac/ticket/406 requires: - if env.get('SERVER_SOFTWARE', '').startswith('lighttpd/'): - ctx.path = lstrips(env.get('REQUEST_URI').split('?')[0], - os.environ.get('REAL_SCRIPT_NAME', env.get('SCRIPT_NAME', ''))) - - ctx.fullpath = ctx.path - if env.get('QUERY_STRING'): - ctx.fullpath += '?' + env.get('QUERY_STRING', '') - -unloadhooks = {} - -def unload(): - """ - Unloads the context for the thread. - - You can ask for a function to be run at loadtime by - adding it ot the dictionary `unloadhooks`. - """ - for x in unloadhooks.values(): x() - # ensures db cursors and such are GCed promptly - del _context[currentThread()] - -def _unload(): - unload() - -if __name__ == "__main__": - import doctest - doctest.testmod() - - urls = ('/web.py', 'source') - class source: - def GET(self): - header('Content-Type', 'text/python') - print open(sys.argv[0]).read() - run(urls) diff --git a/packages/python/python-webpy_0.21.bb b/packages/python/python-webpy_0.31.bb index f6bb1812d0..616e8b4c9b 100644 --- a/packages/python/python-webpy_0.21.bb +++ b/packages/python/python-webpy_0.31.bb @@ -2,10 +2,16 @@ DESCRIPTION = "A Lightweight Web Application Framework" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" -RDEPENDS = "python-netserver python-netclient python-pprint" PR = "ml0" SRC_URI = "http://webpy.org/static/web.py-${PV}.tar.gz" S = "${WORKDIR}/webpy" inherit distutils + +RDEPENDS = "\ + python-netserver \ + python-netclient \ + python-pprint \ +" + diff --git a/packages/python/python-xappy_0.5.bb b/packages/python/python-xappy_0.5.bb index d257905896..ae9cda69fb 100644 --- a/packages/python/python-xappy_0.5.bb +++ b/packages/python/python-xappy_0.5.bb @@ -1,15 +1,15 @@ DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine" +SECTION = "python/devel" LICENSE = "GPLv2" - -DEPENDS += "xapian-core" +DEPENDS = "xapian-core" +PR = "ml0" SRC_URI = "http://xappy.googlecode.com/files/xappy-${PV}.tar.gz" +S = "${WORKDIR}/xappy-${PV}" inherit distutils -S = "${WORKDIR}/xappy-${PV}" - do_stage() { distutils_stage_all } - + diff --git a/packages/python/python-xlib_0.14.bb b/packages/python/python-xlib_0.14.bb index ef4a3b9e80..eb29004223 100644 --- a/packages/python/python-xlib_0.14.bb +++ b/packages/python/python-xlib_0.14.bb @@ -3,11 +3,8 @@ HOMEPAGE = "http://sourceforge.net/projects/python-xlib/" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" - -SRCNAME = "python-xlib" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" inherit distutils diff --git a/packages/python/python24-2.4.4/autohell.patch b/packages/python/python24-2.4.4/autohell.patch deleted file mode 100644 index b0eebb9ce8..0000000000 --- a/packages/python/python24-2.4.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/python24-2.4.4/bindir-libdir.patch b/packages/python/python24-2.4.4/bindir-libdir.patch deleted file mode 100644 index 27ae5dce5b..0000000000 --- a/packages/python/python24-2.4.4/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4c1/Makefile.pre.in~bindir-libdir.patch -+++ Python-2.4c1/Makefile.pre.in -@@ -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/python24-2.4.4/crosscompile.patch b/packages/python/python24-2.4.4/crosscompile.patch deleted file mode 100644 index f917bb2567..0000000000 --- a/packages/python/python24-2.4.4/crosscompile.patch +++ /dev/null @@ -1,108 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4c1/Makefile.pre.in~crosscompile -+++ Python-2.4c1/Makefile.pre.in -@@ -162,6 +162,7 @@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -188,7 +189,7 @@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -320,8 +321,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 -@@ -442,7 +443,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) -@@ -718,19 +719,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 - -@@ -825,7 +826,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.4c1/setup.py~crosscompile -+++ Python-2.4c1/setup.py -@@ -206,6 +206,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 -@@ -239,8 +240,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') - - # Add paths to popular package managers on OS X/darwin - if sys.platform == "darwin": -@@ -293,6 +294,9 @@ - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] -+ - # - # The following modules are all pretty straightforward, and compile - # on pretty much any POSIXish platform. diff --git a/packages/python/python24-2.4.4/fix-tkinter-detection.patch b/packages/python/python24-2.4.4/fix-tkinter-detection.patch deleted file mode 100644 index 602aa8e021..0000000000 --- a/packages/python/python24-2.4.4/fix-tkinter-detection.patch +++ /dev/null @@ -1,39 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4.1/setup.py~fix-tkinter-detection -+++ Python-2.4.1/setup.py -@@ -999,7 +999,7 @@ - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1018,22 +1018,6 @@ - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/packages/python/python24-2.4.4/sitebranding.patch b/packages/python/python24-2.4.4/sitebranding.patch deleted file mode 100644 index 85bb83a506..0000000000 --- a/packages/python/python24-2.4.4/sitebranding.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4.3/Lib/site.py~sitebranding -+++ Python-2.4.3/Lib/site.py -@@ -305,8 +305,9 @@ - "Jython is maintained by the Jython developers (www.jython.org).") - else: - __builtin__.credits = _Printer("credits", """\ -- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands -- for supporting Python development. See www.python.org for more information.""") -+ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). -+ It is a part of the Python-For-Embedded-Systems initiative which is maintained by -+ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") - here = os.path.dirname(os.__file__) - __builtin__.license = _Printer( - "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python24-manifest.inc b/packages/python/python24-manifest.inc deleted file mode 100644 index d08235e42e..0000000000 --- a/packages/python/python24-manifest.inc +++ /dev/null @@ -1,291 +0,0 @@ -######################################################################################################################## -### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Jul 21 14:25:07 2007 -### -### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy -### -### Warning: Manual edits will be lost! -### -######################################################################################################################## - - -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " - -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " - -DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml2" -RDEPENDS_python-profile="python-core" -FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " - -DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml2" -RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " - -DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml2" -RDEPENDS_python-distutils="python-core" -FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/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.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* " - -DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml2" -RDEPENDS_python-codecs="python-core" -FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* " - -DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml2" -RDEPENDS_python-pickle="python-core python-codecs python-io python-re" -FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " - -DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml2" -RDEPENDS_python-datetime="python-core python-codecs" -FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " - -DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml4" -RDEPENDS_python-core="" -FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.* /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/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.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/_ssl.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* " - -DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml2" -RDEPENDS_python-compiler="python-core" -FILES_python-compiler="${libdir}/python2.4/compiler " - -DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml2" -RDEPENDS_python-compression="python-core python-zlib" -FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* " - -DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml2" -RDEPENDS_python-re="python-core" -FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/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.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* " - -DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml2" -RDEPENDS_python-terminal="python-core python-io" -FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* " - -DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml2" -RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" -FILES_python-email="${libdir}/python2.4/email " - -DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml2" -RDEPENDS_python-image="python-core" -FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so " - -DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml2" -RDEPENDS_python-core-dbg="python-core" -FILES_python-core-dbg="/usr/lib/python2.4/lib-dynload/.debug /usr/bin/.debug /usr/lib/.debug " - -DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml2" -RDEPENDS_python-resource="python-core" -FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so " - -DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml2" -RDEPENDS_python-devel="python-core" -FILES_python-devel="/usr/include /usr/lib/python2.4/config " - -DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml2" -RDEPENDS_python-math="python-core" -FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* " - -DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml2" -RDEPENDS_python-hotshot="python-core" -FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/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.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* " - -DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml2" -RDEPENDS_python-syslog="python-core" -FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so " - -DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml2" -RDEPENDS_python-tkinter="python-core" -FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/python2.4/lib-tk " - -DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml2" -RDEPENDS_python-gdbm="python-core" -FILES_python-gdbm="${libdir}/python2.4/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.4/lib-dynload/fcntl.so " - -DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml2" -RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" -FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " - -DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml2" -RDEPENDS_python-pprint="python-core" -FILES_python-pprint="${libdir}/python2.4/pprint.* " - -DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml2" -RDEPENDS_python-netserver="python-core python-netclient" -FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* " - -DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml2" -RDEPENDS_python-curses="python-core" -FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so " - -DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml2" -RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" -FILES_python-smtpd="/usr/bin/smtpd.* " - -DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml2" -RDEPENDS_python-html="python-core" -FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* " - -DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml2" -RDEPENDS_python-readline="python-core" -FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " - -DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml2" -RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" -FILES_python-subprocess="${libdir}/python2.4/subprocess.* " - -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="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* " - -DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml2" -RDEPENDS_python-logging="python-core" -FILES_python-logging="${libdir}/python2.4/logging " - -DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml2" -RDEPENDS_python-mailbox="python-core python-mime" -FILES_python-mailbox="${libdir}/python2.4/mailbox.* " - -DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml2" -RDEPENDS_python-xml="python-core python-re" -FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* " - -DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml2" -RDEPENDS_python-mime="python-core python-io" -FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/uu.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* " - -DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml2" -RDEPENDS_python-tests="python-core" -FILES_python-tests="${libdir}/python2.4/test " - -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.4/unittest.* " - -DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml2" -RDEPENDS_python-stringold="python-core python-re" -FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* " - -DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml2" -RDEPENDS_python-robotparser="python-core python-netclient" -FILES_python-robotparser="${libdir}/python2.4/robotparser.* " - -DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml2" -RDEPENDS_python-lib-old-and-deprecated="python-core" -FILES_python-lib-old-and-deprecated="${libdir}/python2.4/lib-old " - -DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml2" -RDEPENDS_python-compile="python-core" -FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* " - -DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml2" -RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" -FILES_python-debugger="${libdir}/python2.4/bdb.* ${libdir}/python2.4/pdb.* " - -DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml2" -RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.4/cmd.* ${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* " - -DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml2" -RDEPENDS_python-bsddb="python-core" -FILES_python-bsddb="${libdir}/python2.4/bsddb " - -DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml2" -RDEPENDS_python-mmap="python-core python-io" -FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " - -DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml2" -RDEPENDS_python-zlib="python-core" -FILES_python-zlib="${libdir}/python2.4/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.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* " - -DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml2" -RDEPENDS_python-crypt="python-core" -FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so " - -DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml2" -RDEPENDS_python-idle="python-core python-tkinter" -FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " - -DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml2" -RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " - -DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml2" -RDEPENDS_python-audio="python-core" -FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/sndhdr.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " - - - diff --git a/packages/python/python24-native-2.4.0/bindir-libdir.patch b/packages/python/python24-native-2.4.0/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python24-native-2.4.0/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/python24-native-2.4.0/cross-distutils.patch b/packages/python/python24-native-2.4.0/cross-distutils.patch deleted file mode 100644 index 76ae883c1d..0000000000 --- a/packages/python/python24-native-2.4.0/cross-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +201,8 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch deleted file mode 100644 index 54109afd62..0000000000 --- a/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> -# - ---- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line -+++ Python-2.4/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' - diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb deleted file mode 100644 index 15b2b4c0fe..0000000000 --- a/packages/python/python24-native_2.4.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "" -PR = "r2" - -EXCLUDE_FROM_WORLD = "1" - -SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1 \ - file://dont-modify-shebang-line.patch;patch=1" -S = "${WORKDIR}/Python-2.4" - -inherit autotools native - -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ - --without-cxx --with-signal-module --with-wctype-functions" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' - -do_configure() { - # the autofoo stuff is too old to allow regenerating - oe_runconf -} - -do_stage_append() { - # install pgen for later usage with non-native builds - install Parser/pgen ${STAGING_BINDIR_NATIVE}/ -} - diff --git a/packages/python/python24-pyqt2/features b/packages/python/python24-pyqt2/features deleted file mode 100644 index 6fe74cafe4..0000000000 --- a/packages/python/python24-pyqt2/features +++ /dev/null @@ -1,31 +0,0 @@ --x Qt_THREAD_SUPPORT --x Qt_CODECS --x Qt_COLORDIALOG --x Qt_DIAL --x Qt_DOM --x Qt_DRAGANDDROP --x Qt_IMAGE_TEXT --x Qt_INPUTDIALOG --x Qt_FILEDIALOG --x Qt_FONTDIALOG --x Qt_MIMECLIPBOARD --x Qt_NETWORKPROTOCOL --x Qt_NETWORKPROTOCOL_FTP --x Qt_NETWORKPROTOCOL_HTTP --x Qt_PICTURE --x Qt_PRINTDIALOG --x Qt_PRINTER --x Qt_PROGRESSDIALOG --x Qt_PROPERTIES --x Qt_SEMIMODAL --x Qt_SIZEGRIP --x Qt_SPLITTER --x Qt_STYLE_CDE --x Qt_STYLE_INTERLACE --x Qt_STYLE_MOTIF --x Qt_STYLE_MOTIFPLUS --x Qt_STYLE_PLATINUM --x Qt_STYLE_SGI --x Qt_TRANSFORMATIONS --x Qt_WIZARD --x Qt_WORKSPACE diff --git a/packages/python/python24-pyqt2/qt2-fix.patch b/packages/python/python24-pyqt2/qt2-fix.patch deleted file mode 100644 index 5ee978e8f6..0000000000 --- a/packages/python/python24-pyqt2/qt2-fix.patch +++ /dev/null @@ -1,124 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip -@@ -235,7 +235,7 @@ - sipClass = sipClass_QCanvasLine; - break; - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - case 8: - sipClass = sipClass_QCanvasSpline; - break; ---- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip -@@ -114,7 +114,7 @@ - %ConvertToSubClassCode - Py_BEGIN_ALLOW_THREADS - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - int rtti = sipCpp -> rtti(); - - if (rtti == QCheckTableItem::RTTI) ---- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip -@@ -102,7 +102,7 @@ - #endif - {sipName_QComboBox, &sipClass_QComboBox}, - {sipName_QCommonStyle, &sipClass_QCommonStyle}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QDateEdit, &sipClass_QDateEdit}, - {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, - {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, -@@ -111,13 +111,13 @@ - {sipName_QDial, &sipClass_QDial}, - #endif - {sipName_QDialog, &sipClass_QDialog}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QDockArea, &sipClass_QDockArea}, - {sipName_QDockWindow, &sipClass_QDockWindow}, - #endif - {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, - {sipName_QDragObject, &sipClass_QDragObject}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QErrorMessage, &sipClass_QErrorMessage}, - #endif - #if QT_VERSION >= 0x030100 -@@ -133,7 +133,7 @@ - {sipName_QFrame, &sipClass_QFrame}, - {sipName_QGrid, &sipClass_QGrid}, - {sipName_QGridLayout, &sipClass_QGridLayout}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QGridView, &sipClass_QGridView}, - #endif - {sipName_QGroupBox, &sipClass_QGroupBox}, -@@ -175,7 +175,7 @@ - {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, - {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, - #endif --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, - #endif - #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) -@@ -185,7 +185,7 @@ - #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) - {sipName_QPrintDialog, &sipClass_QPrintDialog}, - #endif --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QProcess, &sipClass_QProcess}, - #endif - {sipName_QProgressBar, &sipClass_QProgressBar}, -@@ -194,7 +194,7 @@ - #endif - {sipName_QPushButton, &sipClass_QPushButton}, - {sipName_QRadioButton, &sipClass_QRadioButton}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, - #endif - #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) -@@ -229,11 +229,11 @@ - {sipName_QTabWidget, &sipClass_QTabWidget}, - {sipName_QTextBrowser, &sipClass_QTextBrowser}, - {sipName_QTextDrag, &sipClass_QTextDrag}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QTextEdit, &sipClass_QTextEdit}, - #endif - {sipName_QTextView, &sipClass_QTextView}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QTimeEdit, &sipClass_QTimeEdit}, - #endif - {sipName_QTimer, &sipClass_QTimer}, ---- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip -@@ -528,7 +528,7 @@ - sipClass = sipClass_QChildEvent; - break; - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - case QEvent::ContextMenu: - sipClass = sipClass_QContextMenuEvent; - break; -@@ -539,7 +539,7 @@ - break; - #endif - --#if QT_VERSION >= 300 && QT_VERSION < 0x030100 -+#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 - case QEvent::IMCompose: - sipClass = sipClass_QIMEvent; - break; diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb deleted file mode 100644 index dc93d28a09..0000000000 --- a/packages/python/python24-pyqt2_3.13.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings" -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqte2 virtual/libqpe1" -RDEPENDS = "python-core python24-sip" -SRCNAME = "pyqt" -PR = "ml5" - -SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ - file://qt2-fix.patch;patch=1 \ - file://features" -S = "${WORKDIR}/PyQt-x11-gpl-${PV}" - -inherit palmtop sip3 distutils-base - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -SIP_MODULES = "qt qtcanvas qttable qtpe" -SIP_FEATURES = "${WORKDIR}/features" -EXTRA_OEMAKE = " MAKEFLAGS= " - -EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ - QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \ - QMAKE_RPATH=-Wl,-rpath-link, \ - DESTDIR= \ - VERSION=1.0.0 \ - DEFINES+=SIP_MAKE_DLL \ - DEFINES+=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_configure_prepend() { - printf "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - for module in ${SIP_MODULES} - do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages" -FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/.debug" diff --git a/packages/python/python24-pyqwt2/features b/packages/python/python24-pyqwt2/features deleted file mode 100644 index 56eab20b69..0000000000 --- a/packages/python/python24-pyqwt2/features +++ /dev/null @@ -1,30 +0,0 @@ --x Qt_THREAD_SUPPORT --x Qt_CODECS --x Qt_COLORDIALOG --x Qt_DIAL --x Qt_DOM --x Qt_DRAGANDDROP --x Qt_IMAGE_TEXT --x Qt_INPUTDIALOG --x Qt_FILEDIALOG --x Qt_FONTDIALOG --x Qt_MIMECLIPBOARD --x Qt_NETWORKPROTOCOL --x Qt_NETWORKPROTOCOL_FTP --x Qt_PICTURE --x Qt_PRINTDIALOG --x Qt_PRINTER --x Qt_PROGRESSDIALOG --x Qt_PROPERTIES --x Qt_SEMIMODAL --x Qt_SIZEGRIP --x Qt_SPLITTER --x Qt_STYLE_CDE --x Qt_STYLE_INTERLACE --x Qt_STYLE_MOTIF --x Qt_STYLE_MOTIFPLUS --x Qt_STYLE_PLATINUM --x Qt_STYLE_SGI --x Qt_TRANSFORMATIONS --x Qt_WIZARD --x Qt_WORKSPACE diff --git a/packages/python/python24-pyqwt2/qt2.x-compat.patch b/packages/python/python24-pyqwt2/qt2.x-compat.patch deleted file mode 100644 index 249ff4a5ee..0000000000 --- a/packages/python/python24-pyqwt2/qt2.x-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- PyQwt-20040118/sip/qwtarray.sip~add-missing-feature-tests 2003-12-14 16:54:29.000000000 +0100 -+++ PyQwt-20040118/sip/qwtarray.sip 2004-01-29 18:31:21.000000000 +0100 -@@ -34,11 +34,10 @@ - // educational versions of Qt, PyQt and sip, PyQwt becomes a free plug-in - // for a non-free program. - -- - %MappedType QwtArray<long> - { - %TypeHeaderCode --#include <qmemarray.h> -+//#include <qmemarray.h> - %End - - %ConvertFromTypeCode -@@ -339,7 +338,6 @@ - %End // ConvertToTypeCode - }; // QwtArray<QwtEventPattern::MousePattern> - -- - // Local Variables: - // mode: C++ - // c-file-style: "stroustrup" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb deleted file mode 100644 index 4f1f9bc0c9..0000000000 --- a/packages/python/python24-pyqwt2_3.10.bb +++ /dev/null @@ -1,65 +0,0 @@ -DESCRIPTION = "Python QWT Bindings, QtE edition" -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" -DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" -SRCNAME = "pyqwt" -PR = "ml4" - -SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ - file://qt2.x-compat.patch;patch=1 \ - file://features" -S = "${WORKDIR}/PyQwt-20040118" - -inherit palmtop sip3 distutils-base - -QMAKE_PROFILES = "pyqwt.pro" -EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -SIP_MODULES = "qwt" -SIP_FEATURES = "${WORKDIR}/features" -EXTRA_OEMAKE = " MAKEFLAGS= " - -EXTRA_QMAKEVARS_POST += "TARGET=qwt \ - DESTDIR= \ - VERSION=1.0.0 \ - DEFINES+=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \ - DEFINES+=HAS_NUMERIC DEFINES+=QWT_NO_MEMARRAY \ - INCLUDEPATH+=../numpy \ - INCLUDEPATH+=${S}/qwt-sources/include \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_generate_prepend() { - printf "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro - - echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip - echo "TEMPLATE=lib" >>sip/qwtmod.sip - echo 'SOURCES = $B' >>sip/qwtmod.sip - echo 'HEADERS = $H' >>sip/qwtmod.sip - echo "%End" >>sip/qwtmod.sip - - mkdir -p sip/qwt/ - mv sip/*.* sip/qwt/ -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - for module in ${SIP_MODULES} - do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python24-sip_4.1.1.bb b/packages/python/python24-sip_4.1.1.bb deleted file mode 100644 index 718b019af9..0000000000 --- a/packages/python/python24-sip_4.1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqte2 python24" -RDEPENDS = "python-core" -PR = "ml4" - -SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit palmtop distutils-base - -EXTRA_QMAKEVARS_POST += "TEMPLATE=lib \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - -do_configure_prepend() { - cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro -} - -do_stage() { - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ - oe_libinstall -so libsip ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ - install -m 0644 sip.h ${STAGING_INCDIR}/sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/packages/python/python24_2.4.4.bb b/packages/python/python24_2.4.4.bb deleted file mode 100644 index 313075094e..0000000000 --- a/packages/python/python24_2.4.4.bb +++ /dev/null @@ -1,79 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml2" - -PYTHON_MAJMIN = "2.4" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1 \ - file://sitebranding.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 \ - --enable-shared" - -# -# 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}/python${PYTHON_MAJMIN}/ - install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ - install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - 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}/python${PYTHON_MAJMIN}/config/ -} - -do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" -} - -do_stage() { - install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - oe_libinstall -a -so libpython2.4 ${STAGING_LIBDIR} -} - -do_install() { - install -m 0644 Makefile.orig Makefile - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - DESTDIR=${D} install -} - -require python24-manifest.inc - -RPROVIDES_python-core = "python" -RPROVIDES_python-curses = "python" -PACKAGES =+ "libpython2" -FILES_libpython2 = "${libdir}/libpython*" - -# catch all the rest (unsorted) -PACKAGES += "python-misc" -FILES_python-misc = "${libdir}/python2.4" - -# catch manpage -PACKAGES += "python-man" -FILES_python-man = "${datadir}/man" - diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb deleted file mode 100644 index a405c49bb0..0000000000 --- a/packages/python/python_2.5.2.bb +++ /dev/null @@ -1,117 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" -DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -# bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml18" - -PYTHON_MAJMIN = "2.5" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1 \ - file://autohell.patch;patch=1 \ - file://sitebranding.patch;patch=1 \ - file://enable-ctypes-module.patch;patch=1 \ - file://default-is-optimized.patch;patch=1 \ - \ - file://05-install.patch;patch=1 \ - file://06-fix-urllib-exception.patch;patch=1 \ - file://16-bug1179-imageop.patch;patch=1 \ - file://13-set-wakeup-fix.patch;patch=1 \ - \ - file://sitecustomize.py \ -" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ - --without-cxx --with-signal-module --with-wctype-functions \ - --enable-shared" - -# -# 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}/python${PYTHON_MAJMIN}/ - install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ - install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - 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}/python${PYTHON_MAJMIN}/config/ -} - -do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" libpython2.5.so - - oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} - - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" -} - -do_stage() { - install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} -} - -do_install() { - install -m 0644 Makefile.orig Makefile - - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - DESTDIR=${D} LIBDIR=${libdir} install - - install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} - - # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 - sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile -} - -require python-${PYTHON_MAJMIN}-manifest.inc - -# manual dependency additions -RPROVIDES_python-core = "python" -RRECOMMENDS_python-core = "python-readline" -RRECOMMENDS_python-crypt = "openssl" - -# add sitecustomize -FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" - -# package libpython -PACKAGES =+ "libpython2" -FILES_libpython2 = "${libdir}/libpython*" - -# catch debug extensions -FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" - -# catch all the rest (unsorted) -PACKAGES += "python-misc" -FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" - -# catch manpage -PACKAGES += "python-man" -FILES_python-man = "${datadir}/man" - diff --git a/packages/python/python_2.6.1.bb b/packages/python/python_2.6.1.bb index df50e72a9e..f73a06ad50 100644 --- a/packages/python/python_2.6.1.bb +++ b/packages/python/python_2.6.1.bb @@ -1,6 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" +PR = "ml0" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ @@ -92,7 +93,7 @@ FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" # package libpython PACKAGES =+ "libpython2" -FILES_libpython2 = "${libdir}/libpython*" +FILES_libpython2 = "${libdir}/libpython*.so*" # catch debug extensions (isn't that already in python-core-dbg?) FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" diff --git a/packages/rdiff-backup/rdiff-backup_1.0.4.bb b/packages/rdiff-backup/rdiff-backup_1.0.4.bb index 05aa686a02..836363ddf7 100644 --- a/packages/rdiff-backup/rdiff-backup_1.0.4.bb +++ b/packages/rdiff-backup/rdiff-backup_1.0.4.bb @@ -1,2 +1,2 @@ require rdiff-backup.inc -PR = "r0" +PR = "r1" diff --git a/packages/rdiff-backup/rdiff-backup_1.1.5.bb b/packages/rdiff-backup/rdiff-backup_1.1.5.bb index a8cf1876ec..6b67289b0b 100644 --- a/packages/rdiff-backup/rdiff-backup_1.1.5.bb +++ b/packages/rdiff-backup/rdiff-backup_1.1.5.bb @@ -1,5 +1,5 @@ require rdiff-backup.inc -PR = "r0" +PR = "r1" # 1.1.x added the use of sha which we get from python-crypt RDEPENDS_${PN} += "python-crypt" diff --git a/packages/sip/sip-native_4.7.8.bb b/packages/sip/sip-native_4.7.9.bb index 127d26f389..127d26f389 100644 --- a/packages/sip/sip-native_4.7.8.bb +++ b/packages/sip/sip-native_4.7.9.bb diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index ca92c246b4..47fe227cc2 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,113 +1,115 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml38" +PV = "2.6" +PR = "ml40" RDEPENDS = "\ - python-ao \ - python-cheetah \ - python-connexion \ - python-constraint \ - python-dbus \ - python-dialog \ - task-python-efl \ - task-python-efl-examples \ -# python-fam \ - python-fnorb \ - python-formencode \ - python-fpconst \ - python-fugrep \ - python-fuse \ - python-fusil \ - python-gammu \ - python-gmpy \ - python-gnosis \ - python-gsmd \ - python-gst \ - python-hmm \ - python-imaging \ - python-imdbpy \ - python-inotify \ - python-irclib \ - python-itools \ - python-logilab-common \ - python-libgmail \ - python-lightmediascanner \ - python-lxml \ - python-m2crypto \ - python-mad \ - python-mako \ - python-numarray \ - python-numeric \ - python-ogg \ - python-opendir \ - python-pexpect \ - python-ptrace \ - python-pyalsa \ - python-pyalsaaudio \ - python-pybluez \ - python-pycairo \ - python-pychecker \ - python-pycodes \ - python-pycurl \ - python-pydirectfb \ - python-pyephem \ - python-pyfits \ - python-pyflakes \ - python-pygame \ - python-pygobject \ - python-pygoogle \ - python-pygtk-1.2 \ - python-pygtk \ - python-pyid3lib \ - python-pyiw \ - python-pylinda \ - python-pylint \ - python-pyqt \ - python-pyraf \ - python-pyreverse \ - python-pyrex \ - python-pyro \ - python-pyserial \ - python-pytester \ - python-pyusb \ - python-pyvisa \ - python-pyweather \ - python-pyxml \ - python-pyxmlrpc \ - python-pyyaml \ - python-rpyc \ - python-scapy \ - python-scons \ - python-setuptools \ - python-simplejson \ - python-sip \ - python-sgmlop \ - python-snmplib \ - python-soappy \ - python-sphinxsearch \ - python-spydi \ - python-spyro \ - python-sqlalchemy \ - python-sqlobject \ -# python-sword \ - python-tlslite \ - python-urwid \ - python-vmaps \ - python-vorbis \ - python-webpy \ - moin \ - plone \ - python-twisted \ - zope" - -BROKEN_PACKAGES = "\ - python-egenix-mx-base \ - python-mysqldb \ - python-pyqwt \ + python-ao \ + python-cheetah \ + python-connexion \ + python-constraint \ + python-daap \ + python-dbus \ + python-dialog \ + python-docutils \ + task-python-efl \ + task-python-efl-examples \ + python-fam \ + python-flup \ + python-fnorb\ + python-formencode \ + python-fpconst \ + python-fugrep \ + python-fuse \ + python-fusil \ + python-gammu \ + python-gmpy \ + python-gnosis \ + python-gst \ + python-imaging \ + python-imdbpy \ + python-inotify \ + python-irclib \ + python-logilab-common \ + python-libgmail \ + python-m2crypto \ + python-mad \ + python-mako \ + python-netfilter \ + python-numarray \ + python-numeric \ + python-numpy \ + python-ogg \ + python-opendir \ + python-pexpect \ + python-psyco \ + python-ptrace \ + python-pyalsa \ + python-pyalsaaudio \ + python-pybluez \ + python-pycairo \ + python-pychecker \ + python-pycodes \ + python-pycrypto \ + python-pycurl \ + python-pyephem \ + python-pyfits \ + python-pyflakes \ + python-pygame \ + python-pygobject \ + python-pygoogle \ + python-pygtk-1.2 \ + python-pygtk \ + python-pyid3lib \ + python-pylinda \ + python-pylint \ + python-pylirc \ + python-pymetar \ + python-pymp3 \ + python-pyode \ + python-pyopenssl \ + python-pyqt \ + python-pyraf \ + python-pyrex \ + python-pyrtc \ + python-pyro \ + python-pyserial \ + python-pysqlite2 \ + python-pytester \ + python-pyusb \ + python-pyvisa \ + python-pyweather \ + python-pyxdg \ + python-pyxml \ + python-pyxmlrpc \ + python-pyyaml \ + python-pyzeroconf \ + python-rpyc \ + python-scapy \ + python-scons \ + python-setuptools \ + python-simplejson \ + python-sip \ + python-sgmlop \ + python-soappy \ + python-sphinx \ + python-sphinxsearch \ + python-spydi \ + python-spyro \ + python-sqlalchemy \ + python-sqlobject \ + python-traits \ + python-tlslite \ + python-twisted \ + python-vorbis \ + python-webpy \ + python-xappy \ + python-xlib \ + \ + dtn \ + iotop \ + moin \ + plone \ + zope \ " - -#fixme add python-pycap once libdnet is in again -#fixme add python-pyx once kpathwhich-native is there -#fixme add packages dynamically -LICENSE = "MIT" diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb index 000947f629..78cf439e68 100644 --- a/packages/zope/zope_3.3.1.bb +++ b/packages/zope/zope_3.3.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "python" RDEPENDS = "python-core python-shell" LICENSE = "ZPL" -PR = "r5" +PR = "r6" SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz" S = "${WORKDIR}/Zope-${PV}" |