python-packages: Clean up Makefiles 11919/head
authorJeffery To <jeffery.to@gmail.com>
Tue, 21 Apr 2020 17:27:50 +0000 (01:27 +0800)
committerJeffery To <jeffery.to@gmail.com>
Wed, 22 Apr 2020 08:36:55 +0000 (16:36 +0800)
This removes:

* Python 3 variants (VARIANT:=python3)

* "for Python3" from package titles

* Package selection condition from package dependencies, e.g.
  +PACKAGE_python3-six:python3-light replaced with +python3-light

* "Default" package information sections, e.g.
  Package/python-six/Default removed and package details merged into
  Package/python3-six

* "(Variant for Python3)" from package descriptions

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
137 files changed:
lang/python/Flask/Makefile
lang/python/Jinja2/Makefile
lang/python/MarkupSafe/Makefile
lang/python/Werkzeug/Makefile
lang/python/bcrypt/Makefile
lang/python/click-log/Makefile
lang/python/click/Makefile
lang/python/django-appconf/Makefile
lang/python/django-compressor/Makefile
lang/python/django-formtools/Makefile
lang/python/django-jsonfield/Makefile
lang/python/django-picklefield/Makefile
lang/python/django-postoffice/Makefile
lang/python/django-ranged-response/Makefile
lang/python/django-restframework/Makefile
lang/python/django-restframework39/Makefile
lang/python/django-simple-captcha/Makefile
lang/python/django-statici18n/Makefile
lang/python/django-webpack-loader/Makefile
lang/python/django/Makefile
lang/python/django1/Makefile
lang/python/gunicorn/Makefile
lang/python/itsdangerous/Makefile
lang/python/openpyxl/Makefile
lang/python/passlib/Makefile
lang/python/pillow/Makefile
lang/python/pyjwt/Makefile
lang/python/pymysql/Makefile
lang/python/pyodbc/Makefile
lang/python/python-aiohttp-cors/Makefile
lang/python/python-aiohttp/Makefile
lang/python/python-appdirs/Makefile
lang/python/python-asn1crypto/Makefile
lang/python/python-astral/Makefile
lang/python/python-async-timeout/Makefile
lang/python/python-atomicwrites/Makefile
lang/python/python-attrs/Makefile
lang/python/python-automat/Makefile
lang/python/python-awscli/Makefile
lang/python/python-boto3/Makefile
lang/python/python-botocore/Makefile
lang/python/python-cachelib/Makefile
lang/python/python-cachetools/Makefile
lang/python/python-certifi/Makefile
lang/python/python-cffi/Makefile
lang/python/python-chardet/Makefile
lang/python/python-colorama/Makefile
lang/python/python-constantly/Makefile
lang/python/python-contextlib2/Makefile
lang/python/python-crypto/Makefile
lang/python/python-cryptodome/Makefile
lang/python/python-cryptodomex/Makefile
lang/python/python-cryptography/Makefile
lang/python/python-curl/Makefile
lang/python/python-dateutil/Makefile
lang/python/python-decorator/Makefile
lang/python/python-defusedxml/Makefile
lang/python/python-dns/Makefile
lang/python/python-docutils/Makefile
lang/python/python-et_xmlfile/Makefile
lang/python/python-evdev/Makefile
lang/python/python-flask-login/Makefile
lang/python/python-gmpy2/Makefile
lang/python/python-gnupg/Makefile
lang/python/python-hyperlink/Makefile
lang/python/python-idna/Makefile
lang/python/python-ifaddr/Makefile
lang/python/python-incremental/Makefile
lang/python/python-influxdb/Makefile
lang/python/python-intelhex/Makefile
lang/python/python-jdcal/Makefile
lang/python/python-jmespath/Makefile
lang/python/python-jsonpath-ng/Makefile
lang/python/python-libmodbus/Makefile
lang/python/python-lxml/Makefile
lang/python/python-markdown/Makefile
lang/python/python-more-itertools/Makefile
lang/python/python-multidict/Makefile
lang/python/python-mysqlclient/Makefile
lang/python/python-netdisco/Makefile
lang/python/python-oauthlib/Makefile
lang/python/python-packaging/Makefile
lang/python/python-paho-mqtt/Makefile
lang/python/python-parsley/Makefile
lang/python/python-pluggy/Makefile
lang/python/python-ply/Makefile
lang/python/python-py/Makefile
lang/python/python-pyasn1-modules/Makefile
lang/python/python-pyasn1/Makefile
lang/python/python-pycparser/Makefile
lang/python/python-pyopenssl/Makefile
lang/python/python-pyotp/Makefile
lang/python/python-pyparsing/Makefile
lang/python/python-pyrsistent/Makefile
lang/python/python-pyserial/Makefile
lang/python/python-pytest/Makefile
lang/python/python-pytz/Makefile
lang/python/python-qrcode/Makefile
lang/python/python-rcssmin/Makefile
lang/python/python-requests-oauthlib/Makefile
lang/python/python-requests/Makefile
lang/python/python-rsa/Makefile
lang/python/python-s3transfer/Makefile
lang/python/python-schedule/Makefile
lang/python/python-schema/Makefile
lang/python/python-sentry-sdk/Makefile
lang/python/python-service-identity/Makefile
lang/python/python-simplejson/Makefile
lang/python/python-six/Makefile
lang/python/python-slugify/Makefile
lang/python/python-sqlalchemy/Makefile
lang/python/python-stem/Makefile
lang/python/python-twisted/Makefile
lang/python/python-urllib3/Makefile
lang/python/python-voluptuous-serialize/Makefile
lang/python/python-voluptuous/Makefile
lang/python/python-wcwidth/Makefile
lang/python/python-yaml/Makefile
lang/python/python-yarl/Makefile
lang/python/python-zeroconf/Makefile
lang/python/python-zipp/Makefile
lang/python/python-zope-interface/Makefile
lang/python/python3-asgiref/Makefile
lang/python/python3-bottle/Makefile
lang/python/python3-django-cors-headers/Makefile
lang/python/python3-django-etesync-journal/Makefile
lang/python/python3-drf-nested-routers/Makefile
lang/python/python3-maxminddb/Makefile
lang/python/python3-netifaces/Makefile
lang/python/python3-pyroute2/Makefile
lang/python/python3-speedtest-cli/Makefile
lang/python/python3-sqlparse/Makefile
lang/python/python3-unidecode/Makefile
lang/python/ruamel-yaml/Makefile
lang/python/text-unidecode/Makefile
lang/python/vobject/Makefile
lang/python/xmltodict/Makefile

index 0813155172152b9c7829e459b428552e176ead26..f7d97b0ee5e22021873d44db29e37b701d2ffd13 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=Flask
 PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52
@@ -30,7 +30,6 @@ define Package/python3-flask
            +python3-itsdangerous +python3-jinja2 +python3 +python3-logging \
            +python3-markupsafe +python3-multiprocessing +python3-setuptools \
            +python3-werkzeug
-  VARIANT:=python3
 endef
 
 define Package/python3-flask/description
index 6be18dbcda6e7cf9c5b9fe365fa6710bf5666eb6..dd557ba2efd137b97208b64de56d3ce7e8fdc1ac 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=Jinja2
 PKG_VERSION:=2.10.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de
@@ -27,7 +27,6 @@ define Package/python3-jinja2
   TITLE:=Jinja2
   URL:=http://jinja.pocoo.org/
   DEPENDS:=+python3-light +python3-markupsafe
-  VARIANT:=python3
 endef
 
 define Package/python3-jinja2/description
index dde6dede320677a402656b8be58c738db2eb9d93..cd9518545550ef270aacdbd1382a2605e759533c 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=MarkupSafe
 PKG_VERSION:=1.1.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b
@@ -26,7 +26,6 @@ define Package/python3-markupsafe
   TITLE:=MarkupSafe
   URL:=https://palletsprojects.com/p/markupsafe/
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-markupsafe/description
index deb3a51bd677ca5b6b3f540df408443a746cbdd6..2a75925176aefffce1d9e19b7edc749053303ac7 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=Werkzeug
 PKG_VERSION:=0.16.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7
@@ -26,7 +26,6 @@ define Package/python3-werkzeug
   TITLE:=Werkzeug
   URL:=https://palletsprojects.com/p/werkzeug/
   DEPENDS:=+python3-light +python3-email
-  VARIANT:=python3
 endef
 
 define Package/python3-werkzeug/description
index 90c53bd63780692bd352cbe1f9e8fcf11d2aa34d..0f56c4d5197e229f7ebfdae3356e1f012de8de01 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcrypt
 PKG_VERSION:=3.1.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42
@@ -22,27 +22,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/bcrypt/Default
+define Package/python3-bcrypt
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Modern password hashing
   URL:=https://github.com/pyca/bcrypt/
-endef
-
-define Package/python3-bcrypt
-$(call Package/bcrypt/Default)
   DEPENDS:= \
-       +PACKAGE_python3-bcrypt:python3 \
-       +PACKAGE_python3-bcrypt:python3-cffi \
-       +PACKAGE_python3-bcrypt:python3-six
-  VARIANT:=python3
+       +python3 \
+       +python3-cffi \
+       +python3-six
 endef
 
 define Package/python3-bcrypt/description
   Good password hashing for your software and your servers.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-bcrypt))
index 3da043a5d95b50cb4b5e9e96a3e239a1c88f574f..5a39c81de4d745f094c07001038843eb10bdc0d2 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=click-log
 PKG_VERSION:=0.3.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PKG_SOURCE_URL:=https://codeload.github.com/click-contrib/click-log/tar.gz/$(PKG_VERSION)?
@@ -24,7 +24,6 @@ define Package/python3-click-log
   URL:=http://github.com/mitsuhiko/click
   TITLE:=python3-click-log
   DEPENDS:=+python3-click
-  VARIANT:=python3
 endef
 
 define Package/python3-click-log/description
index 4d237083bceaa728eca80a40668e84999eacadfa..fff235d8c77a91a757e438a363e5bc436db3174f 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=click
 PKG_VERSION:=7.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PYPI_SOURCE_NAME:=Click
@@ -27,7 +27,6 @@ define Package/python3-click
   TITLE:=Click
   URL:=https://palletsprojects.com/p/click/
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-click/description
index 21aee4f8dbee1998bcc119cf3d9de9c625d0f47c..cb1963731c85e8a5a236a735ff7dd5f90d7f2101 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-appconf
 PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3
@@ -22,27 +22,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-appconf/Default
+define Package/python3-django-appconf
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Helper class for handling config defaults
   URL:=https://django-appconf.readthedocs.io
-endef
-
-define Package/python3-django-appconf
-$(call Package/django-appconf/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-appconf:python3 \
-       +PACKAGE_python3-django-appconf:python3-django1 \
-       +PACKAGE_python3-django-appconf:python3-six
-  VARIANT:=python3
+       +python3 \
+       +python3-django1 \
+       +python3-six
 endef
 
 define Package/python3-django-appconf/description
   A helper class for handling configuration defaults of packaged apps gracefully
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-appconf))
index 8f420a15371fc9fda68f4b1974aefd26620e9cdd..5b9c478bb53171462984308fe122e52d8fbb33ba 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-compressor
 PKG_VERSION:=2.2
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PYPI_NAME:=$(PKG_NAME)
 PYPI_SOURCE_NAME:=django_compressor
@@ -23,22 +23,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-compressor/Default
+define Package/python3-django-compressor
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Compress CSS/JS into single cached files
   URL:=https://django-compressor.readthedocs.io
-endef
-
-define Package/python3-django-compressor
-$(call Package/django-compressor/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-compressor:python3 \
-       +PACKAGE_python3-django-compressor:python3-django1 \
-       +PACKAGE_python3-django-compressor:python3-django-appconf \
-       +PACKAGE_python3-django-compressor:python3-rcssmin
-  VARIANT:=python3
+       +python3 \
+       +python3-django1 \
+       +python3-django-appconf \
+       +python3-rcssmin
 endef
 
 define Package/python3-django-compressor/description
@@ -46,8 +41,6 @@ define Package/python3-django-compressor/description
   Note that the JavaScript filter is not being installed as a dependency.
   You'll need to build the rjsmin module (it is not par of the openwrt standard
   feeds) to use JavaScript functionality.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-compressor))
index 3bbd46958655354a15833362614b2219ac7bd445..27104b572c3a6cd078cd96659031c09939bd38e8 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-formtools
 PKG_VERSION:=2.1
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=7703793f1675aa6e871f9fed147e8563816d7a5b9affdc5e3459899596217f7c
@@ -20,27 +20,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-formtools/Default
+define Package/python3-django-formtools
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=High-level abstractions for Django forms
   URL:=https://django-formtools.readthedocs.io
-endef
-
-define Package/python3-django-formtools
-$(call Package/django-formtools/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-formtools:python3 \
-       +PACKAGE_python3-django-formtools:python3-django1
-  VARIANT:=python3
+       +python3 \
+       +python3-django1
 endef
 
 define Package/python3-django-formtools/description
   Django "formtools" is a set of high-level abstractions for Django forms.
   Currently for form previews and multi-step forms.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-formtools))
index 930be5b0d3c5be63162245f57e6ed645c1cb3b80..39b998d127a902b1e1b452ffe98a44220365683d 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-jsonfield
 PKG_VERSION:=2.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=jsonfield
 PKG_HASH:=ed7c5e1829e9453e24a8bebef1e702ffe402e6def6b326f0e0b88764c59a6dc7
@@ -22,28 +22,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-jsonfield/Default
+define Package/python3-django-jsonfield
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=A reusable Django field to store validated JSON in models
   URL:=https://github.com/rpkilby/jsonfield
