From b0b2faa4396c6a1ebc87ff6228dfe28cc351353e Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Tue, 22 Sep 2020 03:00:00 +0000
Subject: dev-python/protobuf-python: Apply patches in top-level source
 directory.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 dev-python/protobuf-python/protobuf-python-3.11.4.ebuild | 11 +++++++++--
 dev-python/protobuf-python/protobuf-python-3.12.2.ebuild | 11 +++++++++--
 dev-python/protobuf-python/protobuf-python-3.12.4.ebuild | 11 +++++++++--
 dev-python/protobuf-python/protobuf-python-3.13.0.ebuild |  7 +++++--
 dev-python/protobuf-python/protobuf-python-9999.ebuild   |  7 +++++--
 5 files changed, 37 insertions(+), 10 deletions(-)

(limited to 'dev-python/protobuf-python')

diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
index d95a668e36a0..0d5203efdc86 100644
--- a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS="manual"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -30,7 +30,6 @@ IUSE=""
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,6 +42,14 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
index a6ada7b300a8..2cd68f6c7fda 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_{6..9}})
-DISTUTILS_USE_SETUPTOOLS="manual"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -30,7 +30,6 @@ IUSE=""
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,6 +42,14 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
index 45575c8ab012..9e7ca9ff7d58 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="manual"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -30,7 +30,6 @@ IUSE=""
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,6 +42,14 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
index 51f7d5f7b7f2..eb481ccd564a 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -44,6 +43,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	distutils-r1_python_prepare_all
 
 	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index fc808ec3a2a3..0007bff057a7 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -44,6 +43,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	distutils-r1_python_prepare_all
 
 	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
-- 
cgit v1.2.3