commit: 638010c004ed1f2dce17437e175de79392cb4c19
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:30:06 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:30:06 2022 +0000
URL:
https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=638010c0
sys-apps/portage: Version bump to 3.0.26
Package-Manager: Portage-3.0.24, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
sys-apps/portage/Manifest | 11 +-
sys-apps/portage/portage-3.0.26.ebuild | 283 +++++++++++++++++++++++++++++++++
2 files changed, 289 insertions(+), 5 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ab7a3b1d4..97718bf2c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,14 +11,15 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306
BLAKE2B 9ffcf396b983a
EBUILD portage-3.0.20.ebuild 10558 BLAKE2B
cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9
SHA512
7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22
EBUILD portage-3.0.23.ebuild 9204 BLAKE2B
81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745
SHA512
b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928
EBUILD portage-3.0.24.ebuild 9199 BLAKE2B
6ef7deb3179caec623206e941af071655653cec6b72c88a16fca0c9215a871e772405fc04dcd0157cfbf66204b466cf6f31f3960cb22bb9a909e53b40c20cc93
SHA512
01756c98f699cedb88278f17444d55921da9a8826cdcc38c331ca2dc01740d1874f70829f7a8f5aeb2cf0260bdbee8ee25a317fa559b6dd0f614908239133b04
+EBUILD portage-3.0.26.ebuild 9205 BLAKE2B
c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586
SHA512
02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d
MISC metadata.xml 1482 BLAKE2B
1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b
SHA512
5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
-----BEGIN PGP SIGNATURE-----
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4X8xfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4Yb5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGf/fgP/b9h6Ns1hG4SY+yyeQy/PBLs7RGhKIAVbgCRHCo3YI0qNghzSzCGFHE1/
-g20d4S6GadDwcU1o7/5e3XB6HFgMazZdN3xyFJAxW2fbmgeMPEokjPti8k4RnHg6
-pOcp7/JPwvhPYDSoUNJCKKeiqxj9eR0/wMtqRVfuyRlrc07QbCQ=
-=Az1F
+kGdFvwQAhVqt9V1Warki9E2V8SpLZLralaupe2eOMEZSxAw6AaHZYkv8LAy/2N/D
+oMg9wqITJzF0VD/ss8LSljP0aZ0rKVLYMLohnqE3HDQhNYYkr/KI0A1aqgbqu7HD
+SFPzdlS3vvubHK+m5jyuk6zpV4rfMxyKzPvQXz8Kqmt6pBDotrI=
+=w7jB
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-3.0.26.ebuild
b/sys-apps/portage/portage-3.0.26.ebuild
new file mode 100644
index 000000000..6e7b4a14b
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.26.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git";
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="ce24ddf9e0a9ba9e86f9ccf38004559c6367d756"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ >=sys-apps/abi-wrapper-1.0-r6
+ apidoc? (
+ dev-python/sphinx
+ dev-python/sphinx-epytext
+ )"
+# 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
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/findutils-4.4
+ !build? (
+ >=sys-apps/sed-4.0.5
+ >=app-shells/bash-5.0:0[readline]
+ >=app-admin/eselect-1.2
+ rsync-verify? (
+ >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+ >=sec-keys/openpgp-keys-gentoo-release-20180706
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+ )
+ )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_musl? ( >=sys-apps/sandbox-2.2 )
+ kernel_linux? ( sys-apps/util-linux )
+ >=app-misc/pax-utils-0.1.17
+ 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
+ >=sys-apps/abi-wrapper-1.0-r6
+ !<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
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+ check_extra_config
+}
+
+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":' \
+ -i lib/_emerge/create_depgraph_params.py || \
+ die "failed to patch create_depgraph_params.py"
+
+ einfo "Enabling additional FEATURES for gentoo-dev..."
+ echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox
strict-keepdir"' \
+ >> cnf/make.globals || die
+ fi
+
+ if use native-extensions; then
+ printf "[build_ext]\nportage_ext_modules=true\n" >> \
+ setup.cfg || die
+ fi
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon =
False:" \
+ -i lib/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ 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
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ hprefixify -e
"s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+ -w "/_BINARY/" lib/portage/const.py
+
+ einfo "Prefixing shebangs ..."
+ > "${T}/shebangs" || die
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} ==
"#!${EPREFIX}/"* ]] ; then
+ echo "${REPLY}" >> "${T}/shebangs" || die
+ fi
+ done < <(find . -type f -executable ! -name etc-update -print0)
+
+ if [[ -s ${T}/shebangs ]]; then
+ xargs sed -i -e "1s:^#!:#!${EPREFIX}:" <
"${T}/shebangs" || die "sed failed"
+ fi
+
+ einfo "Adjusting make.globals, repos.conf and etc-update ..."
+ hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+ 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
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >>
cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration
for this arch."
+ eerror "Please notify the arch maintainer about this issue.
Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use apidoc && targets+=( apidoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=(
+ install_docbook
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+ use apidoc && targets+=(
+ install_apidoc
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+ # Due to distutils/python-exec limitations
+ # 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
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die
"sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ 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
+
+ # 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() {
+ einfo
+ elog "For setup instructions after switching to portage-multilib"
+ elog "read doc/portage-multilib-instructions inside the multilib
overlay"
+ einfo
+ elog "The bin/ dir of the overlay has some scripts to switch from lib32"
+ elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
+
+ einfo ""
+ einfo "This release of portage NO LONGER contains the repoman code
base."
+ einfo "Repoman has its own ebuild and release package."
+ einfo "For repoman functionality please emerge app-portage/repoman"
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