-endef
-
-define Package/python3-django-jsonfield
-$(call Package/django-jsonfield/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-jsonfield:python3 \
-       +PACKAGE_python3-django-jsonfield:python3-django1 \
-       +PACKAGE_python3-django-jsonfield:python3-six
-  VARIANT:=python3
+       +python3 \
+       +python3-django1 \
+       +python3-six
 endef
 
 define Package/python3-django-jsonfield/description
   jsonfield is a reusable model field that allows you to store validated
   JSON, automatically handling serialization to and from the database.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-jsonfield))
index da3f4ee0594567c5312ee0a4a153abb0edcf5ee5..7d5705aa844b0e5c07fdac77b6456cbbc877062f 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-picklefield
 PKG_VERSION:=2.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=67a5e156343e3b032cac2f65565f0faa81635a99c7da74b0f07a0f5db467b646
@@ -25,26 +25,19 @@ include ../python3-package.mk
 PYTHON3_PKG_SETUP_VARS:= \
   PKG_VERSION="$(PKG_VERSION)"
 
-define Package/django-picklefield/Default
+define Package/python3-django-picklefield
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Pickled object field for Django
   URL:=https://github.com/gintas/django-picklefield/
-endef
-
-define Package/python3-django-picklefield
-$(call Package/django-picklefield/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-picklefield:python3 \
-       +PACKAGE_python3-django-picklefield:python3-django1
-  VARIANT:=python3
+       +python3 \
+       +python3-django1
 endef
 
 define Package/python3-django-picklefield/description
   Pickled object field for Django
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-picklefield))
index 0525f342052658132d3adab2f1b56c221f75a9bf..f617b4ecf64cc1d10d0a61f6a03b24825256e878 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-postoffice
 PKG_VERSION:=3.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=django-post-office
 PYPI_SOURCE_NAME:=django-post_office
@@ -23,28 +23,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-postoffice/Default
+define Package/python3-django-postoffice
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=A Django app to monitor and send mail asynchronously
   URL:=https://github.com/ui/django-post_office
-endef
-
-define Package/python3-django-postoffice
-$(call Package/django-postoffice/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-postoffice:python3 \
-       +PACKAGE_python3-django-postoffice:python3-django1 \
-       +PACKAGE_python3-django-postoffice:python3-django-jsonfield
-  VARIANT:=python3
+       +python3 \
+       +python3-django1 \
+       +python3-django-jsonfield
 endef
 
 define Package/python3-django-postoffice/description
   A Django app to monitor and send mail asynchronously, complete with template
   support
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-postoffice))
index 6006963d2d12df021cafac0d034c9fe01fa9dd16..c222983f44b777e6d2f84aedd757302e2165551b 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-ranged-response
 PKG_VERSION:=0.2.0
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=f71fff352a37316b9bead717fc76e4ddd6c9b99c4680cdf4783b9755af1cf985
@@ -20,26 +20,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-ranged-response/Default
+define Package/python3-django-ranged-response
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Add Content-Range: to FileResponse
   URL:=https://github.com/i3thuan5/django-ranged-response
-endef
-
-define Package/python3-django-ranged-response
-$(call Package/django-ranged-response/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-ranged-response:python3 \
-       +PACKAGE_python3-django-ranged-response:python3-django1
-  VARIANT:=python3
+       +python3 \
+       +python3-django1
 endef
 
 define Package/python3-django-ranged-response/description
   Modified Django FileResponse that adds Content-Range headers.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-ranged-response))
index f18b8811bb63e4d4bd4ebf9d023cf280b3f42def..ff5bb1554e7a3648243809491440b2476a801278 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-restframework
 PKG_VERSION:=3.11.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=djangorestframework
 PKG_HASH:=e782087823c47a26826ee5b6fa0c542968219263fb3976ec3c31edab23a4001f
@@ -29,13 +29,10 @@ define Package/python3-django-restframework
   TITLE:=Web APIs for Django, made easy.
   URL:=https://www.django-rest-framework.org
   DEPENDS:=+python3 +django
-  VARIANT:=python3
 endef
 
 define Package/python3-django-restframework/description
   Web APIs for Django, made easy.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-restframework))
index 6c45abb73f173e3751c225a550feb0d2269c2752..b3a130ebefd98190330219a9963a4ac4e62a738d 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-restframework39
 PKG_VERSION:=3.9.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=djangorestframework
 PKG_HASH:=c12869cfd83c33d579b17b3cb28a2ae7322a53c3ce85580c2a2ebe4e3f56c4fb
@@ -22,27 +22,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-restframework39/Default
+define Package/python3-django-restframework39
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Web APIs for Django, made easy.
   URL:=https://www.django-rest-framework.org
-endef
-
-define Package/python3-django-restframework39
-$(call Package/django-restframework39/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-restframework39:python3 \
-       +PACKAGE_python3-django-restframework39:python3-django1
+       +python3 \
+       +python3-django1
   CONFLICTS:=python3-django-restframework
-  VARIANT:=python3
 endef
 
 define Package/python3-django-restframework39/description
   Web APIs for Django, made easy. (3.9 series)
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-restframework39))
index 03f547a45010358c724a9b296b43c7d5dc029143..7c1ed938222dd7c6ac7b78f3241be279e1a476c6 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-simple-captcha
 PKG_VERSION:=0.5.12
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mbi/django-simple-captcha/tar.gz/v$(PKG_VERSION)?
@@ -19,37 +19,26 @@ PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-
-define Package/django-simple-captcha/Default
+define Package/python3-django-simple-captcha
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Simple Django captcha application
   URL:=https://github.com/mbi/django-simple-captcha
-endef
-
-define Package/python3-django-simple-captcha
-$(call Package/django-simple-captcha/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-simple-captcha:python3 \
-       +PACKAGE_python3-django-simple-captcha:python3-six \
-       +PACKAGE_python3-django-simple-captcha:python3-django1 \
-       +PACKAGE_python3-django-simple-captcha:python3-pillow \
-       +PACKAGE_python3-django-simple-captcha:python3-django-ranged-response
-  VARIANT:=python3
+       +python3 \
+       +python3-six \
+       +python3-django1 \
+       +python3-pillow \
+       +python3-django-ranged-response
 endef
 
 define Package/python3-django-simple-captcha/description
   Django Simple Captcha is an extremely simple, yet highly customizable Django
   application to add captcha images to any Django form.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-simple-captcha))
index 73872264b8b21107e8cb22fc0984fb47f24ac705..4f9ad8b1fa5942f6187658b433f14f632e9c2607 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-statici18n
 PKG_VERSION:=1.9.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=913dd056c1abcbe129b1db806cb4cfb821c4077d7e857d6eb29043ea64f4d1d0
@@ -22,28 +22,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-statici18n/Default
+define Package/python3-django-statici18n
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Helper for generating JavaScript catalog to static files
   URL:=https://django-statici18n.readthedocs.io
-endef
-
-define Package/python3-django-statici18n
-$(call Package/django-statici18n/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-statici18n:python3 \
-       +PACKAGE_python3-django-statici18n:python3-django1 \
-       +PACKAGE_python3-django-statici18n:python3-django-appconf \
-       +PACKAGE_python3-django-statici18n:python3-six
-  VARIANT:=python3
+       +python3 \
+       +python3-django1 \
+       +python3-django-appconf \
+       +python3-six
 endef
 
 define Package/python3-django-statici18n/description
   A Django app that provides helper for generating JavaScript catalog to static files.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-statici18n))
index d21f0268b92f66e32949534266d6b4fd061b36b8..2702d266049eceaf537ca0b9c6c0aeed41e4580a 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-webpack-loader
 PKG_VERSION:=0.6.0
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520
@@ -20,26 +20,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/django-webpack-loader/Default
+define Package/python3-django-webpack-loader
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Transparently use webpack in django
   URL:=https://github.com/owais/django-webpack-loader
-endef
-
-define Package/python3-django-webpack-loader
-$(call Package/django-webpack-loader/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django-webpack-loader:python3 \
-       +PACKAGE_python3-django-webpack-loader:python3-django1
-  VARIANT:=python3
+       +python3 \
+       +python3-django1
 endef
 
 define Package/python3-django-webpack-loader/description
   Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-django-webpack-loader))
index c6be64b0f8ea947b0bca286e1deb3203c82c8ee7..b4f9c9b24e18b2ea74bf05181942685912e6280c 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django
 PKG_VERSION:=3.0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Django
 PKG_HASH:=d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1
@@ -32,12 +32,10 @@ define Package/python3-django
   DEPENDS:= +python3 +python3-pytz +python3-sqlparse +python3-asgiref
   CONFLICTS:=python3-django1 python-django1-common
   PROVIDES:=django
-  VARIANT:=python3
 endef
 
 define Package/python3-django/description
-    The web framework for perfectionists with deadlines (LTS 2.2 series).
-    Python3 only.
+    The web framework for perfectionists with deadlines.
 endef
 
 define Py3Package/python3-django/install
index d3599e9621bd2fdc472660d89dcdd4300f64405a..8281d5881771c72cf04c0bf6ab190d073cfc5675 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django1
 PKG_VERSION:=1.11.29
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=Django
 PKG_HASH:=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c
@@ -34,17 +34,14 @@ endef
 define Package/python3-django1
 $(call Package/django1/Default)
   DEPENDS:= \
-       +PACKAGE_python3-django1:python3 \
-       +PACKAGE_python3-django1:python3-pytz \
-       +PACKAGE_python3-django1:python-django1-common
-  VARIANT:=python3
+       +python3 \
+       +python3-pytz \
+       +python-django1-common
   PROVIDES:=django
 endef
 
 define Package/python3-django1/description
   The web framework for perfectionists with deadlines (LTS 1.11 series).
-.
-(Variant for Python3)
 endef
 
 define Package/python-django1-common
index 49df326d27f0b485e6522921157d84085b9af2de..37a3fe9925d783a46bd9a9c5344a496d308be6a7 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gunicorn
 PKG_VERSION:=20.0.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626
@@ -34,13 +34,10 @@ define Package/python3-gunicorn
 $(call Package/gunicorn/Default)
   TITLE:=WSGI HTTP Server for UNIX (library)
   DEPENDS:=+python3
-  VARIANT:=python3
 endef
 
 define Package/python3-gunicorn/description
     WSGI HTTP Server for UNIX (libraries)
-.
-(Variant for Python3)
 endef
 
 # Make sure that the binaries are not installed with the libraries
@@ -56,8 +53,6 @@ endef
 
 define Package/gunicorn3/description
     WSGI HTTP Server for UNIX (daemon)
-.
-(Variant for Python3)
 endef
 
 define Package/gunicorn3/install
index 81cd669e6c7130c30812ba0186ab65c9963fb07f..65d49d5d5030d1bac9848af1d0c94483677f02de 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=itsdangerous
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19
@@ -26,7 +26,6 @@ define Package/python3-itsdangerous
   TITLE:=ItsDangerous
   URL:=https://palletsprojects.com/p/itsdangerous/
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-itsdangerous/description
index 77cad3be0e715c64b30091a7d83a49949c0b307b..1ee366e551adc023f52be08304f1c83b503ad2cb 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-openpyxl
 PKG_VERSION:=3.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=MIT
@@ -29,13 +29,10 @@ define Package/python3-openpyxl
   TITLE:=A Python library to read/write Excel 2010 xlsx/xlsm files
   URL:=https://openpyxl.readthedocs.org/
   DEPENDS:=+python3 +python3-defusedxml +python3-et_xmlfile +python3-jdcal
-  VARIANT:=python3
 endef
 
 define Package/python3-openpyxl/description
   A Python library to read/write Excel 2010 xlsx/xlsm files
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-openpyxl))
index bba473f68a0e6c0597be9c3938866ee0e89cdef7..8080be90888f97e9a6ea7ac33f4c287677671ec3 100644 (file)
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=passlib
 PKG_VERSION:=1.7.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-3-Clause
 
 PYPI_NAME:=$(PKG_NAME)
@@ -16,18 +16,13 @@ include $(INCLUDE_DIR)/package.mk
 
 include ../python3-package.mk
 
-define Package/passlib/Default
+define Package/python3-passlib
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Comprehensive password hashing framework
   URL:=https://bitbucket.org/ecollins/passlib
-endef
-
-define Package/python3-passlib
-$(call Package/passlib/Default)
-  DEPENDS:=+PACKAGE_python3-passlib:python3 +PACKAGE_python3-passlib:python3-dateutil
-  VARIANT:=python3
+  DEPENDS:=+python3 +python3-dateutil
 endef
 
 define Package/python3-passlib/description
@@ -37,8 +32,6 @@ as well as a framework for managing existing password hashes. It’s
 designed to be useful for a wide range of tasks, from verifying a hash
 found in /etc/shadow, to providing full-strength password hashing for
 multi-user applications.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-passlib))
index b0ec93b183eb1f5620282f10aac5480fca2f71a7..17898e81ca5b923b8625181b4157cc1c070c1d21 100644 (file)
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pillow
 PKG_VERSION:=7.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Pillow
 PKG_HASH:=0f89ddc77cf421b8cd34ae852309501458942bf370831b4a9b406156b599a14e
@@ -22,25 +22,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pillow/Default
+define Package/python3-pillow
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=The friendly PIL fork
   URL:=https://python-pillow.org/
-  DEPENDS:=+libfreetype +libjpeg +libtiff +zlib
-endef
-
-define Package/python3-pillow
-$(call Package/python-pillow/Default)
-  DEPENDS+=+python3
-  VARIANT:=python3
+  DEPENDS:=+libfreetype +libjpeg +libtiff +zlib +python3
 endef
 
 define Package/python3-pillow/description
   The friendly PIL fork
-.
-(Variant for Python3)
 endef
 
 PYTHON3_PKG_SETUP_GLOBAL_ARGS += build_ext \
index b4745b631d8d876fdbe02fa8dc3b2f8720866663..15f131ab28cb9ef8d8460f866c608cb33c36a919 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pyjwt
 PKG_VERSION:=1.7.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
 PKG_LICENSE:=MIT
