diff options
36 files changed, 679 insertions, 225 deletions
diff --git a/abs/core/python_modules/__changelog b/abs/core/python_modules/__changelog new file mode 100644 index 0000000..4a02fe3 --- /dev/null +++ b/abs/core/python_modules/__changelog @@ -0,0 +1 @@ +removed python from requirement --jm diff --git a/abs/core/python_modules/dbus-python/PKGBUILD b/abs/core/python_modules/dbus-python/PKGBUILD deleted file mode 100644 index 91b80d3..0000000 --- a/abs/core/python_modules/dbus-python/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 87863 2010-08-18 14:30:02Z ibiru $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=dbus-python -pkgver=0.83.1 -pkgrel=3 -pkgdesc="Python bindings for DBUS" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-glib>=0.82' 'python2>=2.6.6') -makedepends=('pkg-config' 'docutils') -options=('!libtool') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('5fdf3970aa0c00020289de7ba8f3be18') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} - diff --git a/abs/core/python_modules/gitpython/PKGBUILD b/abs/core/python_modules/gitpython/PKGBUILD index 5b4d975..9c72ac0 100644 --- a/abs/core/python_modules/gitpython/PKGBUILD +++ b/abs/core/python_modules/gitpython/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Jon Bergli Heier <snakebite@jvnv.net> pkgname=gitpython -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="A python library used to interact with Git repositories" arch=('any') @@ -8,13 +8,13 @@ url="http://gitorious.org/git-python" license=('BSD') depends=('python2' 'git' 'python-gitdb') conflicts=('gitpython-git') -source=("http://pypi.python.org/packages/source/G/GitPython/GitPython-${pkgver}.tar.gz") -md5sums=('98f9a4e33574065660b7257fa93d707d') +source=("http://pypi.python.org/packages/source/G/GitPython/GitPython-${pkgver}.RC1.tar.gz") build() { - cd "$srcdir/GitPython-$pkgver" + cd "$srcdir/GitPython-$pkgver.RC1" python2 setup.py install --root="$pkgdir/" --optimize=1 || return 1 install -D -m 644 LICENSE "$pkgdir"/usr/share/licenses/gitpython/LICENSE } # vim:set ts=2 sw=2 et: +md5sums=('849082fe29adc653a3621465213cab96') diff --git a/abs/core/python_modules/mysql-python/PKGBUILD b/abs/core/python_modules/mysql-python/PKGBUILD index f9fcd0d..4c1b043 100644 --- a/abs/core/python_modules/mysql-python/PKGBUILD +++ b/abs/core/python_modules/mysql-python/PKGBUILD @@ -1,28 +1,20 @@ -# $Id: PKGBUILD 89788 2010-09-04 05:19:02Z remy $ +# $Id: PKGBUILD 151041 2012-02-24 14:12:17Z pierre $ +# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: damir <damir@archlinux.org> pkgname=mysql-python pkgver=1.2.3 -pkgrel=5 +pkgrel=3 pkgdesc="MySQL support for Python" arch=("i686" "x86_64") -url="http://sourceforge.net/projects/mysql-python" +url="http://mysql-python.sourceforge.net/" license=('GPL2') -depends=('python2>=2.3' 'python2<2.7' 'libmysqlclient>=5.1.59') -makedepends=('mysql>=5.1.59' 'setuptools') +depends=('python2' 'libmysqlclient') +makedepends=('mysql' 'python2-distribute') source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz") - -build() { - - /bin/true - -} +md5sums=('215eddb6d853f6f4be5b4afc4154292f') package() { - cd ${srcdir}/MySQL-python-${pkgver} - python2 setup.py install --root=${pkgdir} || return 1 - + python2 setup.py install --root=${pkgdir} --optimize=1 } - -md5sums=('215eddb6d853f6f4be5b4afc4154292f') diff --git a/abs/core/python_modules/pygobject/PKGBUILD b/abs/core/python_modules/pygobject/PKGBUILD deleted file mode 100644 index 09e4e6d..0000000 --- a/abs/core/python_modules/pygobject/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 92839 2010-10-01 13:19:30Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pygobject -pkgver=2.26.0 -pkgrel=3 -pkgdesc="Python bindings for GObject" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('python2' 'glib2>=2.26.0' 'pycairo>=1.8.10' 'gobject-introspection>=0.9.6') -source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/2.26/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool') -url="http://www.pygtk.org/" -sha256sums=('5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - - find "$pkgdir"/usr/share/pygobject -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" -} - diff --git a/abs/core/python_modules/pygobject2/PKGBUILD b/abs/core/python_modules/pygobject2/PKGBUILD new file mode 100644 index 0000000..0f03bda --- /dev/null +++ b/abs/core/python_modules/pygobject2/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=pygobject2 +pkgname=(python2-gobject2 pygobject2-devel) +pkgver=2.28.6 +pkgrel=6 +arch=('i686' 'x86_64') +url="http://www.pygtk.org/" +license=('LGPL') +makedepends=( 'python2') +source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz + python2-fix-type.patch + python3-fix-build.patch + python3-fix-maketrans.patch) +options=('!libtool') +sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' + 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' + 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' + '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') + +build() { + cd "${srcdir}" + cp -a "pygobject-${pkgver}" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --disable-introspection + make + ) + + ( + cd "pygobject-${pkgver}" + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python2-fix-type.patch" + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + ./configure --prefix=/usr --disable-introspection + make + ) +} + +package_python-gobject2() { + pkgdesc="Python 3 bindings for GObject2" +# depends=('glib2' 'pygobject2-devel' 'python') + replaces=('py3gobject') + provides=("py3gobject=$pkgver") + + cd "${srcdir}/pygobject-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Delete devel stuff + rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} +} + +package_python2-gobject2() { + pkgdesc="Python 2 bindings for GObject2" + depends=('glib2' 'pygobject2-devel' 'python2') + replaces=('pygobject') + provides=("pygobject=$pkgver") + + cd "${srcdir}/python2-build" + make DESTDIR="${pkgdir}" install + + find "$pkgdir"/usr/share/pygobject -name '*.py' | \ + xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # Split devel stuff + mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ + "$srcdir/devel/" +} + +package_pygobject2-devel() { + pkgdesc="Development files for the pygobject bindings" + + cd "${srcdir}/devel" + mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} + + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" + mv gtk-doc "$pkgdir/usr/share/" + mv xsl "$pkgdir/usr/share/pygobject/" +} diff --git a/abs/core/python_modules/pygobject2/__changelog b/abs/core/python_modules/pygobject2/__changelog new file mode 100644 index 0000000..92b1ef7 --- /dev/null +++ b/abs/core/python_modules/pygobject2/__changelog @@ -0,0 +1 @@ +remove python3 diff --git a/abs/core/python_modules/pygobject2/python2-fix-type.patch b/abs/core/python_modules/pygobject2/python2-fix-type.patch new file mode 100644 index 0000000..78e7ddf --- /dev/null +++ b/abs/core/python_modules/pygobject2/python2-fix-type.patch @@ -0,0 +1,50 @@ +From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Mon, 12 Mar 2012 16:44:14 -0400 +Subject: gio-types.defs: change some enums to flags + +These flags types were originally incorrectly handled in glib as being +enums. That bug was fixed, but they're still enums here, leading to +warnings about the mismatch. + +Change them to flags. + +https://bugzilla.gnome.org/show_bug.cgi?id=668522 +--- + gio/gio-types.defs | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gio-types.defs b/gio/gio-types.defs +index 331e0bc..7eee5c8 100644 +--- a/gio/gio-types.defs ++++ b/gio/gio-types.defs +@@ -526,7 +526,7 @@ + ) + ) + +-(define-enum MountMountFlags ++(define-flags MountMountFlags + (in-module "gio") + (c-name "GMountMountFlags") + (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") +@@ -545,7 +545,7 @@ + ) + ) + +-(define-enum DriveStartFlags ++(define-flags DriveStartFlags + (in-module "gio") + (c-name "GDriveStartFlags") + (gtype-id "G_TYPE_DRIVE_START_FLAGS") +@@ -770,7 +770,7 @@ + ) + ) + +-(define-enum SocketMsgFlags ++(define-flags SocketMsgFlags + (in-module "gio") + (c-name "GSocketMsgFlags") + (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") +-- +1.7.9.1 + diff --git a/abs/core/python_modules/pygobject2/python3-fix-build.patch b/abs/core/python_modules/pygobject2/python3-fix-build.patch new file mode 100644 index 0000000..4cb8cfe --- /dev/null +++ b/abs/core/python_modules/pygobject2/python3-fix-build.patch @@ -0,0 +1,34 @@ +From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <icq@gnome.org> +Date: Thu, 21 Apr 2011 14:52:20 +0000 +Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore + +--- +diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c +index 81b9865..edf52d7 100644 +--- a/gi/pygi-foreign-cairo.c ++++ b/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include <pycairo/py3cairo.h> + #endif + +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, + static PyMethodDef _gi_cairo_functions[] = {0,}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); ++#endif ++ + if (Pycairo_CAPI == NULL) + return PYGLIB_MODULE_ERROR_RETURN; + +-- +cgit v0.9 diff --git a/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch b/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch new file mode 100644 index 0000000..f5bc0e7 --- /dev/null +++ b/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch @@ -0,0 +1,36 @@ +From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Wed, 13 Jul 2011 06:42:22 +0000 +Subject: [python3] Fix maketrans import + +Python3 moved the maketrans() function from the string module to a str method. +This unbreaks gi/module.py for Python 3 again. +--- +diff --git a/gi/module.py b/gi/module.py +index 70df76c..d56bdaf 100644 +--- a/gi/module.py ++++ b/gi/module.py +@@ -24,7 +24,11 @@ from __future__ import absolute_import + + import os + import gobject +-import string ++try: ++ maketrans = ''.maketrans ++except AttributeError: ++ # fallback for Python 2 ++ from string import maketrans + + import gi + from .overrides import registry +@@ -124,7 +128,7 @@ class IntrospectionModule(object): + # Don't use upper() here to avoid locale specific + # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') + # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 +- ascii_upper_trans = string.maketrans( ++ ascii_upper_trans = maketrans( + 'abcdefgjhijklmnopqrstuvwxyz', + 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') + for value_info in info.get_values(): +-- +cgit v0.9 diff --git a/abs/core/python_modules/pygtk/PKGBUILD b/abs/core/python_modules/pygtk/PKGBUILD index 73e9fd5..e82fdbe 100644 --- a/abs/core/python_modules/pygtk/PKGBUILD +++ b/abs/core/python_modules/pygtk/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 94310 2010-10-06 15:16:23Z ibiru $ +# $Id: PKGBUILD 148886 2012-02-05 11:54:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=pygtk -pkgver=2.22.0 -pkgrel=4 +pkgver=2.24.0 +pkgrel=3 pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64') license=('LGPL') -depends=('libglade>=2.6.4' 'pycairo>=1.8.10' 'pygobject>=2.21.5') -makedepends=('python-numpy') -optdepends=('python-numpy') +depends=('libglade' 'python2-cairo' 'pygobject') +makedepends=('python2-numpy' 'pygobject2-devel') +optdepends=('python2-numpy') options=('!libtool') url="http://www.pygtk.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/pygtk/2.22/${pkgname}-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 python27.patch) -sha256sums=('4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8' +sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') build() { cd "${srcdir}/${pkgname}-${pkgver}" + #https://bugzilla.gnome.org/show_bug.cgi?id=623965 patch -Np1 -i "${srcdir}/python27.patch" - ./configure --prefix=/usr - make || return 1 + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py + make DESTDIR="${pkgdir}" install install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" + + sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py } diff --git a/abs/core/python_modules/pyqt/PKGBUILD b/abs/core/python_modules/pyqt/PKGBUILD index 8488d62..669bc4c 100644 --- a/abs/core/python_modules/pyqt/PKGBUILD +++ b/abs/core/python_modules/pyqt/PKGBUILD @@ -1,34 +1,39 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 163679 2012-07-17 18:11:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt -pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.6 +pkgname=('pyqt-common' 'python2-pyqt') +pkgver=4.9.4 pkgrel=2 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') -makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' - 'python-opengl' 'qt-assistant-compat' 'qtwebkit') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') +makedepends=('qt' 'python2-sip' + 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" + 'fix-pyuic4.patch') +md5sums=('a0b6a820633366365af5124ddbd059c7' + '097651aea0bafded5abdfd6d62afd2ad') build() { - cd "${srcdir}" + # FS#30728 + cd "${srcdir}"/PyQt-x11-gpl-${pkgver} + patch -p1 -i "${srcdir}"/fix-pyuic4.patch + cd .. + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - python configure.py \ - --confirm-license \ - --qsci-api + #cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + #python configure.py \ + # --confirm-license \ + # --qsci-api # Thanks Gerardo for the rpath fix - find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + #find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - make + #make ### Python2 version ### cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" @@ -43,36 +48,52 @@ build() { make } +package_pyqt-common(){ + pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" + + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + make -C pyrcc DESTDIR="${pkgdir}" install + make -C pylupdate DESTDIR="${pkgdir}" install + make -C designer INSTALL_ROOT="${pkgdir}" install + + install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api +} + package_pyqt(){ - pkgdesc="A set of Python bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip') + pkgdesc="A set of Python 3.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python-qt') - provides=('python-qt') - + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } package_python2-pyqt(){ - pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit" - depends=('pyqt' 'python2-sip' 'dbus-python') + pkgdesc="A set of Python 2.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python2-qt') provides=('python2-qt') cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Provided by pyqt - rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} - rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so - rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api + # Fix conflicts with pyqt + mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } diff --git a/abs/core/python_modules/pyqt/__changelog b/abs/core/python_modules/pyqt/__changelog new file mode 100644 index 0000000..9731eb3 --- /dev/null +++ b/abs/core/python_modules/pyqt/__changelog @@ -0,0 +1 @@ +removed python3 diff --git a/abs/core/python_modules/pyqt/fix-pyuic4.patch b/abs/core/python_modules/pyqt/fix-pyuic4.patch new file mode 100644 index 0000000..2173443 --- /dev/null +++ b/abs/core/python_modules/pyqt/fix-pyuic4.patch @@ -0,0 +1,91 @@ +# HG changeset patch +# User Phil Thompson <phil at riverbankcomputing.com> +# Date 2012-07-13 13:39:28 +0100 +# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a +# Parent fd0f3da9d79ca9858d10a20c15fb85456cb832d7 +Fixed a regression in pyuic's handling of custom widgets. + +diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py +--- a/pyuic/uic/Compiler/qobjectcreator.py ++++ b/pyuic/uic/Compiler/qobjectcreator.py +@@ -1,6 +1,6 @@ + ############################################################################# + ## +-## Copyright (C) 2011 Riverbank Computing Limited. ++## Copyright (C) 2012 Riverbank Computing Limited. + ## Copyright (C) 2006 Thorsten Marek. + ## All right reserved. + ## +@@ -100,7 +100,6 @@ + assert widgetClass not in self._widgets + self._widgets[widgetClass] = (baseClass, module) + +- + def _resolveBaseclass(self, baseClass): + try: + for x in range(0, 10): +@@ -114,19 +113,17 @@ + except KeyError: + raise ValueError("unknown baseclass %s" % baseClass) + +- + def search(self, cls): + try: +- self._usedWidgets.add(cls) + baseClass = self._resolveBaseclass(self._widgets[cls][0]) + DEBUG("resolved baseclass of %s: %s" % (cls, baseClass)) +- +- return type(cls, (baseClass,), +- {"module" : ""}) +- + except KeyError: + return None + ++ self._usedWidgets.add(cls) ++ ++ return type(cls, (baseClass, ), {"module" : ""}) ++ + def _writeImportCode(self): + imports = {} + for widget in self._usedWidgets: +diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py +--- a/pyuic/uic/objcreator.py ++++ b/pyuic/uic/objcreator.py +@@ -102,19 +102,26 @@ + self._modules.append(self._customWidgets) + + def createQObject(self, classname, *args, **kwargs): +- # Handle scoped names, typically static factory methods. +- parts = classname.split('.') +- factory = self.findQObjectType(parts[0]) ++ # Handle regular and custom widgets. ++ factory = self.findQObjectType(classname) + +- if factory is not None: +- for part in parts[1:]: +- factory = getattr(factory, part, None) +- if factory is None: +- break +- else: +- return self._cpolicy.instantiate(factory, *args, **kwargs) ++ if factory is None: ++ # Handle scoped names, typically static factory methods. ++ parts = classname.split('.') + +- raise NoSuchWidgetError(classname) ++ if len(parts) > 1: ++ factory = self.findQObjectType(parts[0]) ++ ++ if factory is not None: ++ for part in parts[1:]: ++ factory = getattr(factory, part, None) ++ if factory is None: ++ break ++ ++ if factory is None: ++ raise NoSuchWidgetError(classname) ++ ++ return self._cpolicy.instantiate(factory, *args, **kwargs) + + def invoke(self, rname, method, args=()): + return self._cpolicy.invoke(rname, method, args) diff --git a/abs/core/python_modules/pyrex/PKGBUILD b/abs/core/python_modules/pyrex/PKGBUILD index 11a7344..d3e12b3 100644 --- a/abs/core/python_modules/pyrex/PKGBUILD +++ b/abs/core/python_modules/pyrex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89621 2010-09-02 16:28:29Z remy $ +# $Id: PKGBUILD 150429 2012-02-17 16:29:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Arjan timmerman <arjan@soulfly.nl> @@ -15,8 +15,12 @@ depends=('python2') source=(http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-${pkgver}.tar.gz) md5sums=('515dee67d15d4393841e2d60e8341947') -build() { +build( ) { cd "${srcdir}/Pyrex-${pkgver}" - python2 setup.py install --root="${pkgdir}" --prefix=/usr || return 1 + python2 setup.py build } +package() { + cd "${srcdir}/Pyrex-${pkgver}" + python2 setup.py install --root="${pkgdir}" --prefix=/usr +} diff --git a/abs/core/python_modules/python-async/PKGBUILD b/abs/core/python_modules/python-async/PKGBUILD index a9dc8d5..1d6a945 100644 --- a/abs/core/python_modules/python-async/PKGBUILD +++ b/abs/core/python_modules/python-async/PKGBUILD @@ -15,3 +15,4 @@ build() { python2 setup.py install --root="$pkgdir/" || return 1 } # vim:set ts=2 sw=2 et: +md5sums=('6f0e2ced1fe85f8410b9bde11be08587') diff --git a/abs/core/python_modules/python-decorator/PKGBUILD b/abs/core/python_modules/python-decorator/PKGBUILD index 5e2e8f5..5b9d85f 100644 --- a/abs/core/python_modules/python-decorator/PKGBUILD +++ b/abs/core/python_modules/python-decorator/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Pierre Chapuis <catwell at archlinux dot us> pkgname=python-decorator -pkgver=3.2.0 -pkgrel=3 +pkgver=3.3.2 +pkgrel=1 pkgdesc='Python Decorator module' arch=('any') url='http://pypi.python.org/pypi/decorator' @@ -11,8 +11,6 @@ license=('BSD') depends=('python2') source=("http://pypi.python.org/packages/source/d/decorator/decorator-${pkgver}.tar.gz" 'LICENSE.txt') -md5sums=('6208cd51365083c168ab3a04426a646b' - '0ca76d2c707f09dbb04acc425ea1a08b') build() { cd decorator-${pkgver} @@ -28,3 +26,5 @@ package() { install -D -m644 ${srcdir}/LICENSE.txt \ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } +md5sums=('446f5165af67eb0fcd8fd28abd259e86' + '0ca76d2c707f09dbb04acc425ea1a08b') diff --git a/abs/core/python_modules/python-decorator/__changelog b/abs/core/python_modules/python-decorator/__changelog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/core/python_modules/python-decorator/__changelog diff --git a/abs/core/python_modules/python-distribute/PKGBUILD b/abs/core/python_modules/python-distribute/PKGBUILD new file mode 100644 index 0000000..5627eb7 --- /dev/null +++ b/abs/core/python_modules/python-distribute/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 159385 2012-05-22 22:16:56Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sebastien Binet <binet@farnsworth> +pkgbase=python-distribute +pkgname=('python2-distribute') +pkgver=0.6.27 +pkgrel=1 +pkgdesc="Easily build and distribute Python packages" +arch=('any') +license=('PSF') +url="http://pypi.python.org/pypi/distribute" +makedepends=('python2') +source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz + distribute-python2_and_3.patch) +sha1sums=('cebaaf91938581cb8c4a2f708f2b3e770232d3a5' + '9c19c12edac507b0f76696d282b9831c4b653a7e') +build() { + cd "${srcdir}" + + pushd distribute-${pkgver} + patch -Np1 -i ../distribute-python2_and_3.patch + popd + + cp -a distribute-${pkgver}{,-python2} + + ## Build python 3 module + cd distribute-${pkgver} + # python setup.py build +# python setup.py test + + # Build python 2 module + cd ../distribute-${pkgver}-python2 + + sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py + + python2 setup.py build +# python2 setup.py test +} + +package_python-distribute() { + # depends=('python>=3.2') + + cd "${srcdir}/distribute-${pkgver}" + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build +} + +package_python2-distribute() { + depends=('python2>=2.7') + provides=('setuptools') + conflicts=('setuptools') + + cd "${srcdir}/distribute-${pkgver}-python2" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build +} diff --git a/abs/core/python_modules/python-distribute/__changelog b/abs/core/python_modules/python-distribute/__changelog new file mode 100644 index 0000000..a995e3a --- /dev/null +++ b/abs/core/python_modules/python-distribute/__changelog @@ -0,0 +1 @@ +remove python diff --git a/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch b/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch new file mode 100644 index 0000000..2c51100 --- /dev/null +++ b/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch @@ -0,0 +1,36 @@ +diff -Naur distribute-0.6.27.ori/distribute.egg-info/entry_points.txt distribute-0.6.27/distribute.egg-info/entry_points.txt +--- distribute-0.6.27.ori/distribute.egg-info/entry_points.txt 2012-05-18 15:46:04.000000000 -0400 ++++ distribute-0.6.27/distribute.egg-info/entry_points.txt 2012-05-22 18:14:17.443383039 -0400 +@@ -11,6 +11,8 @@ + install_egg_info = setuptools.command.install_egg_info:install_egg_info + alias = setuptools.command.alias:alias + easy_install = setuptools.command.easy_install:easy_install ++easy_install-2.7 = setuptools.command.easy_install:main ++easy_install-3.2 = setuptools.command.easy_install:main + install_scripts = setuptools.command.install_scripts:install_scripts + bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst + bdist_egg = setuptools.command.bdist_egg:bdist_egg +diff -Naur distribute-0.6.27.ori/distribute_setup.py distribute-0.6.27/distribute_setup.py +--- distribute-0.6.27.ori/distribute_setup.py 2012-05-18 15:45:03.000000000 -0400 ++++ distribute-0.6.27/distribute_setup.py 2012-05-22 18:14:17.443383039 -0400 +@@ -299,8 +299,7 @@ + log.warn('Could not find the install location') + return + pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1]) +- setuptools_file = 'setuptools-%s-py%s.egg-info' % \ +- (SETUPTOOLS_FAKED_VERSION, pyver) ++ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION + pkg_info = os.path.join(placeholder, setuptools_file) + if os.path.exists(pkg_info): + log.warn('%s already exists', pkg_info) +diff -Naur distribute-0.6.27.ori/setup.py distribute-0.6.27/setup.py +--- distribute-0.6.27.ori/setup.py 2012-05-18 15:19:51.000000000 -0400 ++++ distribute-0.6.27/setup.py 2012-05-22 18:14:17.443383039 -0400 +@@ -100,6 +100,7 @@ + finally: + f.close() + ++console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]] + + # if we are installing Distribute using "python setup.py install" + # we need to get setuptools out of the way diff --git a/abs/core/python_modules/python-iplib/PKGBUILD b/abs/core/python_modules/python-iplib/PKGBUILD index 39d0b55..05f798d 100755 --- a/abs/core/python_modules/python-iplib/PKGBUILD +++ b/abs/core/python_modules/python-iplib/PKGBUILD @@ -4,12 +4,11 @@ pkgver=1.1 pkgrel=3 pkgdesc="IPlib is a Python module useful to convert amongst many different notations and to manage couples of address/netmask in the CIDR notation." url="http://www.pymedia.org" -arch=('i686') +arch=('i686' 'x86_64') license=('GPL') depends=('python2') #makedepends=('python2>=2.3') source=(http://erlug.linux.it/~da/soft/iplib/iplib-1.1.tar.gz) -md5sums=('3437ddbfc1986b2d06e7f4a0724ac5a0') build() { cd ${srcdir}/${_libname}-${pkgver} @@ -23,3 +22,4 @@ build() { xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" } +md5sums=('3437ddbfc1986b2d06e7f4a0724ac5a0') diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD index df85c69..e12b716 100644 --- a/abs/core/python_modules/python-lxml/PKGBUILD +++ b/abs/core/python_modules/python-lxml/PKGBUILD @@ -1,30 +1,49 @@ -# $Id$ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Guillem Rieu <guillemr@gmx.net> - -pkgname=python-lxml -pkgver=2.3 -pkgrel=1 +# $Id: PKGBUILD 162858 2012-07-02 13:06:22Z giovanni $ +# Maintainer: + +pkgname=('python2-lxml') +pkgver=2.3.4 +pkgrel=2 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64') -license=('BSD' 'GPL' 'custom') -url="http://codespeak.net/lxml" -depends=('python2' 'libxslt') -optdepends=("beautiful-soup: support for parsing not well formed HTML") -conflicts=('lxml') -replaces=('lxml') -source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz") -md5sums=('a245a015fd59b63e220005f263e1682a') - -package() { - cd ${srcdir}/lxml-$pkgver +license=('BSD' 'custom') +url="http://lxml.de/" +makedepends=('python2' 'libxslt') +source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) +sha1sums=('90a226d8a2ee38de47fc3351445dab6df0e33a20' + '7962be7794d7f4c87d2fce0104c27990f48f1ce1') + +check() { + cd "${srcdir}"/lxml-$pkgver + make PYTHON=python2 test + #make PYTHON=python test +} + +package_python2-lxml() { + depends=('python2' 'libxslt') + optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML') + cd "${srcdir}"/lxml-$pkgver python2 setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt - install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt +} + +package_python-lxml() { + depends=('python' 'libxslt') + + cd "${srcdir}"/lxml-$pkgver + python setup.py install --root="${pkgdir}" --optimize=1 + + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt } diff --git a/abs/core/python_modules/python-lxml/__changelog b/abs/core/python_modules/python-lxml/__changelog new file mode 100644 index 0000000..9731eb3 --- /dev/null +++ b/abs/core/python_modules/python-lxml/__changelog @@ -0,0 +1 @@ +removed python3 diff --git a/abs/core/python_modules/python-m2crypto/PKGBUILD b/abs/core/python_modules/python-m2crypto/PKGBUILD index 8d74cbe..010da5c 100644 --- a/abs/core/python_modules/python-m2crypto/PKGBUILD +++ b/abs/core/python_modules/python-m2crypto/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 87898 2010-08-18 16:12:44Z ibiru $ -# Maintainer: +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=python-m2crypto -pkgver=0.20.2 -pkgrel=4 +pkgver=0.21.1 +pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('i686' 'x86_64') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz" - 'openssl1.patch') -md5sums=('6c24410410d6eb1920ea43f77a93613a' - '80a707ad6610f2871efdf40658e30364') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') build() { cd "${srcdir}/M2Crypto-${pkgver}" - patch -Np0 -i ${srcdir}/openssl1.patch python2 setup.py build } diff --git a/abs/core/python_modules/python-netifaces/PKGBUILD b/abs/core/python_modules/python-netifaces/PKGBUILD index 258a9c2..481de96 100644 --- a/abs/core/python_modules/python-netifaces/PKGBUILD +++ b/abs/core/python_modules/python-netifaces/PKGBUILD @@ -2,7 +2,7 @@ #Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> pkgname=python-netifaces _orig_name=netifaces -pkgver=0.5 +pkgver=0.8 pkgrel=3 pkgdesc="Portable module to access network interface information in Python." depends=('python2') @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') url="http://alastairs-place.net/netifaces/" license=('MIT') provides=('netifaces' 'python-netifaces') -source=("http://alastairs-place.net/2007/03/netifaces/${_orig_name}-${pkgver}.tar.gz") +source=("http://alastairs-place.net/projects/netifaces/${_orig_name}-${pkgver}.tar.gz") build() { cd "${srcdir}/${_orig_name}-${pkgver}" python2 setup.py install --root "${pkgdir}" || return 1 @@ -20,5 +20,5 @@ build() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/README" || return 1 } -md5sums=('ea662a4b4c7db5d1631cc33bf68eb030') +md5sums=('e57e5983f4c286fac5f8068fbfc5c873') diff --git a/abs/core/python_modules/python-nose/PKGBUILD b/abs/core/python_modules/python-nose/PKGBUILD index e48c434..5d36e01 100644 --- a/abs/core/python_modules/python-nose/PKGBUILD +++ b/abs/core/python_modules/python-nose/PKGBUILD @@ -1,26 +1,45 @@ -# $Id: $ -# Maintainer: +# $Id: PKGBUILD 144082 2011-12-03 05:50:51Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Cilyan Olowen <gaknar@gmail.com> - -pkgname=python-nose -pkgver=0.11.3 +pkgbase=python-nose +pkgname=('python2-nose' ) +pkgver=1.1.2 pkgrel=3 pkgdesc="A discovery-based unittest extension" arch=('any') url="http://www.somethingaboutorange.com/mrl/projects/nose/" license=('LGPL2') -depends=('setuptools') -source=("http://www.somethingaboutorange.com/mrl/projects/nose/nose-${pkgver}.tar.gz") -md5sums=('7f1dc53750811f78bedef9e14a4bc5a5') +source=("http://pypi.python.org/packages/source/n/nose/nose-${pkgver}.tar.gz") +makedepends=( 'python2' 'python2-distribute' ) +md5sums=('144f237b615e23f21f6a50b2183aa817') build() { - cd "${srcdir}/nose-${pkgver}" + cd "$srcdir/nose-$pkgver" sed -i -e "s:man/man1:share/man/man1:g" setup.py + cp -R $srcdir/nose-$pkgver $srcdir/nose2-$pkgver +} + +package_python-nose() { + depends=('python' 'python-distribute') + cd "$srcdir/nose-$pkgver" + python setup.py install --prefix=/usr --root=${pkgdir} + mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests3" } -package() { - cd "${srcdir}/nose-${pkgver}" - python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1 +package_python2-nose() { + depends=('python2' 'python2-distribute') + cd "$srcdir/nose2-$pkgver" + python2 setup.py install --prefix=/usr --root=${pkgdir} + mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests2" + rm -rf $pkgdir/usr/share } +package_python-nose-doc(){ + pkgdesc="Nose documentation and examples" + cd "$srcdir/nose-$pkgver/doc" + make html + mkdir -p "$pkgdir/usr/share/doc/python-nose" + cp -r .build/html "$pkgdir/usr/share/doc/python-nose" + cp -r ../examples "$pkgdir/usr/share/doc/python-nose" +} diff --git a/abs/core/python_modules/python-nose/__changelog b/abs/core/python_modules/python-nose/__changelog new file mode 100644 index 0000000..0802ff6 --- /dev/null +++ b/abs/core/python_modules/python-nose/__changelog @@ -0,0 +1 @@ +removed python diff --git a/abs/core/python_modules/python-numpy/PKGBUILD b/abs/core/python_modules/python-numpy/PKGBUILD index 57b41f5..8c9c6be 100644..100755 --- a/abs/core/python_modules/python-numpy/PKGBUILD +++ b/abs/core/python_modules/python-numpy/PKGBUILD @@ -1,36 +1,61 @@ -# $Id: PKGBUILD 95257 2010-10-17 20:17:04Z ibiru $ +# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -pkgname=python-numpy -pkgver=1.5.0 -pkgrel=3 +pkgbase=python-numpy +pkgname=('python2-numpy') +pkgver=1.6.1 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://numpy.scipy.org/" -depends=('lapack' 'python2') -makedepends=('python-nose' 'gcc-fortran') -optdepends=('python-nose: test suite') +makedepends=('lapack' 'python2' 'python2-distribute' 'gcc-fortran' 'python2-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('3a8bfdc434df782d647161c48943ee09') +md5sums=('2bce18c08fc4fce461656f0f4dd9103e') build() { - cd "${srcdir}/numpy-${pkgver}" + cd "${srcdir}" + cp -a numpy-${pkgver} numpy-py2-${pkgver} export Atlas=None export LDFLAGS="$LDFLAGS -shared" + + echo "Building Python2" + cd "${srcdir}/numpy-py2-${pkgver}" python2 setup.py config_fc --fcompiler=gnu95 build + + #echo "Building Python3" + #cd "${srcdir}/numpy-${pkgver}" + #python setup.py config_fc --fcompiler=gnu95 build } -package() { - cd "${srcdir}/numpy-${pkgver}" - python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" +package_python2-numpy() { + depends=('lapack' 'python2') + optdepends=('python-nose: testsuite') + + cd "${srcdir}/numpy-py2-${pkgver}" + python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/" sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find $pkgdir -name '*.py') + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + $(find ${pkgdir} -name '*.py') +} + +package_python-numpy() { + depends=('lapack' 'python') + provides=("python3-numpy=${pkgver}") + replaces=('python3-numpy') + conflicts=('python3-numpy') + + cd "${srcdir}/numpy-${pkgver}" + python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 + + install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/" } diff --git a/abs/core/python_modules/python-numpy/__changelog b/abs/core/python_modules/python-numpy/__changelog new file mode 100644 index 0000000..3bc4789 --- /dev/null +++ b/abs/core/python_modules/python-numpy/__changelog @@ -0,0 +1 @@ +remove python3 support diff --git a/abs/core/python_modules/python-opengl/PKGBUILD b/abs/core/python_modules/python-opengl/PKGBUILD index e4ff382..57f77fd 100644 --- a/abs/core/python_modules/python-opengl/PKGBUILD +++ b/abs/core/python_modules/python-opengl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89543 2010-09-01 17:18:01Z remy $ +# $Id: PKGBUILD 150966 2012-02-24 10:19:17Z pierre $ # Contributor: Josh Taylor <joshtaylor.mail@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -14,18 +14,14 @@ arch=('any') depends=('python2' 'tk' 'freeglut' 'setuptools') provides=('pyopengl' 'python-pyopengl') conflicts=('pyopengl' 'python-pyopengl') -source=(http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz - 'LICENSE') +source=("http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz" + 'LICENSE') md5sums=('221d4a6a0928fcfeef26751370ec5f52' '0b53c508a63e5dbaf44cdfb0fa103b3a') -build() { - /bin/true -} - package() { cd ${srcdir}/PyOpenGL-${pkgver} - python2 setup.py install --root=${pkgdir} || return 1 + python2 setup.py install --root=${pkgdir} install -Dm644 ${srcdir}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD index e00fa93..4374e09 100644 --- a/abs/core/python_modules/python-parted/PKGBUILD +++ b/abs/core/python_modules/python-parted/PKGBUILD @@ -1,11 +1,11 @@ pkgname=python-parted __pkgname=pyparted pkgver=3.8 -pkgrel=4 +pkgrel=1 pkgdesc="Python bindings for libparted" arch=('i686' 'x86_64') license=('LGPL' 'MPL') -depends=('python2' 'parted=>3.0' 'python-decorator') +depends=('python2' 'parted>=3.1' 'python-decorator') options=('!libtool') source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz) url="https://fedorahosted.org/pyparted/" diff --git a/abs/core/python_modules/python-pexpect/PKGBUILD b/abs/core/python_modules/python-pexpect/PKGBUILD index 80874a1..09ddb51 100644 --- a/abs/core/python_modules/python-pexpect/PKGBUILD +++ b/abs/core/python_modules/python-pexpect/PKGBUILD @@ -1,17 +1,24 @@ -# Maintainer: Aaron Schaefer <aaron@elasticdog.com> +# $Id: PKGBUILD 69520 2012-04-17 21:14:19Z ebelanger $ +# Maintainer: +# Contributor: Aaron Schaefer <aaron@elasticdog.com> + pkgname=python-pexpect -pkgver=2.3 -pkgrel=5 +pkgver=2.4 +pkgrel=1 pkgdesc='A pure Python Expect-like module' -arch=('i686' 'x86_64') +arch=('any') url='http://pexpect.sourceforge.net/' license=('MIT') depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/pexpect/pexpect-$pkgver.tar.gz") -md5sums=('bf107cf54e67bc6dec5bea1f3e6a65c3') +source=("http://pypi.python.org/packages/source/p/pexpect/pexpect-$pkgver.tar.gz") +md5sums=('fe82d69be19ec96d3a6650af947d5665') + +package() { + cd "$srcdir/pexpect-$pkgver" + + # python2 fix + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' FSM.py -build() { - cd $startdir/src/pexpect-$pkgver - python2 setup.py install --root=$startdir/pkg || return 1 - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + python2 setup.py install --root="$pkgdir" + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/abs/core/python_modules/python-pycurl/PKGBUILD b/abs/core/python_modules/python-pycurl/PKGBUILD index 84da9ef..9b70523 100644 --- a/abs/core/python_modules/python-pycurl/PKGBUILD +++ b/abs/core/python_modules/python-pycurl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 150558 2012-02-18 14:39:59Z pierre $ +# Maintainer: +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: kontrast <kontr4st@gmail.com> pkgname=python-pycurl pkgver=7.19.0 -pkgrel=7 +pkgrel=6 pkgdesc="A Python interface to libcurl" arch=('i686' 'x86_64') url="http://pycurl.sourceforge.net" @@ -17,7 +17,6 @@ source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz") md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b') package() { - cd ${srcdir}/pycurl-${pkgver} + cd "${srcdir}"/pycurl-${pkgver} python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr } - diff --git a/abs/core/python_modules/python2-cairo/PKGBUILD b/abs/core/python_modules/python2-cairo/PKGBUILD new file mode 100644 index 0000000..0f2fb14 --- /dev/null +++ b/abs/core/python_modules/python2-cairo/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=python2-cairo +pkgver=1.10.0 +pkgrel=1 +pkgdesc="Python2 bindings for the cairo graphics library" +arch=('i686' 'x86_64') +license=('LGPL' 'MPL') +depends=('python2' 'cairo') +options=('!libtool') +provides=("pycairo=${pkgver}") +conflicts=('pycairo') +replaces=('pycairo') +source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.bz2) +url="http://www.cairographics.org/pycairo" +md5sums=('20337132c4ab06c1146ad384d55372c5') + +build() { + cd "${srcdir}/py2cairo-${pkgver}" + sed -i 's:bin/env python:bin/env python2:' waf + python2 ./waf --version + pushd .waf-* + popd + PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr + PYTHON=/usr/bin/python2 ./waf build +} + +package() { + cd "${srcdir}/py2cairo-${pkgver}" + PYTHON=/usr/bin/python2 ./waf install --destdir="${pkgdir}" +} diff --git a/abs/core/python_modules/urlgrabber/PKGBUILD b/abs/core/python_modules/urlgrabber/PKGBUILD index ccd0d62..f82aa85 100644 --- a/abs/core/python_modules/urlgrabber/PKGBUILD +++ b/abs/core/python_modules/urlgrabber/PKGBUILD @@ -1,18 +1,18 @@ +# $Id: PKGBUILD 66686 2012-02-27 11:56:32Z cbrannon $ +# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Pat Rondon <pmr@@patrondon.org> pkgname=urlgrabber pkgver=3.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level cross-protocol url-grabber and Python library" url="http://urlgrabber.baseurl.org/" license=('LGPL') -arch=('i686' 'x86_64') -depends=('python2') -provides=(python-urlgrabber) -source=("${url}/download/urlgrabber-${pkgver}.tar.gz") -build() { - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py install --prefix=${pkgdir}/usr || return 1 +arch=(any) +depends=(python2 python-pycurl) +source=(http://$pkgname.baseurl.org/download/$pkgname-$pkgver.tar.gz) - find "$pkgdir/" -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" -} +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + } md5sums=('00c8359bf71062d0946bacea521f80b4') |