From a54e26a375a60e5dd07696c227f01f8e329c4cf4 Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
Date: Sun, 3 May 2020 20:18:42 -0700
Subject: gis/cartopy: Updated for version 0.18.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 gis/cartopy/cartopy.SlackBuild | 9 +++------
 gis/cartopy/cartopy.info       | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'gis')

diff --git a/gis/cartopy/cartopy.SlackBuild b/gis/cartopy/cartopy.SlackBuild
index c5ff17247c..fc1fbf84a8 100644
--- a/gis/cartopy/cartopy.SlackBuild
+++ b/gis/cartopy/cartopy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cartopy
-VERSION=${VERSION:-0.17.0}
+VERSION=${VERSION:-0.18.0}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
@@ -69,17 +69,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
-  python2 setup.py install --root=$PKG
-CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
-  python3 setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES CONTRIBUTING.md COPYING COPYING.LESSER README.md \
+  CHANGES COPYING COPYING.LESSER README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/gis/cartopy/cartopy.info b/gis/cartopy/cartopy.info
index b349b33d46..968658e101 100644
--- a/gis/cartopy/cartopy.info
+++ b/gis/cartopy/cartopy.info
@@ -1,10 +1,10 @@
 PRGNAM="cartopy"
-VERSION="0.17.0"
+VERSION="0.18.0"
 HOMEPAGE="https://scitools.org.uk/cartopy/"
-DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.17.0/cartopy-0.17.0.tar.gz"
-MD5SUM="9fe063295a9fd854803d3c01a60720d0"
+DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.18.0/cartopy-0.18.0.tar.gz"
+MD5SUM="8e7db886f3192f5431f841211816b540"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="geos matplotlib python3-matplotlib proj pyshp scipy scipy3 Shapely"
+REQUIRES="geos python3-matplotlib proj pyshp scipy3 Shapely"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
-- 
cgit v1.2.3