@@ -20,24 +20,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pyjwt/Default
+define Package/python3-pyjwt
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=JSON Web Token implementation in Python
   URL:=http://github.com/jpadilla/pyjwt
-endef
-
-define Package/python3-pyjwt
-  $(call Package/python-pyjwt/Default)
-  DEPENDS:=+PACKAGE_python3-pyjwt:python3
-  VARIANT:=python3
+  DEPENDS:=+python3
 endef
 
 define Package/python3-pyjwt/description
   A Python implementation of RFC 7519.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-pyjwt))
index 87baddd1c426446a9042b830ed118cd6b3e0eae1..55275aaf1596b4a0236da2e05e48b56c8f52c12e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pymysql
 PKG_VERSION:=0.9.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=PyMySQL
 PKG_HASH:=d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7
@@ -31,7 +31,6 @@ define Package/python3-pymysql
   TITLE:=Pure Python MySQL Client
   URL:=https://pymysql.readthedocs.io/
   DEPENDS:=+python3 +PYTHON3_PYMYSQL_SHA_PASSWORD_SUPPORT:python3-cryptography
-  VARIANT:=python3
 endef
 
 define Package/python3-pymysql/config
index 87ca5c936a17e98a5e53363b419e3b8433586023..1bb1f4686bb88ff839a47c7a5d0c73c29f5b1910 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pyodbc
 PKG_VERSION:=4.0.26
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=e52700b5d24a846483b5ab80acd9153f8e593999c9184ffea11596288fb33de3
@@ -22,19 +22,13 @@ include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pyodbc/Default
+define Package/python3-pyodbc
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  URL:=https://github.com/mkleehammer/pyodbc
-  DEPENDS:=+unixodbc $(CXX_DEPENDS)
-endef
-
-define Package/python3-pyodbc
-$(call Package/python-pyodbc/Default)
   TITLE:=python3-pyodbc
-  DEPENDS+=+PACKAGE_python3-pyodbc:python3-light
-  VARIANT:=python3
+  URL:=https://github.com/mkleehammer/pyodbc
+  DEPENDS:=+unixodbc +python3-light $(CXX_DEPENDS)
 endef
 
 define Package/python3-pyodbc/description
@@ -42,8 +36,6 @@ DB API Module for ODBC
 
 A Python DB API 2 module for ODBC. This project provides an up-to-date,
 convenient interface to ODBC using native data types like datetime and decimal.
-
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-pyodbc))
index b8c85f95fa7daf667e80689aa859ce259494e9c1..892a660c3ab51bedab1d51565ac0a45d04d7d412 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aiohttp-cors
 PKG_VERSION:=0.7.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=aiohttp_cors
 PYPI_SOURCE_NAME:=aiohttp-cors
@@ -32,7 +32,6 @@ define Package/python3-aiohttp-cors
   DEPENDS:= \
        +python3-aiohttp \
        +python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-aiohttp-cors/description
index d031acf71a21be322302787672ec4645432cd1be..f672175e6ee6877d9854fb4b130ed30b6a468ca1 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aiohttp
 PKG_VERSION:=3.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=fc55b1fec0e4cc1134ffb09ea3970783ee2906dc5dfd7cd16917913f2cfed65b
@@ -40,7 +40,6 @@ define Package/python3-aiohttp
        +python3-codecs \
        +python3-cgi \
        +python3-openssl
-  VARIANT:=python3
 endef
 
 define Package/python3-aiohttp/description
index d876e8b15359bba88f6a82b46aec89dd1ed5e3e6..5f9d2b954e367ddbb1fd70e63131227ab5586b07 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-appdirs
 PKG_VERSION:=1.4.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PYPI_NAME:=appdirs
@@ -24,7 +24,6 @@ define Package/python3-appdirs
   URL:=https://github.com/ActiveState/appdirs
   TITLE:=python3-appdirs
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python-appdirs/description
index ce719f06664721fc7fe8ece6224e19177f67bc8f..08f6aac2e85238938d937a13104ac82f06f1c5ff 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-asn1crypto
 PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=asn1crypto
 PKG_HASH:=5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d
@@ -29,7 +29,6 @@ define Package/python3-asn1crypto
   URL:=https://github.com/wbond/asn1crypto
   TITLE:=Fast pure Python lib for ASN1 structures
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-asn1crypto/description
index 35825e8aa47c7fa08cb3216db13b30c4cf729c34..b5fe47d4fa59fa8b6bc2607bfe515713621dc800 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-astral
 PKG_VERSION:=1.10.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=astral
 PKG_HASH:=d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1
@@ -22,26 +22,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-astral/Default
+define Package/python3-astral
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Calculations for the position of the sun and moon
   URL:=https://github.com/sffjunkie/astral
-endef
-
-define Package/python3-astral
-$(call Package/python-astral/Default)
   DEPENDS+= \
-      +PACKAGE_python3-astral:python3-light \
-      +PACKAGE_python3-astral:python3-pytz
-  VARIANT:=python3
+      +python3-light \
+      +python3-pytz
 endef
 
 define Package/python3-astral/description
 Astral is a python module for calculating the times of various aspects of the sun and moon.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-astral))
index 50a761c64347d9d7ae16646d4b0b508cdcc48c22..cb66dd01fc23631e51b8da47586ab7cf0dff35a0 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=async-timeout
 PKG_VERSION:=3.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=async_timeout
 PYPI_SOURCE_NAME:=async-timeout
@@ -32,7 +32,6 @@ define Package/python3-async-timeout
   DEPENDS:= \
   +python3-light \
   +python3-asyncio
-  VARIANT:=python3
 endef
 
 define Package/python3-async-timeout/description
index 315f2c33c2657bf6b7cb6f2ffea5c74550e8d771..d035c94e48346b78597533e38039e3f3a673629b 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-atomicwrites
 PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=atomicwrites
 PKG_HASH:=75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6
@@ -29,7 +29,6 @@ define Package/python3-atomicwrites
   TITLE:=Atomic file writes
   URL:=https://github.com/untitaker/python-atomicwrites
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-atomicwrites/description
index 82fc5d4bde9cb5d0a26cb93d7931a981ee87791f..240ec6be68c556d68bce3e0c4b13bd2fbe6c4d4a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-attrs
 PKG_VERSION:=19.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=attrs
 PKG_HASH:=f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72
@@ -22,26 +22,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-attrs/Default
+define Package/python3-attrs
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Classes Without Boilerplate
   URL:=https://www.attrs.org/
-endef
-
-define Package/python3-attrs
-$(call Package/python-attrs/Default)
-  DEPENDS:=+PACKAGE_python3-attrs:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-attrs/description
 attrs is an MIT-licensed Python package with class decorators that ease
 the chores of implementing the most common attribute-related object
 protocols.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-attrs))
index b399ec03f4976698d56f60a8e8386abed0bac50e..248f7b705542b702121cb18baa43b55011a706a3 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-automat
 PKG_VERSION:=20.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Automat
 PKG_HASH:=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
@@ -25,29 +25,22 @@ include ../python3-package.mk
 PYTHON3_PKG_SETUP_VARS:= \
   PKG_VERSION="$(PKG_VERSION)"
 
-define Package/python-automat/Default
+define Package/python3-automat
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Concise, idiomatic finite-state automata
   URL:=https://github.com/glyph/Automat
-endef
-
-define Package/python3-automat
-$(call Package/python-automat/Default)
   DEPENDS:= \
-      +PACKAGE_python3-automat:python3-light \
-      +PACKAGE_python3-automat:python3-attrs \
-      +PACKAGE_python3-automat:python3-six
-  VARIANT:=python3
+      +python3-light \
+      +python3-attrs \
+      +python3-six
 endef
 
 define Package/python3-automat/description
 Automat is a library for concise, idiomatic Python expression of
 finite-state automata (particularly deterministic finite-state
 transducers).
-.
-(Variant for Python3)
 endef
 
 define Py3Package/python3-automat/filespec
index 537b5c78baa1e88be023b6db7ddb077fd7674731..c4818c20b0fff3ac9e35bfc93e0e4bafe61d94df 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=awscli
 PKG_VERSION:=1.16.75
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=8d96ec0de325ea8271cc6aa95b7392bbf548ec4aabd3ffbcdc0619b64edd4a45
@@ -14,31 +14,24 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-awscli/Default
+define Package/python3-awscli
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=awscli
   URL:=https://github.com/aws/aws-cli
-endef
-
-define Package/python3-awscli
-$(call Package/python-awscli/Default)
-  DEPENDS:=+PACKAGE_python3-awscli:python3 \
-       +PACKAGE_python3-awscli:python3-yaml \
-       +PACKAGE_python3-awscli:python3-pyasn1 \
-       +PACKAGE_python3-awscli:python3-botocore \
-       +PACKAGE_python3-awscli:python3-rsa \
-       +PACKAGE_python3-awscli:python3-colorama \
-       +PACKAGE_python3-awscli:python3-docutils \
-       +PACKAGE_python3-awscli:python3-s3transfer
-  VARIANT:=python3
+  DEPENDS:=+python3 \
+       +python3-yaml \
+       +python3-pyasn1 \
+       +python3-botocore \
+       +python3-rsa \
+       +python3-colorama \
+       +python3-docutils \
+       +python3-s3transfer
 endef
 
 define Package/python3-awscli/description
 This package provides a unified command line interface to Amazon Web Services.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-awscli))
index 4f43b4e1ca92e0549cca171b954a0e29d9b0a5d8..27f69b3c9b4369a13966d1eae56ad3d2fe091492 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=boto3
 PKG_VERSION:=1.9.135
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=5e5805992e873e5687b5ef3b4c56c386ccb4df1c3364f8b8601d289e2f275be1
@@ -25,7 +25,6 @@ define Package/python3-boto3
        +python3-jmespath \
        +python3-botocore \
        +python3-s3transfer
-  VARIANT:=python3
 endef
 
 define Package/python3-boto3/description
index 505dbe1f99efcf0f8a4508ed31e3261bfe6fb493..739be11261fa4bcc819a79d28f13c7ef690db446 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=botocore
 PKG_VERSION:=1.12.66
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=25c39ecc71356287cf79d66981ec77deca374e28043b19b2f818d48aa34272a1
@@ -14,30 +14,23 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-botocore/Default
+define Package/python3-botocore
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=botocore
   URL:=https://github.com/boto/botocore
-endef
-
-define Package/python3-botocore
-$(call Package/python-botocore/Default)
-  DEPENDS:=+PACKAGE_python3-botocore:python3 \
-       +PACKAGE_python3-botocore:python3-urllib3 \
-       +PACKAGE_python3-botocore:python3-docutils \
-       +PACKAGE_python3-botocore:python3-dateutil \
-       +PACKAGE_python3-botocore:python3-jmespath \
-       +PACKAGE_python3-botocore:python3-requests
-  VARIANT:=python3
+  DEPENDS:=+python3 \
+       +python3-urllib3 \
+       +python3-docutils \
+       +python3-dateutil \
+       +python3-jmespath \
+       +python3-requests
 endef
 
 define Package/python3-botocore/description
 A low-level interface to a growing number of Amazon Web Services.
 The botocore package is the foundation for the AWS CLI as well as boto3.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-botocore))
index 52b6d93cc720500d99ef996640d3b1125267b14b..0573183760738f5828c15dc99ac80c98c4f207d5 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cachelib
 PKG_VERSION:=0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cachelib
 PKG_HASH:=8b889b509d372095357b8705966e1282d40835c4126d7c2b07fd414514d8ae8d
@@ -26,7 +26,6 @@ define Package/python3-cachelib
   TITLE:=cachelib
   URL:=https://github.com/pallets/cachelib
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-cachelib/description
index 6b7ae4096301c8d03a074c3306fdb70661fc58ff..de81b48f4cc8bcac998d8f81c1c8c7df081a97c8 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cachetools
 PKG_VERSION:=3.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cachetools
 PKG_HASH:=8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
@@ -29,7 +29,6 @@ define Package/python3-cachetools
   TITLE:=Extensible memoizing collections and decorators
   URL:=https://github.com/tkem/cachetools
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-cachetools/description
index 914bce87b9968a1ddde59a106375b4915e0539f4..aa4f426739a48e5a6d076ada0d5713e520e6e615 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-certifi
 PKG_VERSION:=2019.11.28
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
 PKG_LICENSE:=MPL-2.0
@@ -20,25 +20,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-certifi/Default
+define Package/python3-certifi
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Python package for Mozilla's CA Bundle
   URL:=http://certifi.io/
-endef
-
-define Package/python3-certifi
-  $(call Package/python-certifi/Default)
-  DEPENDS:=+PACKAGE_python3-certifi:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-certifi/description
   Certifi is a carefully curated collection of Root Certificates for validating the
   trustworthiness of SSL certificates while verifying the identity of TLS hosts.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-certifi))
index 77b5fd7d1007090f715f46903e11ff879c3e7d27..5bad6e65bd2603f979e159402bda86e48e6f9085 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cffi
 PKG_VERSION:=1.14.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cffi
 PKG_HASH:=2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6
@@ -22,27 +22,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-cffi/Default
+define Package/python3-cffi
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=C Foreign Function Interface
   URL:=https://cffi.readthedocs.org/
-  DEPENDS:=+libffi
-endef
-
-define Package/python3-cffi
-$(call Package/python-cffi/Default)
-  DEPENDS+= \
-      +PACKAGE_python3-cffi:python3-light \
-      +PACKAGE_python3-cffi:python3-pycparser
-  VARIANT:=python3
+  DEPENDS:= \
+      +libffi \
+      +python3-light \
+      +python3-pycparser
 endef
 
 define Package/python3-cffi/description
 Foreign Function Interface for Python calling C code.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-cffi))
index 956491cb7fcea466451ac16769f66a654954bff1..f9c0cf0b178a4a42756d738b52d2efc6bd480314 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-chardet
 PKG_VERSION:=3.0.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=LGPL-2.1
 
 PYPI_NAME:=chardet
