From 3c24a24e257cd874bfca679aa351a4488dfeb023 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 30 Jan 2020 22:44:26 +0800 Subject: [PATCH] python-packages: Clean up Makefiles * Replace $(PKG_NAME) with package name in call, define, and eval lines * Remove extra "define" in $(call define Package/.../description) Signed-off-by: Jeffery To --- lang/python/django-appconf/Makefile | 34 ++++++++-------- lang/python/django-compressor/Makefile | 42 ++++++++++---------- lang/python/django-constance/Makefile | 2 +- lang/python/django-formtools/Makefile | 34 ++++++++-------- lang/python/django-jsonfield/Makefile | 32 +++++++-------- lang/python/django-picklefield/Makefile | 32 +++++++-------- lang/python/django-postoffice/Makefile | 36 ++++++++--------- lang/python/django-ranged-response/Makefile | 32 +++++++-------- lang/python/django-restframework/Makefile | 32 +++++++-------- lang/python/django-simple-captcha/Makefile | 44 ++++++++++----------- lang/python/django-statici18n/Makefile | 34 ++++++++-------- lang/python/django-webpack-loader/Makefile | 32 +++++++-------- lang/python/gunicorn/Makefile | 4 +- lang/python/python3-netifaces/Makefile | 6 +-- lang/python/python3-pyroute2/Makefile | 6 +-- lang/python/python3-unidecode/Makefile | 6 +-- 16 files changed, 204 insertions(+), 204 deletions(-) diff --git a/lang/python/django-appconf/Makefile b/lang/python/django-appconf/Makefile index 89623a9eb..78863cc81 100644 --- a/lang/python/django-appconf/Makefile +++ b/lang/python/django-appconf/Makefile @@ -23,46 +23,46 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-appconf/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Helper class for handling config defaults - URL:=https://$(PKG_NAME).readthedocs.io + URL:=https://django-appconf.readthedocs.io endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-appconf +$(call Package/django-appconf/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-appconf:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-appconf/description A helper class for handling configuration defaults of packaged apps gracefully endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-appconf +$(call Package/django-appconf/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-appconf:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-appconf/description +$(call Package/python-django-appconf/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-appconf)) +$(eval $(call BuildPackage,python-django-appconf)) +$(eval $(call BuildPackage,python-django-appconf-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-appconf)) +$(eval $(call BuildPackage,python3-django-appconf)) +$(eval $(call BuildPackage,python3-django-appconf-src)) diff --git a/lang/python/django-compressor/Makefile b/lang/python/django-compressor/Makefile index 6b40b2ea4..fa7dd215b 100644 --- a/lang/python/django-compressor/Makefile +++ b/lang/python/django-compressor/Makefile @@ -24,53 +24,53 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-compressor/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Compress CSS/JS into single cached files - URL:=https://$(PKG_NAME).readthedocs.io + URL:=https://django-compressor.readthedocs.io endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-compressor +$(call Package/django-compressor/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-compressor:python \ python-django1 \ - +PACKAGE_python-$(PKG_NAME):python-django-appconf \ - +PACKAGE_python-$(PKG_NAME):python-rcssmin + +PACKAGE_python-django-compressor:python-django-appconf \ + +PACKAGE_python-django-compressor:python-rcssmin VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-compressor/description Compresses linked and inline JavaScript or CSS into single cached files. 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. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-compressor +$(call Package/django-compressor/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-compressor:python3 \ python3-django \ - +PACKAGE_python3-$(PKG_NAME):python3-django-appconf \ - +PACKAGE_python3-$(PKG_NAME):python3-rcssmin + +PACKAGE_python3-django-compressor:python3-django-appconf \ + +PACKAGE_python3-django-compressor:python3-rcssmin VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-compressor/description +$(call Package/python-django-compressor/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-compressor)) +$(eval $(call BuildPackage,python-django-compressor)) +$(eval $(call BuildPackage,python-django-compressor-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-compressor)) +$(eval $(call BuildPackage,python3-django-compressor)) +$(eval $(call BuildPackage,python3-django-compressor-src)) diff --git a/lang/python/django-constance/Makefile b/lang/python/django-constance/Makefile index fe159597f..f0c3fcdfe 100644 --- a/lang/python/django-constance/Makefile +++ b/lang/python/django-constance/Makefile @@ -53,7 +53,7 @@ $(call Package/python-django-constance/Default) endef define Package/python3-django-constance/description -$(call define Package/python-django-constance/description) +$(call Package/python-django-constance/description) . (Variant for Python3) endef diff --git a/lang/python/django-formtools/Makefile b/lang/python/django-formtools/Makefile index 863bfc964..cf15742c4 100644 --- a/lang/python/django-formtools/Makefile +++ b/lang/python/django-formtools/Makefile @@ -21,47 +21,47 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-formtools/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=High-level abstractions for Django forms - URL:=https://$(PKG_NAME).readthedocs.io + URL:=https://django-formtools.readthedocs.io endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-formtools +$(call Package/django-formtools/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-formtools:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-formtools/description Django "formtools" is a set of high-level abstractions for Django forms. Currently for form previews and multi-step forms. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-formtools +$(call Package/django-formtools/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-formtools:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-formtools/description +$(call Package/python-django-formtools/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-formtools)) +$(eval $(call BuildPackage,python-django-formtools)) +$(eval $(call BuildPackage,python-django-formtools-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-formtools)) +$(eval $(call BuildPackage,python3-django-formtools)) +$(eval $(call BuildPackage,python3-django-formtools-src)) diff --git a/lang/python/django-jsonfield/Makefile b/lang/python/django-jsonfield/Makefile index 42cdc6d0d..c10eae0e2 100644 --- a/lang/python/django-jsonfield/Makefile +++ b/lang/python/django-jsonfield/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-jsonfield/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -31,38 +31,38 @@ define Package/$(PKG_NAME)/Default URL:=https://github.com/adamchainz/django-jsonfield endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-jsonfield +$(call Package/django-jsonfield/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-jsonfield:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-jsonfield/description JSONField for django models endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-jsonfield +$(call Package/django-jsonfield/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-jsonfield:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-jsonfield/description +$(call Package/python-django-jsonfield/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-jsonfield)) +$(eval $(call BuildPackage,python-django-jsonfield)) +$(eval $(call BuildPackage,python-django-jsonfield-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-jsonfield)) +$(eval $(call BuildPackage,python3-django-jsonfield)) +$(eval $(call BuildPackage,python3-django-jsonfield-src)) diff --git a/lang/python/django-picklefield/Makefile b/lang/python/django-picklefield/Makefile index dff160f21..5e707c67d 100644 --- a/lang/python/django-picklefield/Makefile +++ b/lang/python/django-picklefield/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-picklefield/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -31,38 +31,38 @@ define Package/$(PKG_NAME)/Default URL:=https://github.com/gintas/django-picklefield/ endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-picklefield +$(call Package/django-picklefield/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-picklefield:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-picklefield/description Pickled object field for Django endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-picklefield +$(call Package/django-picklefield/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-picklefield:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-picklefield/description +$(call Package/python-django-picklefield/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-picklefield)) +$(eval $(call BuildPackage,python-django-picklefield)) +$(eval $(call BuildPackage,python-django-picklefield-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-picklefield)) +$(eval $(call BuildPackage,python3-django-picklefield)) +$(eval $(call BuildPackage,python3-django-picklefield-src)) diff --git a/lang/python/django-postoffice/Makefile b/lang/python/django-postoffice/Makefile index f75f509c3..6e86e2f3b 100644 --- a/lang/python/django-postoffice/Makefile +++ b/lang/python/django-postoffice/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-postoffice/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -32,41 +32,41 @@ define Package/$(PKG_NAME)/Default URL:=https://github.com/ui/django-post_office endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-postoffice +$(call Package/django-postoffice/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-postoffice:python \ python-django1 \ - +PACKAGE_python-$(PKG_NAME):python-django-jsonfield + +PACKAGE_python-django-postoffice:python-django-jsonfield VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-postoffice/description A Django app to monitor and send mail asynchronously, complete with template support endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-postoffice +$(call Package/django-postoffice/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-postoffice:python3 \ python3-django \ - +PACKAGE_python3-$(PKG_NAME):python3-django-jsonfield + +PACKAGE_python3-django-postoffice:python3-django-jsonfield VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-postoffice/description +$(call Package/python-django-postoffice/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-postoffice)) +$(eval $(call BuildPackage,python-django-postoffice)) +$(eval $(call BuildPackage,python-django-postoffice-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-postoffice)) +$(eval $(call BuildPackage,python3-django-postoffice)) +$(eval $(call BuildPackage,python3-django-postoffice-src)) diff --git a/lang/python/django-ranged-response/Makefile b/lang/python/django-ranged-response/Makefile index 363c0c36a..6c9bb9abc 100644 --- a/lang/python/django-ranged-response/Makefile +++ b/lang/python/django-ranged-response/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-ranged-response/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -29,38 +29,38 @@ define Package/$(PKG_NAME)/Default URL:=https://github.com/wearespindle/django-ranged-fileresponse endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-ranged-response +$(call Package/django-ranged-response/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-ranged-response:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-ranged-response/description Modified Django FileResponse that adds Content-Range headers. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-ranged-response +$(call Package/django-ranged-response/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-ranged-response:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-ranged-response/description +$(call Package/python-django-ranged-response/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-ranged-response)) +$(eval $(call BuildPackage,python-django-ranged-response)) +$(eval $(call BuildPackage,python-django-ranged-response-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-ranged-response)) +$(eval $(call BuildPackage,python3-django-ranged-response)) +$(eval $(call BuildPackage,python3-django-ranged-response-src)) diff --git a/lang/python/django-restframework/Makefile b/lang/python/django-restframework/Makefile index cb90f6a51..9bff50d15 100644 --- a/lang/python/django-restframework/Makefile +++ b/lang/python/django-restframework/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-restframework/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -31,38 +31,38 @@ define Package/$(PKG_NAME)/Default URL:=https://www.django-rest-framework.org endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-restframework +$(call Package/django-restframework/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-restframework:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-restframework/description Web APIs for Django, made easy. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-restframework +$(call Package/django-restframework/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-restframework:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-restframework/description +$(call Package/python-django-restframework/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-restframework)) +$(eval $(call BuildPackage,python-django-restframework)) +$(eval $(call BuildPackage,python-django-restframework-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-restframework)) +$(eval $(call BuildPackage,python3-django-restframework)) +$(eval $(call BuildPackage,python3-django-restframework-src)) diff --git a/lang/python/django-simple-captcha/Makefile b/lang/python/django-simple-captcha/Makefile index 54988b23d..fd493147c 100644 --- a/lang/python/django-simple-captcha/Makefile +++ b/lang/python/django-simple-captcha/Makefile @@ -27,7 +27,7 @@ include ../python3-package.mk PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) -define Package/$(PKG_NAME)/Default +define Package/django-simple-captcha/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -35,45 +35,45 @@ define Package/$(PKG_NAME)/Default URL:=https://github.com/mbi/django-simple-captcha endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-simple-captcha +$(call Package/django-simple-captcha/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-six \ + +PACKAGE_python-django-simple-captcha:python \ + +PACKAGE_python-django-simple-captcha:python-six \ python-django1 \ - +PACKAGE_python-$(PKG_NAME):python-pillow \ - +PACKAGE_python-$(PKG_NAME):python-django-ranged-response + +PACKAGE_python-django-simple-captcha:python-pillow \ + +PACKAGE_python-django-simple-captcha:python-django-ranged-response VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-simple-captcha/description Django Simple Captcha is an extremely simple, yet highly customizable Django application to add captcha images to any Django form. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-simple-captcha +$(call Package/django-simple-captcha/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-six \ + +PACKAGE_python3-django-simple-captcha:python3 \ + +PACKAGE_python3-django-simple-captcha:python3-six \ python3-django \ - +PACKAGE_python3-$(PKG_NAME):python3-pillow \ - +PACKAGE_python3-$(PKG_NAME):python3-django-ranged-response + +PACKAGE_python3-django-simple-captcha:python3-pillow \ + +PACKAGE_python3-django-simple-captcha:python3-django-ranged-response VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-simple-captcha/description +$(call Package/python-django-simple-captcha/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-simple-captcha)) +$(eval $(call BuildPackage,python-django-simple-captcha)) +$(eval $(call BuildPackage,python-django-simple-captcha-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-simple-captcha)) +$(eval $(call BuildPackage,python3-django-simple-captcha)) +$(eval $(call BuildPackage,python3-django-simple-captcha-src)) diff --git a/lang/python/django-statici18n/Makefile b/lang/python/django-statici18n/Makefile index de9fe61d6..9c1f2ebbe 100644 --- a/lang/python/django-statici18n/Makefile +++ b/lang/python/django-statici18n/Makefile @@ -23,46 +23,46 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-statici18n/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Helper for generating JavaScript catalog to static files - URL:=https://$(PKG_NAME).readthedocs.io + URL:=https://django-statici18n.readthedocs.io endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-statici18n +$(call Package/django-statici18n/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-statici18n:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-statici18n/description A Django app that provides helper for generating JavaScript catalog to static files. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-statici18n +$(call Package/django-statici18n/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-statici18n:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-statici18n/description +$(call Package/python-django-statici18n/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-statici18n)) +$(eval $(call BuildPackage,python-django-statici18n)) +$(eval $(call BuildPackage,python-django-statici18n-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-statici18n)) +$(eval $(call BuildPackage,python3-django-statici18n)) +$(eval $(call BuildPackage,python3-django-statici18n-src)) diff --git a/lang/python/django-webpack-loader/Makefile b/lang/python/django-webpack-loader/Makefile index dd41c48b5..1ff80d64c 100644 --- a/lang/python/django-webpack-loader/Makefile +++ b/lang/python/django-webpack-loader/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk -define Package/$(PKG_NAME)/Default +define Package/django-webpack-loader/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages @@ -29,38 +29,38 @@ define Package/$(PKG_NAME)/Default URL:=https://github.com/owais/django-webpack-loader endef -define Package/python-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python-django-webpack-loader +$(call Package/django-webpack-loader/Default) DEPENDS:= \ - +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-django-webpack-loader:python \ python-django1 VARIANT:=python MDEPENDS:=python-django1 endef -define Package/python-$(PKG_NAME)/description +define Package/python-django-webpack-loader/description Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers. endef -define Package/python3-$(PKG_NAME) -$(call Package/$(PKG_NAME)/Default) +define Package/python3-django-webpack-loader +$(call Package/django-webpack-loader/Default) DEPENDS:= \ - +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-django-webpack-loader:python3 \ python3-django VARIANT:=python3 MDEPENDS:=python3-django endef -define Package/python3-$(PKG_NAME)/description -$(call define Package/python-$(PKG_NAME)/description) +define Package/python3-django-webpack-loader/description +$(call Package/python-django-webpack-loader/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME))) -$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) +$(eval $(call PyPackage,python-django-webpack-loader)) +$(eval $(call BuildPackage,python-django-webpack-loader)) +$(eval $(call BuildPackage,python-django-webpack-loader-src)) -$(eval $(call Py3Package,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME))) -$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-django-webpack-loader)) +$(eval $(call BuildPackage,python3-django-webpack-loader)) +$(eval $(call BuildPackage,python3-django-webpack-loader-src)) diff --git a/lang/python/gunicorn/Makefile b/lang/python/gunicorn/Makefile index 0a6ca3625..1e65f4d1e 100644 --- a/lang/python/gunicorn/Makefile +++ b/lang/python/gunicorn/Makefile @@ -53,7 +53,7 @@ $(call Package/gunicorn/Default) endef define Package/python3-gunicorn/description -$(call define Package/python-gunicorn/description) +$(call Package/python-gunicorn/description) . (Variant for Python3) endef @@ -89,7 +89,7 @@ $(call Package/gunicorn/Default) endef define Package/gunicorn3/description -$(call define Package/gunicorn/description) +$(call Package/gunicorn/description) . (Variant for Python3) endef diff --git a/lang/python/python3-netifaces/Makefile b/lang/python/python3-netifaces/Makefile index f126df49b..11f1da331 100644 --- a/lang/python/python3-netifaces/Makefile +++ b/lang/python/python3-netifaces/Makefile @@ -36,6 +36,6 @@ define Package/python3-netifaces/description Portable network interface information. endef -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-netifaces)) +$(eval $(call BuildPackage,python3-netifaces)) +$(eval $(call BuildPackage,python3-netifaces-src)) diff --git a/lang/python/python3-pyroute2/Makefile b/lang/python/python3-pyroute2/Makefile index 9f32a630b..9430655f1 100644 --- a/lang/python/python3-pyroute2/Makefile +++ b/lang/python/python3-pyroute2/Makefile @@ -46,6 +46,6 @@ endef PYTHON3_PKG_SETUP_ARGS:= -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-pyroute2)) +$(eval $(call BuildPackage,python3-pyroute2)) +$(eval $(call BuildPackage,python3-pyroute2-src)) diff --git a/lang/python/python3-unidecode/Makefile b/lang/python/python3-unidecode/Makefile index a1967f3ed..044990f85 100644 --- a/lang/python/python3-unidecode/Makefile +++ b/lang/python/python3-unidecode/Makefile @@ -36,6 +36,6 @@ define Package/python-unidecode/description Unidecode, lossy ASCII transliterations of Unicode text endef -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME)-src)) +$(eval $(call Py3Package,python3-unidecode)) +$(eval $(call BuildPackage,python3-unidecode)) +$(eval $(call BuildPackage,python3-unidecode-src))