From be37df00dabf5155d7d9bd8ff7414ed2e44426fa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 24 Mar 2022 20:47:19 +0100 Subject: [PATCH] package/python-coherence: drop package The package does not work with python3, is unmaintained upstream and depends on twisted which no longer works with python2, so drop it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++ package/Config.in | 1 - .../0001-Fix-twisted-detection.patch | 29 ------------------- package/python-coherence/Config.in | 10 ------- .../python-coherence/python-coherence.hash | 3 -- package/python-coherence/python-coherence.mk | 13 --------- 6 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 package/python-coherence/0001-Fix-twisted-detection.patch delete mode 100644 package/python-coherence/Config.in delete mode 100644 package/python-coherence/python-coherence.hash delete mode 100644 package/python-coherence/python-coherence.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3f3b42a2a9..197fb4d899 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2021.02" +config BR2_PACKAGE_PYTHON_COHERENCE + bool "python-coherence package removed" + select BR2_LEGACY + help + This package has been removed as it does not work with + Python 3.x and is unmaintained. + config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d45e6d3a86..22ff876c62 100644 --- a/package/Config.in +++ b/package/Config.in @@ -935,7 +935,6 @@ menu "External python modules" source "package/python-cheroot/Config.in" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" - source "package/python-coherence/Config.in" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" diff --git a/package/python-coherence/0001-Fix-twisted-detection.patch b/package/python-coherence/0001-Fix-twisted-detection.patch deleted file mode 100644 index c0e51b9e31..0000000000 --- a/package/python-coherence/0001-Fix-twisted-detection.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3cf8d89cbb44b5c7a0693d0b5d665e68acc3927c Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 10 May 2016 00:14:33 +0200 -Subject: [PATCH] Fix twisted detection. - -Addresses https://github.com/coherence-project/Coherence/issues/25 - -Signed-off-by: Thomas Klausner -Signed-off-by: Yegor Yefremov ---- - coherence/__init__.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/coherence/__init__.py b/coherence/__init__.py -index 2e4e8f1..4c4d73d 100644 ---- a/coherence/__init__.py -+++ b/coherence/__init__.py -@@ -24,8 +24,6 @@ try: - if twisted_version < Version("twisted", 2, 5, 0): - raise ImportError("Twisted >= 2.5 is required. Please install it.") - -- if twisted_web_version < Version("twisted.web", 2, 5, 0): -- raise ImportError("Twisted.Web >= 2.5 is required. Please install it") - except ImportError, exc: - # log error to stderr, might be useful for debugging purpose - for arg in exc.args: --- -2.8.1 - diff --git a/package/python-coherence/Config.in b/package/python-coherence/Config.in deleted file mode 100644 index 0f50080e67..0000000000 --- a/package/python-coherence/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_COHERENCE - bool "python-coherence" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - select BR2_PACKAGE_PYTHON_PYASN1 - help - A DLNA/UPnP Media Server and Framework for the Digital Living. - - https://github.com/coherence-project/Coherence diff --git a/package/python-coherence/python-coherence.hash b/package/python-coherence/python-coherence.hash deleted file mode 100644 index 3c2d45b537..0000000000 --- a/package/python-coherence/python-coherence.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 97c8b700b3fe73d48eacb259008f410d6567e5d7d1b8e96386f8cc2422135ca5 python-coherence-b7856985fd496689ca1f9024925ae737297c00d1.tar.gz -sha256 7713ed8484b4d3364c7f6f2c02aed427b06a0159b1f77aecf907d47016812e81 LICENCE diff --git a/package/python-coherence/python-coherence.mk b/package/python-coherence/python-coherence.mk deleted file mode 100644 index 24da7f70a7..0000000000 --- a/package/python-coherence/python-coherence.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-coherence -# -################################################################################ - -PYTHON_COHERENCE_VERSION = b7856985fd496689ca1f9024925ae737297c00d1 -PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,$(PYTHON_COHERENCE_VERSION)) -PYTHON_COHERENCE_SETUP_TYPE = setuptools -PYTHON_COHERENCE_LICENSE = MIT -PYTHON_COHERENCE_LICENSE_FILES = LICENCE - -$(eval $(python-package))