@@ -19,25 +19,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-chardet/Default
+define Package/python3-chardet
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
   URL:=https://github.com/chardet/chardet
-endef
-
-define Package/python3-chardet
-$(call Package/python-chardet/Default)
-  TITLE:=Universal encoding detector for Python3
-  DEPENDS:=+PACKAGE_python3-chardet:python3-light
-  VARIANT:=python3
+  TITLE:=Universal encoding detector
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-chardet/description
   Universal encoding detector for Python 2 and 3
-.
-(Variant for Python3)
 endef
 
 define Py3Package/python3-chardet/install
index d81d50c7ad2b3d14d13e9892a8cee1e08999bdf4..695f1824c5683f0221ab763483e587259d513f78 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=colorama
 PKG_VERSION:=0.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
@@ -14,25 +14,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-colorama/Default
+define Package/python3-colorama
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=colorama
   URL:=https://github.com/tartley/colorama
-endef
-
-define Package/python3-colorama
-$(call Package/python-colorama/Default)
-  DEPENDS:=+PACKAGE_python3-colorama:python3
-  VARIANT:=python3
+  DEPENDS:=+python3
 endef
 
 define Package/python3-colorama/description
 Makes ANSI escape character sequences
 (for producing colored terminal text and cursor positioning) work under MS Windows.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-colorama))
index c0efca096a73ec2582a70a13a19ca2b3efda9a5b..129a72b5c8dc057c361f24c5026cea1cd6a902ae 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-constantly
 PKG_VERSION:=15.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=constantly
 PKG_HASH:=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
@@ -22,26 +22,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-constantly/Default
+define Package/python3-constantly
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Symbolic constants in Python
   URL:=https://github.com/twisted/constantly
-endef
-
-define Package/python3-constantly
-$(call Package/python-constantly/Default)
-  DEPENDS:=+PACKAGE_python3-constantly:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-constantly/description
 A library that provides symbolic constant support. It includes
 collections and constants with text, numeric, and bit flag values.
 Originally twisted.python.constants from the Twisted project.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-constantly))
index 04c256cedf497bb9b0dd1a393e380b912770909c..d5e110a85b63fc9ee0befeb4198231f191be9bf3 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-contextlib2
 PKG_VERSION:=0.5.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PYPI_NAME:=contextlib2
@@ -23,7 +23,6 @@ define Package/python3-contextlib2
   URL:=http://contextlib2.readthedocs.org
   TITLE:=python3-contextlib2
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python-contextlib2/description
index 8ee28e025c8f9aaba0bf316804527b603454028b..a284ff4351b772693086dd3d7270c6e5ae5d81c4 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-crypto
 PKG_VERSION:=2.6.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PYPI_NAME:=pycrypto
 PKG_HASH:=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
@@ -27,26 +27,18 @@ PYTHON3_PKG_SETUP_ARGS:=
 PYTHON3_PKG_SETUP_VARS:= \
   CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)"
 
-define Package/python-crypto/Default
+define Package/python3-crypto
   SECTION:=lang-python
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Python Cryptography Toolkit
   URL:=https://www.dlitz.net/software/pycrypto/
-  DEPENDS:=+libgmp
-endef
-
-define Package/python3-crypto
-$(call Package/python-crypto/Default)
-  DEPENDS+=+PACKAGE_python3-crypto:python3
-  VARIANT:=python3
+  DEPENDS:=+libgmp +python3
 endef
 
 define Package/python3-crypto/description
 A collection of both secure hash functions (such as MD5 and SHA),
 and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal, etc.).
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-crypto))
index 32632712d3b182a776f89cbc49acc3eac2ce3975..72a22b430431985f7570ab3cc01d8c937e5ab201 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptodome
 PKG_VERSION:=3.9.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pycryptodome
 PKG_HASH:=f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2
@@ -24,27 +24,19 @@ PYTHON3_PKG_SETUP_ARGS:=
 PYTHON3_PKG_SETUP_VARS:= \
   CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)"
 
-define Package/python-cryptodome/Default
+define Package/python3-cryptodome
   SECTION:=lang-python
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=A self-contained cryptographic library for Python
   URL:=https://www.pycryptodome.org/
-  DEPENDS:=+libgmp
-endef
-
-define Package/python3-cryptodome
-$(call Package/python-cryptodome/Default)
-  DEPENDS+=+PACKAGE_python3-cryptodome:python3
-  VARIANT:=python3
+  DEPENDS:=+libgmp +python3
   CONFLICTS:=python3-crypto
 endef
 
 define Package/python3-cryptodome/description
 PyCryptodome is a self-contained Python package of low-level
 cryptographic primitives.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-cryptodome))
index a103ecb47d8826f378f887810f697026b1a52b99..562122cf5170bfe8c20c90b28d2ae07065cae183 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptodomex
 PKG_VERSION:=3.9.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pycryptodomex
 PKG_HASH:=50163324834edd0c9ce3e4512ded3e221c969086e10fdd5d3fdcaadac5e24a78
@@ -23,26 +23,18 @@ PYTHON3_PKG_SETUP_ARGS:=
 PYTHON3_PKG_SETUP_VARS:= \
   CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)"
 
-define Package/python-cryptodomex/Default
+define Package/python3-cryptodomex
   SECTION:=lang-python
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=A self-contained cryptographic library for Python
   URL:=https://www.pycryptodome.org/
-  DEPENDS:=+libgmp
-endef
-
-define Package/python3-cryptodomex
-$(call Package/python-cryptodomex/Default)
-  DEPENDS+=+PACKAGE_python3-cryptodomex:python3
-  VARIANT:=python3
+  DEPENDS:=+libgmp +python3
 endef
 
 define Package/python3-cryptodomex/description
 PyCryptodome is a self-contained Python package of low-level
 cryptographic primitives.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-cryptodomex))
index 6d52596b5f215c8ade2b4e8904403d651a3ffffa..495e077c46b08f0a45952b33d421ffcba0faf703 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptography
 PKG_VERSION:=2.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cryptography
 PKG_HASH:=0cacd3ef5c604b8e5f59bf2582c076c98a37fe206b31430d0cd08138aff0986e
@@ -26,30 +26,23 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-cryptography/Default
+define Package/python3-cryptography
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Cryptographic recipes and primitives
   URL:=https://github.com/pyca/cryptography
-  DEPENDS:=+libopenssl
-endef
-
-define Package/python3-cryptography
-$(call Package/python-cryptography/Default)
-  DEPENDS+= \
-      +PACKAGE_python3-cryptography:python3 \
-      +PACKAGE_python3-cryptography:python3-cffi \
-      +PACKAGE_python3-cryptography:python3-six
-  VARIANT:=python3
+  DEPENDS:= \
+      +libopenssl \
+      +python3 \
+      +python3-cffi \
+      +python3-six
 endef
 
 define Package/python3-cryptography/description
 cryptography is a package which provides cryptographic recipes and
 primitives to Python developers.  Our goal is for it to be your "cryptographic
 standard library". It supports Python 2.6-2.7, Python 3.3+, and PyPy 2.6+.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-cryptography))
index 8248c9bd71b42b41bd92f546f1e33f7a1e1b084c..e285967fe27de4d2a1be3fec90a316c90c5240fb 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pycurl
 PKG_VERSION:=7.43.0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3
@@ -19,25 +19,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-curl/Default
+define Package/python3-curl
   CATEGORY:=Languages
   SECTION:=lang
   SUBMENU:=Python
   TITLE:=Python module interface to the cURL library
   URL:=http://pycurl.io/
-  DEPENDS:=+libcurl
-endef
-
-define Package/python3-curl
-$(call Package/python-curl/Default)
-  DEPENDS+=+PACKAGE_python3-curl:python3
-  VARIANT:=python3
+  DEPENDS:=+libcurl +python3
 endef
 
 define Package/python3-curl/description
 PycURL is a Python interface to libcurl, the multiprotocol file transfer library.
-.
-(Variant for Python3)
 endef
 
 PYTHON3_PKG_SETUP_ARGS:=
index 5427f177275fbe73a29a7dd297770f763ed89e66..87e0df8730164ac34c16ab1e0e317bd0e4d8ac64 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dateutil
 PKG_VERSION:=2.8.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-2-Clause
 
 PYPI_NAME:=$(PKG_NAME)
@@ -21,24 +21,17 @@ include $(INCLUDE_DIR)/package.mk
 
 include ../python3-package.mk
 
-define Package/python-dateutil/Default
+define Package/python3-dateutil
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Extensions to the standard Python datetime module
   URL:=https://dateutil.readthedocs.org/
-endef
-
-define Package/python3-dateutil
-$(call Package/python-dateutil/Default)
-  DEPENDS:=+PACKAGE_python3-dateutil:python3 +PACKAGE_python3-dateutil:python3-six
-  VARIANT:=python3
+  DEPENDS:=+python3 +python3-six
 endef
 
 define Package/python3-dateutil/description
   Extensions to the standard Python datetime module
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-dateutil))
index b8fdc4563ee340ea950f4015fddab51fd94aacb1..210d1626529515c56da8d59a3838439b0c8f4216 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-decorator
 PKG_VERSION:=4.3.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 PKG_CPE_ID:=cpe:/a:python:decorator
 
@@ -25,7 +25,6 @@ define Package/python3-decorator
   URL:=https://github.com/micheles/decorator
   TITLE:=python3-decodator
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 $(eval $(call Py3Package,python3-decorator))
index a7476defa28f5daa5218447699e9fc12093f5aab..144d3439e9dede76bf94a7ab5b96d6a231031389 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-defusedxml
 PKG_VERSION:=0.6.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
 PKG_LICENSE:=Python-2.0
@@ -20,27 +20,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-defusedxml/Default
+define Package/python3-defusedxml
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=XML bomb protection for Python
   URL:=https://github.com/tiran/defusedxml
-endef
-
-define Package/python3-defusedxml
-  $(call Package/python-defusedxml/Default)
   DEPENDS:= \
-       +PACKAGE_python3-defusedxml:python3-light \
-       +PACKAGE_python3-defusedxml:python3-xml
-  VARIANT:=python3
+       +python3-light \
+       +python3-xml
 endef
 
 define Package/python3-defusedxml/description
   The defusedxml package contains several Python-only workarounds and fixes for
   denial of service and other vulnerabilities in Python’s XML libraries.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-defusedxml))
index a7837131aa9162f98065909de0af1087f35c681d..fe7fd9d1c1a22f4796ed30321556879b3e916d8b 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dns
 PKG_VERSION:=1.16.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=dnspython-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.dnspython.org/kits/1.16.0/
@@ -20,31 +20,22 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
 PKG_CPE_ID:=cpe:/a:debian:python-dns
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-dnspython-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/dnspython-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-
-define Package/python-dns/Default
+define Package/python3-dns
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=dnspython
   URL:=http://www.dnspython.org/
-endef
-
-define Package/python3-dns
-$(call Package/python-dns/Default)
-  DEPENDS:=+PACKAGE_python3-dns:python3
-  VARIANT:=python3
+  DEPENDS:=+python3
 endef
 
 define Package/python3-dns/description
  dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-dns))
index 4cc9c2534897729cec549b3ced28fcaa5b3f4363..04e4d756eaa66aaddf14187db9ae6ce8d2431585 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docutils
 PKG_VERSION:=0.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274
@@ -14,26 +14,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-docutils/Default
+define Package/python3-docutils
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=docutils
   URL:=http://docutils.sourceforge.net
-endef
-
-define Package/python3-docutils
-$(call Package/python-docutils/Default)
-  DEPENDS:=+PACKAGE_python3-docutils:python3
-  VARIANT:=python3
+  DEPENDS:=+python3
 endef
 
 define Package/python3-docutils/description
 Docutils is a modular system for processing documentation into useful formats,
 such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText,
 an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
-.
-(Variant for Python3)
 endef
 
 PYTHON3_PKG_SETUP_ARGS:=
index 6266e66276186ee13347b24710ae1c0db09c844b..f1a4157454e4eb85a549e100a52d08824b270b6a 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-et_xmlfile
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Eneas U de Queiroz <cote2004-github@yahoo.com>
 PKG_LICENSE:=MIT
@@ -19,28 +19,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-et_xmlfile/Default
+define Package/python3-et_xmlfile
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Low memory library for creating large XML files.
   URL:=https://bitbucket.org/openpyxl/et_xmlfile
-endef
-
-define Package/python3-et_xmlfile
-$(call Package/python-et_xmlfile/Default)
   DEPENDS:= \
        +python3-light \
        +python3-lxml
-  VARIANT:=python3
 endef
 
 define Package/python3-et_xmlfile/description
   An implementation of lxml.xmlfile for the standard library.
   It is based upon the xmlfile module from lxml with the aim of
   allowing code to be developed that will work with both libraries.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-et_xmlfile))
index 037d26c92ec6592f055020536a0995db47840b49..0a64927c37cc1e090158a50bf773605022ea5195 100644 (file)
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=python-evdev
 PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=Paulo Costa <me@paulo.costa.nom.br>, Alexandru Ardelean <ardeleanalex@gmail.com>
@@ -22,26 +22,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-evdev/Default
+define Package/python3-evdev
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  URL:=https://github.com/gvalkov/python-evdev
-endef
-
-define Package/python3-evdev
-$(call Package/python-evdev/Default)
   TITLE:=python3-evdev
+  URL:=https://github.com/gvalkov/python-evdev
   DEPENDS:= \
-      +PACKAGE_python3-evdev:python3-light \
-      +PACKAGE_python3-evdev:python3-ctypes
-  VARIANT:=python3
+      +python3-light \
+      +python3-ctypes
 endef
 
 define Package/python3-evdev/description
        Bindings to the Linux input handling subsystem
