From 4c4b6192f9e39b932311411a85326bd45e421777 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 1 Dec 2021 22:41:44 +0100 Subject: [PATCH] net-misc/google-cloud-sdk: Properly use the python single eclass If python-single-r1.eclass is inherited, then PYTHON_USEDEP can't be used directly inside dependency variable - either PYTHON_SINGLE_USEDEP (for single-python-impl packages) should be used or the dependency should be wrapped into python_gen_cond_dep function (for multi-python-impl packages). crcmod is a multi-python-impl package, so use the latter. Also follow the practice of specifying the BDEPEND in terms of RDEPEND. For this, we need to bump the EAPI to 7. --- ...0-r1.ebuild => google-cloud-sdk-355.0.0-r2.ebuild} | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/{google-cloud-sdk-355.0.0-r1.ebuild => google-cloud-sdk-355.0.0-r2.ebuild} (92%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild index 1e695905ee..854ee948e3 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{6..10} ) @@ -15,12 +15,15 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64" IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" S="${WORKDIR}/${PN}" -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-python/crcmod[${PYTHON_USEDEP}]" +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/crcmod[${PYTHON_USEDEP}] + ')" +BDEPEND="${RDEPEND}" src_prepare() { # Drop unused python2 code