From 41be08383ecd8b4a4448880212ad5e8393fa21ec Mon Sep 17 00:00:00 2001 From: OscarL Date: Wed, 7 Jun 2023 06:01:49 -0300 Subject: [PATCH] dbuspython: recipe clean up. (#8809) * Provide "non _x86" package name. * Remove unneded \n scaping. --- .../dbuspython/dbuspython-1.2.14.recipe | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dev-python/dbuspython/dbuspython-1.2.14.recipe b/dev-python/dbuspython/dbuspython-1.2.14.recipe index 47b0a5277..eb81cfec7 100644 --- a/dev-python/dbuspython/dbuspython-1.2.14.recipe +++ b/dev-python/dbuspython/dbuspython-1.2.14.recipe @@ -17,7 +17,7 @@ COPYRIGHT="2002-2010 Red Hat Inc. LICENSE="MIT AFL v2.1 GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-$portVersion.tar.gz" CHECKSUM_SHA256="b10206ba3dd641e4e46411ab91471c88e0eec1749860e4285193ee68df84ac31" SOURCE_DIR="dbus-python-$portVersion" @@ -50,20 +50,27 @@ BUILD_PREREQUIRES=" PYTHON_PACKAGES=(python38 python39) PYTHON_VERSIONS=(3.8 3.9) for i in "${!PYTHON_PACKAGES[@]}"; do -pythonPackage=${PYTHON_PACKAGES[i]} -pythonVersion=${PYTHON_VERSIONS[$i]} -eval "PROVIDES_${pythonPackage}=\"\ - ${portName}_$pythonPackage = $portVersion\ - \"; \ -REQUIRES_$pythonPackage=\"\ - haiku$secondaryArchSuffix\n\ - ${portName} == $portVersion base\n\ - lib:libdbus_1$secondaryArchSuffix\n\ - lib:libglib_2.0$secondaryArchSuffix\n\ - cmd:python$pythonVersion\ - \"" -BUILD_PREREQUIRES="$BUILD_PREREQUIRES - cmd:python$pythonVersion" + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + eval "PROVIDES_${pythonPackage}=\" + ${portName}_$pythonPackage = $portVersion + \"" + if [ "$targetArchitecture" = x86_gcc2 ]; then + eval "PROVIDES_$pythonPackage+=\" + dbuspython_$pythonPackage = $portVersion + \"" + fi + eval "REQUIRES_$pythonPackage=\" + haiku$secondaryArchSuffix + ${portName} == $portVersion base + lib:libdbus_1$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + cmd:python$pythonVersion + \"" + BUILD_PREREQUIRES+=" + cmd:python$pythonVersion + " done BUILD()