-.
-(Variant for Python3)
 endef
 
 LINUX_EVDEV_HEADERS="$(LINUX_DIR)/include/uapi/linux/input.h:$(LINUX_DIR)/include/uapi/linux/input-event-codes.h"
index cc7b06c2fbc60b16d9b2410da5037073f72b2394..283622760ebf418b3e6fc4c4ab22695b568d2045 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-flask-login
 PKG_VERSION:=0.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Flask-Login
 PKG_HASH:=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b
@@ -30,7 +30,6 @@ define Package/python3-flask-login
   TITLE:=User session management plugin for Flask
   URL:=https://github.com/maxcountryman/flask-login
   DEPENDS:=+python3-light +python3-flask
-  VARIANT:=python3
 endef
 
 define Package/python3-flask-login/description
index c12e341c74b41702c383a6312ea5c75d6f43f1c9..46c49d7f3e4efb4d6ed6dcdc0341ab3167c18403 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-gmpy2
 PKG_VERSION:=2.0.8
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PYPI_NAME:=gmpy2
 PYPI_SOURCE_EXT:=zip
@@ -25,19 +25,13 @@ include ../python3-package.mk
 
 PYTHON3_PKG_SETUP_ARGS:=--nompfr
 
-define Package/python-gmpy2/Default
+define Package/python3-gmpy2
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=GMP/MPIR, MPFR, and MPC interface
   URL:=https://github.com/aleaxit/gmpy
-  DEPENDS:=+libgmp
-endef
-
-define Package/python3-gmpy2
-$(call Package/python-gmpy2/Default)
-  DEPENDS+=+PACKAGE_python3-gmpy2:python3-light
-  VARIANT:=python3
+  DEPENDS:=+libgmp +python3-light
 endef
 
 define Package/python3-gmpy2/description
@@ -48,8 +42,6 @@ MPFR (correctly rounded real floating-point arithmetic) and MPC (correctly
 rounded complex floating-point arithmetic) libraries. gmpy2 also updates the
 API and naming conventions to be more consistent and support the additional
 functionality.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-gmpy2))
index fd439b245e1d3a9650d541006d0ac6cbb77f6995..bf782f948241fbec2ae251a9920563f78542f12a 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-gnupg
 PKG_VERSION:=0.4.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e
@@ -20,19 +20,13 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-gnupg/Default
+define Package/python3-gnupg
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  URL:=https://gnupg.readthedocs.io/en/latest/
-  DEPENDS:=+gnupg
-endef
-
-define Package/python3-gnupg
-$(call Package/python-gnupg/Default)
   TITLE:=python3-gnupg
-  DEPENDS+=+PACKAGE_python3-gnupg:python3-light
-  VARIANT:=python3
+  URL:=https://gnupg.readthedocs.io/en/latest/
+  DEPENDS:=+gnupg +python3-light
 endef
 
 define Package/python3-gnupg/description
@@ -45,8 +39,6 @@ and sanitised, and therefore this module should be safe to use in
 networked applications requiring direct user input. It is intended for
 use on Windows, MacOS X, BSD, or Linux, with Python 2.6, Python 2.7,
 Python 3.3, Python 3.4, or PyPy.
-
-(Variant for Python3)
 endef
 
 define Py3Build/Compile
index 8a88eb60db0979f002b3b1ad505640d267f37a25..a91fa1cfe34b7e6a840e3691229d1433314bf617 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-hyperlink
 PKG_VERSION:=19.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=hyperlink
 PKG_HASH:=4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654
@@ -22,28 +22,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-hyperlink/Default
+define Package/python3-hyperlink
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Pure-Python immutable URLs
   URL:=https://github.com/python-hyper/hyperlink
-endef
-
-define Package/python3-hyperlink
-$(call Package/python-hyperlink/Default)
   DEPENDS:= \
-      +PACKAGE_python3-hyperlink:python3-light \
-      +PACKAGE_python3-hyperlink:python3-idna
-  VARIANT:=python3
+      +python3-light \
+      +python3-idna
 endef
 
 define Package/python3-hyperlink/description
 Hyperlink provides a pure-Python implementation of immutable URLs. Based
 on RFC 3986 and 3987, the Hyperlink URL makes working with both URIs and
 IRIs easy.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-hyperlink))
index fe524b44bad1b5b2f4966b78584fe1e3c31eb13f..e1cf6b9452de01db95fe199932ecc00c7a5712e5 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-idna
 PKG_VERSION:=2.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=idna
 PKG_HASH:=7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb
@@ -22,20 +22,15 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-idna/Default
+define Package/python3-idna
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=IDNA library
   URL:=https://github.com/kjd/idna
-endef
-
-define Package/python3-idna
-$(call Package/python-idna/Default)
   DEPENDS:= \
-      +PACKAGE_python3-idna:python3-light \
-      +PACKAGE_python3-idna:python3-codecs
-  VARIANT:=python3
+      +python3-light \
+      +python3-codecs
 endef
 
 define Package/python3-idna/description
@@ -43,8 +38,6 @@ A library to support the Internationalised Domain Names in Applications
 (IDNA) protocol as specified in RFC 5891. This version of the protocol
 is often referred to as "IDNA2008" and can produce different results
 from the earlier standard from 2003.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-idna))
index 9c65f691757e70b2ee80cebc1a9e99fd067c24b1..4c4f1f863470aa2d3839190954bf8179101e6acd 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-ifaddr
 PKG_VERSION:=0.1.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=ifaddr
 PKG_HASH:=c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93
@@ -31,7 +31,6 @@ define Package/python3-ifaddr
   DEPENDS:= \
        +python3-light \
        +python3-ctypes
-  VARIANT:=python3
 endef
 
 define Package/python3-ifaddr/description
index 7390088f09d23b0aa6ade8637a84513c1fbea8bc..7e46ed67fd74d9e3ff98657e045a7462414de4aa 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-incremental
 PKG_VERSION:=17.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=incremental
 PKG_HASH:=7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3
@@ -22,24 +22,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-incremental/Default
+define Package/python3-incremental
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Versions your Python projects
   URL:=https://github.com/twisted/incremental
-endef
-
-define Package/python3-incremental
-$(call Package/python-incremental/Default)
-  DEPENDS:=+PACKAGE_python3-incremental:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-incremental/description
 Incremental is a small library that versions your Python projects.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-incremental))
index 3f7d5f5a21572fc1f5412866db0c5ab8e3f8cd50..2b7bdf8e66c26a9d055b3813abf44f70c291bafc 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-influxdb
 PKG_VERSION:=5.2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PYPI_NAME:=influxdb
@@ -24,7 +24,6 @@ define Package/python3-influxdb
   URL:=https://github.com/influxdb/influxdb-python
   TITLE:=python3-influxdb
   DEPENDS:=+python3-requests +python3-pytz +python3-six +python3-dateutil
-  VARIANT:=python3
 endef
 
 define Package/python3-influxdb/description
index bccb044f8ae4ec6657e3179f7549f7cf4d60f3f0..91c2510ca35f2ba0f6ba827242eddabba8be2b63 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-intelhex
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=IntelHex
 PYPI_SOURCE_NAME:=intelhex
@@ -27,7 +27,6 @@ define Package/python3-intelhex
   TITLE:=python3-intelhex
   URL:=https://github.com/bialix/intelhex
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-intelhex/description
index 035fa623f9398f47638c7d50893f9c830755b025..c1da5c3d6b9f21bcab85f67ab667784e717ab7ca 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-jdcal
 PKG_VERSION:=1.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Eneas U de Queiroz <cote2004-github@yahoo.com>
 PKG_LICENSE:=BSD-2-Clause
@@ -20,24 +20,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-jdcal/Default
+define Package/python3-jdcal
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Julian dates from proleptic Gregorian and Julian calendars
   URL:=https://github.com/phn/jdcal
-endef
-
-define Package/python3-jdcal
-$(call Package/python-jdcal/Default)
-  DEPENDS:= +PACKAGE_python3-jdcal:python3-light
-  VARIANT:=python3
+  DEPENDS:= +python3-light
 endef
 
 define Package/python3-jdcal/description
   This module contains functions for converting between Julian dates and calendar dates.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-jdcal))
index 3006caf9a80c2d94d7cbd261de574b32534f58f7..e74341e050fc207210ad28f81f7715a212bcefe1 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jmespath
 PKG_VERSION:=0.9.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64
@@ -14,25 +14,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-jmespath/Default
+define Package/python3-jmespath
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=jmespath
   URL:=https://github.com/jmespath/jmespath.py
-endef
-
-define Package/python3-jmespath
-$(call Package/python-jmespath/Default)
-  DEPENDS:=+PACKAGE_python3-jmespath:python3
-  VARIANT:=python3
+  DEPENDS:=+python3
 endef
 
 define Package/python3-jmespath/description
   JMESPath (pronounced “james path”) allows you to declaratively specify how to extract
   elements from a JSON document.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-jmespath))
index 7059c27c9670ab7afefeabb2ca483ac2aa5b85d4..4988fbb3533e7e8bcbe496e85d64c1f807ad28bd 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-jsonpath-ng
 PKG_VERSION:=1.4.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PYPI_NAME:=jsonpath-ng
@@ -23,7 +23,6 @@ define Package/python3-jsonpath-ng
   URL:=https://github.com/h2non/jsonpath-ng
   TITLE:=python3-jsonpath-ng
   DEPENDS:=+python3-ply +python3-six +python3-decorator
-  VARIANT:=python3
 endef
 
 $(eval $(call Py3Package,python3-jsonpath-ng))
index fda6db33d1e5b88d26e99aadb5b7cdb5993835f0..8f582e6c59c4bfc501dde83dd8ca06cc187b296c 100644 (file)
@@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=python-libmodbus
 PKG_VERSION:=0.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
@@ -15,26 +15,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-libmodbus/Default
+define Package/python3-libmodbus
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  URL:=https://pypi.org/project/pylibmodbus
-endef
-
-define Package/python3-libmodbus
-$(call Package/python-libmodbus/Default)
   TITLE:=pylibmodbus
+  URL:=https://pypi.org/project/pylibmodbus
   DEPENDS:=+libmodbus \
-     +PACKAGE_python3-libmodbus:python3-light \
-     +PACKAGE_python3-libmodbus:python3-cffi
-  VARIANT:=python3
+     +python3-light \
+     +python3-cffi
 endef
 
 define Package/python3-libmodbus/description
        Python Interface for libmodbus written with CFFI.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-libmodbus))
index 05decd7044a1e361407316785b1f2721595395fd..75b4fe06a90f267b3fcf4c4fc847dddf5d169167 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-lxml
 PKG_VERSION:=4.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=lxml
 PKG_HASH:=eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06
@@ -23,26 +23,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-lxml/Default
+define Package/python3-lxml
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  URL:=https://lxml.de
-  DEPENDS:=+libxml2 +libxslt +libexslt
-endef
-
-define Package/python3-lxml
-$(call Package/python-lxml/Default)
   TITLE:=python3-lxml
-  DEPENDS+=+PACKAGE_python3-lxml:python3-light
-  VARIANT:=python3
+  URL:=https://lxml.de
+  DEPENDS:=+libxml2 +libxslt +libexslt +python3-light
 endef
 
 define Package/python3-lxml/description
 The lxml XML toolkit is a Pythonic binding
 for the C libraries libxml2 and libxslt.
-.
-(Variant for Python3)
 endef
 
 TARGET_LDFLAGS += -lxml2 -lxslt -lexslt
index 90f80d4577ce0baf09c28901d0b549169f0d4955..3d04c94a1c6ef8e6076c0e0ac24cdd4a05423326 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-markdown
 PKG_VERSION:=3.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Markdown
 PKG_HASH:=90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902
@@ -32,7 +32,6 @@ define Package/python3-markdown
        +python3-light \
        +python3-setuptools \
        +python3-logging
-  VARIANT:=python3
 endef
 
 define Package/python3-markdown/description
index 895aed57bdfee77a3e6eab1937b9f14fbddb79dd..48ee58d89dc8bb85d3618c72a8b1a517c8f1a877 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-more-itertools
 PKG_VERSION:=8.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=more-itertools
 PKG_HASH:=b1ddb932186d8a6ac451e1d95844b382f55e12686d51ca0c68b6f61f2ab7a507
@@ -29,7 +29,6 @@ define Package/python3-more-itertools
   TITLE:=More routines for operating on iterables, beyond itertools
   URL:=https://github.com/erikrose/more-itertools
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-more-itertools/description
index fee8560113c35b7e95ded559d94d64a78e94e354..b757b2cda6dee262095484f7294b63b217ee35ce 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=multidict
 PKG_VERSION:=4.5.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=024b8129695a952ebd93373e45b5d341dbb87c17ce49637b34000093f243dd4f
@@ -31,7 +31,6 @@ define Package/python3-multidict
   DEPENDS:= \
       +python3-light \
       +python3-attrs
-  VARIANT:=python3
 endef
 
 define Package/python3-multidict/description
index 9f24e3b83401567a095d1cfbcc3d97385bea0a2a..f758600d7e412f38e59800fa709063c03c05125e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-mysqlclient
 PKG_VERSION:=1.4.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0
 
 PYPI_NAME:=mysqlclient
@@ -22,25 +22,18 @@ include ../python3-package.mk
 # python-mysqlclient needs iconv
 include $(INCLUDE_DIR)/nls.mk
 
-define Package/python-mysqlclient/Default
+define Package/python3-mysqlclient
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
+  TITLE:=MySQL database adapter
   URL:=https://mysqlclient.readthedocs.io/
-endef
-
-define Package/python3-mysqlclient
-  $(call Package/python-mysqlclient/Default)
-  TITLE:=MySQL database adapter for Python3
-  DEPENDS:=+PACKAGE_python3-mysqlclient:python3 +libmysqlclient
-  VARIANT:=python3
+  DEPENDS:=+python3 +libmysqlclient
 endef
 
 define Package/python3-mysqlclient/description
  MySQLdb is an thread-compatible interface to the popular MySQL database
  server that provides the Python database API.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-mysqlclient))
