CVS commit: pkgsrc/converters/py-arabic-reshaper

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan  5 09:37:15 UTC 2022

Modified Files:
        pkgsrc/converters/py-arabic-reshaper: Makefile distinfo
        pkgsrc/converters/py-arabic-reshaper/patches: patch-setup.py

Log Message:
py-arabic-reshaper: revert

This uses setuptools for pkg_resources

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/py-arabic-reshaper/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/converters/py-arabic-reshaper/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/converters/py-arabic-reshaper/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/converters/py-arabic-reshaper/Makefile
diff -u pkgsrc/converters/py-arabic-reshaper/Makefile:1.3 pkgsrc/converters/py-arabic-reshaper/Makefile:1.4
--- pkgsrc/converters/py-arabic-reshaper/Makefile:1.3   Wed Jan  5 08:58:37 2022
+++ pkgsrc/converters/py-arabic-reshaper/Makefile       Wed Jan  5 09:37:15 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/01/05 08:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/05 09:37:15 wiz Exp $
 
 DISTNAME=      arabic_reshaper-2.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/arabic-reshaper/}
 
@@ -12,6 +12,7 @@ COMMENT=      Reconstruct Arabic sentences
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27

Index: pkgsrc/converters/py-arabic-reshaper/distinfo
diff -u pkgsrc/converters/py-arabic-reshaper/distinfo:1.4 pkgsrc/converters/py-arabic-reshaper/distinfo:1.5
--- pkgsrc/converters/py-arabic-reshaper/distinfo:1.4   Wed Jan  5 09:12:55 2022
+++ pkgsrc/converters/py-arabic-reshaper/distinfo       Wed Jan  5 09:37:15 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2022/01/05 09:12:55 wiz Exp $
+$NetBSD: distinfo,v 1.5 2022/01/05 09:37:15 wiz Exp $
 
 BLAKE2s (arabic_reshaper-2.1.3.tar.gz) = 2e678f8db19a4523f304bf0a4de04f530924d55daeb173843fa6709a33fa1841
 SHA512 (arabic_reshaper-2.1.3.tar.gz) = c0236fd481aeef56d2f56f2ddb642a71c011d7c34cd66002346d47dc9f73595934f26f375d67bfc62b48cabda911aafb2b86abc05f417ddb0d33874af2eca2da
 Size (arabic_reshaper-2.1.3.tar.gz) = 24460 bytes
-SHA1 (patch-setup.py) = b08faed80de6a75748c8139873a95fcfea3e5434
+SHA1 (patch-setup.py) = 1304e79145dad8df1115820a7b22dc5a5cd0916d

Index: pkgsrc/converters/py-arabic-reshaper/patches/patch-setup.py
diff -u pkgsrc/converters/py-arabic-reshaper/patches/patch-setup.py:1.2 pkgsrc/converters/py-arabic-reshaper/patches/patch-setup.py:1.3
--- pkgsrc/converters/py-arabic-reshaper/patches/patch-setup.py:1.2     Wed Jan  5 09:12:55 2022
+++ pkgsrc/converters/py-arabic-reshaper/patches/patch-setup.py Wed Jan  5 09:37:15 2022
@@ -1,9 +1,7 @@
-$NetBSD: patch-setup.py,v 1.2 2022/01/05 09:12:55 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2022/01/05 09:37:15 wiz Exp $
 
 Fix building with Python 2.7.
 
-https://github.com/mpcabd/python-arabic-reshaper/issues/77
-
 --- setup.py.orig      2021-03-23 11:03:30.000000000 +0000
 +++ setup.py
 @@ -5,8 +5,8 @@ from setuptools import setup
@@ -17,13 +15,3 @@ https://github.com/mpcabd/python-arabic-
  
  setup(
      name="arabic_reshaper",
-@@ -19,8 +19,7 @@ setup(
-     license="MIT",
-     packages=['arabic_reshaper'],
-     install_requires=['configparser; python_version <"3"',
--                      'future',
--                      'setuptools'],
-+                      'future',],
-     extras_require={
-         'with-fonttools': ['fonttools>=4.0; python_version >="3"',
-                            'fonttools>=3.0<4.0; python_version <"3"']