From 82c05422cd6ee027be731263b449c63bef73f6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 18 Sep 2022 15:34:46 +0200 Subject: [PATCH] app-portage/recover-broken-vdb: Use PEP517 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- ...1.0.0.ebuild => recover-broken-vdb-1.0.0-r1.ebuild} | 8 +++++--- .../recover-broken-vdb/recover-broken-vdb-9999.ebuild | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) rename app-portage/recover-broken-vdb/{recover-broken-vdb-1.0.0.ebuild => recover-broken-vdb-1.0.0-r1.ebuild} (85%) diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild similarity index 85% rename from app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild rename to app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild index 1aa783fa8e1bc..090365bd9c158 100644 --- a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild +++ b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=pyproject.toml +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 @@ -24,6 +24,8 @@ SLOT="0" # Require latest version of pax-utils to avoid users breaking their systems again # The tool itself works fine with older versions -RDEPEND=">=app-misc/pax-utils-1.3.3 +RDEPEND=" + >=app-misc/pax-utils-1.3.3 sys-apps/file - $(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')" + $(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]') +" diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild index 6bf7368751621..6577b6801c548 100644 --- a/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild +++ b/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=pyproject.toml +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 @@ -24,6 +24,8 @@ SLOT="0" # Require latest version of pax-utils to avoid users breaking their systems again # The tool itself works fine with older versions -RDEPEND=">=app-misc/pax-utils-1.3.3 +RDEPEND=" + >=app-misc/pax-utils-1.3.3 sys-apps/file - $(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')" + $(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]') +"