index 9c5ae54d2e8003d8319112c3ba3977501228f64b..377afead981b17a3d32cb99b5c461c592c012c8f 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-netdisco
 PKG_VERSION:=2.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=netdisco
 PKG_HASH:=2b3aca14a1807712a053f11fd80dc251dd821ee4899aefece515287981817762
@@ -32,7 +32,6 @@ define Package/python3-netdisco
          +python3-light \
          +python3-requests \
          +python3-zeroconf
-  VARIANT:=python3
 endef
 
 define Package/python3-netdisco/description
index 4fcd4cea913bf96aae22482b2f41bfcee1a960bc..c2fe25980320e574f51f78318afddc9a9a5bd547 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-oauthlib
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -20,25 +20,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-oauthlib/Default
+define Package/python3-oauthlib
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=OAuth request-signing logic for Python
   URL:=https://github.com/oauthlib/oauthlib
-endef
-
-define Package/python3-oauthlib
-  $(call Package/python-oauthlib/Default)
-  DEPENDS:=+PACKAGE_python3-oauthlib:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-oauthlib/description
   A generic, spec-compliant, thorough implementation of the OAuth request-signing
   logic for Python
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-oauthlib))
index c656b11aa1e7ef5eb3e52e6bad2508faa0bfffa1..c88b464951252aad956fab8d6b075e6990d819d1 100644 (file)
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-packaging
 PKG_VERSION:=20.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=packaging
 PKG_HASH:=3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3
@@ -28,7 +28,6 @@ define Package/python3-packaging
   TITLE:=Core utilities for Python packages
   URL:=https://github.com/pypa/packaging
   DEPENDS:=+python3-light +python3-pyparsing +python3-six +python3-logging +python3-distutils
-  VARIANT:=python3
 endef
 
 define Package/python3-packaging/description
index 515402929874b3c333113bbaad446425c881a14c..0be206f2273a93b158f3207b22c6f6a81f869b8e 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-paho-mqtt
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>, Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=EPL-1.0 Eclipse Distribution License v1.0
@@ -26,7 +26,6 @@ define Package/python3-paho-mqtt
   TITLE:=python3-paho-mqtt
   URL:=http://eclipse.org/paho
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-paho-mqtt/description
index ad28e585ebfc3ec1edb59ab23fd094552a0a967a..7eaf15e101770c62ab439b037d8003da686427a0 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-parsley
 PKG_VERSION:=1.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PYPI_NAME:=Parsley
 PKG_HASH:=9444278d47161d5f2be76a767809a3cbe6db4db822f46a4fd7481d4057208d41
@@ -24,24 +24,17 @@ include ../python3-package.mk
 
 PYTHON3_PKG_SETUP_ARGS:=
 
-define Package/python-parsley/Default
+define Package/python3-parsley
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Parsing and pattern matching
   URL:=http://launchpad.net/parsley
-endef
-
-define Package/python3-parsley
-$(call Package/python-parsley/Default)
-  DEPENDS:=+PACKAGE_python3-parsley:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-parsley/description
 Parsing and pattern matching made easy.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-parsley))
index 2c34fe42543b3c7d37b42a315a0f3999b05d2058..8d79e0e22fc8fe933475e9a8b4c72315002307f9 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pluggy
 PKG_VERSION:=0.13.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pluggy
 PKG_HASH:=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
@@ -31,7 +31,6 @@ define Package/python3-pluggy
   TITLE:=Plugin and hook calling mechanisms for Python
   URL:=https://github.com/pytest-dev/pluggy
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-pluggy/description
index 4b302d04800e2f771108d071cd462256f903d001..6a0b283eb8076a3053d2370d96170264d20c3ee3 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-ply
 PKG_VERSION:=3.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=ply
 PKG_HASH:=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
@@ -22,25 +22,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-ply/Default
+define Package/python3-ply
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=lex and yacc for Python
   URL:=http://www.dabeaz.com/ply/
-endef
-
-define Package/python3-ply
-$(call Package/python-ply/Default)
-  DEPENDS:=+PACKAGE_python3-ply:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-ply/description
 PLY is a 100% Python implementation of the common parsing tools lex
 and yacc.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-ply))
index d6264fe148658e140a0aa786a58f290a2ef1cbb5..1ed1a09e0c8440353baa72febd7115efb99422dd 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-py
 PKG_VERSION:=1.8.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=py
 PKG_HASH:=5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa
@@ -31,7 +31,6 @@ define Package/python3-py
   TITLE:=py
   URL:=https://github.com/pytest-dev/py
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-py/description
index 5eafbfef400cc00bfa39e2133c216c5291e575c2..8d82aa8cfc7ef7877128a5b4c8b8bd3087c80fd4 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pyasn1-modules
 PKG_VERSION:=0.2.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyasn1-modules
 PKG_HASH:=905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e
@@ -22,27 +22,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pyasn1-modules/Default
+define Package/python3-pyasn1-modules
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Collection of ASN.1 modules
   URL:=https://github.com/etingof/pyasn1-modules
-endef
-
-define Package/python3-pyasn1-modules
-$(call Package/python-pyasn1-modules/Default)
   DEPENDS:= \
-      +PACKAGE_python3-pyasn1-modules:python3-light \
-      +PACKAGE_python3-pyasn1-modules:python3-pyasn1
-  VARIANT:=python3
+      +python3-light \
+      +python3-pyasn1
 endef
 
 define Package/python3-pyasn1-modules/description
 This is a small but growing collection of ASN.1 data structures
 expressed in Python terms using pyasn1 data model.
-.
-(Variant for Python3).
 endef
 
 $(eval $(call Py3Package,python3-pyasn1-modules))
index 23c81a6138c97a55e2132bcd1fc0b4d3f589d954..36e7194cb736c6bbb14de0345eb850826b81e476 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pyasn1
 PKG_VERSION:=0.4.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyasn1
 PKG_HASH:=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
@@ -22,18 +22,13 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pyasn1/Default
+define Package/python3-pyasn1
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=ASN.1 library for Python
   URL:=https://github.com/etingof/pyasn1
-endef
-
-define Package/python3-pyasn1
-$(call Package/python-pyasn1/Default)
-  DEPENDS:=+PACKAGE_python3-pyasn1:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-pyasn1/description
@@ -41,8 +36,6 @@ This is an implementation of ASN.1 types and codecs in Python programming
 language. It has been first written to support particular protocol (SNMP)
 but then generalized to be suitable for a wide range of protocols
 based on ASN.1 specification.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-pyasn1))
index 1c1b9199e7fc4b00e504b09b3d432cb54a36998a..b8f63fc37f98c8f4e39e79eb382b1248d40de8e7 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pycparser
 PKG_VERSION:=2.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pycparser
 PKG_HASH:=2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0
@@ -24,28 +24,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pycparser/Default
+define Package/python3-pycparser
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=C parser in Python
   URL:=https://github.com/eliben/pycparser
-endef
-
-define Package/python3-pycparser
-$(call Package/python-pycparser/Default)
   DEPENDS:= \
-      +PACKAGE_python3-pycparser:python3-light \
-      +PACKAGE_python3-pycparser:python3-ply
-  VARIANT:=python3
+      +python3-light \
+      +python3-ply
 endef
 
 define Package/python3-pycparser/description
 pycparser is a parser for the C language, written in pure Python. It is a
 module designed to be easily integrated into applications that need to parse
 C source code.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-pycparser))
index e693cacd34478e7cfec6f599512ddab3376f0f71..6580e74fc10a5ef0f06cf281798823ba7ecd1779 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pyopenssl
 PKG_VERSION:=19.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyOpenSSL
 PKG_HASH:=9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507
@@ -23,27 +23,20 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pyopenssl/Default
+define Package/python3-pyopenssl
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=OpenSSL wrapper
   URL:=https://pyopenssl.org/
-endef
-
-define Package/python3-pyopenssl
-$(call Package/python-pyopenssl/Default)
   DEPENDS:= \
-      +PACKAGE_python3-pyopenssl:python3-light \
-      +PACKAGE_python3-pyopenssl:python3-cryptography \
-      +PACKAGE_python3-pyopenssl:python3-six
-  VARIANT:=python3
+      +python3-light \
+      +python3-cryptography \
+      +python3-six
 endef
 
 define Package/python3-pyopenssl/description
 Python wrapper module around the OpenSSL library
-.
-(Variant for Python3).
 endef
 
 $(eval $(call Py3Package,python3-pyopenssl))
index e04a92f7b89be56a7465e115b8a2b96418e373d3..9cda8ac67d009c31424c1af192216368946bc227 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pyotp
 PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=fc537e8acd985c5cbf51e11b7d53c42276fee017a73aec7c07380695671ca1a1
@@ -29,7 +29,6 @@ define Package/python3-pyotp
   TITLE:=Python One-Time Password Library
   URL:=https://github.com/pyauth/pyotp
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-pyotp/description
index 3388b25ded604d53a4663980e581e603f9fcc957..0c4365c18760224199b6602356429f5266ceef35 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pyparsing
 PKG_VERSION:=2.4.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyparsing
 PKG_HASH:=c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1
@@ -30,7 +30,6 @@ define Package/python3-pyparsing
   TITLE:=Library for constructing grammar directly in python
   URL:=https://github.com/pyparsing/pyparsing/
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-pyparsing/description
index 9121a7fe055af11bf52cd5f2e3a5ccdc0b21773c..c5ee84e63554cd7eca8fa07550e02f9736ee5194 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pyrsistent
 PKG_VERSION:=0.15.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyrsistent
 PKG_HASH:=34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533
@@ -29,7 +29,6 @@ define Package/python3-pyrsistent
   TITLE:=Persistent/Functional/Immutable data structures
   URL:=https://github.com/tobgu/pyrsistent
   DEPENDS:=+python3-light +python3-six
-  VARIANT:=python3
 endef
 
 define Package/python3-pyrsistent/description
index 7cc4ec91fe5e90fdf06e5eff861178ac5b3af366..e74cc880e47daf6f05f5b533371123c7ad508499 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pyserial
 PKG_VERSION:=3.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyserial
 PKG_HASH:=6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627
@@ -21,18 +21,13 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pyserial/Default
+define Package/python3-pyserial
   SECTION:=lang-python
   CATEGORY:=Languages
   SUBMENU:=Python
-  URL:=https://github.com/pyserial/pyserial
-endef
-
-define Package/python3-pyserial
-$(call Package/python-pyserial/Default)
   TITLE:=python3-pyserial
-  DEPENDS:=+PACKAGE_python3-pyserial:python3-light
-  VARIANT:=python3
+  URL:=https://github.com/pyserial/pyserial
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-pyserial/description
@@ -40,8 +35,6 @@ This module encapsulates the access for the serial port. It provides backends
 for Python running on Windows, OSX, Linux, BSD (possibly any POSIX compliant
 system) and IronPython. The module named "serial" automatically selects the
 appropriate backend.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-pyserial))
index 2a7003bc7f4b4301638a6f1357217bf34c8a8311..f13a4ea22f601f4140f5b36d7198d52aec080c95 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pytest
 PKG_VERSION:=5.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pytest
 PKG_HASH:=84dde37075b8805f3d1f392cc47e38a0e59518fb46a431cfdaf7cf1ce805f970
@@ -41,8 +41,6 @@ define Package/python3-pytest
        +python3-decimal \
        +python3-logging \
        +python3-urllib
-
-  VARIANT:=python3
 endef
 
 define Package/python3-pytest/description
index f421b198be20b2f042a9954695fcca48f973605f..260c437321abdc2f30226b7865395b1c85dd2575 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pytz
 PKG_VERSION:=2019.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pytz
 PKG_HASH:=b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be
@@ -22,24 +22,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-pytz/Default
+define Package/python3-pytz
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
+  TITLE:=World timezone definitions, modern and historical
   URL:=https://pythonhosted.org/pytz/
-endef
-
-define Package/python3-pytz
-$(call Package/python-pytz/Default)
-  TITLE:=World timezone definitions, modern and historical for Python3
-  DEPENDS:=+PACKAGE_python3-pytz:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-pytz/description
   World timezone definitions, modern and historical
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-pytz))
index 1628c90d0960dc23c498c454f8b8982ee055fdf5..1e674f754f934f50f396286ad3a4f85efd60d903 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-qrcode
 PKG_VERSION:=6.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=qrcode
 PKG_HASH:=505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369
@@ -20,28 +20,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-qrcode/Default
+define Package/python3-qrcode
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=QR Code image generator
   URL:=https://github.com/lincolnloop/python-qrcode
-endef
-
-define Package/python3-qrcode
-$(call Package/python-qrcode/Default)
   DEPENDS:= \
-       +PACKAGE_python3-qrcode:python3 \
-       +PACKAGE_python3-qrcode:python3-setuptools \
-       +PACKAGE_python3-qrcode:python3-six \
-       +PACKAGE_python3-qrcode:python3-pillow
-  VARIANT:=python3
+       +python3 \
+       +python3-setuptools \
+       +python3-six \
+       +python3-pillow
 endef
 
 define Package/python3-qrcode/description
   Pure python QR Code generator
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-qrcode))
index 7791a8b4dfacac2e1b3f3cbc49ab16bf899b44a1..ff4db1b0ed54f3e754777e7066cff755e011f5f7 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-rcssmin
 PKG_VERSION:=1.0.6
-PKG_RELEASE=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Eneas U de Queiroz <cote2004-github@yahoo.com>
 PKG_LICENSE:=Apache-2.0
@@ -20,19 +20,14 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-rcssmin/Default
+define Package/python3-rcssmin
     SUBMENU:=Python
     SECTION:=lang
     CATEGORY:=Languages
     TITLE:=Fast CSS minifier for Python
     URL:=http://opensource.perlig.de/rcssmin/
