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 <cotequeiroz@gmail.com>
(cherry-picked from commit 90527d75afe1847fdddad973ca4ad988f826c8c4)

diff --git a/lang/python/django-appconf/Makefile b/lang/python/django-appconf/Makefile
index e37f15848e85fe7e0a72527b8fe4241398f65a4b..8e81051e1cc7100a242998d296c7484072e1b802 100644 (file)
--- 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 a4c9c4e093f8e6e083aa5a4120314f388a9448aa..6638bae69a59160a54e7c0de490678b7842570c2 100644 (file)
--- 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 7a225acb7a5a442a2b0e952e9434a72197a7bd59..749c0aae1b2d6d15df0129dd060ffdf47e481752 100644 (file)
--- 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 4057bc687cbc5d3366e221d4fc8c07e46246fbcf..445cd344623ae274832d54e66bc1449d47c0eba8 100644 (file)
--- 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 ed3ffbcebc90b50a6310144bf0d9022861e5a6e4..9e95d3a98cae9915a275bdb0d832580b70169e71 100644 (file)
--- 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 b24157b27945ef2f5c91d9255f96136670a45db2..9a7331fc494b48da8336a7d851539069ef74a977 100644 (file)
--- 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 0a0a6f1671ee480ac07fdde89e1142bbe5567ca0..cd8ea3dbec9bbf130f95521f2d9feb71b5b253ba 100644 (file)
--- 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 09d1579264d48edb4fda3be2ae47458cfcc999c2..b9a767eea9db7dc288251235305bfca511905a28 100644 (file)
--- 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 b699c4857b1a08c177392c920a97ff9b57047457..45c8d7e1ffe2f8d488f0ed9861cddf063ac260bf 100644 (file)
--- 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 81d94d9eef4e788cb0b9541b10698b26e7f457f6..20b488ce81374bf1e57853aa358f1882bfe7c147 100644 (file)
--- 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 b4a3898dcbfd9cac570c7e22cbd5a68317771543..c1666b165a126d2d20a256f1b1a0e06d0943fbf8 100644 (file)
--- 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 fe1d88e8b42605a87603e23bff32b217141c25b8..e8ded57dd5ecd18cc2aaacbb62ed9a4237138925 100644 (file)
--- 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 3e2e8f96640b81413f8a555878b76d433b32dfb8..f115e1dc52ac030957695e70403fa657e0e9ae90 100644 (file)
--- 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 272aae44fc6949372a98ec03a26c9403cfa5fc45..9bd0b9aa4baf1d86412d0f72aabe2148e64e90be 100644 (file)
--- 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 6e163e099d907fcf6918d49c8aba6878eff1a008..e14290081c6ef1767dc3a9846e7cd0ca6fa3cfa2 100644 (file)
--- 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