From ed1993458f6486cab53b1c00543884ac6a5be43c Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 11 Jan 2018 06:22:15 +0800 Subject: [PATCH] zope-interface: update to 4.4.3, rename to python-zope-interface, add python3 variant Renaming the package is needed to allow for a Python 3 variant (python3-zope-interface). Packages that depend on this (only twisted) also have their dependencies adjusted. Signed-off-by: Jeffery To --- lang/python/python-zope-interface/Makefile | 80 ++++++++++++++++++++++ lang/python/twisted/Makefile | 4 +- lang/python/zope-interface/Makefile | 54 --------------- 3 files changed, 82 insertions(+), 56 deletions(-) create mode 100644 lang/python/python-zope-interface/Makefile delete mode 100644 lang/python/zope-interface/Makefile diff --git a/lang/python/python-zope-interface/Makefile b/lang/python/python-zope-interface/Makefile new file mode 100644 index 000000000..b78893cc2 --- /dev/null +++ b/lang/python/python-zope-interface/Makefile @@ -0,0 +1,80 @@ +# +# Copyright (C) 2006-2011, 2015-2018 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-zope-interface +PKG_VERSION:=4.4.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=zope.interface-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://pypi.python.org/packages/bd/d2/25349ed41f9dcff7b3baf87bd88a4c82396cf6e02f1f42bb68657a3132af +PKG_HASH:=d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-zope-interface-$(PKG_VERSION) + +PKG_LICENSE:=ZPL-2.1 +PKG_LICENSE_FILES:=LICENSE.txt +PKG_MAINTAINER:=Jeffery To + +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/python-zope-interface/Default + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + URL:=https://github.com/zopefoundation/zope.interface +endef + +define Package/python-zope-interface +$(call Package/python-zope-interface/Default) + TITLE:=python-zope-interface + DEPENDS:=+PACKAGE_python-zope-interface:python-light + VARIANT:=python +endef + +define Package/python3-zope-interface +$(call Package/python-zope-interface/Default) + TITLE:=python3-zope-interface + DEPENDS:=+PACKAGE_python3-zope-interface:python3-light + VARIANT:=python3 +endef + +define Package/python-zope-interface/description +This package provides an implementation of "object interfaces" for +Python. Interfaces are a mechanism for labeling objects as conforming to +a given API or contract. So, this package can be considered as +implementation of the Design By Contract methodology support in Python. +endef + +define Package/python3-zope-interface/description +$(call Package/python-zope-interface/description) +. +(Variant for Python3) +endef + +define PyPackage/python-zope-interface/filespec ++|$(PYTHON_PKG_DIR) +-|$(PYTHON_PKG_DIR)/zope/interface/common/tests +-|$(PYTHON_PKG_DIR)/zope/interface/tests +endef + +define Py3Package/python3-zope-interface/filespec ++|$(PYTHON3_PKG_DIR) +-|$(PYTHON3_PKG_DIR)/zope/interface/common/tests +-|$(PYTHON3_PKG_DIR)/zope/interface/tests +endef + +$(eval $(call PyPackage,python-zope-interface)) +$(eval $(call BuildPackage,python-zope-interface)) + +$(eval $(call Py3Package,python3-zope-interface)) +$(eval $(call BuildPackage,python3-zope-interface)) diff --git a/lang/python/twisted/Makefile b/lang/python/twisted/Makefile index 210569d2b..47811726f 100644 --- a/lang/python/twisted/Makefile +++ b/lang/python/twisted/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=twisted PKG_VERSION:=16.4.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://pypi.python.org/packages/6b/23/8dbe86fc83215015e221fbd861a545c6ec5c9e9cd7514af114d1f64084ab \ @@ -32,7 +32,7 @@ define Package/twisted CATEGORY:=Languages TITLE:=Python networking engine URL:=http://twistedmatrix.com/ - DEPENDS:=+python-light +zope-interface + DEPENDS:=+python-light +python-zope-interface endef define Package/twisted/description diff --git a/lang/python/zope-interface/Makefile b/lang/python/zope-interface/Makefile deleted file mode 100644 index d9a41a352..000000000 --- a/lang/python/zope-interface/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2006-2011, 2015-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=zope.interface -PKG_VERSION:=4.3.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pypi.python.org/packages/38/1b/d55c39f2cf442bd9fb2c59760ed058c84b57d25c680819c25f3aff741e1f -PKG_HASH:=6a0e224a052e3ce27b3a7b1300a24747513f7a507217fcc2a4cb02eb92945cee - -PKG_LICENSE:=ZPL-2.1 -PKG_LICENSE_FILES:=LICENSE.txt -PKG_MAINTAINER:=Jeffery To - -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/zope-interface - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Zope interface - URL:=https://github.com/zopefoundation/zope.interface - DEPENDS:=+python-light -endef - -define Package/zope-interface/description -This package provides an implementation of "object interfaces" for -Python. Interfaces are a mechanism for labeling objects as conforming to -a given API or contract. So, this package can be considered as -implementation of the Design By Contract methodology support in Python. -endef - -define PyPackage/zope-interface/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/zope/interface/common/tests --|$(PYTHON_PKG_DIR)/zope/interface/tests -endef - -define Build/Compile - $(call Build/Compile/PyMod,, \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" --no-compile, \ - ) -endef - -$(eval $(call PyPackage,zope-interface)) -$(eval $(call BuildPackage,zope-interface))