-endef
-
-define Package/python3-rcssmin
-    $(call Package/python-rcssmin/Default)
     DEPENDS:= \
-       +PACKAGE_python3-rcssmin:python3-light
-    VARIANT:=python3
+       +python3-light
 endef
 
 define Package/python3-rcssmin/description
@@ -41,8 +36,6 @@ define Package/python3-rcssmin/description
     RCSSmin does syntactical compression only (removing spaces, comments and possibly
     semicolons). It does not provide semantic compression (like removing empty blocks,
     collapsing redundant properties etc).
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-rcssmin))
index 6cd863d065b391026e081d1a9db473cba7326cd3..d77273f5c6ad1c87c100659d5605b6ef75c27a23 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-requests-oauthlib
 PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
 PKG_LICENSE:=ISC
@@ -20,28 +20,21 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-requests-oauthlib/Default
+define Package/python3-requests-oauthlib
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=OAuthlib auth for Requests
   URL:=https://github.com/requests/requests-oauthlib
-endef
-
-define Package/python3-requests-oauthlib
-  $(call Package/python-requests-oauthlib/Default)
   DEPENDS:= \
-       +PACKAGE_python3-requests-oauthlib:python3 \
-       +PACKAGE_python3-requests-oauthlib:python3-oauthlib \
-       +PACKAGE_python3-requests-oauthlib:python3-requests
-  VARIANT:=python3
+       +python3 \
+       +python3-oauthlib \
+       +python3-requests
 endef
 
 define Package/python3-requests-oauthlib/description
   This python package provides first-class OAuth library support
   for Requests.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-requests-oauthlib))
index 9a33e315f00b15bda0e0590b4675b2b4550e963e..fbcd95b8ea5b425406296b22c3f012e8aaa9aa0b 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-requests
 PKG_VERSION:=2.23.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>, Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=Apache-2.0
@@ -23,29 +23,22 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-requests/Default
+define Package/python3-requests
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=HTTP library for Python
   URL:=https://2.python-requests.org/
-endef
-
-define Package/python3-requests
-$(call Package/python-requests/Default)
   DEPENDS:= \
-         +PACKAGE_python3-requests:python3-light  \
-         +PACKAGE_python3-requests:python3-chardet  \
-         +PACKAGE_python3-requests:python3-idna  \
-         +PACKAGE_python3-requests:python3-urllib3  \
-         +PACKAGE_python3-requests:python3-certifi
-  VARIANT:=python3
+         +python3-light  \
+         +python3-chardet  \
+         +python3-idna  \
+         +python3-urllib3  \
+         +python3-certifi
 endef
 
 define Package/python3-requests/description
   Requests is the only Non-GMO HTTP library for Python, safe for human consumption
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-requests))
index eba462f63513aecfb713b86ccd9233d17bb7df50..456021ac1d2ea7f7553acc13850bd39c3c52fb4c 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rsa
 PKG_VERSION:=4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487
@@ -14,26 +14,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-rsa/Default
+define Package/python3-rsa
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=rsa
   URL:=https://stuvel.eu/rsa
-endef
-
-define Package/python3-rsa
-$(call Package/python-rsa/Default)
-  DEPENDS:=+PACKAGE_python3-rsa:python3 +PACKAGE_python3-rsa:python3-pyasn1
-  VARIANT:=python3
+  DEPENDS:=+python3 +python3-pyasn1
 endef
 
 define Package/python3-rsa/description
   Is a pure-Python RSA implementation. It supports encryption and decryption,
   signing and verifying signatures, and key generation according to PKCS#1 version 1.5.
   It can be used as a Python library as well as on the commandline. 
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-rsa))
index e49212f6c11106b56fcd1d9f4f419cc2adcfe6ec..a6e04f9f1f2f079b478c67b6f230cd6dd14385de 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=s3transfer
 PKG_VERSION:=0.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021
@@ -14,26 +14,19 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-s3transfer/Default
+define Package/python3-s3transfer
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=s3transfer
   URL:=https://github.com/boto/s3transfer
-endef
-
-define Package/python3-s3transfer
-$(call Package/python-s3transfer/Default)
   DEPENDS:= \
-       +PACKAGE_python3-s3transfer:python3 \
-       +PACKAGE_python3-s3transfer:python3-botocore
-  VARIANT:=python3
+       +python3 \
+       +python3-botocore
 endef
 
 define Package/python3-s3transfer/description
 S3transfer is a Python library for managing Amazon S3 transfers.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-s3transfer))
index c7e4b6eea13e9f2472ecc733e074ff871bcef75a..6d28bd0e48bdafd7f00e231cb09d514fa87fff9f 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-schedule
 PKG_VERSION:=0.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=schedule
 PKG_HASH:=f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9
@@ -29,7 +29,6 @@ define Package/python3-schedule
   TITLE:=Job scheduling for humans
   URL:=https://github.com/dbader/schedule
   DEPENDS:=+python3-light +python3-logging
-  VARIANT:=python3
 endef
 
 define Package/python3-schedule/description
index 4c96f39cd8df6cc12b33ce73e9611d38eefb8a42..6d30034d59f31ae89c83f0b4716fc783553d7ddc 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-schema
 PKG_VERSION:=0.7.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PKG_SOURCE_URL:=https://codeload.github.com/keleshev/schema/tar.gz/v$(PKG_VERSION)?
@@ -24,7 +24,6 @@ define Package/python3-schema
   URL:=https://github.com/keleshev/schema
   TITLE:=python3-schema
   DEPENDS:=+python3-light +python3-contextlib2
-  VARIANT:=python3
 endef
 
 define Package/python3-schema/description
index 34391662357975185857f4c512863e6318af63b6..21828109155504434bd4ddd351e668d8c6585942 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-sentry-sdk
 PKG_VERSION:=0.13.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=sentry-sdk
 PKG_HASH:=c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82
@@ -33,7 +33,6 @@ define Package/python3-sentry-sdk
        +python3-light \
        +python3-logging \
        +python3-urllib3
-  VARIANT:=python3
 endef
 
 define Package/python3-sentry-sdk/description
index 5810e1d5787bd2d636ddb899fd1d9270739b6309..8e1c1475c758ed97f9955879a19a774fd92ca1fe 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-service-identity
 PKG_VERSION:=18.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=service_identity
 PKG_HASH:=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
@@ -22,30 +22,23 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-service-identity/Default
+define Package/python3-service-identity
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Service identity verification
   URL:=https://service-identity.readthedocs.io/
-endef
-
-define Package/python3-service-identity
-$(call Package/python-service-identity/Default)
   DEPENDS:= \
-      +PACKAGE_python3-service-identity:python3-light \
-      +PACKAGE_python3-service-identity:python3-attrs \
-      +PACKAGE_python3-service-identity:python3-cryptography \
-      +PACKAGE_python3-service-identity:python3-pyasn1 \
-      +PACKAGE_python3-service-identity:python3-pyasn1-modules
-  VARIANT:=python3
+      +python3-light \
+      +python3-attrs \
+      +python3-cryptography \
+      +python3-pyasn1 \
+      +python3-pyasn1-modules
 endef
 
 define Package/python3-service-identity/description
 service_identity aspires to give you all the tools you need for
 verifying whether a certificate is valid for the intended purposes.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-service-identity))
index 808c73871e68b275b392c39826901b825f4f13fb..691075cb02d6286c42888244a793c0dcc16524ff 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-simplejson
 PKG_VERSION:=3.17.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=MIT
 PKG_CPE_ID:=cpe:/a:simplejson_project:simplejson
 
@@ -20,25 +20,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-simplejson/Default
+define Package/python3-simplejson
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+  TITLE:=Simple, fast, extensible JSON encoder/decoder
   URL:=https://simplejson.readthedocs.org/
-endef
-
-define Package/python3-simplejson
-$(call Package/python-simplejson/Default)
-  TITLE:=Simple, fast, extensible JSON encoder/decoder for Python3
-  DEPENDS:=+PACKAGE_python3-simplejson:python3-light +PACKAGE_python3-simplejson:python3-decimal
-  VARIANT:=python3
+  DEPENDS:=+python3-light +python3-decimal
 endef
 
 define Package/python3-simplejson/description
   Simple, fast, extensible JSON encoder/decoder for Python
-.
-(Variant for Python3)
 endef
 
 define Py3Package/python3-simplejson/filespec
index 70c90a91a6ff177eae548d9cc8be805d8be2b1da..5a9244b20267a88a790a74d2675f1ade049b5dc4 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-six
 PKG_VERSION:=1.14.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=six
 PKG_HASH:=236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a
@@ -25,18 +25,13 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-six/Default
+define Package/python3-six
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Python 2 and 3 compatibility library
   URL:=https://github.com/benjaminp/six
-endef
-
-define Package/python3-six
-$(call Package/python-six/Default)
-  DEPENDS:=+PACKAGE_python3-six:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-six/description
@@ -44,8 +39,6 @@ Six is a Python 2 and 3 compatibility library.  It provides utility functions
 for smoothing over the differences between the Python versions with the goal of
 writing Python code that is compatible on both Python versions.  See the
 documentation for more information on what is provided.
-.
-(Variant for Python3)
 endef
 
 define Host/Compile
index 537cee9b94caefbdda3ca197a9a63ef6911ab19e..906771ebfcfa7680211d8dfcd2d78ece7637a06e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-slugify
 PKG_VERSION:=4.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=a8fc3433821140e8f409a9831d13ae5deccd0b033d4744d94b31fea141bdd84c
@@ -33,7 +33,6 @@ define Package/python3-slugify
     +python3-codecs \
     +python3-setuptools \
     +python3-text-unidecode
-  VARIANT:=python3
 endef
 
 define Package/python3-slugify/description
index f540fe3fe18ede6cc2b1a989f859c960c9ed654c..a25a523abda04f7eef645075c2feeeca9d4edf80 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-sqlalchemy
 PKG_VERSION:=1.3.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=SQLAlchemy
 PKG_HASH:=64a7b71846db6423807e96820993fa12a03b89127d278290ca25c0b11ed7b4fb
@@ -34,7 +34,6 @@ define Package/python3-sqlalchemy
        +python3-urllib \
        +python3-decimal \
        +python3-logging
-  VARIANT:=python3
 endef
 
 define Package/python3-sqlalchemy/description
index 46c0dce7730bc726a68c2204ca2afb68f500695c..12ca92b4a1cc601ac06e0220ac46cb6911efeda8 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-stem
 PKG_VERSION:=1.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=stem
 PKG_HASH:=a0b48ea6224e95f22aa34c0bc3415f0eb4667ddeae3dfb5e32a6920c185568c2
@@ -24,7 +24,6 @@ define Package/python3-stem
   TITLE:=A controller library for Tor
   URL:=https://stem.torproject.org/
   DEPENDS:=+python3
-  VARIANT:=python3
 endef
 
 define Package/python3-stem/description
index ee72d39a0de03770d7683a437b45b298d013f4ce..1a3946777135acd6c6a945e385cbe9634b14337e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-twisted
 PKG_VERSION:=20.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Twisted
 PYPI_SOURCE_EXT:=tar.bz2
@@ -26,34 +26,27 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-twisted/Default
+define Package/python3-twisted
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Asynchronous networking framework
   URL:=https://twistedmatrix.com/
-endef
-
-define Package/python3-twisted
-$(call Package/python-twisted/Default)
   DEPENDS:= \
-      +PACKAGE_python3-twisted:python3-light \
-      +PACKAGE_python3-twisted:python3-attrs \
-      +PACKAGE_python3-twisted:python3-automat \
-      +PACKAGE_python3-twisted:python3-constantly \
-      +PACKAGE_python3-twisted:python3-incremental \
-      +PACKAGE_python3-twisted:python3-hyperlink \
-      +PACKAGE_python3-twisted:python3-setuptools \
-      +PACKAGE_python3-twisted:python3-zope-interface
-  VARIANT:=python3
+      +python3-light \
+      +python3-attrs \
+      +python3-automat \
+      +python3-constantly \
+      +python3-incremental \
+      +python3-hyperlink \
+      +python3-setuptools \
+      +python3-zope-interface
 endef
 
 define Package/python3-twisted/description
 Twisted is a networking engine written in Python, supporting numerous
 protocols. It contains a web server, numerous chat clients, chat servers,
 mail servers, and more.
-.
-(Variant for Python3)
 endef
 
 define Py3Package/python3-twisted/filespec
index d291773f5db636d2da2ba42bfcdcc0ecb57ab524..e7d1aa026e7d1f386600674c5069e8826b32a393 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-urllib3
 PKG_VERSION:=1.25.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
 PKG_LICENSE:=MIT
@@ -23,24 +23,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-urllib3/Default
+define Package/python3-urllib3
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Sanity-friendly HTTP client
   URL:=https://urllib3.readthedocs.io/
-endef
-
-define Package/python3-urllib3
-$(call Package/python-urllib3/Default)
-  DEPENDS:=+PACKAGE_python3-urllib3:python3
-  VARIANT:=python3
+  DEPENDS:=+python3
 endef
 
 define Package/python3-urllib3/description
   HTTP library with thread-safe connection pooling, file post, and more.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-urllib3))
index 8f73d4735a12815b9ef9e4b568f9698bd1da5329..693fe0395eccaa07c08d8d301d98a33bc86d6832 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voluptuous-serialize
 PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=740cd00ce2ecf0f3345d550163fdd2f20de2e0a60c3c678450e68314c2f592f5
@@ -31,7 +31,6 @@ define Package/python3-voluptuous-serialize
   DEPENDS:= \
        +python3-light \
        +python3-voluptuous
-  VARIANT:=python3
 endef
 
 define Package/python3-voluptuous-serialize/description
index bcac10b079e0d031aeed746b49b8adb5e24136d5..a3d239f8c7dbd0541514ce5b4df87cff894ebbda 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-voluptuous
 PKG_VERSION:=0.11.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=voluptuous
 PKG_HASH:=2abc341dbc740c5e2302c7f9b8e2e243194fb4772585b991931cb5b22e9bf456
