From e8a26891590be5a40e160798a195fa8a52297856 Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Mon, 14 Jul 2025 19:28:11 -0300
Subject: [PATCH] markdown: recipe clean up. Drop Python 3.9 support. (#12590)

---
 dev-python/markdown/markdown-3.1.1.recipe | 66 +++++++++++++----------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/dev-python/markdown/markdown-3.1.1.recipe b/dev-python/markdown/markdown-3.1.1.recipe
index e617ee6f6..d99b0ad59 100644
--- a/dev-python/markdown/markdown-3.1.1.recipe
+++ b/dev-python/markdown/markdown-3.1.1.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2007, 2008 The Python Markdown Project
 	2004, 2005, 2006 Yuri Takhteyev
 	2004 Manfred Stienstra"
 LICENSE="BSD (3-clause)"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-$portVersion.tar.gz"
 CHECKSUM_SHA256="2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"
 SOURCE_DIR="Markdown-$portVersion"
@@ -26,34 +26,40 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 
-PYTHON_PACKAGES=(python39 python310)
-PYTHON_VERSIONS=(3.9 3.10)
-commandSuffixes=(3.8 "" 3.10)
-for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-commandSuffix=${commandSuffixes[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\n\
-	cmd:markdown_py$commandSuffix\n\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+PYTHON_VERSIONS=(3.10)
+defaultVersion=3.10
+
+for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+	pythonPackage=python${pythonVersion//.}
+
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
+		cmd:markdown_py_$pythonVersion
+		\""
+	# Provide non-suffixed cmd only for the default Python version
+	if [ $pythonVersion = $defaultVersion ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			cmd:markdown_py = $portVersion
+			\""
+	fi
+
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
 
 INSTALL()
 {
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
-		commandSuffix=${commandSuffixes[$i]}
+	for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+		pythonPackage=python${pythonVersion//.}
 
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
@@ -65,13 +71,19 @@ INSTALL()
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
-		if [ "$pythonVersion" = "$commandSuffix" ]; then
+		# Version suffix all the scripts
+		for f in $binDir/*; do
+			mv $f $f-$pythonVersion
+		done
+
+		# And provide suffix-less symlinks for the default version
+		if [ $pythonVersion = $defaultVersion ]; then
 			for f in $binDir/*; do
-				mv $f ${f}$commandSuffix
+				ln -sr $f ${f%-$pythonVersion}
 			done
 		fi
 
-		packageEntries  $pythonPackage \
+		packageEntries $pythonPackage \
 			$prefix/lib/python* \
 			$binDir
 	done