From 594c5aa8e0fd41f15b310e96492154acb01c5a22 Mon Sep 17 00:00:00 2001 From: OscarL Date: Wed, 7 Jun 2023 05:58:59 -0300 Subject: [PATCH] psutil, pycurl: provide "non _x86" package name. (#8814) The psutil recipe remains disabled (so no rev-bump there). --- dev-python/psutil/psutil-5.6.7.recipe | 5 +++++ dev-python/pycurl/pycurl-7.45.2.recipe | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dev-python/psutil/psutil-5.6.7.recipe b/dev-python/psutil/psutil-5.6.7.recipe index db19d8c16..97748d263 100644 --- a/dev-python/psutil/psutil-5.6.7.recipe +++ b/dev-python/psutil/psutil-5.6.7.recipe @@ -42,6 +42,11 @@ for i in "${!PYTHON_PACKAGES[@]}"; do eval "PROVIDES_${pythonPackage}=\" ${portName}_$pythonPackage = $portVersion \"" + if [ "$targetArchitecture" = x86_gcc2 ]; then + eval "PROVIDES_$pythonPackage+=\" + psutil_$pythonPackage = $portVersion + \"" + fi eval "REQUIRES_$pythonPackage=\" haiku$secondaryArchSuffix cmd:python$pythonVersion diff --git a/dev-python/pycurl/pycurl-7.45.2.recipe b/dev-python/pycurl/pycurl-7.45.2.recipe index 7fc386b33..70375a0b7 100644 --- a/dev-python/pycurl/pycurl-7.45.2.recipe +++ b/dev-python/pycurl/pycurl-7.45.2.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2001-2008 Kjetil Jacobsen 2013-2018 Oleg Pudeyev" LICENSE="GNU LGPL v2.1 MIT" -REVISION="5" +REVISION="6" SOURCE_URI="https://github.com/pycurl/pycurl/archive/REL_${portVersion//./_}.tar.gz" CHECKSUM_SHA256="1aaaf415a5affe141593b3edf6ce187a79d99fbeb65c0b18490b03edc606394c" SOURCE_DIR="pycurl-REL_${portVersion//./_}" @@ -47,6 +47,11 @@ for i in "${!PYTHON_PACKAGES[@]}"; do eval "PROVIDES_${pythonPackage}=\" ${portName}_$pythonPackage = $portVersion \"" + if [ "$targetArchitecture" = x86_gcc2 ]; then + eval "PROVIDES_$pythonPackage+=\" + pycurl_$pythonPackage = $portVersion + \"" + fi eval "REQUIRES_$pythonPackage=\" haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix