From db4cbf71a588531b7f432725ae14beb37e7af67e Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 9 Jul 2019 09:12:06 -0300 Subject: [PATCH] django: move django* packages under django submenu This changes the python[3]-django dependencies in packages to be non-selecting, and adds an MDEPENDS line so that the *-src packages get placed inside the django menu as well. Added MENU:= to the src-package definitions in python[3]-package.mk, so it does not import that setting from the binary package. Signed-off-by: Eneas U de Queiroz (cherry-picked from commit 90527d75afe1847fdddad973ca4ad988f826c8c4) --- lang/python/django-appconf/Makefile | 6 ++-- lang/python/django-compressor/Makefile | 6 ++-- lang/python/django-constance/Makefile | 6 ++-- lang/python/django-formtools/Makefile | 6 ++-- lang/python/django-jsonfield/Makefile | 6 ++-- lang/python/django-picklefield/Makefile | 6 ++-- lang/python/django-postoffice/Makefile | 6 ++-- lang/python/django-ranged-response/Makefile | 34 ++++++++++++++++--- lang/python/django-restframework/Makefile | 6 ++-- lang/python/django-simple-captcha/Makefile | 6 ++-- lang/python/django-statici18n/Makefile | 24 ++++++++++++++ lang/python/django-webpack-loader/Makefile | 36 +++++++++++++++++++++ lang/python/django/Makefile | 1 + lang/python/python-package.mk | 1 + lang/python/python3-package.mk | 1 + 15 files changed, 129 insertions(+), 22 deletions(-) diff --git a/lang/python/django-appconf/Makefile b/lang/python/django-appconf/Makefile index e37f15848..8e81051e1 100644 --- a/lang/python/django-appconf/Makefile +++ b/lang/python/django-appconf/Makefile @@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django + python3-django VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-compressor/Makefile b/lang/python/django-compressor/Makefile index a4c9c4e09..6638bae69 100644 --- a/lang/python/django-compressor/Makefile +++ b/lang/python/django-compressor/Makefile @@ -39,10 +39,11 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django \ + python-django \ +PACKAGE_python-$(PKG_NAME):python-django-appconf \ +PACKAGE_python-$(PKG_NAME):python-rcssmin VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -56,10 +57,11 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django \ + python3-django \ +PACKAGE_python3-$(PKG_NAME):python3-django-appconf \ +PACKAGE_python3-$(PKG_NAME):python3-rcssmin VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-constance/Makefile b/lang/python/django-constance/Makefile index 7a225acb7..749c0aae1 100644 --- a/lang/python/django-constance/Makefile +++ b/lang/python/django-constance/Makefile @@ -37,8 +37,9 @@ define Package/python-django-constance $(call Package/python-django-constance/Default) DEPENDS:= \ +PACKAGE_python-django-constance:python \ - +PACKAGE_python-django-constance:python-django + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/python-django-constance/description @@ -49,8 +50,9 @@ define Package/python3-django-constance $(call Package/python-django-constance/Default) DEPENDS:= \ +PACKAGE_python3-django-constance:python3 \ - +PACKAGE_python3-django-constance:python3-django + python3-django VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-django-constance/description diff --git a/lang/python/django-formtools/Makefile b/lang/python/django-formtools/Makefile index 4057bc687..445cd3446 100644 --- a/lang/python/django-formtools/Makefile +++ b/lang/python/django-formtools/Makefile @@ -37,8 +37,9 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -50,8 +51,9 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django + python3-django VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-jsonfield/Makefile b/lang/python/django-jsonfield/Makefile index ed3ffbceb..9e95d3a98 100644 --- a/lang/python/django-jsonfield/Makefile +++ b/lang/python/django-jsonfield/Makefile @@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django + python3-django VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-picklefield/Makefile b/lang/python/django-picklefield/Makefile index b24157b27..9a7331fc4 100644 --- a/lang/python/django-picklefield/Makefile +++ b/lang/python/django-picklefield/Makefile @@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django + python3-django VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-postoffice/Makefile b/lang/python/django-postoffice/Makefile index 0a0a6f167..cd8ea3dbe 100644 --- a/lang/python/django-postoffice/Makefile +++ b/lang/python/django-postoffice/Makefile @@ -39,9 +39,10 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django \ + python-django \ +PACKAGE_python-$(PKG_NAME):python-django-jsonfield VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -53,9 +54,10 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django \ + python3-django \ +PACKAGE_python3-$(PKG_NAME):python3-django-jsonfield VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-ranged-response/Makefile b/lang/python/django-ranged-response/Makefile index 09d157926..b9a767eea 100644 --- a/lang/python/django-ranged-response/Makefile +++ b/lang/python/django-ranged-response/Makefile @@ -18,6 +18,7 @@ PKG_HASH:=f71fff352a37316b9bead717fc76e4ddd6c9b99c4680cdf4783b9755af1cf985 include $(INCLUDE_DIR)/package.mk include ../python-package.mk +include ../python3-package.mk define Package/django-ranged-response SUBMENU:=Python @@ -25,14 +26,39 @@ define Package/django-ranged-response CATEGORY:=Languages TITLE:=Add Content-Range: to FileResponse URL:=https://github.com/wearespindle/django-ranged-fileresponse - DEPENDS:=+python +python-django +endef + +define Package/python-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python-$(PKG_NAME):python \ + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/django-ranged-response/description Modified Django FileResponse that adds Content-Range headers. endef -$(eval $(call PyPackage,django-ranged-response)) -$(eval $(call BuildPackage,django-ranged-response)) -$(eval $(call BuildPackage,django-ranged-response-src)) +define Package/python3-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python3-$(PKG_NAME):python3 \ + python3-django + VARIANT:=python3 + MDEPENDS:=python3-django + +define Package/python3-$(PKG_NAME)/description +$(call define Package/python-$(PKG_NAME)/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 Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) diff --git a/lang/python/django-restframework/Makefile b/lang/python/django-restframework/Makefile index b699c4857..45c8d7e1f 100644 --- a/lang/python/django-restframework/Makefile +++ b/lang/python/django-restframework/Makefile @@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ - +PACKAGE_python-$(PKG_NAME):python-django + python-django VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ - +PACKAGE_python3-$(PKG_NAME):python3-django + python3-django VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-simple-captcha/Makefile b/lang/python/django-simple-captcha/Makefile index 81d94d9ee..20b488ce8 100644 --- a/lang/python/django-simple-captcha/Makefile +++ b/lang/python/django-simple-captcha/Makefile @@ -40,10 +40,11 @@ $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python-six \ - +PACKAGE_python-$(PKG_NAME):python-django \ + python-django \ +PACKAGE_python-$(PKG_NAME):python-pillow \ +PACKAGE_python-$(PKG_NAME):python-django-ranged-response VARIANT:=python + MDEPENDS:=python-django endef define Package/python-$(PKG_NAME)/description @@ -56,10 +57,11 @@ $(call Package/$(PKG_NAME)/Default) DEPENDS:= \ +PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3-six \ - +PACKAGE_python3-$(PKG_NAME):python3-django \ + python3-django \ +PACKAGE_python3-$(PKG_NAME):python3-pillow \ +PACKAGE_python3-$(PKG_NAME):python3-django-ranged-response VARIANT:=python3 + MDEPENDS:=python3-django endef define Package/python3-$(PKG_NAME)/description diff --git a/lang/python/django-statici18n/Makefile b/lang/python/django-statici18n/Makefile index b4a3898dc..c1666b165 100644 --- a/lang/python/django-statici18n/Makefile +++ b/lang/python/django-statici18n/Makefile @@ -24,17 +24,41 @@ define Package/django-statici18n SUBMENU:=Python SECTION:=lang CATEGORY:=Languages +<<<<<<< HEAD TITLE:=A Django app that provides helper for generating JavaScript catalog to static files. URL:=https://django-statici18n.readthedocs.org/ DEPENDS:=+python +python-django +======= + TITLE:=Helper for generating JavaScript catalog to static files + URL:=https://$(PKG_NAME).readthedocs.io +endef + +define Package/python-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python-$(PKG_NAME):python \ + python-django + VARIANT:=python + MDEPENDS:=python-django +>>>>>>> 90527d75a... django: move django* packages under django submenu endef define Package/django-statici18n/description A Django app that provides helper for generating JavaScript catalog to static files. endef +<<<<<<< HEAD define Build/Compile $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) +======= +define Package/python3-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python3-$(PKG_NAME):python3 \ + python3-django + VARIANT:=python3 + MDEPENDS:=python3-django +>>>>>>> 90527d75a... django: move django* packages under django submenu endef define Package/django-statici18n/install diff --git a/lang/python/django-webpack-loader/Makefile b/lang/python/django-webpack-loader/Makefile index fe1d88e8b..e8ded57dd 100644 --- a/lang/python/django-webpack-loader/Makefile +++ b/lang/python/django-webpack-loader/Makefile @@ -26,14 +26,50 @@ define Package/django-webpack-loader CATEGORY:=Languages TITLE:=Transparently use webpack in django URL:=https://github.com/owais/django-webpack-loader +<<<<<<< HEAD DEPENDS:=+python +python-django +======= +endef + +define Package/python-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python-$(PKG_NAME):python \ + python-django +>>>>>>> 90527d75a... django: move django* packages under django submenu VARIANT:=python + MDEPENDS:=python-django endef define Package/django-webpack-loader/description Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers. endef +<<<<<<< HEAD $(eval $(call PyPackage,django-webpack-loader)) $(eval $(call BuildPackage,django-webpack-loader)) $(eval $(call BuildPackage,django-webpack-loader-src)) +======= +define Package/python3-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python3-$(PKG_NAME):python3 \ + python3-django + VARIANT:=python3 + MDEPENDS:=python3-django +endef + +define Package/python3-$(PKG_NAME)/description +$(call define Package/python-$(PKG_NAME)/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 Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) +>>>>>>> 90527d75a... django: move django* packages under django submenu diff --git a/lang/python/django/Makefile b/lang/python/django/Makefile index 3e2e8f966..f115e1dc5 100644 --- a/lang/python/django/Makefile +++ b/lang/python/django/Makefile @@ -35,6 +35,7 @@ define Package/django/Default CATEGORY:=Languages TITLE:=The web framework for perfectionists with deadlines. URL:=https://www.djangoproject.com/ + MENU:=1 endef define Package/python-django diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk index 272aae44f..9bd0b9aa4 100644 --- a/lang/python/python-package.mk +++ b/lang/python/python-package.mk @@ -45,6 +45,7 @@ define PyPackage EXTRA_DEPENDS:= TITLE+= (sources) USERID:= + MENU:= endef define Package/$(1)-src/description diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk index 6e163e099..e14290081 100644 --- a/lang/python/python3-package.mk +++ b/lang/python/python3-package.mk @@ -44,6 +44,7 @@ define Py3Package EXTRA_DEPENDS:= TITLE+= (sources) USERID:= + MENU:= endef define Package/$(1)-src/description