From c5107d9a1a61287282981b374e4f41eff6058727 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 21 Oct 2018 15:00:31 +0000
Subject: [PATCH] PycURL: split & rewrite the eval command, use a simpler sed
 regexp.

devel:libpython was in BUILD_PREREQUIRES until the previous commit
and was moved to BUILD_REQUIRES. Move it back to BUILD_PREREQUIRES.

Every commit in this recipe has been tested locally on each arch,
but something went wrong with pycurl_x86 in the build servers.
---
 dev-python/pycurl/pycurl-7.43.0.2.recipe | 44 +++++++++++-------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/dev-python/pycurl/pycurl-7.43.0.2.recipe b/dev-python/pycurl/pycurl-7.43.0.2.recipe
index ec4f2e05f..b206a5bcd 100644
--- a/dev-python/pycurl/pycurl-7.43.0.2.recipe
+++ b/dev-python/pycurl/pycurl-7.43.0.2.recipe
@@ -64,32 +64,30 @@ fi
 for i in "${!PYTHON_PACKAGES[@]}"; do
 	pythonPackage=${PYTHON_PACKAGES[i]}
 	pythonLibSuffix=${PYTHON_LIBSUFFIXES[$i]}
-	pythonVersion="`$pythonPackage --version 2>&1 | sed \
-		-e "s/Python \([[:digit:]]*\.[[:digit:]]*\)\..*/\1/"`"
+	pythonVersion="`$pythonPackage --version 2>&1 | sed -n \
+		-e "s/Python \([0-9]*\.[0-9]*\)\..*/\1/p"`"
 	PYTHON_VERSIONS+=($pythonVersion)
 
-	eval "\
-		PROVIDES_${pythonPackage}=\"\n\
-			${portName}_$pythonPackage = $portVersion\n\
-			\"; \
-		REQUIRES_$pythonPackage=\"\n\
-			haiku$secondaryArchSuffix\n\
-			cmd:python$pythonVersion\n\
-			lib:libcrypto$secondaryArchSuffix\n\
-			lib:libcurl$secondaryArchSuffix\n\
-			lib:libnghttp2$secondaryArchSuffix\n\
-			lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix\n\
-			lib:libssl$secondaryArchSuffix\n\
-			lib:libz$secondaryArchSuffix\n\
-			\"\
-		"
-
-	BUILD_REQUIRES="$BUILD_REQUIRES
-		setuptools_$pythonPackage
-		devel:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
-		"
-	BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+	eval "REQUIRES_$pythonPackage=\"
+		haiku$secondaryArchSuffix
 		cmd:python$pythonVersion
+		lib:libcrypto$secondaryArchSuffix
+		lib:libcurl$secondaryArchSuffix
+		lib:libnghttp2$secondaryArchSuffix
+		lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
+		lib:libssl$secondaryArchSuffix
+		lib:libz$secondaryArchSuffix
+		\""
+
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		devel:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
 		"
 done