@@ -22,25 +22,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-voluptuous/Default
+define Package/python3-voluptuous
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Data validation library
   URL:=https://github.com/alecthomas/voluptuous
-endef
-
-define Package/python3-voluptuous
-$(call Package/python-voluptuous/Default)
   DEPENDS:= \
-      +PACKAGE_python3-voluptuous:python3-light
-  VARIANT:=python3
+      +python3-light
 endef
 
 define Package/python3-voluptuous/description
 It is primarily intended for validating data coming into Python as JSON, YAML, etc.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-voluptuous))
index cdfde0cbc7331349978dfbf8dfa7b31cb6d5ab86..ac9c8281a339a4f65b050157c584c3b20d4de5db 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-wcwidth
 PKG_VERSION:=0.1.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=wcwidth
 PKG_HASH:=ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1
@@ -30,7 +30,6 @@ define Package/python3-wcwidth
   TITLE:=Terminal width calculation library
   URL:=https://github.com/jquast/wcwidth
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-wcwidth/description
index cf0cb122508187555e081d95b7074a409f1f0a5f..a26b5724f35a7e19d63d9c9865828182051c941a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-yaml
 PKG_VERSION:=5.3.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=PyYAML
 PKG_HASH:=b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d
@@ -23,25 +23,17 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-yaml/Default
+define Package/python3-yaml
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=YAML parser and emitter for Python
   URL:=https://github.com/yaml/pyyaml
-  DEPENDS:=+libyaml
-endef
-
-define Package/python3-yaml
-$(call Package/python-yaml/Default)
-  DEPENDS+=+PACKAGE_python3-yaml:python3-light
-  VARIANT:=python3
+  DEPENDS:=+libyaml +python3-light
 endef
 
 define Package/python3-yaml/description
   PyYAML is a YAML parser and emitter for the Python programming language.
-.
-(Variant for Python3)
 endef
 
 PYTHON3_PKG_SETUP_GLOBAL_ARGS:=--with-libyaml
index 08ac4382fc7c77365ecbdc5eb144195e7d06a615..fce56c8db136914e242608c6f55250345086b853 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=yarl
 PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9
@@ -33,7 +33,6 @@ define Package/python3-yarl
   +python3-multidict \
   +python3-urllib \
   +python3-idna
-  VARIANT:=python3
 endef
 
 define Package/python3-yarl/description
index 8c629474109fa47c9dc9f902ed753c8202828fd6..761abd152dc917a40a1b6eee1d27dd13039f964b 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-zeroconf
 PKG_VERSION:=0.24.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=zeroconf
 PKG_HASH:=f66d38f16026097572939ab78b1f46a97f556bca415491eb0fd094d0b5827dfe
@@ -32,7 +32,6 @@ define Package/python3-zeroconf
          +python3-light \
          +python3-logging \
          +python3-ifaddr
-  VARIANT:=python3
 endef
 
 define Package/python3-zeroconf/description
index a76c4fabc2c31b1cef472d53c1d27f93d623760a..19d9e12c1c5efe6e13bf70ef55f57784ef92642c 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-zipp
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=zipp
 PKG_HASH:=c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96
@@ -22,7 +22,6 @@ define Package/python3-zipp
   TITLE:=Zipfile object wrapper
   URL:=https://github.com/jaraco/zipp
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="setuptools_scm[toml] >= 3.4.1"
index e3852dcd5237c51cde9605fb81da662c994160f2..23ab41be9114a82698b8640de35589154b3b8763 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-zope-interface
 PKG_VERSION:=5.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=zope.interface
 PKG_HASH:=67267aa6764f488833f92d9d6889239af92bd80b4c99cc76e7f847f660e660fa
@@ -22,18 +22,13 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-zope-interface/Default
+define Package/python3-zope-interface
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Interfaces for Python
   URL:=https://github.com/zopefoundation/zope.interface
-endef
-
-define Package/python3-zope-interface
-$(call Package/python-zope-interface/Default)
-  DEPENDS:=+PACKAGE_python3-zope-interface:python3-light
-  VARIANT:=python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-zope-interface/description
@@ -41,8 +36,6 @@ This package provides an implementation of "object interfaces" for
 Python. Interfaces are a mechanism for labeling objects as conforming to
 a given API or contract. So, this package can be considered as
 implementation of the Design By Contract methodology support in Python.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-zope-interface))
index c2e6a98b5a8481dfba81f62cc505b93a53fe4f77..6ef9727fe7acff053a75e6a5113e2d229d02798c 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asgiref
 PKG_VERSION:=3.2.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=asgiref
 PKG_HASH:=8036f90603c54e93521e5777b2b9a39ba1bad05773fcf2d208f0299d1df58ce5
@@ -22,7 +22,6 @@ define Package/python3-asgiref
   TITLE:=Standard for Python asynchronous web apps and servers.
   URL:=https://asgi.readthedocs.io/en/latest/
   DEPENDS:=+python3-light +python3-logging +python3-asyncio
-  VARIANT:=python3
 endef
 
 define Package/python3-asgiref/description
index 5fc5bd0aecfb63e86b22358019656877ad6bcf41..5caf251995b1d713ad69ec1c32c8af44ff41b73c 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-bottle
 PKG_VERSION:=0.12.17
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=bottle
 PKG_HASH:=e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c
@@ -30,7 +30,6 @@ define Package/python3-bottle
        TITLE:=Fast and simple WSGI-framework for small web-applications
        URL:=https://bottlepy.org
        DEPENDS:=+python3
-       VARIANT:=python3
 endef
 
 define Package/python3-bottle/description
index b7d8778236cd99b1cfaf18ee74628ecab2d85184..1279516a0944181b0ffb276100d57520d079ae58 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-cors-headers
 PKG_VERSION:=3.2.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=django-cors-headers
 PKG_HASH:=a5960addecc04527ab26617e51b8ed42f0adab4594b24bb0f3c33e2bd3857c3f
@@ -22,7 +22,6 @@ define Package/python3-django-cors-headers
   TITLE:=Django application for handling the server headers required for Cross-Origin Resource Sharing (CORS).
   URL:=https://github.com/ottoyiu/django-cors-headers
   DEPENDS:=+django +python3-urllib +python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-django-cors-headers/description
index 9c9787ba54196f9a38553b5951e9057c753dcddd..50321db85f3f6f435d6edc3d769e78d673f7b868 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-etesync-journal
 PKG_VERSION:=1.2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=django-etesync-journal
 PKG_HASH:=1b481f592217186482be9faee686f0c132790db4177deb1f5152b73e99ac6338
@@ -22,7 +22,6 @@ define Package/python3-django-etesync-journal
   TITLE:=The server side implementation of the EteSync protocol.
   URL:=https://www.etesync.com/
   DEPENDS:=+django +python3-django-restframework +python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-django-etesync-journal/description
index 3a42067dd235465150a060f71c8d7d2d40403ff9..4e0289d197fba43035c6e2b348639c92afb99424 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=drf-nested-routers
 PKG_VERSION:=0.91
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=drf-nested-routers
 PKG_HASH:=46e5c3abc15c782cafafd7d75028e8f9121bbc6228e3599bbb48a3daa4585034
@@ -22,7 +22,6 @@ define Package/python3-drf-nested-routers
   TITLE:=Nested resources for the Django Rest Framework
   URL:=https://github.com/alanjds/drf-nested-routers
   DEPENDS:=+python3-django-restframework +django +python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-drf-nested-routers/description
index 7d96da49fd52589b680763777d340df69e74d88e..b04f9d9b6b6017481d5692717dcc7b1f1bb5412f 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=maxminddb
 PKG_VERSION:=1.5.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=d0ce131d901eb11669996b49a59f410efd3da2c6dbe2c0094fe2fef8d85b6336
@@ -30,7 +30,6 @@ define Package/python3-maxminddb
   TITLE:=Reader for the MaxMind DB format
   URL:=https://dev.maxmind.com/
   DEPENDS:=+python3-light +libmaxminddb
-  VARIANT:=python3
 endef
 
 define Package/python3-maxminddb/description
index 11f1da331346f2fe8155b46f7312c7ebb378b878..02fc5c2b0969dd0072b5df8143746d7074114475 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-netifaces
 PKG_VERSION:=0.10.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=netifaces
 PKG_HASH:=2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3
@@ -29,7 +29,6 @@ define Package/python3-netifaces
   TITLE:=Portable network interface information
   URL:=https://github.com/al45tair/netifaces
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-netifaces/description
index 9430655f135ab4da31369c2421d3ea4bdda600e0..4e08314d3886ad42d230dde4a1c519a8bb0fefa0 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-pyroute2
 PKG_VERSION:=0.5.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyroute2
 PKG_HASH:=963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98
@@ -35,7 +35,6 @@ define Package/python3-pyroute2
          +python3-multiprocessing \
          +python3-sqlite3 \
          +python3-ctypes
-  VARIANT:=python3
 endef
 
 define Package/python3-pyroute2/description
index ec53116477eb228dbc64e1fd76256954fdeecfd0..9c87f8b445dc73eb1a57355c666148856b9417f0 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-speedtest-cli
 PKG_VERSION:=2.1.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=speedtest-cli
 PKG_HASH:=cf1d386222f94c324e3125ba9a0d187e46d4a13dca08c023bdb9a23096be2e54
@@ -23,7 +23,6 @@ define Package/python3-speedtest-cli
   URL:=https://github.com/sivel/speedtest-cli
   DEPENDS:=+python3-light +python3-pkg-resources +python3-xml +python3-email \
          +python3-urllib +python3-codecs +python3-openssl
-  VARIANT:=python3
 endef
 
 define Package/python3-speedtest-cli/description
index c7d38625070dc6128188cf5a9ac0034351a28d0a..508e0a50ebb54caa2417d15c0f307c5ffa40e889 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqlparse
 PKG_VERSION:=0.3.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=sqlparse
 PKG_HASH:=e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548
@@ -22,7 +22,6 @@ define Package/python3-sqlparse
   TITLE:=Non-validating SQL parser module.
   URL:=https://github.com/andialbrecht/sqlparse
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python3-sqlparse/description
index 044990f85317e5ad230dd282dba5e8a8db014b07..30265718c27a47bae2df03e51317217777cd5c48 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-unidecode
 PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=Unidecode
 PKG_HASH:=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
@@ -29,7 +29,6 @@ define Package/python3-unidecode
   TITLE:=ASCII transliterations of Unicode text
   URL:=https://github.com/avian2/unidecode
   DEPENDS:=+python3-light
-  VARIANT:=python3
 endef
 
 define Package/python-unidecode/description
index 0fa9f1a383fc99965979dc9e8377cf3f711da1f6..389ce7d76a2115ec179c2a978d3a5159bb7e9845 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruamel-yaml
 PKG_VERSION:=0.15.100
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=ruamel.yaml
 PKG_HASH:=8e42f3067a59e819935a2926e247170ed93c8f0b2ab64526f888e026854db2e4
@@ -22,25 +22,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/ruamel-yaml/Default
+define Package/python3-ruamel-yaml
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=YAML 1.2 loader/dumper package for Python
   URL:=https://bitbucket.org/ruamel/yaml
-endef
-
-define Package/python3-ruamel-yaml
-$(call Package/ruamel-yaml/Default)
   DEPENDS:= \
-      +PACKAGE_python3-ruamel-yaml:python3-light
-  VARIANT:=python3
+      +python3-light
 endef
 
 define Package/python3-ruamel-yaml/description
 ruamel-yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-ruamel-yaml))
index 88acb06f8a2e47083a6554becad0a1f6cb3163cd..e77108f4561b18fd12ddd0f8cd46b7e30474dcc8 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-text-unidecode
 PKG_VERSION:=1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=text-unidecode
 PKG_HASH:=bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93
@@ -22,25 +22,18 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-text-unidecode/Default
+define Package/python3-text-unidecode
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=The most basic Text::Unidecode port
   URL:=https://github.com/kmike/text-unidecode/
-endef
-
-define Package/python3-text-unidecode
-$(call Package/python-text-unidecode/Default)
   DEPENDS:= \
-      +PACKAGE_python3-text-unidecode:python3-light
-  VARIANT:=python3
+      +python3-light
 endef
 
 define Package/python3-text-unidecode/description
 text-unidecode is the most basic port of the Text::Unidecode Perl library.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-text-unidecode))
index 7afdd59c01dabec376ea8cdcf43ddb66f490a67c..1bd27c12c2d519b7b2de9a09394a470aa57e97c2 100644 (file)
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vobject
 PKG_VERSION:=0.9.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 
 PYPI_NAME:=$(PKG_NAME)
@@ -16,25 +16,18 @@ include $(INCLUDE_DIR)/package.mk
 
 include ../python3-package.mk
 
-define Package/python-vobject/Default
+define Package/python3-vobject
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
   TITLE:=VObject
   URL:=http://eventable.github.io/vobject/
-endef
-
-define Package/python3-vobject
-$(call Package/python-vobject/Default)
-  DEPENDS:=+PACKAGE_python3-vobject:python3 +PACKAGE_python3-vobject:python3-dateutil
-  VARIANT:=python3
+  DEPENDS:=+python3 +python3-dateutil
 endef
 
 define Package/python3-vobject/description
   vCard and vCalendar support for Python
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-vobject))
index 78d9d6a5667290debc20437cb6870d577fd2519a..44cf4cd502b8aadddfeb7e29b112a035efbd26ac 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-xmltodict
 PKG_VERSION:=0.12.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=xmltodict
 PKG_HASH:=50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21
@@ -32,7 +32,6 @@ define Package/python3-xmltodict
        +python3-light \
        +python3-xml \
        +python3-urllib
-  VARIANT:=python3
 endef
 
 define Package/python3-xmltodict/description