py-scour: remove, graphics/py-scour is the same version

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sat Jan 29 08:26:59 2022 +0100
Changeset:	133570a6b8aceeb0bfbb3442c83ccd452f15d57d

Modified Files:
	Makefile
	py-crossbar/Makefile
Removed Files:
	py-scour/DESCR
	py-scour/Makefile
	py-scour/PLIST
	py-scour/distinfo

Log Message:
py-scour: remove, graphics/py-scour is the same version

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

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

diffstat:
 Makefile             |  3 +--
 py-crossbar/Makefile |  2 +-
 py-scour/DESCR       | 10 ----------
 py-scour/Makefile    | 18 ------------------
 py-scour/PLIST       | 24 ------------------------
 py-scour/distinfo    |  5 -----
 6 files changed, 2 insertions(+), 60 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index fefabfde45..6b075bae34 100644
--- a/Makefile
+++ b/Makefile
@@ -3281,7 +3281,6 @@ SUBDIR+=	ppp
 SUBDIR+=	ppr
 SUBDIR+=	praat
 SUBDIR+=	prboom-plus
-SUBDIR+=	pre-commit
 SUBDIR+=	preftools
 SUBDIR+=	preload
 SUBDIR+=	premake
@@ -4338,6 +4337,7 @@ SUBDIR+=	py-pp
 SUBDIR+=	py-ppft
 SUBDIR+=	py-ppscore
 SUBDIR+=	py-prayertime
+SUBDIR+=	py-pre-commit
 SUBDIR+=	py-prel
 SUBDIR+=	py-premailer
 SUBDIR+=	py-preshed
@@ -4552,7 +4552,6 @@ SUBDIR+=	py-scimath
 SUBDIR+=	py-sciproc
 SUBDIR+=	py-scipy-data_fitting
 SUBDIR+=	py-scitools
-SUBDIR+=	py-scour
 SUBDIR+=	py-scramp
 SUBDIR+=	py-screenutils
 SUBDIR+=	py-scrobbler
diff --git a/py-crossbar/Makefile b/py-crossbar/Makefile
index 4f79ff4ab2..f213bcbdea 100644
--- a/py-crossbar/Makefile
+++ b/py-crossbar/Makefile
@@ -30,7 +30,7 @@ DEPENDS+=	${PYPKGPREFIX}-hpack>=4.0.0:../../net/py-hpack
 DEPENDS+=	${PYPKGPREFIX}-netaddr>=0.8.0:../../net/py-netaddr
 DEPENDS+=	${PYPKGPREFIX}-txtorcon>=1.15.0:../../net/py-txtorcon
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+=	${PYPKGPREFIX}-scour>=0.38.2:../../wip/py-scour
+DEPENDS+=	${PYPKGPREFIX}-scour>=0.38.2:../../graphics/py-scour
 DEPENDS+=	${PYPKGPREFIX}-passlib>=0.14.3:../../security/py-passlib
 DEPENDS+=	${PYPKGPREFIX}-watchdog>=0.10.4:../../sysutils/py-watchdog
 DEPENDS+=	${PYPKGPREFIX}-priority>=1.0.3:../../www/py-priority
diff --git a/py-scour/DESCR b/py-scour/DESCR
deleted file mode 100644
index 86ebb3f5b2..0000000000
--- a/py-scour/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Scour is an SVG optimizer/cleaner that reduces the size
-of scalable vector graphics by optimizing structure and
-removing unnecessary data written in Python.It can be
-used to create streamlined vector graphics suitable for
-web deployment, publishing/sharing or further processing.
-
-The goal of Scour is to output a file that renderes identically
-at a fraction of the size by removing a lot of redundant
-information created by most SVG editors. Optimization options
-are typically lossless but can be tweaked for more agressive cleaning.
diff --git a/py-scour/Makefile b/py-scour/Makefile
deleted file mode 100644
index beb86d1a71..0000000000
--- a/py-scour/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	scour-0.38.2
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	graphics python
-MASTER_SITES=	${MASTER_SITE_PYPI:=s/scour/}
-
-MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	https://github.com/scour-project/scour
-COMMENT=	Scour SVG Optimizer
-LICENSE=	apache-2.0
-
-DEPENDS+=	${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
-
-USE_LANGUAGES=	# none
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-scour/PLIST b/py-scour/PLIST
deleted file mode 100644
index 1e51df9441..0000000000
--- a/py-scour/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD$
-bin/scour
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_INFODIR}/zip-safe
-${PYSITELIB}/scour/__init__.py
-${PYSITELIB}/scour/__init__.pyc
-${PYSITELIB}/scour/__init__.pyo
-${PYSITELIB}/scour/scour.py
-${PYSITELIB}/scour/scour.pyc
-${PYSITELIB}/scour/scour.pyo
-${PYSITELIB}/scour/svg_regex.py
-${PYSITELIB}/scour/svg_regex.pyc
-${PYSITELIB}/scour/svg_regex.pyo
-${PYSITELIB}/scour/svg_transform.py
-${PYSITELIB}/scour/svg_transform.pyc
-${PYSITELIB}/scour/svg_transform.pyo
-${PYSITELIB}/scour/yocto_css.py
-${PYSITELIB}/scour/yocto_css.pyc
-${PYSITELIB}/scour/yocto_css.pyo
diff --git a/py-scour/distinfo b/py-scour/distinfo
deleted file mode 100644
index 778149a9d5..0000000000
--- a/py-scour/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-RMD160 (scour-0.38.2.tar.gz) = 138e33fb4a0ce7add2bff0804484fa0bf5879680
-SHA512 (scour-0.38.2.tar.gz) = d4aec9d95f1ef706182f0da8ce1c6314174ef00cfa3276255dac55cf23f9f707ed372494f8f800a69247e82e3db476f7781816c4a9126c142e2cfffdc679e094
-Size (scour-0.38.2.tar.gz) = 52947 bytes