twisted: Rename package, fix errors

This renames the Python 2 twisted package to python-twisted, and updates dependents (i.e. obfsproxy) to reference the updated name. This also fixes conflicts between the Python 2 and 3 packages. Twisted installs some scripts to /usr/bin, and previously scripts for both packages used the same names. This adds a "3" suffix to scripts installed by python3-twisted. This also adds python[3]-setuptools as a dependency, as the scripts installed to /usr/bin depend on pkg_resources (part of setuptools). Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2025-12-19 00:51:19 +00:00 · 2019-02-18 16:11:02 +08:00
parent a0172009fb
commit 247d162e2e
4 changed files with 32 additions and 24 deletions
--- a/lang/python/python-twisted/Makefile
+++ b/lang/python/python-twisted/Makefile
@@ -0,0 +1,104 @@
+#
+# 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-twisted
+PKG_VERSION:=18.9.0
+PKG_RELEASE:=2
+
+PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/T/Twisted
+PKG_HASH:=294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-twisted-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=libtirpc
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+include ../python-package.mk
+include ../python3-package.mk
+
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/python-twisted/Default
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  URL:=http://twistedmatrix.com/
+endef
+
+define Package/python-twisted
+$(call Package/python-twisted/Default)
+  TITLE:=Python networking engine
+  DEPENDS:= \
+      +PACKAGE_python-twisted:python-light \
+      +PACKAGE_python-twisted:python-attrs \
+      +PACKAGE_python-twisted:python-automat \
+      +PACKAGE_python-twisted:python-constantly \
+      +PACKAGE_python-twisted:python-incremental \
+      +PACKAGE_python-twisted:python-hyperlink \
+      +PACKAGE_python-twisted:python-setuptools \
+      +PACKAGE_python-twisted:python-zope-interface
+  VARIANT:=python
+endef
+
+define Package/python3-twisted
+$(call Package/python-twisted/Default)
+  TITLE:=Python3 networking engine
+  DEPENDS:= \
+      +PACKAGE_python3-twisted:python3-light \
+      +PACKAGE_python3-twisted:python3-attrs \
+      +PACKAGE_python3-twisted:python3-automat \
+      +PACKAGE_python3-twisted:python3-constantly \
+      +PACKAGE_python3-twisted:python3-incremental \
+      +PACKAGE_python3-twisted:python3-hyperlink \
+      +PACKAGE_python3-twisted:python3-setuptools \
+      +PACKAGE_python3-twisted:python3-zope-interface
+  VARIANT:=python3
+endef
+
+define Package/python-twisted/description
+Twisted is a networking engine written in Python, supporting numerous
+protocols. It contains a web server, numerous chat clients, chat servers,
+mail servers, and more.
+endef
+
+define Package/python3-twisted/description
+$(call Package/python-twisted/description)
+.
+(Variant for Python3)
+endef
+
+define PyPackage/python-twisted/filespec
+|$(PYTHON_PKG_DIR)
+-|$(PYTHON_PKG_DIR)/twisted/conch/scripts/tkconch.py
+endef
+
+define Py3Package/python3-twisted/filespec
+|$(PYTHON3_PKG_DIR)
+-|$(PYTHON3_PKG_DIR)/twisted/conch/scripts/tkconch.py
+endef
+
+define Py3Package/python3-twisted/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	for bin in $(1)/usr/bin/*; do \
+		mv $$$$$$$$bin $$$$$$$${bin}3 ; \
+	done
+endef
+
+$(eval $(call PyPackage,python-twisted))
+$(eval $(call BuildPackage,python-twisted))
+$(eval $(call BuildPackage,python-twisted-src))
+
+$(eval $(call Py3Package,python3-twisted))
+$(eval $(call BuildPackage,python3-twisted))
+$(eval $(call BuildPackage,python3-twisted-src))