[arch-commits] Commit in python-basemap/trunk (PKGBUILD)

[Jaroslav Lichtblau]

    Date: Wednesday, March 19, 2014 @ 00:14:29
  Author: jlichtblau
Revision: 107731

upgpkg: python-basemap 1.0.7-2

Modified:
  python-basemap/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-18 22:51:56 UTC (rev 107730)
+++ PKGBUILD	2014-03-18 23:14:29 UTC (rev 107731)
@@ -7,7 +7,7 @@
 pkgbase=python-basemap
 pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
 pkgver=1.0.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://matplotlib.org/basemap/"
 license=('custom')
@@ -16,7 +16,7 @@
 sha1sums=('e1d5750aab4b2d2c3191bba078a6ae3e2bafa068')
 
 _py2basever=2.7
-_py3basever=3.3
+_py3basever=3.4
 
 build() {
    pushd "${srcdir}"/basemap-${pkgver}
@@ -27,15 +27,31 @@
 
    cp -a "${srcdir}"/basemap-${pkgver}{,-python2}
 
+    # Python2 Version
+   cd "${srcdir}"/basemap-${pkgver}-python2
+   python2 setup.py config
+   python2 setup.py build
+   
    # Python3 Version
    cd "${srcdir}"/basemap-${pkgver}
    python setup.py config
    python setup.py build
+}
 
-   # Python2 Version
+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-pillow: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
    cd "${srcdir}"/basemap-${pkgver}-python2
-   python2 setup.py config
-   python2 setup.py build
+
+   python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+
+   # Conflict with files from python2-matplotlib
+   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() {
@@ -49,28 +65,12 @@
 
    # 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 "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__pycache__/__init__.cpython-34.{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-pillow: 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${_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"