diff --git a/dev-python/psutil/patches/psutil-5.9.8.patchset b/dev-python/psutil/patches/psutil-6.0.0.patchset similarity index 99% rename from dev-python/psutil/patches/psutil-5.9.8.patchset rename to dev-python/psutil/patches/psutil-6.0.0.patchset index 806c5c6c4..8cd1ad00b 100644 --- a/dev-python/psutil/patches/psutil-5.9.8.patchset +++ b/dev-python/psutil/patches/psutil-6.0.0.patchset @@ -1,11 +1,11 @@ -From 13892923cf7b6b8d8f329e764a40c8eb2e0d2602 Mon Sep 17 00:00:00 2001 +From 9c57e95957596311de7885d2d75e8a666e0b8822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 12 Feb 2020 04:16:40 +0100 Subject: WIP: preliminary Haiku port diff --git a/psutil/__init__.py b/psutil/__init__.py -index 8138db4..b326a86 100644 +index 3a50350..9548338 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -16,6 +16,7 @@ sensors) in Python. Supported platforms: @@ -24,7 +24,7 @@ index 8138db4..b326a86 100644 from ._common import LINUX from ._common import MACOS from ._common import NETBSD # NOQA -@@ -141,6 +143,9 @@ elif AIX: +@@ -142,6 +144,9 @@ elif AIX: # via sys.modules. PROCFS_PATH = "/proc" @@ -35,7 +35,7 @@ index 8138db4..b326a86 100644 raise NotImplementedError('platform %s is not supported' % sys.platform) diff --git a/psutil/_common.py b/psutil/_common.py -index 6989fea..34daca1 100644 +index 9fd7b0c..1c228eb 100644 --- a/psutil/_common.py +++ b/psutil/_common.py @@ -50,8 +50,8 @@ _DEFAULT = object() @@ -1369,10 +1369,10 @@ index 24628af..bd40126 100644 #endif diff --git a/setup.py b/setup.py -index 7c59f56..32ff198 100755 +index e337500..5de7ce6 100755 --- a/setup.py +++ b/setup.py -@@ -48,6 +48,7 @@ sys.path.insert(0, os.path.join(HERE, "psutil")) +@@ -49,6 +49,7 @@ sys.path.insert(0, os.path.join(HERE, "psutil")) from _common import AIX # NOQA from _common import BSD # NOQA from _common import FREEBSD # NOQA @@ -1380,7 +1380,7 @@ index 7c59f56..32ff198 100755 from _common import LINUX # NOQA from _common import MACOS # NOQA from _common import NETBSD # NOQA -@@ -382,6 +383,16 @@ elif AIX: +@@ -384,6 +385,16 @@ elif AIX: # fmt: on ) @@ -1398,5 +1398,5 @@ index 7c59f56..32ff198 100755 sys.exit('platform %s is not supported' % sys.platform) -- -2.43.2 +2.45.2 diff --git a/dev-python/psutil/psutil-5.9.8.recipe b/dev-python/psutil/psutil-6.0.0.recipe similarity index 94% rename from dev-python/psutil/psutil-5.9.8.recipe rename to dev-python/psutil/psutil-6.0.0.recipe index ad57e1f73..d84321cc9 100644 --- a/dev-python/psutil/psutil-5.9.8.recipe +++ b/dev-python/psutil/psutil-6.0.0.recipe @@ -11,12 +11,12 @@ COPYRIGHT="2009 Giampaolo Rodola'" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://github.com/giampaolo/psutil/archive/release-$portVersion.tar.gz" -CHECKSUM_SHA256="962fbb077209fda6416046b704b51ed17a61edde41a4573886640026e2c53bae" +CHECKSUM_SHA256="187588c10ff4804b91e0c947d6b1a4006dbb633261c0f869865de518603c5d5e" SOURCE_DIR="psutil-release-$portVersion" PATCHES="psutil-$portVersion.patchset" -ARCHITECTURES="?all !x86_gcc2" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" $portName = $portVersion