[arch-commits] Commit in python-basemap/repos/community-x86_64 (4 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Mon Oct 1 12:32:04 UTC 2018


    Date: Monday, October 1, 2018 @ 12:32:04
  Author: jlichtblau
Revision: 388841

archrelease: copy trunk to community-x86_64

Added:
  python-basemap/repos/community-x86_64/LICENSE
    (from rev 388840, python-basemap/trunk/LICENSE)
  python-basemap/repos/community-x86_64/PKGBUILD
    (from rev 388840, python-basemap/trunk/PKGBUILD)
Deleted:
  python-basemap/repos/community-x86_64/LICENSE
  python-basemap/repos/community-x86_64/PKGBUILD

----------+
 LICENSE  |   28 ++++-----
 PKGBUILD |  173 +++++++++++++++++++++++++++++--------------------------------
 2 files changed, 97 insertions(+), 104 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2018-10-01 12:31:51 UTC (rev 388840)
+++ LICENSE	2018-10-01 12:32:04 UTC (rev 388841)
@@ -1,14 +0,0 @@
-copyright (c) 2011 by Jeffrey Whitaker.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notices appear in all copies and that
-both the copyright notices and this permission notice appear in
-supporting documentation.
-THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.

Copied: python-basemap/repos/community-x86_64/LICENSE (from rev 388840, python-basemap/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2018-10-01 12:32:04 UTC (rev 388841)
@@ -0,0 +1,14 @@
+copyright (c) 2011 by Jeffrey Whitaker.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notices appear in all copies and that
+both the copyright notices and this permission notice appear in
+supporting documentation.
+THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-01 12:31:51 UTC (rev 388840)
+++ PKGBUILD	2018-10-01 12:32:04 UTC (rev 388841)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Matthias Ellmer <ellmer.matthias at gmail.com>
-# Contributor: Julien Morin <jmorin at cp.dias.ie>
-
-pkgbase=python-basemap
-pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
-pkgver=1.1.0
-pkgrel=2
-arch=('x86_64')
-url="https://matplotlib.org/basemap/"
-license=('MIT')
-makedepends=('cython' 'python2-numpy' 'python-numpy' 'geos' 'shapelib')
-source=($pkgname-$pkgver.tar.gz::https://github.com/matplotlib/basemap/archive/v$pkgver.tar.gz
-        LICENSE)
-sha256sums=('6acdc3a08bfcebf0a1b52a05d73d51b7aa5e7240fedfa95537c92d16f2ef8778'
-            '0deac85afb0740df7626b6d8d7aa4b8814bbe9a412fb1a0e5962895d17e63add')
-
-_py2basever=2.7
-_py3basever=3.7
-
-prepare() {
-  pushd "${srcdir}"/basemap-${pkgver}
-# regenerate cythonized sources for python 3.7
-  cythonize --force src/_geoslib.pyx
-# Remove the bundled libraries and common data
-  rm -r geos-*
-  sed -i "s/lib64/lib/g" setup.py
-  popd
-
-  cp -a "${srcdir}"/basemap-${pkgver}{,-python2}
-}
-
-build() {
-# 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
-}
-
-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
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-# 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() {
-  pkgdesc="Toolkit for plotting data on map projections"
-  depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2')
-  optdepends=('python-pillow: Python Imaging Library is only needed for bluemarble and warpimage methods.')
-
-  cd "${srcdir}"/basemap-${pkgver}
-
-  python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-# 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-3?.pyc
-
-  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_python-basemap-common() {
-  pkgdesc="Data files for python-basemap"
-  license=('GPL2')
-
-  cd "${srcdir}"/basemap-${pkgver}
-
-  install -dm755 "${pkgdir}"/usr/share/basemap
-  cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/
-}

Copied: python-basemap/repos/community-x86_64/PKGBUILD (from rev 388840, python-basemap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-10-01 12:32:04 UTC (rev 388841)
@@ -0,0 +1,83 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Matthias Ellmer <ellmer.matthias at gmail.com>
+# Contributor: Julien Morin <jmorin at cp.dias.ie>
+
+pkgbase=python-basemap
+pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
+pkgver=1.2.0
+pkgrel=1
+arch=('x86_64')
+url="https://matplotlib.org/basemap/"
+license=('MIT')
+makedepends=('cython' 'python2-numpy' 'python-numpy' 'geos' 'shapelib'
+             'python2-pyproj' 'python-pyproj' 'python2-setuptools' 'python-setuptools')
+source=($pkgname-$pkgver.tar.gz::https://github.com/matplotlib/basemap/archive/v${pkgver}rel.tar.gz
+        LICENSE)
+sha256sums=('bd5bf305918a2eb675939873b735238f9e3dfe6b5c290e37c41e5b082ff3639a'
+            '0deac85afb0740df7626b6d8d7aa4b8814bbe9a412fb1a0e5962895d17e63add')
+
+_py2basever=2.7
+_py3basever=3.7
+
+prepare() {
+  pushd "${srcdir}"/basemap-${pkgver}rel
+# regenerate cythonized sources for python 3.7
+  cythonize --force src/_geoslib.pyx
+# Remove the bundled libraries and common data
+  rm -r geos-*
+  sed -i "s/lib64/lib/g" setup.py
+  popd
+
+  cp -a "${srcdir}"/basemap-${pkgver}rel{,-python2}
+}
+
+build() {
+# Python2 Version
+  cd "${srcdir}"/basemap-${pkgver}rel-python2
+  python2 setup.py config
+  python2 setup.py build
+
+# Python3 Version
+  cd "${srcdir}"/basemap-${pkgver}rel
+  python setup.py config
+  python setup.py build
+}
+
+package_python2-basemap() {
+  pkgdesc="Toolkit for plotting data on map projections"
+  depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2' 'python2-pyproj')
+  optdepends=('python2-pillow: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
+  cd "${srcdir}"/basemap-${pkgver}rel-python2
+
+  python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  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() {
+  pkgdesc="Toolkit for plotting data on map projections"
+  depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2' 'python-pyproj')
+  optdepends=('python-pillow: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
+  cd "${srcdir}"/basemap-${pkgver}rel
+
+  python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  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_python-basemap-common() {
+  pkgdesc="Data files for python-basemap"
+  license=('GPL2')
+
+  cd "${srcdir}"/basemap-${pkgver}rel
+
+  install -dm755 "${pkgdir}"/usr/share/basemap
+  cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/
+}



More information about the arch-commits mailing list