diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /sys-apps/portage | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'sys-apps/portage')
-rw-r--r-- | sys-apps/portage/Manifest | 16 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.12.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.13.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.14.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.15-r2.ebuild | 275 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.16.ebuild (renamed from sys-apps/portage/portage-3.0.9.ebuild) | 11 | ||||
-rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 8 |
7 files changed, 302 insertions, 14 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index fbd60d26ca25..f6f5700a9673 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -5,11 +5,15 @@ DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d52 DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350 DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590 DIST portage-3.0.14.tar.bz2 1049983 BLAKE2B 174fe1f14bf1cabbe044724bab5eeada6e4d86be7ffd00db1dfe97568dca450aa44856ef7c241e7ed194f99aecb6f8bcffaf30e428c17e53d4afd4265543b495 SHA512 796f34922abe8dcc0deb687c7b42644bc82fedf8751eeb97ef26355dcd600cd134809abcc71c3bdfc233e1c15511c13cbb06c66b5889f47f2b2f51d5384d5888 -DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd SHA512 01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618 +DIST portage-3.0.15-bug-772386-fetch-48226b2df140.patch 1432 BLAKE2B 37fa0521566a15eb6c137cb8c6c877782015a2b9e4999b257a3467d58790dede07496ed94f2c49a76d09bdaf2e80b6344fd3a3229ca9cd31102b26a9a988376e SHA512 65dd8c94edb4320c88d534f9e6bcf3cf553086fb6441ee01a917d2645f564bcb6d1b86ba60e6ac3059c28722dac0391856a223a0c8e03103078e5acbbb895bc1 +DIST portage-3.0.15-bug-772386-fetch.patch 1283 BLAKE2B e2a3f554e13ab70d0efa376fe9adc3820da08c82aea092bef7571b3c9f3f23640b39a9f3aa6bc0cc2a10eb3c636ce2cf0523ccfcd9d03cb2bac942de5d55044b SHA512 58e4b14441e6093da5cc49c7894173164897938c1445b3fed23f5cc81d1c8601f427e4b8f6a918ffaae06dfdeafc9bc1bb3c71ec846c497630abe9b942b44e12 +DIST portage-3.0.15.tar.bz2 1052590 BLAKE2B 144a80241300952075f884da570e90736f1a8b40067bcc7aac0740dd3be7b3574f4fb9de4471aca201d99b95ce0eb3202d94bc2489caef8e74e9db73ab229eff SHA512 588e4c0ca2f8155e141faa96fb10155f554ea68dd5bf426aa3c15db333317e7a6535cce4fdea0b273f90b72cbf0bfc9a28fdb776ed57244bbe13da49f46b3491 +DIST portage-3.0.16.tar.bz2 1055482 BLAKE2B 84d1ffd0be8855a7fee5b966d72032e59d72184dabab99c97bd829c669ac8eb526470c7b05958c9ea4cce4236bfb4998167db8feed74f8ef879d1e529c3d0eb5 SHA512 ae8ca1d15143bc0b62506d46b042626dc3d8587110c909448cb3735080a4c916d5d6d4bcaa4f189f98a32b0de29f2fc8b643f38642ec26fab58d1448ac50f1c3 EBUILD portage-2.3.99-r2.ebuild 8472 BLAKE2B fc3cbd3cbb80a6590cfd461e4895029069b48e941842d64c46ece7c55c2be68da8a7a302e79f4c882f365987e92cce608b67b3a10c6630297130f7e92c21d456 SHA512 d6b8f093ea2b6006cc3c7b71fc3585c160332014243707ef3c03f75d98190c10e22fcbaf963aee2537675cdbbe9af2a2453affabe973b28df8b0a6d80c9bf694 -EBUILD portage-3.0.12.ebuild 8396 BLAKE2B 3a2515d1f91ffaacbe1392b5dce378fe3f846f4285afde440b4f23b53bfbbae765a9121919594159df7b733f34253c21bcafbe6f4b01305adbf7a36431384963 SHA512 d23397efe162c287af773690022a3eff7fb360484076cbb793cc56b7dc195f78734c5f16ed682e265b786873b328ea59705058a5f1126892429f3e560677c528 -EBUILD portage-3.0.13.ebuild 8396 BLAKE2B 3a2515d1f91ffaacbe1392b5dce378fe3f846f4285afde440b4f23b53bfbbae765a9121919594159df7b733f34253c21bcafbe6f4b01305adbf7a36431384963 SHA512 d23397efe162c287af773690022a3eff7fb360484076cbb793cc56b7dc195f78734c5f16ed682e265b786873b328ea59705058a5f1126892429f3e560677c528 -EBUILD portage-3.0.14.ebuild 8405 BLAKE2B 2b7c0a4f8b79c880f5f0866abf5fb4b8200e0de2e3d7618e2f8d3ac06b31a1e6c4a850134ea584545d253e533392f18430fb2e0fdbbc3df797935beb3cacfe23 SHA512 c20b98d6f02209fe59d303ad9b923ffecfb570eaa65df8bf8d5971c8518518e8f4d81388c8c5d2d6c6ba011731a76c2734e4f2597f24e3041ab794f42b6950de -EBUILD portage-3.0.9.ebuild 8377 BLAKE2B 7c1e5f4cc10a711bc0a94c02cecfef0425d9c463f8a2e9ad133111aabfd6dee42093f228c8e60eba91cfb79ef4f2016ce1cbabdf62c651596cecfc9491d0247c SHA512 a8da2067de9de897ef685673bfe121a05ef33552ee0b1733098816e95ed5cce3c1c68612198275870d2e62810b74f46781580e514ee4f84b3bc224cbb90792ee -EBUILD portage-9999.ebuild 7436 BLAKE2B 30163c25a403cd5d98302c56fd6adf85fa8cd844f1f9b0d0a344ae4eb719d341fd769e82e8cda88a5125d6e722d409604e0060d6996a3c8cf53e53d714e7f617 SHA512 8164b6a56590ee14859d5cd2e15c296645d840fd586388c2aeda45f02010a8d111f734e6b8f2a8aa240196654a2083721b5857d5e6791bbe4f94cb4c6d308c59 +EBUILD portage-3.0.12.ebuild 8420 BLAKE2B 800633bf0fd26fe14f4e47e88a5a73478790a59968e8f35884e269b98747589b7d603cfe1f2e703b2a5ef86f9e797ee46af4892aa873b52cbc748933ec3a3c99 SHA512 9a65e037896df9ad6b1a359f26bbae7514cc7a8333c04eb153ffe24d4414f0ae8b4431fe8a5cc7dc29758bb3b702f771681b05ca7ec4ecbcf2e3864b8e8bd53b +EBUILD portage-3.0.13.ebuild 8420 BLAKE2B 800633bf0fd26fe14f4e47e88a5a73478790a59968e8f35884e269b98747589b7d603cfe1f2e703b2a5ef86f9e797ee46af4892aa873b52cbc748933ec3a3c99 SHA512 9a65e037896df9ad6b1a359f26bbae7514cc7a8333c04eb153ffe24d4414f0ae8b4431fe8a5cc7dc29758bb3b702f771681b05ca7ec4ecbcf2e3864b8e8bd53b +EBUILD portage-3.0.14.ebuild 8429 BLAKE2B 769f0513e4c1523f128351092bdeb08c0bc974e38121f3a7b39576445f03297523e3072605c77a6dbfe19933077b5bbb82266d3040c40ab2929863f8dd8dcff2 SHA512 c6f369df50cb097f80e44d9c6792cc43f40371cdc45804227b0386b51982fadb2a2c671345a2421444ef74d281ecd3e7535de36c6089116984f8303d7daa1eaa +EBUILD portage-3.0.15-r2.ebuild 8792 BLAKE2B 86233ecf18468b3e474bb19c768ec4a17fa88fd3d6daadb248dbc8398afafb0397df8d25664910bd528a4ed0324387b1da10481420cf11e1d3542f399f3d5145 SHA512 8ee2df75d1ca1bd25a89df48bdb1c78b39bd7b5ca139ac342b7b26c6a5f274226989a0d91bb19a89308f3b965b6d7522e260af5ac9e100db134208ed7d655185 +EBUILD portage-3.0.16.ebuild 8604 BLAKE2B 1c5432568f2072c27fbb335a7f0db6602d3b173827a986101d8d1776ff68e02626c30509490b1facd212a4375e060446dde25350d65a7729ba91bb1e1d8bfc89 SHA512 be1425c6b9a0a0b37c861c89a12780e0c3bd2f349d0f6cea4bfc907dabf516cf5cba5e5788ff05f77139e3ed5c0ce7f9bdcfb52fc03eece864367976c44f0e0b +EBUILD portage-9999.ebuild 7635 BLAKE2B 420719610f41fad605e3c66480f7c38729d4ddcde63543a21bfe596e36ce1fb11de479bef7c33e0d4dab69048dffbfc7425905b7e1671b573ec438889cff7ac8 SHA512 788af0dad2f48a19bf9baf01eab81059fb0aa1e8168f3266af7315f62c6a743031ee21c20320be1cd8d93096c837a499c518860cacd19c5c38e972964a419173 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild index 7980c3ee293e..0c67947746ed 100644 --- a/sys-apps/portage/portage-3.0.12.ebuild +++ b/sys-apps/portage/portage-3.0.12.ebuild @@ -243,7 +243,7 @@ pkg_preinst() { PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die - env -u BINPKG_COMPRESS \ + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild index 7980c3ee293e..0c67947746ed 100644 --- a/sys-apps/portage/portage-3.0.13.ebuild +++ b/sys-apps/portage/portage-3.0.13.ebuild @@ -243,7 +243,7 @@ pkg_preinst() { PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die - env -u BINPKG_COMPRESS \ + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die diff --git a/sys-apps/portage/portage-3.0.14.ebuild b/sys-apps/portage/portage-3.0.14.ebuild index 57a36478cce8..26f0e3f8e28b 100644 --- a/sys-apps/portage/portage-3.0.14.ebuild +++ b/sys-apps/portage/portage-3.0.14.ebuild @@ -243,7 +243,7 @@ pkg_preinst() { PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die - env -u BINPKG_COMPRESS \ + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die diff --git a/sys-apps/portage/portage-3.0.15-r2.ebuild b/sys-apps/portage/portage-3.0.15-r2.ebuild new file mode 100644 index 000000000000..eb9abac2065d --- /dev/null +++ b/sys-apps/portage/portage-3.0.15-r2.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 linux-info tmpfiles prefix + +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 ~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 )" +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 ) + 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 + !<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 + +SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" + +prefix_src_archives() { + local x y + for x in ${@}; do + for y in ${SRC_ARCHIVES}; do + echo ${y}/${x} + done + done +} + +TARBALL_PV=${PV} +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) + https://github.com/gentoo/portage/commit/3e5ef19d5d6b26fde08da463d730ff90edf6eb29.patch -> ${P}-bug-772386-fetch.patch + https://github.com/gentoo/portage/commit/48226b2df1408cf1944cb7c6128c73710c740dd3.patch -> ${P}-bug-772386-fetch-48226b2df140.patch" + +PATCHES=( + "${DISTDIR}/${P}-bug-772386-fetch.patch" + "${DISTDIR}/${P}-bug-772386-fetch-48226b2df140.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 + + 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 ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f ! -name etc-update -print0) + + 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 + + # 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 +} diff --git a/sys-apps/portage/portage-3.0.9.ebuild b/sys-apps/portage/portage-3.0.16.ebuild index 002a731eda70..0c20c5376262 100644 --- a/sys-apps/portage/portage-3.0.9.ebuild +++ b/sys-apps/portage/portage-3.0.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" +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 )" @@ -34,6 +34,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) # 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 @@ -242,10 +243,14 @@ pkg_preinst() { PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die - env -u BINPKG_COMPRESS \ + 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. diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 76d98e48e668..f229af539a23 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -234,10 +234,14 @@ pkg_preinst() { PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die - env -u BINPKG_COMPRESS \ + 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. |