From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 84C3113835A for ; Thu, 24 Sep 2020 14:26:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62AC5E081A; Thu, 24 Sep 2020 14:26:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 134DBE0805 for ; Thu, 24 Sep 2020 14:26:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7D7E33BEE5 for ; Thu, 24 Sep 2020 14:26:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 735AB37B for ; Thu, 24 Sep 2020 14:26:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1600957602.b0b2faa4396c6a1ebc87ff6228dfe28cc351353e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/protobuf-python/protobuf-python-3.11.4.ebuild dev-python/protobuf-python/protobuf-python-3.12.2.ebuild dev-python/protobuf-python/protobuf-python-3.12.4.ebuild dev-python/protobuf-python/protobuf-python-3.13.0.ebuild dev-python/protobuf-python/protobuf-python-9999.ebuild X-VCS-Directories: dev-python/protobuf-python/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b0b2faa4396c6a1ebc87ff6228dfe28cc351353e X-VCS-Branch: master Date: Thu, 24 Sep 2020 14:26:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dff9bb31-fe61-4b07-a94e-1530a785e27c X-Archives-Hash: ce37c94f9a7301b9f9425055fe140ecc commit: b0b2faa4396c6a1ebc87ff6228dfe28cc351353e Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Tue Sep 22 03:00:00 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Sep 24 14:26:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b2faa4 dev-python/protobuf-python: Apply patches in top-level source directory. Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert 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(-) 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 d95a668e36a..0d5203efdc8 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 a6ada7b300a..2cd68f6c7fd 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 45575c8ab01..9e7ca9ff7d5 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 51f7d5f7b7f..eb481ccd564 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 fc808ec3a2a..0007bff057a 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