pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Use lang/python/distutils.mk instead



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Tue May 8 04:12:17 2018 +0200
Changeset:	e7c3f847f126290bb1d0d2836631a1be0e302031

Modified Files:
	py-ana/Makefile
	py-ana/PLIST
	py-ana/distinfo
Removed Files:
	py-ana/patches/patch-setup.py

Log Message:
Use lang/python/distutils.mk instead

As recommended by leot@, thanks!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e7c3f847f126290bb1d0d2836631a1be0e302031

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

diffstat:
 py-ana/Makefile               |  2 +-
 py-ana/PLIST                  |  6 +-----
 py-ana/distinfo               |  1 -
 py-ana/patches/patch-setup.py | 10 ----------
 4 files changed, 2 insertions(+), 17 deletions(-)

diffs:
diff --git a/py-ana/Makefile b/py-ana/Makefile
index ae927d459c..2b41198e72 100644
--- a/py-ana/Makefile
+++ b/py-ana/Makefile
@@ -11,5 +11,5 @@ COMMENT=	ana
 
 PYTHON_VERSIONS_ACCEPTED=	27
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-ana/PLIST b/py-ana/PLIST
index 407bfcd658..28c3533ebd 100644
--- a/py-ana/PLIST
+++ b/py-ana/PLIST
@@ -1,9 +1,5 @@
 @comment $NetBSD$
-${PYSITELIB}/ana-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/ana-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/ana-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/ana-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/ana-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/ana/__init__.py
 ${PYSITELIB}/ana/__init__.pyc
 ${PYSITELIB}/ana/__init__.pyo
diff --git a/py-ana/distinfo b/py-ana/distinfo
index 9ec9196af7..45c302d19b 100644
--- a/py-ana/distinfo
+++ b/py-ana/distinfo
@@ -4,4 +4,3 @@ SHA1 (ana-0.05.tar.gz) = 4ff7fe2f7813f2c79ae077f424fb22fa4b2d1dd0
 RMD160 (ana-0.05.tar.gz) = 60aec0b0567be7d4a89834739e28c6d518103b9c
 SHA512 (ana-0.05.tar.gz) = 98eaf9f6db5eaadfa2907b6b611ed04c0216197130761a4959fb37facb4f3b6cf100243a65e32c106f6d60225599080e11a2d0477cb87be34e28fae14aab8e30
 Size (ana-0.05.tar.gz) = 3132 bytes
-SHA1 (patch-setup.py) = bc7ed9cbdfe520f6ce16f23667f57f02108139b2
diff --git a/py-ana/patches/patch-setup.py b/py-ana/patches/patch-setup.py
deleted file mode 100644
index ad4e14fa33..0000000000
--- a/py-ana/patches/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
-Fix error "Unknown distribution option: 'install_requires'"
-
---- setup.py.orig	2018-03-27 23:17:53.000000000 +0000
-+++ setup.py
-@@ -1,2 +1,2 @@
--from distutils.core import setup
-+from setuptools import setup
- setup(name='ana', version='0.05', install_requires=['future'], packages=['ana'])


Home | Main Index | Thread Index | Old Index