From f823ef2526438469cee11515d3d255d7cf0297a9 Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Mon, 21 Mar 2022 13:01:27 +0100 Subject: sys-apps/portage: Version bump to 3.0.30 Package-Manager: Portage-3.0.29, Repoman-3.0.3 Manifest-Sign-Key: 0xC05330B3211CA2D4 Signed-off-by: Thomas Sachau --- sys-apps/portage/Manifest | 12 +- ...revert-default-enable-soname-dependencies.patch | 52 ++++ sys-apps/portage/portage-3.0.30.ebuild | 290 +++++++++++++++++++++ 3 files changed, 349 insertions(+), 5 deletions(-) create mode 100644 sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch create mode 100644 sys-apps/portage/portage-3.0.30.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index abafb6dc5..f1e540710 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea 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 @@ -16,14 +17,15 @@ EBUILD portage-3.0.24.ebuild 9199 BLAKE2B 6ef7deb3179caec623206e941af071655653ce EBUILD portage-3.0.26.ebuild 9205 BLAKE2B c924bca8c7f639d882096f08a1b51cc1287f9228f778dfe4605b2035ead78cc629160f6888c0e0d07c3a1d962c429fe8bf4cca75a8339a31cf9ac84ac4fb2586 SHA512 02425fc3585580866f740831d64c7e2f43c02cd9571d98a605ee3aad1c290a5130111936ec52bdd4bbbff23024bf2bf96d0088166977bbb076c08756db752b0d EBUILD portage-3.0.28.ebuild 9529 BLAKE2B 499c3e5177925bb8dd6f09a4903945b3f488a9c33d4b32b26b64f26a2b6c5d9d81a685755021f6d13840acab8148fd61ba5cfeda9ad37415f048e8befa490813 SHA512 4a37a197ac2f497b2061ae9286fbd4f38857b16af0d1ae452f0bb50f5e1506bd42f7fbaea5b5b4c1012e594c6488388fe305df24ca37209f5cb5ca7abaf07d2d EBUILD portage-3.0.29.ebuild 9267 BLAKE2B 87e4bee8b06cbb5c75fa9ce5668d921b3cdaba9cefb178c7f3f37155e855ebdb2d1d2691be069d531f6e4495a469bf2a268ac7f0c551b71afc9558803d96ac00 SHA512 de0a7a48dbb616158f8add0b7c0b86dee8b388da0a30420b2b128f2d67bebce723b16bfd924564e52f2a4e5e500ba1b5d6d6eeba18b0fc5cdf8e4fa4d4c6bf2c +EBUILD portage-3.0.30.ebuild 9380 BLAKE2B caf264cd2ae25e8441f6d7407f532814a6c55b899e83b5acf6089934eb92e064c5020a6548dbb4b42e11aa1768e39aea07853d040d3ddd6faa8b3571bacb102c SHA512 79788509230fa9654b999640dd59912c41a930603cada3ae80bb6fc7818f1a69a93d2333e041c5d05184b666ba4cdeadb95786d8a89e3af49377ee3d683d14bd MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a -----BEGIN PGP SIGNATURE----- -iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4ZXdfFIAAAAAALgAo +iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4aRdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ -kGf7uQP/T+/7X12Raztv6FqtVkgDHdU01UE3sgzmvjRTeEnEsVsFiB2tHP0XxHJJ -1qkM8tyRPhOB3iuQf2IAj2NARNNtX3IqlWtkWsAZqm0ojHCmiM00LJj49PsOnwbG -4Qj1jndHscmIKnZ07ECd6m0kr9+yEozenzqoBSLGgFcJacDzxIc= -=woLh +kGfYmwP/dohTo87heQAz+9ZhlL6P1f8Z2kg/UwFiUrF3VxhwoFZErWJ4j8EpO5yV +x59Smqz8HuwpwhWFZYXxBKO5LUa+RKz9erz3MJxJIldGYt+sm4gFDCoqDSuWBX8G +nCVMbXwRtlFQqFpSJVfSJIpRK6JnPcmyOXddnR1lUbowI8izJ/I= +=dTBb -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch b/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch new file mode 100644 index 000000000..bcb2e427d --- /dev/null +++ b/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch @@ -0,0 +1,52 @@ +From 2c025e87bb6253f869f9e84e6eb0d98eecfd49c4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Mon, 20 Dec 2021 11:16:30 -0500 +Subject: [PATCH] Revert "emerge: Default enable soname dependencies (bug + 687956)" +To: gentoo-portage-dev@lists.gentoo.org + +This change seems to cause problems with emerge --depclean. + +Reverts: 6091fcd861034b9b20677098827eff7b7a148853 +Bug: https://bugs.gentoo.org/687956 +Bug: https://bugs.gentoo.org/829623 +Signed-off-by: Mike Gilbert +--- + lib/_emerge/create_depgraph_params.py | 2 +- + man/emerge.1 | 7 +++---- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/lib/_emerge/create_depgraph_params.py b/lib/_emerge/create_depgraph_params.py +index 95c4c2035..11c3e3736 100644 +--- a/lib/_emerge/create_depgraph_params.py ++++ b/lib/_emerge/create_depgraph_params.py +@@ -104,7 +104,7 @@ def create_depgraph_params(myopts, myaction): + if ignore_built_slot_operator_deps is not None: + myparams["ignore_built_slot_operator_deps"] = ignore_built_slot_operator_deps + +- myparams["ignore_soname_deps"] = myopts.get("--ignore-soname-deps", "n") ++ myparams["ignore_soname_deps"] = myopts.get("--ignore-soname-deps", "y") + + dynamic_deps = myopts.get("--dynamic-deps", "y") != "n" and "--nodeps" not in myopts + if dynamic_deps: +diff --git a/man/emerge.1 b/man/emerge.1 +index ff565b46f..8f6d12925 100644 +--- a/man/emerge.1 ++++ b/man/emerge.1 +@@ -639,10 +639,9 @@ supported beginning with \fBEAPI 5\fR. + .TP + .BR "\-\-ignore\-soname\-deps < y | n >" + Ignore the soname dependencies of binary and installed packages. This +-option may be useful when working with binary or installed packages +-that lack appropriate soname dependency metadata because they were built +-with a package manager that does not support soname dependencies (perhaps +-an older version of portage). Soname ++option is enabled by default, since soname dependencies are relatively ++new, and the required metadata is not guaranteed to exist for binary and ++installed packages built with older versions of portage. Also, soname + dependencies will be automatically ignored for dependency calculations + that can pull unbuilt ebuilds into the dependency graph, since unbuilt + ebuilds do not have any soname dependency metadata, making it impossible +-- +2.34.1 + diff --git a/sys-apps/portage/portage-3.0.30.ebuild b/sys-apps/portage/portage-3.0.30.ebuild new file mode 100644 index 000000000..179f67e33 --- /dev/null +++ b/sys-apps/portage/portage-3.0.30.ebuild @@ -0,0 +1,290 @@ +# 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="a5893dcca4aae2fdcccbcb6578bf48c203f5e1d9" +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[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + )" +# 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 + ) ) + !=sys-apps/abi-wrapper-1.0-r6 + !> 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() { + if ! use build; 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 + 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() { + 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 "" +} -- cgit v1.2.3-65-gdbad