CVS commit: pkgsrc/www/py-curl

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug 20 07:31:52 UTC 2018

Modified Files:
        pkgsrc/www/py-curl: distinfo
        pkgsrc/www/py-curl/patches: patch-setup.py

Log Message:
py-curl: only use distutils (used to import setuptools when wheels were installed)


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/py-curl/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-curl/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-curl/distinfo
diff -u pkgsrc/www/py-curl/distinfo:1.24 pkgsrc/www/py-curl/distinfo:1.25
--- pkgsrc/www/py-curl/distinfo:1.24    Tue Jun  5 18:50:31 2018
+++ pkgsrc/www/py-curl/distinfo Mon Aug 20 07:31:51 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2018/06/05 18:50:31 wiz Exp $
+$NetBSD: distinfo,v 1.25 2018/08/20 07:31:51 adam Exp $
 
 SHA1 (pycurl-7.43.0.2.tar.gz) = cd617ed4e40a3b8f5ca5bf54aba7f35ed25afa46
 RMD160 (pycurl-7.43.0.2.tar.gz) = d6f40fc0f1e3f69bead2c2b9daf71a7195635f2c
 SHA512 (pycurl-7.43.0.2.tar.gz) = 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0
 Size (pycurl-7.43.0.2.tar.gz) = 214212 bytes
-SHA1 (patch-setup.py) = 41722b45efbbc3e3b65f88354b647b4c6304ab50
+SHA1 (patch-setup.py) = c47fedb656cebd4ac3bafa1cc6f08223ea75e086

Index: pkgsrc/www/py-curl/patches/patch-setup.py
diff -u pkgsrc/www/py-curl/patches/patch-setup.py:1.1 pkgsrc/www/py-curl/patches/patch-setup.py:1.2
--- pkgsrc/www/py-curl/patches/patch-setup.py:1.1       Wed Apr  5 17:56:18 2017
+++ pkgsrc/www/py-curl/patches/patch-setup.py   Mon Aug 20 07:31:51 2018
@@ -1,10 +1,25 @@
-$NetBSD: patch-setup.py,v 1.1 2017/04/05 17:56:18 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2018/08/20 07:31:51 adam Exp $
 
+Stick to distutils.
 Add multi Python variant support.
 
---- setup.py.orig      2016-02-04 04:39:06.000000000 +0000
+--- setup.py.orig      2018-06-02 04:59:02.000000000 +0000
 +++ setup.py
-@@ -520,9 +520,9 @@ def get_data_files():
+@@ -10,12 +10,7 @@ VERSION = "7.43.0.2"
+ 
+ import glob, os, re, sys, subprocess
+ import distutils
+-try:
+-    import wheel
+-    if wheel:
+-        from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ from distutils.extension import Extension
+ from distutils.util import split_quoted
+ from distutils.version import LooseVersion
+@@ -605,9 +600,9 @@ def get_data_files():
      # a list of tuples with (path to install to, a list of local files)
      data_files = []
      if sys.platform == "win32":