From 3f0eba8efc528e9bc8c1b7bab9b5c357901bab45 Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Sat, 20 May 2023 16:01:39 +0200 Subject: sys-apps/portage: add 3.0.34 Signed-off-by: Thomas Sachau --- sys-apps/portage/Manifest | 14 +- sys-apps/portage/portage-3.0.34.ebuild | 293 +++++++++++++++++++++++++++++++++ 2 files changed, 294 insertions(+), 13 deletions(-) create mode 100644 sys-apps/portage/portage-3.0.34.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index c0863e2b8..eb0de3954 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,6 +1,3 @@ ------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 @@ -15,14 +12,5 @@ EBUILD portage-3.0.20.ebuild 10548 BLAKE2B b9a291335494091efdf19901f47bcd29f907d EBUILD portage-3.0.23.ebuild 9194 BLAKE2B 6f431c48d77629c17989178aa142506634134729e3bc4ecbcd146965fe0a144fbf0f603ef088f1b5f6afeeb50efd62a7a93fa73e8b888ac857b9300524554f47 SHA512 8ef955c59b3d3009a80cdb3bab5c7e2dddc6d91d56ee99ff967c7a489ea2e1564091176d7df7792a86d6644efc6b31d39241ce56aeb776c55031b7dd3cf051a9 EBUILD portage-3.0.28.ebuild 9519 BLAKE2B 3972e8c02eea3cfee9bfc4ce75467abee6a69b7007b60df608e34291c171ee0598b18043a0dfe5e8cbbc35cc08258bc4245f7f063ef89ce52fdce0da9c40935c SHA512 8a20e7d2feaaf5ebcab2407f81d691935d98592b44cc3b645839f2336be08bedd1133bdeec85244c91db1883892736f26ce272810b7c2ee232517e571050ed42 EBUILD portage-3.0.30.ebuild 9370 BLAKE2B c77fcdd1b0b80c0a398ae06272c9b97b680db6e4c49ad3a2d916682a048aef076c5247f8ed21d56981555325e7f7651e13ffb3b5910b02afd778dca1cdb4975b SHA512 0e364ba2730d372b39d8ed04996a2f17e4557c90f8d5eb5e425fbc790b721ebf2e0a2f5f12ece6d24205e5be3065fc812d9c5258e403cab6b78eb900d2c7a08c +EBUILD portage-3.0.34.ebuild 9480 BLAKE2B d431b911a224ce672154bf136c11642c2205fa25dee87e446a7111ec6e1ecd09666849373f1817a9d4adc648a743dcc311783d8bec1c6b6af60d03fd4dd83916 SHA512 bf3c6159cff3015cc1102b19e0a7d4b87230709ffaa104a24ed55e04c16981aca81cb8c18d383155bedef723e2a0538fd9d78ee365793be1eec50850293ec11e MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a ------BEGIN PGP SIGNATURE----- - -iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmMcocBfFIAAAAAALgAo -aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0 -MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ -kGcvTwP/TFJpJeTw8ZnQN+W1qM6AWE5lgxppqF4xR+NnPt1bbVUNC4WBXrya1AnB -f6WiObAWgS7AYkqOe+WfHbBT98klQol+XXZVPY+Hn8m0JoU7h9yjtsAMyTep2GRB -Zd7o4k5vK139sZl5y5/XQ7f4RszhQvc0G/FTu9ovpCwMJREpLM4= -=+g+3 ------END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-3.0.34.ebuild b/sys-apps/portage/portage-3.0.34.ebuild new file mode 100644 index 000000000..e7d5e4d35 --- /dev/null +++ b/sys-apps/portage/portage-3.0.34.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..11} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 git-r3 linux-info toolchain-funcs multilib tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +EGIT_REPO_URI="https://github.com/TommyD/portage.git" +EGIT_BRANCH="multilib" +EGIT_COMMIT="3b6ad9bd495bb1d31c330133e069fa3140bcbe8c" +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 && ! tc-is-cross-compiler; 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