[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Michał Górny]

commit:     dd2855193d31d04b6dc25d7fddf381c6d61c0080
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 10:18:29 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 10:47:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd285519

sys-apps/portage: Backport setup.py install depr. patch

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-apps/portage/Manifest                                        | 1 +
 .../portage/{portage-3.0.28.ebuild => portage-3.0.28-r1.ebuild}  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 09100f2e8d69..d4fec5b8daf2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,4 +5,5 @@ DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 
4922fad1fc34977b786555
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B 
b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8
 SHA512 
7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 
9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06
 SHA512 
f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 DIST portage-3.0.20.tar.gz 1348818 BLAKE2B 
e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83
 SHA512 
69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
+DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 
1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c
 SHA512 
bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 
8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313
 SHA512 
148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b

diff --git a/sys-apps/portage/portage-3.0.28.ebuild 
b/sys-apps/portage/portage-3.0.28-r1.ebuild
similarity index 96%
rename from sys-apps/portage/portage-3.0.28.ebuild
rename to sys-apps/portage/portage-3.0.28-r1.ebuild
index 18bbc5bc82b3..5142ff74cee1 100644
--- a/sys-apps/portage/portage-3.0.28.ebuild
+++ b/sys-apps/portage/portage-3.0.28-r1.ebuild
@@ -11,7 +11,10 @@ inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2";
+SRC_URI="
+       https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2
+       
https://gitweb.gentoo.org/proj/portage.git/patch/?id=c309328c4e1f6254251d31149ee47b4266d4d70f
+               -> ${P}-setuptools-install-depr.patch"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
@@ -80,6 +83,10 @@ pkg_pretend() {
 }
 
 python_prepare_all() {
+       local PATCHES=(
+               "${DISTDIR}"/${P}-setuptools-install-depr.patch
+       )
+
        distutils-r1_python_prepare_all
 
        sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i 
lib/portage/__init__.py || die