From f4e7f37f8b3099e2e116aba18241f8b35b986ee6 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 19 Oct 2022 16:10:24 -0400
Subject: [PATCH] Make Python 3.9 the default cmd:python3, rename recipes.

It's probable we should have a "_default" package for
Python3 the same way we do OpenJDK. But this should be OK
for the time being at least.
---
 .../{python3-3.7.14.recipe => python3.7-3.7.14.recipe}   | 7 ++-----
 .../{python39-3.9.14.recipe => python3.9-3.9.14.recipe}  | 9 ++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename dev-lang/python/{python3-3.7.14.recipe => python3.7-3.7.14.recipe} (95%)
 rename dev-lang/python/{python39-3.9.14.recipe => python3.9-3.9.14.recipe} (94%)

diff --git a/dev-lang/python/python3-3.7.14.recipe b/dev-lang/python/python3.7-3.7.14.recipe
similarity index 95%
rename from dev-lang/python/python3-3.7.14.recipe
rename to dev-lang/python/python3.7-3.7.14.recipe
index 9b24092a2..d74dca76c 100644
--- a/dev-lang/python/python3-3.7.14.recipe
+++ b/dev-lang/python/python3.7-3.7.14.recipe
@@ -33,20 +33,15 @@ fi
 
 PROVIDES="
 	python3$secondaryArchSuffix = $portVersion compat >= 3.7
-	cmd:2to3 = $portVersion compat >= 3.7
 	cmd:2to3_3.7 = $portVersion compat >= 3.7
-	cmd:idle = $portVersion compat >= 3.7
 	cmd:idle3 = $portVersion compat >= 3.7
 	cmd:idle3.7 = $portVersion compat >= 3.7
-	cmd:pydoc3 = $portVersion compat >= 3.7
 	cmd:pydoc3.7 = $portVersion compat >= 3.7
-	cmd:python3 = $portVersion compat >= 3.7
 	cmd:python3_config = $portVersion compat >= 3.7
 	cmd:python3.7 = $portVersion compat >= 3.7
 	cmd:python3.7_config = $portVersion compat >= 3.7
 	cmd:python3.7m = $portVersion compat >= 3.7
 	cmd:python3.7m_config = $portVersion compat >= 3.7
-	cmd:pyvenv = $portVersion compat >= 3.7
 	cmd:pyvenv_3.7 = $portVersion compat >= 3.7
 	devel:libpython3.7m$secondaryArchSuffix = 1.0
 	lib:libpython3.7m$secondaryArchSuffix = 1.0
@@ -141,6 +136,8 @@ INSTALL()
 	cd $prefix/lib/python3.7
 	rm -rf ctypes/test distutils/tests idlelib/idle_test lib2to3/tests \
 		sqlite3/test test tkinter/test unittest/test
+
+	rm -f $prefix/bin/{2to3,idle3,pydoc3,python3,python3-config,pyvenv}
 }
 
 TEST()
diff --git a/dev-lang/python/python39-3.9.14.recipe b/dev-lang/python/python3.9-3.9.14.recipe
similarity index 94%
rename from dev-lang/python/python39-3.9.14.recipe
rename to dev-lang/python/python3.9-3.9.14.recipe
index 1f34af5d6..155c53db8 100644
--- a/dev-lang/python/python39-3.9.14.recipe
+++ b/dev-lang/python/python3.9-3.9.14.recipe
@@ -32,13 +32,18 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 fi
 
 PROVIDES="
+	python3.9$secondaryArchSuffix = $portVersion compat >= 3.9
 	python39$secondaryArchSuffix = $portVersion compat >= 3.9
 	cmd:2to3_3.9 = $portVersion compat >= 3.9
+	cmd:2to3 = $portVersion compat >= 3.9
 	cmd:idle3.9 = $portVersion compat >= 3.9
+	cmd:idle3 = $portVersion compat >= 3.9
 	cmd:pydoc3.9 = $portVersion compat >= 3.9
+	cmd:pydoc3 = $portVersion compat >= 3.9
 	cmd:python3.9 = $portVersion compat >= 3.9
+	cmd:python3 = $portVersion compat >= 3.9
 	cmd:python3.9_config = $portVersion compat >= 3.9
-	cmd:pyvenv_3.9 = $portVersion compat >= 3.9
+	cmd:python3_config = $portVersion compat >= 3.9
 	devel:libpython3.9$secondaryArchSuffix = 1.0
 	lib:libpython3.9$secondaryArchSuffix = 1.0
 	"
@@ -134,8 +139,6 @@ INSTALL()
 	cd $prefix/lib/python3.9
 	rm -rf ctypes/test distutils/tests idlelib/idle_test lib2to3/tests \
 		sqlite3/test test tkinter/test unittest/test
-
-	rm -f $prefix/bin/{2to3,idle3,pydoc3,python3,python3-config}
 }
 
 TEST()