Date: Tuesday, March 26, 2013 @ 00:59:39 Author: stephane Revision: 87030
split pkg for python 2 and 3 Added: python-basemap/ Modified: python-basemap/trunk/PKGBUILD Deleted: python-basemap/repos/community-i686/PKGBUILD python-basemap/repos/community-x86_64/PKGBUILD python2-basemap/ ---------------------------------+ repos/community-i686/PKGBUILD | 44 --------------------- repos/community-x86_64/PKGBUILD | 44 --------------------- trunk/PKGBUILD | 79 +++++++++++++++++++++++++++++--------- 3 files changed, 61 insertions(+), 106 deletions(-) Deleted: python-basemap/repos/community-i686/PKGBUILD =================================================================== --- python2-basemap/repos/community-i686/PKGBUILD 2013-03-25 23:16:46 UTC (rev 87029) +++ python-basemap/repos/community-i686/PKGBUILD 2013-03-25 23:59:39 UTC (rev 87030) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <[email protected]> -# Contributor: Julien Morin <[email protected]> - -pkgname=python2-basemap -pkgver=1.0.5 -pkgrel=1 -pkgdesc="Toolkit for plotting data on map projections" -arch=('i686' 'x86_64') -url="http://matplotlib.sourceforge.net/basemap/doc/html/"; -license=('custom') -depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') -optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') -source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz";) -sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4') - -build() { - cd "${srcdir}/basemap-${pkgver}" - - # Remove the bundled librarie - rm -r geos-* - - sed -i "s/lib64/lib/g" setup.py - - python2 setup.py config - python2 setup.py build -} - -package() { - cd "${srcdir}/basemap-${pkgver}" - - _pybasever=2.7 - - python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr - - # Conflict with files from python2-matplotlib - rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo} - - # License - install -Dm644 LICENSE_data "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_pyshp "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_proj4 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Deleted: python-basemap/repos/community-x86_64/PKGBUILD =================================================================== --- python2-basemap/repos/community-x86_64/PKGBUILD 2013-03-25 23:16:46 UTC (rev 87029) +++ python-basemap/repos/community-x86_64/PKGBUILD 2013-03-25 23:59:39 UTC (rev 87030) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <[email protected]> -# Contributor: Julien Morin <[email protected]> - -pkgname=python2-basemap -pkgver=1.0.5 -pkgrel=1 -pkgdesc="Toolkit for plotting data on map projections" -arch=('i686' 'x86_64') -url="http://matplotlib.sourceforge.net/basemap/doc/html/"; -license=('custom') -depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') -optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') -source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz";) -sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4') - -build() { - cd "${srcdir}/basemap-${pkgver}" - - # Remove the bundled librarie - rm -r geos-* - - sed -i "s/lib64/lib/g" setup.py - - python2 setup.py config - python2 setup.py build -} - -package() { - cd "${srcdir}/basemap-${pkgver}" - - _pybasever=2.7 - - python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr - - # Conflict with files from python2-matplotlib - rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo} - - # License - install -Dm644 LICENSE_data "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_pyshp "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_proj4 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Modified: python-basemap/trunk/PKGBUILD =================================================================== --- python2-basemap/trunk/PKGBUILD 2013-03-25 23:16:46 UTC (rev 87029) +++ python-basemap/trunk/PKGBUILD 2013-03-25 23:59:39 UTC (rev 87030) @@ -1,44 +1,87 @@ # $Id$ # Maintainer: Stéphane Gaudreault <[email protected]> +# Contributor: Matthias Ellmer <[email protected]> # Contributor: Julien Morin <[email protected]> -pkgname=python2-basemap -pkgver=1.0.5 +pkgbase=python-basemap +pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common') +pkgver=1.0.6 pkgrel=1 -pkgdesc="Toolkit for plotting data on map projections" arch=('i686' 'x86_64') url="http://matplotlib.sourceforge.net/basemap/doc/html/"; license=('custom') -depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') -optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') +makedepends=('python2' 'python') source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz";) -sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4') +sha1sums=('76191964c580b3af33c169cb050bb171328298f9') +_py2basever=2.7 +_py3basever=3.3 + build() { - cd "${srcdir}/basemap-${pkgver}" - - # Remove the bundled librarie + pushd "${srcdir}"/${pkgbase}-${pkgver} + # Remove the bundled libraries and common data rm -r geos-* - + rm -r lib/mpl_toolkits/basemap/data sed -i "s/lib64/lib/g" setup.py + popd + cp -a "${srcdir}"/${pkgbase}-${pkgver}{,-python2} + + # Python3 Version + cd "${srcdir}"/basemap-${pkgver} + python setup.py config + python setup.py build + + # Python2 Version + cd "${srcdir}"/basemap-${pkgver}-python2 python2 setup.py config python2 setup.py build } -package() { - cd "${srcdir}/basemap-${pkgver}" +package_python-basemap() { + pkgdesc="Toolkit for plotting data on map projections" + depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2') + optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') - _pybasever=2.7 + cd "${srcdir}"/basemap-${pkgver} + python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr + + # Conflict with files from python-matplotlib + rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__init__.py + rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__pycache__/__init__.cpython-33.{pyc,pyo} + + rm -fr "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data + ln -sf /usr/share/basemap/data/ "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data +} + +package_python2-basemap() { + pkgdesc="Toolkit for plotting data on map projections" + depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') + optdepends=('python2-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') + + cd "${srcdir}"/basemap-${pkgver}-python2 + python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr # Conflict with files from python2-matplotlib - rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo} + rm "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo} + rm -fr "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data + ln -sf /usr/share/basemap/data/ "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data +} + +package_python-basemap-common() { + pkgdesc="Data files for python-basemap" + + # Make required directories + install -dm755 "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/ + install -dm755 "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/ + + # Move data + cp -a "${srcdir}"/${pkgbase}-${pkgver}/lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/ + # License - install -Dm644 LICENSE_data "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_pyshp "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE_proj4 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 LICENSE_{data,pyshp,proj4} "${pkgdir}"/usr/share/licenses/${pkgbase} + install -Dm644 README "${pkgdir}"/usr/share/licenses/${pkgbase} }
