django-picklefield: update packaging format + add python3 variant

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

diff --git a/lang/python/django-picklefield/Makefile b/lang/python/django-picklefield/Makefile
index fe6e2c5c7fbfc960ffdf896b7d4df3d7598a263a..b24157b27945ef2f5c91d9255f96136670a45db2 100644 (file)
--- a/lang/python/django-picklefield/Makefile
+++ b/lang/python/django-picklefield/Makefile
@@ -10,38 +10,61 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=django-picklefield
 PKG_VERSION:=1.1.0
 PKG_RELEASE:=3
-PKG_LICENSE:=MIT
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/django-picklefield
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/$(PKG_NAME)/
 PKG_HASH:=ce7fee5c6558fe5dc8924993d994ccde75bb75b91cd82787cbd4c92b95a69f9c
+
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@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 ../python-package.mk
+include ../python3-package.mk
 
-define Package/django-picklefield
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/$(PKG_NAME)/Default
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Pickled object field for Django
-  URL:=https://github.com/gintas/django-picklefield
-  DEPENDS:=+python +python-django
+  URL:=https://github.com/gintas/django-picklefield/
+endef
+
+define Package/python-$(PKG_NAME)
+$(call Package/$(PKG_NAME)/Default)
+  DEPENDS:= \
+       +PACKAGE_python-$(PKG_NAME):python \
+       +PACKAGE_python-$(PKG_NAME):python-django
+  VARIANT:=python
 endef
 
-define Package/django-picklefield/description
+define Package/python-$(PKG_NAME)/description
   Pickled object field for Django
 endef
 
-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 \
+       +PACKAGE_python3-$(PKG_NAME):python3-django
+  VARIANT:=python3
 endef
 
-define Package/django-picklefield/install
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) \
-           $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-           $(1)$(PYTHON_PKG_DIR)
+define Package/python3-$(PKG_NAME)/description
+$(call define Package/python-$(PKG_NAME)/description)
+.
+(Variant for Python3)
 endef
 
-$(eval $(call BuildPackage,django-picklefield))
+$(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/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
index 621e6cbe389eb988db983bdabe6b1215aca37d4b..78e78425e4b5dc62c5b5cb76f4adee53950d5cfb 100644 (file)
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -25,7 +25,7 @@ include ../../lang/python/python-package.mk
 SEAFILE_PYTHON_DEPENDS:= \
        simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \
        django django-constance django-appconf django-compressor django-formtools \
-       django-jsonfield
+       django-jsonfield django-picklefield 
 
 define Package/seafile-seahub
   SECTION:=net
@@ -33,7 +33,7 @@ define Package/seafile-seahub
   TITLE:=Seafile server - seahub component
   URL:=https://seafile.com/
   DEPENDS:=+python +pillow \
-       +django-picklefield +django-postoffice +django-restframework \
+       +django-postoffice +django-restframework \
        +django-simple-captcha +django-statici18n +django-webpack-loader \
        +flup +gunicorn +openpyxl \
        $(foreach dep,$(SEAFILE_PYTHON_DEPENDS),+python-$(dep))