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

[Michał Górny]

commit:     3a91ba92dfb771e4ff09a0d3f20ad4e21be84d4f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 27 08:30:48 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 27 09:15:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a91ba92

sys-apps/portage: Bump to 3.0.24

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

 sys-apps/portage/Manifest                           |  1 +
 .../{portage-9999.ebuild => portage-3.0.24.ebuild}  | 21 ++++++++++++++++-----
 sys-apps/portage/portage-9999.ebuild                |  1 -
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 473efdd482b..06543c64f72 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,3 +8,4 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 
BLAKE2B 9ffcf396b983a
 DIST portage-3.0.20.tar.gz 1348818 BLAKE2B 
e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83
 SHA512 
69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
 DIST portage-3.0.22.tar.bz2 1150425 BLAKE2B 
af9cb1eeb96d887fe13514b14b9820c37b0de3204ebd423e69fea839a2908db2a916a03e82186ee9cc64562b770c27e407431fc00427ec1a5119b80ce35d5128
 SHA512 
0c227cb5a532235e735f973a5eb8f018189abb067e4b94276a780357b6ce93c9c967a03a3320affddf3c614fd26188e7598eeaee350305013b427a343892b016
 DIST portage-3.0.23.tar.bz2 1150929 BLAKE2B 
26009cd2c19a138783a713d524744215796d35bb495e753e0fc76a354db89cfd210bdb62eea2dc54609e18024be49cec0e1de96bb6225f6d50fe9d8f52d8cbe5
 SHA512 
e0b21cd9f2eeaf201e2caf9f39afd9d0525a25d1576955b277ea9b44f0fcfdbe27ff54de16a06da53f72a08bbafc73a14f9d874dba4edebca3cbdf69fbf31862
+DIST portage-3.0.24.tar.bz2 1153838 BLAKE2B 
b2cbb8b3156987f42ff6c8f140586eae40da4a0a42091a4d11f46b61b66e81ac8e4c366e69b12c06d3a300405f089d68e70175efb7eabe25bb19c47679c19873
 SHA512 
b16751ba0b4c604cd7d72ad8dfaad40d845f87066b4e54fe264093b88a0b29a6af4e8b72f00be2da501fd288dfa23143d8f61f49048e8565b9d17687ef3732d9

diff --git a/sys-apps/portage/portage-9999.ebuild 
b/sys-apps/portage/portage-3.0.24.ebuild
similarity index 89%
copy from sys-apps/portage/portage-9999.ebuild
copy to sys-apps/portage/portage-3.0.24.ebuild
index 14c3a28ab28..725e03431bf 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-3.0.24.ebuild
@@ -3,25 +3,24 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
-inherit distutils-r1 git-r3 linux-info tmpfiles prefix
+inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git
-       https://github.com/gentoo/portage.git";
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2";
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
+       app-arch/xz-utils
        test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
        >=app-arch/tar-1.27
@@ -83,6 +82,8 @@ pkg_pretend() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i 
lib/portage/__init__.py || die
+
        if use gentoo-dev; then
                einfo "Disabling --dynamic-deps by default for gentoo-dev..."
                sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
@@ -250,4 +251,14 @@ pkg_preinst() {
        if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; 
then
                chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
        fi
+
+       if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+               elog "The emerge --autounmask option is now disabled by 
default, except for"
+               elog "portions of behavior which are controlled by the 
--autounmask-use and"
+               elog "--autounmask-license options. For backward compatibility, 
previous"
+               elog "behavior of --autounmask=y and --autounmask=n is entirely 
preserved."
+               elog "Users can get the old behavior simply by adding 
--autounmask to the"
+               elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale 
for this"
+               elog "change, see https://bugs.gentoo.org/658648.";
+       fi
 }

diff --git a/sys-apps/portage/portage-9999.ebuild 
b/sys-apps/portage/portage-9999.ebuild
index 14c3a28ab28..362444730f0 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1