pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc egg.mk: remove --single-version-externally-managed
details: https://anonhg.NetBSD.org/pkgsrc/rev/1920e89183ba
branches: trunk
changeset: 371324:1920e89183ba
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jan 09 11:58:13 2022 +0000
description:
egg.mk: remove --single-version-externally-managed
setuptools has this as default when --root is used (since version 0.6a11).
diffstat:
audio/playitslowly/Makefile | 3 +--
devel/py-backcall/Makefile | 7 +------
devel/py-configobj/Makefile | 7 +------
devel/py-entrypoints/Makefile | 7 +------
devel/py-hg-evolve/Makefile | 7 +------
devel/py-ipython_genutils/Makefile | 7 +------
devel/py-pep517/Makefile | 7 +------
devel/py-pexpect/Makefile | 7 +------
devel/py-termcolor/Makefile | 5 +----
devel/py-testpath/Makefile | 7 +------
devel/py-tortoisehg/Makefile | 7 +------
devel/py-traitlets4/Makefile | 7 +------
devel/scons/Makefile | 5 +----
devel/texttest/Makefile | 7 +------
lang/py-byterun/Makefile | 7 +------
lang/python/egg.mk | 4 +---
mail/py-spf/Makefile | 7 +------
math/py-gmpy/Makefile | 7 +------
misc/py-anita/Makefile | 7 +------
sysutils/py-ptyprocess/Makefile | 7 +------
textproc/py-libxml2/Makefile | 5 +----
textproc/py-pandocfilters/Makefile | 7 +------
www/py-curl/Makefile | 7 +------
23 files changed, 23 insertions(+), 125 deletions(-)
diffs (truncated from 436 to 300 lines):
diff -r 08d08c987bb7 -r 1920e89183ba audio/playitslowly/Makefile
--- a/audio/playitslowly/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/audio/playitslowly/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/01/07 15:05:31 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/09 11:58:13 wiz Exp $
DISTNAME= playitslowly-1.5.1
PKGREVISION= 5
@@ -29,6 +29,5 @@
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-backcall/Makefile
--- a/devel/py-backcall/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-backcall/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/07 11:46:56 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/09 11:58:13 wiz Exp $
DISTNAME= backcall-0.2.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -19,10 +19,5 @@
cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-configobj/Makefile
--- a/devel/py-configobj/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-configobj/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/01/07 11:46:56 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/09 11:58:13 wiz Exp $
DISTNAME= configobj-5.0.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,9 +16,4 @@
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-entrypoints/Makefile
--- a/devel/py-entrypoints/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-entrypoints/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/07 11:46:56 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/09 11:58:14 wiz Exp $
DISTNAME= entrypoints-0.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -24,10 +24,5 @@
cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-hg-evolve/Makefile
--- a/devel/py-hg-evolve/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-hg-evolve/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2022/01/09 11:58:14 wiz Exp $
#
# Release notes:
# https://www.mercurial-scm.org/pipermail/evolve-testers/
@@ -38,9 +38,4 @@
.endif
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-ipython_genutils/Makefile
--- a/devel/py-ipython_genutils/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-ipython_genutils/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/09 11:58:14 wiz Exp $
DISTNAME= ipython_genutils-0.2.0
PKGREVISION= 3
@@ -14,9 +14,4 @@
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-pep517/Makefile
--- a/devel/py-pep517/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-pep517/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/09 11:58:14 wiz Exp $
DISTNAME= pep517-0.12.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -21,9 +21,4 @@
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-pexpect/Makefile
--- a/devel/py-pexpect/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-pexpect/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2022/01/09 11:58:14 wiz Exp $
DISTNAME= pexpect-4.8.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,9 +16,4 @@
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-termcolor/Makefile
--- a/devel/py-termcolor/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-termcolor/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/09 11:58:14 wiz Exp $
DISTNAME= termcolor-1.1.0
PKGREVISION= 1
@@ -18,7 +18,4 @@
${NADA}
.include "../../lang/python/egg.mk"
-.if ${_PYTHON_VERSION} == 27
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-testpath/Makefile
--- a/devel/py-testpath/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-testpath/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/09 11:58:14 wiz Exp $
DISTNAME= testpath-0.3.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -17,9 +17,4 @@
${RM} ${WRKSRC}/testpath/cli-*.exe
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-tortoisehg/Makefile
--- a/devel/py-tortoisehg/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-tortoisehg/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.82 2022/01/09 11:58:14 wiz Exp $
DISTNAME= tortoisehg-6.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -47,11 +47,6 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../lang/python/versioned_dependencies.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/py-qt5-qscintilla/buildlink3.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/py-traitlets4/Makefile
--- a/devel/py-traitlets4/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/py-traitlets4/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/09 11:58:14 wiz Exp $
DISTNAME= traitlets-4.3.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -23,9 +23,4 @@
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-
-.if ${_PYTHON_VERSION} == 27
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/scons/Makefile
--- a/devel/scons/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/scons/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/01/07 11:46:57 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2022/01/09 11:58:15 wiz Exp $
# 4.1.0 is broken, per reports on gpsd list. Apparently 4.0.1 is ok.
DISTNAME= scons-3.1.2
@@ -30,7 +30,4 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba devel/texttest/Makefile
--- a/devel/texttest/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/devel/texttest/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/01/07 11:46:58 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/09 11:58:15 wiz Exp $
DISTNAME= TextTest-4.0.8
PKGNAME= ${DISTNAME:tl}
@@ -25,11 +25,6 @@
SUBST_VARS.prefix= PREFIX
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../lang/python/application.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba lang/py-byterun/Makefile
--- a/lang/py-byterun/Makefile Sun Jan 09 09:24:51 2022 +0000
+++ b/lang/py-byterun/Makefile Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/07 11:46:58 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/09 11:58:15 wiz Exp $
DISTNAME= byterun
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}-20160218
@@ -20,9 +20,4 @@
EGG_NAME= Byterun-1.0
.include "../../lang/python/egg.mk"
-
-.if ${PYPKGPREFIX} == "py27"
-_PYSETUPTOOLSINSTALLARGS:= ${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed}
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 08d08c987bb7 -r 1920e89183ba lang/python/egg.mk
--- a/lang/python/egg.mk Sun Jan 09 09:24:51 2022 +0000
+++ b/lang/python/egg.mk Sun Jan 09 11:58:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.33 2022/01/05 15:41:32 wiz Exp $
+# $NetBSD: egg.mk,v 1.34 2022/01/09 11:58:15 wiz Exp $
#
# Common logic to handle Python Eggs
#
@@ -35,8 +35,6 @@
PRINT_PLIST_AWK+= { gsub(/${PYVERSSUFFIX:S,.,\.,g}/, \
"$${PYVERSSUFFIX}") }
-_PYSETUPTOOLSINSTALLARGS= --single-version-externally-managed
-
USE_PKG_RESOURCES?= no
Home |
Main Index |
Thread Index |
Old Index