[gentoo-dev] [PATCH 0/3] distutils-r1, python-utils-r1: bump setuptools dep & fix creating python3-embed.pc

[gentoo-dev] [PATCH 0/3] distutils-r1, python-utils-r1: bump setuptools dep & fix creating python3-embed.pc

[Michał Górny]

Hi,

Here are a few small patches to the Python eclasses.  Two notable
changes are bumping setuptools version for DISTUTILS_USE_SETUPTOOLS
to avoid problems on systems with ancient setuptools installed,
and adding python3-embed.pc wrapper for py3.8+ as needed by meson.

While at it, I'm also removing python.pc which was unnecessarily
created as neither upstream nor Arch/Debian/Fedora are installing it
(just python2.pc and python3.pc).

Michał Górny (3):
  distutils-r1.eclass: Align min. setuptools version to current stable
  python-utils-r1.eclass: Do not create 'python.pc' wrapper
  python-utils-r1.eclass: Create python3-embed.pc wrapper

 eclass/distutils-r1.eclass    |  4 ++--
 eclass/python-utils-r1.eclass | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

-- 
2.25.1

[gentoo-dev] [PATCH 1/3] distutils-r1.eclass: Align min. setuptools version to current stable

[Michał Górny]

Closes: https://bugs.gentoo.org/712502
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/distutils-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f3df05eeb670..114ccc8041cc 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -120,10 +120,10 @@ _distutils_set_globals() {
 	local bdep=${rdep}
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		local sdep="dev-python/setuptools[${PYTHON_USEDEP}]"
+		local sdep=">=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]"
 	else
 		local sdep="$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/setuptools-42.0.2[${PYTHON_MULTI_USEDEP}]
 		')"
 	fi
 
-- 
2.25.1

[gentoo-dev] [PATCH 2/3] python-utils-r1.eclass: Do not create 'python.pc' wrapper

[Michał Górny]

Do not create 'python.pc', only 'python[23].pc'.  This seems to match
what other distributions are doing.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/python-utils-r1.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 325964e0e0e8..28314d5135d0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -978,7 +978,7 @@ python_wrapper_setup() {
 		# Clean up, in case we were supposed to do a cheap update.
 		rm -f "${workdir}"/bin/python{,2,3}{,-config} || die
 		rm -f "${workdir}"/bin/2to3 || die
-		rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
+		rm -f "${workdir}"/pkgconfig/python{2,3}.pc || die
 
 		local EPYTHON PYTHON
 		python_export "${impl}" EPYTHON PYTHON
@@ -1021,8 +1021,7 @@ python_wrapper_setup() {
 
 			# Python 2.7+.
 			ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
-				"${workdir}"/pkgconfig/python.pc || die
-			ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die
+				"${workdir}"/pkgconfig/python${pyver}.pc || die
 		else
 			nonsupp+=( 2to3 python-config "python${pyver}-config" )
 		fi
-- 
2.25.1

[gentoo-dev] [PATCH 3/3] python-utils-r1.eclass: Create python3-embed.pc wrapper

[Michał Górny]

Closes: https://bugs.gentoo.org/712526
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/python-utils-r1.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 28314d5135d0..f144cbbb1279 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -978,7 +978,7 @@ python_wrapper_setup() {
 		# Clean up, in case we were supposed to do a cheap update.
 		rm -f "${workdir}"/bin/python{,2,3}{,-config} || die
 		rm -f "${workdir}"/bin/2to3 || die
-		rm -f "${workdir}"/pkgconfig/python{2,3}.pc || die
+		rm -f "${workdir}"/pkgconfig/python{2,3}{,-embed}.pc || die
 
 		local EPYTHON PYTHON
 		python_export "${impl}" EPYTHON PYTHON
@@ -1022,6 +1022,12 @@ python_wrapper_setup() {
 			# Python 2.7+.
 			ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
 				"${workdir}"/pkgconfig/python${pyver}.pc || die
+
+			# Python 3.8+.
+			if [[ ${EPYTHON} != python[23].[67] ]]; then
+				ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}-embed.pc \
+					"${workdir}"/pkgconfig/python${pyver}-embed.pc || die
+			fi
 		else
 			nonsupp+=( 2to3 python-config "python${pyver}-config" )
 		fi
-- 
2.25.1