commit: 3ac601a8e7e069cabae762134571f0f100f70451
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 11:56:18 2021 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 11:56:18 2021 +0000
URL:
https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=3ac601a8
sys-apps/portage: Version bump
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
sys-apps/portage/Manifest | 16 +-
sys-apps/portage/portage-3.0.20.ebuild | 306 +++++++++++++++++++++++++++++++++
2 files changed, 317 insertions(+), 5 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f155fecf5..3afd32d14 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
AUX README.RESCUE 137 BLAKE2B
af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da
SHA512
dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
AUX portage-ccache.conf 60 BLAKE2B
b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941
SHA512
36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
+DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B
9ed7b18ef8b73c59a08e5a2c2fba9365b37bd8cace32d5a275a4003cbf3f40f6a0a5a4d168dae987169e2017222a3af291d9a860a4494c994ef51ca851620db1
SHA512
38f402d1ecf125af7c454afdcee12221fa715f4e043c1a59073422025a12508a06a4bb77503bb75f6ed9603ff507499558bc1032157f5fc0aee9573bb18a6e4b
+DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B
9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672
SHA512
5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
+DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B
4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33
SHA512
4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
+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
EBUILD portage-3.0.14.ebuild 8862 BLAKE2B
73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75
SHA512
534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
EBUILD portage-3.0.18.ebuild 9223 BLAKE2B
9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668
SHA512
c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
+EBUILD portage-3.0.20.ebuild 10601 BLAKE2B
288e0c815f1dd6eaec386987f5d78d36ec0cd61a029e6fc4c9101377a6ac541c850bd791f921a41912570b0882772ac8629d6cd24a2a7dce9dea361f3da728b8
SHA512
c3002bf9b96a3a41c25ed72805699b2a03dbdc2aa79e01a1900deb73209dfce486947fd6e6395fd0a453330bfd63760a0a2627f18946020c78437c5ed044ef04
MISC metadata.xml 1482 BLAKE2B
1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b
SHA512
5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
-----BEGIN PGP SIGNATURE-----
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKlhfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmD9UVZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGe2YwQAvJISLNpnX3Vsw6uweHVFh341Obf9NXcXYfO9I50I+MNAZxYPOpfwm79Y
-HQegXyhilo/APxeDL3nKVQwnBf/xduCO4R82xPyDanWondFmeUN76T9P/UEpvdlH
-WuhmKbaOGVin9Yipc5XrQ4hsk3awClbOJX0jWc4H/0JRdzp8BrA=
-=VcPc
+kGdKwQQAvdB83U83NzxT0SudXgFNl3JkSdLVhNyqzgy2UjYANGP97sjpvS4W5pfd
+x8HqSVgj6gBznFAwaBCGl23kZA4hG3u/jRaBRWaX2NP3JPQrb2HPQyHXQO6T0Gzw
+pNN1bx35Uuphn344qQ9EeURui4sailoMwQSJFL7vvkFFdelJgnk=
+=W9mO
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-3.0.20.ebuild
b/sys-apps/portage/portage-3.0.20.ebuild
new file mode 100644
index 000000000..1251839da
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.20.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 multilib tmpfiles prefix
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git";
+EGIT_BRANCH="multilib"
+EGIT_COMMIT="c0a00cde2d10eda4c207d488e01b48e0bfc75ce9"
+DESCRIPTION="Portage is the package management and distribution system for
Gentoo"
+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:0[readline]
+ >=app-admin/eselect-1.2
+ rsync-verify? (
+ >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+ >=app-crypt/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 )
+ elibc_uclibc? ( >=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"
+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
+
+SRC_URI="
+
https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch
-> portage-3.0.20-bug-777492-a4d8829.patch
+
https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch
-> portage-3.0.20-bug-777492-209be9a.patch
+
https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch
-> portage-3.0.20-bug-796584-693f6bf.patch
+
https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch
-> portage-3.0.20-bug-796812-2ce11f0.patch
+
https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch
-> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+ check_extra_config
+}
+
+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":' \
+ -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} 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 ""
+}
