django-constance: convert to python pkg format + add python3 variant

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry-picked from commit 1b2936a2d0dc469f1c9e42bf694cc5d4c6bb974d)

diff --git a/lang/python/django-constance/Makefile b/lang/python/django-constance/Makefile
index 0a1e78acd0fc03fbb6d2e04e3be3a607721707f6..7a225acb7a5a442a2b0e952e9434a72197a7bd59 100644 (file)
--- a/lang/python/django-constance/Makefile
+++ b/lang/python/django-constance/Makefile
@@ -17,31 +17,49 @@ PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/django-constanc
 PKG_HASH:=a49735063b2c30015d2e52a90609ea9798da722ed070f091de51714758a5d018
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-django-constance-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 include ../python-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-constance
+define Package/python-django-constance/Default
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Django live settings with pluggable backends, including Redis.
   URL:=https://github.com/jazzband/django-constance
-  DEPENDS:=+python +python-django
 endef
 
-define Package/django-constance/description
+define Package/python-django-constance
+$(call Package/python-django-constance/Default)
+  DEPENDS:= \
+       +PACKAGE_python-django-constance:python \
+       +PACKAGE_python-django-constance:python-django
+  VARIANT:=python
+endef
+
+define Package/python-django-constance/description
   Django live settings with pluggable backends, including Redis.
 endef
 
-define Build/Compile
-       $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
+define Package/python3-django-constance
+$(call Package/python-django-constance/Default)
+  DEPENDS:= \
+       +PACKAGE_python3-django-constance:python3 \
+       +PACKAGE_python3-django-constance:python3-django
+  VARIANT:=python3
 endef
 
-define Package/django-constance/install
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) \
-           $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-           $(1)$(PYTHON_PKG_DIR)
+define Package/python3-django-constance/description
+$(call define Package/python-django-constance/description)
+.
+(Variant for Python3)
 endef
 
-$(eval $(call BuildPackage,django-constance))
+$(eval $(call PyPackage,python-django-constance))
+$(eval $(call BuildPackage,python-django-constance))
+$(eval $(call Py3Package,python3-django-constance))
+$(eval $(call BuildPackage,python3-django-constance))

diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
index ad47db2d1704cdf4af2acdb36c1dc2893ee81696..9a0e476f5e33c9cb50b06d6bd441997cbfdff950 100644 (file)
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -24,7 +24,7 @@ include ../../lang/python/python-package.mk
 
 SEAFILE_PYTHON_DEPENDS:= \
        simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \
-       django
+       django django-constance
 
 define Package/seafile-seahub
     SECTION:=net
@@ -32,7 +32,7 @@ define Package/seafile-seahub
     TITLE:=Seafile server - seahub component
     URL:=https://seafile.com/
     DEPENDS:=+python +pillow +django-appconf \
-               +django-compressor +django-constance +django-formtools +django-jsonfield \
+               +django-compressor +django-formtools +django-jsonfield \
                +django-picklefield +django-postoffice +django-restframework \
                +django-simple-captcha +django-statici18n +django-webpack-loader \
                +flup +gunicorn +openpyxl \