commit: a54f98f352747ddde9ebfa96899eaf457320cbf2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 09:17:19 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 10:49:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54f98f3
sys-apps/portage: Bump to 3.0.22
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-apps/portage/Manifest | 1 +
.../{portage-9999.ebuild => portage-3.0.22.ebuild} | 66 ++++++++++++++--------
sys-apps/portage/portage-9999.ebuild | 33 +++++------
3 files changed, 59 insertions(+), 41 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e2172affcdc..b029f9f14ee 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,3 +6,4 @@ 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.22.tar.bz2 1150425 BLAKE2B
af9cb1eeb96d887fe13514b14b9820c37b0de3204ebd423e69fea839a2908db2a916a03e82186ee9cc64562b770c27e407431fc00427ec1a5119b80ce35d5128
SHA512
0c227cb5a532235e735f973a5eb8f018189abb067e4b94276a780357b6ce93c9c967a03a3320affddf3c614fd26188e7598eeaee350305013b427a343892b016
diff --git a/sys-apps/portage/portage-9999.ebuild
b/sys-apps/portage/portage-3.0.22.ebuild
similarity index 78%
copy from sys-apps/portage/portage-9999.ebuild
copy to sys-apps/portage/portage-3.0.22.ebuild
index 43cd42a9073..074056061fb 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-3.0.22.ebuild
@@ -8,18 +8,21 @@ 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="Portage is the package management and distribution system for
Gentoo"
+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";
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="test? ( dev-vcs/git )"
+BDEPEND="
+ app-arch/xz-utils
+ test? ( dev-vcs/git )"
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
>=app-arch/tar-1.27
dev-lang/python-exec:2
@@ -32,6 +35,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
# Require sandbox-2.2 for bug #288863.
# For whirlpool hash, require python[ssl] (bug #425046).
# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
RDEPEND="
acct-user/portage
app-arch/zstd
@@ -57,7 +62,10 @@ RDEPEND="
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3
) )
- !<app-admin/logrotate-3.8.0"
+ !<app-admin/logrotate-3.8.0
+ !<app-portage/gentoolkit-0.4.6
+ !<app-portage/repoman-2.3.10
+ !~app-portage/repoman-3.0.0"
PDEPEND="
!build? (
>=net-misc/rsync-2.6.4
@@ -66,20 +74,6 @@ PDEPEND="
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
# NOTE: FEATURES=installsources requires debugedit and rsync
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage";
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git
- https://github.com/gentoo/portage.git";
-
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -89,6 +83,23 @@ pkg_pretend() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Revert due to regressions:
+ # https://bugs.gentoo.org/777492
+ # https://github.com/gentoo/portage/pull/728
+ eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-209be9a.patch"
+ eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
+
+ # Apply regression fix for https://bugs.gentoo.org/796584.
+ eapply "${DISTDIR}/portage-3.0.20-bug-796584-693f6bf.patch"
+
+ # Apply EAPI 8 fix for https://bugs.gentoo.org/796812.
+ eapply "${DISTDIR}/portage-3.0.20-bug-796812-2ce11f0.patch"
+
+ # Apply EAPI 8 fix for https://bugs.gentoo.org/796959
+ eapply "${DISTDIR}/portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
+
+ 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":' \
@@ -96,7 +107,7 @@ python_prepare_all() {
die "failed to patch create_depgraph_params.py"
einfo "Enabling additional FEATURES for gentoo-dev..."
- echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox
strict-keepdir"' \
+ echo 'FEATURES="${FEATURES} strict-keepdir"' \
>> cnf/make.globals || die
fi
@@ -120,6 +131,7 @@ python_prepare_all() {
if use build || ! use rsync-verify; then
sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \
-i cnf/repos.conf || die "sed failed"
fi
@@ -144,7 +156,7 @@ python_prepare_all() {
einfo "Adjusting make.globals, repos.conf and etc-update ..."
hprefixify cnf/{make.globals,repos.conf} bin/etc-update
- if prefix-guest ; then
+ if use prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-e "s|^\(sync-uri =
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
@@ -217,7 +229,7 @@ python_install_all() {
dotmpfiles "${FILESDIR}"/portage-ccache.conf
# Due to distutils/python-exec limitations
- # they must be installed to /usr/bin.
+ # these must be installed to /usr/bin.
local sbin_relocations='archive-conf dispatch-conf emaint env-update
etc-update fixpackages regenworld'
einfo "Moving admin scripts to the correct directory"
dodir /usr/sbin
@@ -255,4 +267,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 43cd42a9073..09dac2f78d0 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -10,8 +10,10 @@ TMPFILES_OPTIONAL=1
inherit distutils-r1 git-r3 linux-info tmpfiles prefix
-DESCRIPTION="Portage is the package management and distribution system for
Gentoo"
+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";
LICENSE="GPL-2"
KEYWORDS=""
@@ -19,7 +21,8 @@ SLOT="0"
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify
selinux test xattr"
RESTRICT="!test? ( test )"
-BDEPEND="test? ( dev-vcs/git )"
+BDEPEND="
+ test? ( dev-vcs/git )"
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
>=app-arch/tar-1.27
dev-lang/python-exec:2
@@ -32,6 +35,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
# Require sandbox-2.2 for bug #288863.
# For whirlpool hash, require python[ssl] (bug #425046).
# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
RDEPEND="
acct-user/portage
app-arch/zstd
@@ -57,7 +62,10 @@ RDEPEND="
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3
) )
- !<app-admin/logrotate-3.8.0"
+ !<app-admin/logrotate-3.8.0
+ !<app-portage/gentoolkit-0.4.6
+ !<app-portage/repoman-2.3.10
+ !~app-portage/repoman-3.0.0"
PDEPEND="
!build? (
>=net-misc/rsync-2.6.4
@@ -66,20 +74,6 @@ PDEPEND="
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
# NOTE: FEATURES=installsources requires debugedit and rsync
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage";
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git
- https://github.com/gentoo/portage.git";
-
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -120,6 +114,7 @@ python_prepare_all() {
if use build || ! use rsync-verify; then
sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \
-i cnf/repos.conf || die "sed failed"
fi
@@ -144,7 +139,7 @@ python_prepare_all() {
einfo "Adjusting make.globals, repos.conf and etc-update ..."
hprefixify cnf/{make.globals,repos.conf} bin/etc-update
- if prefix-guest ; then
+ if use prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-e "s|^\(sync-uri =
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
@@ -217,7 +212,7 @@ python_install_all() {
dotmpfiles "${FILESDIR}"/portage-ccache.conf
# Due to distutils/python-exec limitations
- # they must be installed to /usr/bin.
+ # these must be installed to /usr/bin.
local sbin_relocations='archive-conf dispatch-conf emaint env-update
etc-update fixpackages regenworld'
einfo "Moving admin scripts to the correct directory"
dodir /usr/sbin
