mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-14 08:26:57 +02:00
sys-apps/portage: Sync with Gentoo
It's from Gentoo commit d5486f568b641234809b8a88cc5fd4f21e898fe5.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
65de901b98
commit
ea6d3e3150
@ -1,4 +1,2 @@
|
||||
DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb5799460e1faa8b8ab137fa017e17d47d6d5da6382e75322f21d4be77a31acffbacd753c70b43b011613cc5a6332bc96 SHA512 c864bcb3bef11916128852a5f50b161d82529d7316ec970703a9ec948c46a51148419ef1dfde2906f72347dd41d0eebd49f5a1769a228d97145f5517c34dbff8
|
||||
DIST portage-3.0.66.1.tar.bz2 1198196 BLAKE2B 8dbd1bc17c1a9a3530425efa31a27efba39e1ef5f5457b4084875c64f7128453139aea447c25a642c124438e88ef484a43b1838cbd8c03748017571dd18f9921 SHA512 fcd3d4d3dcfdb67cbcdb0f4854860f073b4a9d41dadc97a3e6f890e3c75091aceec5622e97495741622b5c390309f05dec35b9e951d7ee7a78e28a9b3ed2939d
|
||||
DIST portage-3.0.67.tar.bz2 1196776 BLAKE2B 4a9056d388b012a0fa343d6fc50c9c3b455cb3a4d356210accf86c4ff4434a2d8cb4d23c3f58f3e23ab8bb4a4e9ee244bd1ec1203d5f72fa6f0e0a2caa92e757 SHA512 e725a471dcadaac771aa7f910524232e237efbb944d3e175825ad659b5190d631a91d4c188089c278a79b4709d4a8d6a6e53c55524c4b1c8d1c43580506e0d1c
|
||||
DIST portage-3.0.68.tar.bz2 1198758 BLAKE2B fbe3a14babbe5687d075c7e691027d04e7a34a35c3199c981e176bae365242e1dc7d4122f2d7a385444798b9413c415ca40801825a9dd9c99c3590efca8087e6 SHA512 4ed6d0945ad94ee19260996dd2ba9fa5e013560a50de887eb7e8df87a3649552316cbc62ee8ef9b4a025d9d98fb74e85ee7734b7a8fe7416450b8d6818fdcfab
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
https://bugs.gentoo.org/940120
|
||||
https://gitweb.gentoo.org/proj/portage.git/commit/?id=123a7be533161b14cacc4aa98708fbf1027ecce1
|
||||
|
||||
From 123a7be533161b14cacc4aa98708fbf1027ecce1 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Wed, 2 Oct 2024 06:02:24 +0100
|
||||
Subject: Revert "emerge-webrsync: actually honour the
|
||||
sync-webrsync-verify-signature attribute"
|
||||
|
||||
This reverts commit f99eb91227918d5bf0cc531e78bd597c73b7ce1f.
|
||||
|
||||
Revert for now as we understand the status quo better, and this
|
||||
breaks syncing w/ emerge-webrsync. I'll come back to this but I'd
|
||||
rather work with a known quantity for now than rush a fix.
|
||||
|
||||
Bug: https://bugs.gentoo.org/940120
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
---
|
||||
bin/emerge-webrsync | 9 ++++-----
|
||||
misc/emerge-delta-webrsync | 9 ++++-----
|
||||
2 files changed, 8 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
|
||||
index 124bcaddc..caa4986da 100755
|
||||
--- a/bin/emerge-webrsync
|
||||
+++ b/bin/emerge-webrsync
|
||||
@@ -105,17 +105,16 @@ do_debug=0
|
||||
keep=false
|
||||
|
||||
handle_pgp_setup() {
|
||||
- local attr repo_has_webrsync_verify webrsync_gpg
|
||||
-
|
||||
# WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification
|
||||
# WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg
|
||||
# WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg"
|
||||
WEBRSYNC_VERIFY_SIGNATURE=1
|
||||
|
||||
- has webrsync-gpg ${FEATURES} && webrsync_gpg=1
|
||||
+ has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0
|
||||
|
||||
- attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature)
|
||||
- [[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1
|
||||
+ repo_has_webrsync_verify=$(
|
||||
+ has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature | LC_ALL=C tr '[:upper:]' '[:lower:]') true yes
|
||||
+ )
|
||||
|
||||
if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then
|
||||
# If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync
|
||||
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
|
||||
index 8550c15fe..a788cdb0e 100755
|
||||
--- a/misc/emerge-delta-webrsync
|
||||
+++ b/misc/emerge-delta-webrsync
|
||||
@@ -165,17 +165,16 @@ if [[ ! -d $STATE_DIR ]]; then
|
||||
fi
|
||||
|
||||
handle_pgp_setup() {
|
||||
- local attr repo_has_webrsync_verify webrsync_gpg
|
||||
-
|
||||
# WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification
|
||||
# WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg
|
||||
# WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg"
|
||||
WEBRSYNC_VERIFY_SIGNATURE=1
|
||||
|
||||
- has webrsync-gpg ${FEATURES} && webrsync_gpg=1
|
||||
+ has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0
|
||||
|
||||
- attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature)
|
||||
- [[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1
|
||||
+ repo_has_webrsync_verify=$(
|
||||
+ has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature | LC_ALL=C tr '[:upper:]' '[:lower:]') true yes
|
||||
+ )
|
||||
|
||||
if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then
|
||||
# If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync
|
||||
--
|
||||
cgit v1.2.3-65-gdbad
|
||||
@ -1,242 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_{10..13} )
|
||||
PYTHON_REQ_USE='bzip2(+),threads(+)'
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
inherit meson linux-info python-r1 tmpfiles
|
||||
|
||||
DESCRIPTION="The package management and distribution system for Gentoo"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="
|
||||
https://anongit.gentoo.org/git/proj/portage.git
|
||||
https://github.com/gentoo/portage.git
|
||||
"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# setuptools is still needed as a workaround for Python 3.12+ for now.
|
||||
# https://github.com/mesonbuild/meson/issues/7702
|
||||
#
|
||||
# >=meson-1.2.1-r1 for bug #912051
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-arch/tar-1.27
|
||||
>=dev-build/meson-1.2.1-r1
|
||||
|| (
|
||||
>=dev-build/meson-1.3.0-r1
|
||||
<dev-build/meson-1.3.0
|
||||
)
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
' python3_12)
|
||||
>=sys-apps/sed-4.0.5
|
||||
sys-devel/patch
|
||||
!build? ( $(python_gen_impl_dep 'ssl(+)') )
|
||||
apidoc? (
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx-epytext[${PYTHON_USEDEP}]
|
||||
)
|
||||
doc? (
|
||||
~app-text/docbook-xml-dtd-4.4
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)
|
||||
"
|
||||
# Require sandbox-2.2 for bug #288863.
|
||||
# For whirlpool hash, require python[ssl] (bug #425046).
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
acct-user/portage
|
||||
>=app-arch/tar-1.27
|
||||
app-arch/zstd
|
||||
>=app-misc/pax-utils-0.1.17
|
||||
dev-lang/python-exec:2
|
||||
>=sys-apps/baselayout-2.9
|
||||
>=sys-apps/findutils-4.9
|
||||
!build? (
|
||||
>=app-admin/eselect-1.2
|
||||
app-portage/getuto
|
||||
>=app-shells/bash-5.0:0
|
||||
>=sec-keys/openpgp-keys-gentoo-release-20240703
|
||||
>=sys-apps/sed-4.0.5
|
||||
rsync-verify? (
|
||||
>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
|
||||
>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
|
||||
elibc_musl? ( >=sys-apps/sandbox-2.2 )
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
|
||||
xattr? ( kernel_linux? (
|
||||
>=sys-apps/install-xattr-0.3
|
||||
) )
|
||||
!<app-admin/logrotate-3.8.0
|
||||
!<app-portage/gentoolkit-0.4.6
|
||||
!<app-portage/repoman-2.3.10
|
||||
!~app-portage/repoman-3.0.0
|
||||
"
|
||||
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
|
||||
# NOTE: FEATURES=installsources requires debugedit and rsync
|
||||
PDEPEND="
|
||||
!build? (
|
||||
>=net-misc/rsync-2.6.4
|
||||
>=sys-apps/coreutils-6.4
|
||||
>=sys-apps/file-5.44-r3
|
||||
)
|
||||
"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
|
||||
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
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|" \
|
||||
-i cnf/repos.conf || die "sed failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local code_only=false
|
||||
python_foreach_impl my_src_configure
|
||||
}
|
||||
|
||||
my_src_configure() {
|
||||
local emesonargs=(
|
||||
-Dcode-only=${code_only}
|
||||
-Deprefix="${EPREFIX}"
|
||||
-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
|
||||
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
$(meson_use doc)
|
||||
$(meson_use apidoc)
|
||||
$(meson_use gentoo-dev)
|
||||
$(meson_use ipc)
|
||||
$(meson_use xattr)
|
||||
)
|
||||
|
||||
if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
|
||||
emesonargs+=( -Dnative-extensions=true )
|
||||
else
|
||||
emesonargs+=( -Dnative-extensions=false )
|
||||
fi
|
||||
|
||||
if use build; then
|
||||
emesonargs+=( -Drsync-verify=false )
|
||||
else
|
||||
emesonargs+=( $(meson_use rsync-verify) )
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
code_only=true
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local EPYTEST_XDIST=1
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
python_foreach_impl epytest
|
||||
}
|
||||
|
||||
src_install() {
|
||||
python_foreach_impl my_src_install
|
||||
dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
|
||||
|
||||
local scripts
|
||||
mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
|
||||
python_replicate_script "${scripts[@]}"
|
||||
}
|
||||
|
||||
my_src_install() {
|
||||
local pydirs=(
|
||||
"${D}$(python_get_sitedir)"
|
||||
"${ED}/usr/lib/portage/${EPYTHON}"
|
||||
)
|
||||
|
||||
meson_src_install
|
||||
python_fix_shebang "${pydirs[@]}"
|
||||
python_optimize "${pydirs[@]}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if ! use build && [[ -z ${ROOT} ]]; then
|
||||
python_setup
|
||||
local sitedir=$(python_get_sitedir)
|
||||
[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
|
||||
env -u DISTDIR \
|
||||
-u PORTAGE_OVERRIDE_EPREFIX \
|
||||
-u PORTAGE_REPOSITORIES \
|
||||
-u PORTDIR \
|
||||
-u PORTDIR_OVERLAY \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.default_locations || die
|
||||
|
||||
env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
|
||||
|
||||
env -u FEATURES -u PORTAGE_REPOSITORIES \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
|
||||
|
||||
env -u BINPKG_FORMAT \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
|
||||
fi
|
||||
|
||||
# elog dir must exist to avoid logrotate error for bug #415911.
|
||||
# This code runs in preinst in order to bypass the mapping of
|
||||
# portage:portage to root:root which happens after src_install.
|
||||
keepdir /var/log/portage/elog
|
||||
# This is allowed to fail if the user/group are invalid for prefix users.
|
||||
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
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Warn about obsolete "enotice" script, bug #867010
|
||||
local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
|
||||
if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
|
||||
eerror "Obsolete 'enotice' script detected!"
|
||||
eerror "Please remove this from ${bashrc} to avoid problems."
|
||||
eerror "See bug 867010 for more details."
|
||||
fi
|
||||
}
|
||||
@ -1,231 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_{10..13} )
|
||||
PYTHON_REQ_USE='bzip2(+),threads(+)'
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
inherit meson linux-info python-r1 tmpfiles
|
||||
|
||||
DESCRIPTION="The package management and distribution system for Gentoo"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="
|
||||
https://anongit.gentoo.org/git/proj/portage.git
|
||||
https://github.com/gentoo/portage.git
|
||||
"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-arch/tar-1.27
|
||||
>=dev-build/meson-1.3.0-r1
|
||||
>=sys-apps/sed-4.0.5
|
||||
sys-devel/patch
|
||||
!build? ( $(python_gen_impl_dep 'ssl(+)') )
|
||||
apidoc? (
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx-epytext[${PYTHON_USEDEP}]
|
||||
)
|
||||
doc? (
|
||||
~app-text/docbook-xml-dtd-4.4
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)
|
||||
"
|
||||
# Require sandbox-2.2 for bug #288863.
|
||||
# For whirlpool hash, require python[ssl] (bug #425046).
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
acct-user/portage
|
||||
>=app-arch/tar-1.27
|
||||
app-arch/zstd
|
||||
>=app-misc/pax-utils-0.1.17
|
||||
dev-lang/python-exec:2
|
||||
>=sys-apps/baselayout-2.9
|
||||
>=sys-apps/findutils-4.9
|
||||
!build? (
|
||||
>=app-admin/eselect-1.2
|
||||
app-portage/getuto
|
||||
>=app-shells/bash-5.0:0
|
||||
>=sec-keys/openpgp-keys-gentoo-release-20240703
|
||||
>=sys-apps/sed-4.0.5
|
||||
rsync-verify? (
|
||||
>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
|
||||
>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
|
||||
elibc_musl? ( >=sys-apps/sandbox-2.2 )
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
|
||||
xattr? ( kernel_linux? (
|
||||
>=sys-apps/install-xattr-0.3
|
||||
) )
|
||||
"
|
||||
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
|
||||
# NOTE: FEATURES=installsources requires debugedit and rsync
|
||||
PDEPEND="
|
||||
!build? (
|
||||
>=net-misc/rsync-2.6.4
|
||||
>=sys-apps/coreutils-6.4
|
||||
>=sys-apps/file-5.44-r3
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-webrsync.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
|
||||
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
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|" \
|
||||
-i cnf/repos.conf || die "sed failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local code_only=false
|
||||
python_foreach_impl my_src_configure
|
||||
}
|
||||
|
||||
my_src_configure() {
|
||||
local emesonargs=(
|
||||
-Dcode-only=${code_only}
|
||||
-Deprefix="${EPREFIX}"
|
||||
-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
|
||||
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
$(meson_use doc)
|
||||
$(meson_use apidoc)
|
||||
$(meson_use gentoo-dev)
|
||||
$(meson_use ipc)
|
||||
$(meson_use xattr)
|
||||
)
|
||||
|
||||
if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
|
||||
emesonargs+=( -Dnative-extensions=true )
|
||||
else
|
||||
emesonargs+=( -Dnative-extensions=false )
|
||||
fi
|
||||
|
||||
if use build; then
|
||||
emesonargs+=( -Drsync-verify=false )
|
||||
else
|
||||
emesonargs+=( $(meson_use rsync-verify) )
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
code_only=true
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local EPYTEST_XDIST=1
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
python_foreach_impl epytest
|
||||
}
|
||||
|
||||
src_install() {
|
||||
python_foreach_impl my_src_install
|
||||
dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
|
||||
|
||||
local scripts
|
||||
mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
|
||||
python_replicate_script "${scripts[@]}"
|
||||
}
|
||||
|
||||
my_src_install() {
|
||||
local pydirs=(
|
||||
"${D}$(python_get_sitedir)"
|
||||
"${ED}/usr/lib/portage/${EPYTHON}"
|
||||
)
|
||||
|
||||
meson_src_install
|
||||
python_fix_shebang "${pydirs[@]}"
|
||||
python_optimize "${pydirs[@]}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if ! use build && [[ -z ${ROOT} ]]; then
|
||||
python_setup
|
||||
local sitedir=$(python_get_sitedir)
|
||||
[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
|
||||
env -u DISTDIR \
|
||||
-u PORTAGE_OVERRIDE_EPREFIX \
|
||||
-u PORTAGE_REPOSITORIES \
|
||||
-u PORTDIR \
|
||||
-u PORTDIR_OVERLAY \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.default_locations || die
|
||||
|
||||
env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
|
||||
|
||||
env -u FEATURES -u PORTAGE_REPOSITORIES \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
|
||||
|
||||
env -u BINPKG_FORMAT \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
|
||||
fi
|
||||
|
||||
# elog dir must exist to avoid logrotate error for bug #415911.
|
||||
# This code runs in preinst in order to bypass the mapping of
|
||||
# portage:portage to root:root which happens after src_install.
|
||||
keepdir /var/log/portage/elog
|
||||
# This is allowed to fail if the user/group are invalid for prefix users.
|
||||
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
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Warn about obsolete "enotice" script, bug #867010
|
||||
local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
|
||||
if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
|
||||
eerror "Obsolete 'enotice' script detected!"
|
||||
eerror "Please remove this from ${bashrc} to avoid problems."
|
||||
eerror "See bug 867010 for more details."
|
||||
fi
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
|
||||
PYTHON_COMPAT=( pypy3_11 python3_{11..13} )
|
||||
PYTHON_REQ_USE='bzip2(+),threads(+)'
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
|
||||
@ -1,231 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
|
||||
PYTHON_REQ_USE='bzip2(+),threads(+)'
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
inherit meson linux-info python-r1 tmpfiles
|
||||
|
||||
DESCRIPTION="The package management and distribution system for Gentoo"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="
|
||||
https://anongit.gentoo.org/git/proj/portage.git
|
||||
https://github.com/gentoo/portage.git
|
||||
"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-arch/tar-1.27
|
||||
>=dev-build/meson-1.3.0-r1
|
||||
>=sys-apps/sed-4.0.5
|
||||
sys-devel/patch
|
||||
!build? ( $(python_gen_impl_dep 'ssl(+)') )
|
||||
apidoc? (
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx-epytext[${PYTHON_USEDEP}]
|
||||
)
|
||||
doc? (
|
||||
~app-text/docbook-xml-dtd-4.4
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)
|
||||
"
|
||||
# Require sandbox-2.2 for bug #288863.
|
||||
# For whirlpool hash, require python[ssl] (bug #425046).
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
acct-user/portage
|
||||
>=app-arch/tar-1.27
|
||||
app-arch/zstd
|
||||
>=app-misc/pax-utils-0.1.17
|
||||
dev-lang/python-exec:2
|
||||
>=sys-apps/baselayout-2.9
|
||||
>=sys-apps/findutils-4.9
|
||||
!build? (
|
||||
>=app-admin/eselect-1.2
|
||||
app-portage/getuto
|
||||
>=app-shells/bash-5.0:0
|
||||
>=sec-keys/openpgp-keys-gentoo-release-20240703
|
||||
>=sys-apps/sed-4.0.5
|
||||
rsync-verify? (
|
||||
>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
|
||||
>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
|
||||
elibc_musl? ( >=sys-apps/sandbox-2.2 )
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
|
||||
xattr? ( kernel_linux? (
|
||||
>=sys-apps/install-xattr-0.3
|
||||
) )
|
||||
"
|
||||
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
|
||||
# NOTE: FEATURES=installsources requires debugedit and rsync
|
||||
PDEPEND="
|
||||
!build? (
|
||||
>=net-misc/rsync-2.6.4
|
||||
>=sys-apps/coreutils-6.4
|
||||
>=sys-apps/file-5.44-r3
|
||||
)
|
||||
"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
|
||||
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
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|" \
|
||||
-i cnf/repos.conf || die "sed failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local code_only=false
|
||||
python_foreach_impl my_src_configure
|
||||
}
|
||||
|
||||
my_src_configure() {
|
||||
local emesonargs=(
|
||||
-Dcode-only=${code_only}
|
||||
-Deprefix="${EPREFIX}"
|
||||
-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
|
||||
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
$(meson_use doc)
|
||||
$(meson_use apidoc)
|
||||
$(meson_use gentoo-dev)
|
||||
$(meson_use ipc)
|
||||
$(meson_use xattr)
|
||||
)
|
||||
|
||||
if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then
|
||||
emesonargs+=( -Dnative-extensions=true )
|
||||
else
|
||||
emesonargs+=( -Dnative-extensions=false )
|
||||
fi
|
||||
|
||||
if use build; then
|
||||
emesonargs+=( -Drsync-verify=false )
|
||||
else
|
||||
emesonargs+=( $(meson_use rsync-verify) )
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
code_only=true
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local EPYTEST_XDIST=1
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
python_foreach_impl epytest
|
||||
}
|
||||
|
||||
src_install() {
|
||||
python_foreach_impl my_src_install
|
||||
dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
|
||||
|
||||
local scripts
|
||||
mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
|
||||
python_replicate_script "${scripts[@]}"
|
||||
}
|
||||
|
||||
my_src_install() {
|
||||
local pydirs=(
|
||||
"${D}$(python_get_sitedir)"
|
||||
"${ED}/usr/lib/portage/${EPYTHON}"
|
||||
)
|
||||
|
||||
meson_src_install
|
||||
python_fix_shebang "${pydirs[@]}"
|
||||
python_optimize "${pydirs[@]}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if ! use build && [[ -z ${ROOT} ]]; then
|
||||
python_setup
|
||||
local sitedir=$(python_get_sitedir)
|
||||
[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
|
||||
env -u DISTDIR \
|
||||
-u PORTAGE_OVERRIDE_EPREFIX \
|
||||
-u PORTAGE_REPOSITORIES \
|
||||
-u PORTDIR \
|
||||
-u PORTDIR_OVERLAY \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
ED="${ED}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.default_locations || die
|
||||
|
||||
env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
ED="${ED}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
|
||||
|
||||
env -u FEATURES -u PORTAGE_REPOSITORIES \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
ED="${ED}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
|
||||
|
||||
env -u BINPKG_FORMAT \
|
||||
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
|
||||
ED="${ED}" \
|
||||
"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
|
||||
fi
|
||||
|
||||
# elog dir must exist to avoid logrotate error for bug #415911.
|
||||
# This code runs in preinst in order to bypass the mapping of
|
||||
# portage:portage to root:root which happens after src_install.
|
||||
keepdir /var/log/portage/elog
|
||||
# This is allowed to fail if the user/group are invalid for prefix users.
|
||||
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
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Warn about obsolete "enotice" script, bug #867010
|
||||
local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
|
||||
if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
|
||||
eerror "Obsolete 'enotice' script detected!"
|
||||
eerror "Please remove this from ${bashrc} to avoid problems."
|
||||
eerror "See bug 867010 for more details."
|
||||
fi
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
|
||||
PYTHON_COMPAT=( pypy3_11 python3_{11..13} )
|
||||
PYTHON_REQ_USE='bzip2(+),threads(+)'
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
|
||||
# py3.14: bug #957070
|
||||
PYTHON_COMPAT=( pypy3_11 python3_{11..13} )
|
||||
PYTHON_REQ_USE='bzip2(+),threads(+)'
|
||||
TMPFILES_OPTIONAL=1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user