diff options
author | 2022-03-21 09:23:12 +0100 | |
---|---|---|
committer | 2022-03-21 09:23:12 +0100 | |
commit | 5409a982b0f0a5c99ad0eeed2a96f72791ae7b77 (patch) | |
tree | c436cf952028ed98097cc2faee5b32d656079907 | |
parent | sys-apps/portage: Drop eclibc_uclibc USE condition (diff) | |
download | multilib-portage-5409a982b0f0a5c99ad0eeed2a96f72791ae7b77.tar.gz multilib-portage-5409a982b0f0a5c99ad0eeed2a96f72791ae7b77.tar.bz2 multilib-portage-5409a982b0f0a5c99ad0eeed2a96f72791ae7b77.zip |
sys-apps/portage: Version bump to 2.0.23
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy@gentoo.org>
-rw-r--r-- | sys-apps/portage/Manifest | 11 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.23.ebuild | 284 |
2 files changed, 290 insertions, 5 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 2969ec1fd..76a480564 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.14.ebuild 8819 BLAKE2B 560eb7cea19b3cc023c079b05cc91bc84187d1afcce9e123dca099ec5d1464db3af6624c590228fe4e4f877ae8e8b4d975d2dafcf91f1dea89baefdad9d2a161 SHA512 5cd0626585d8a0b47c203b061d4c19f7a7d563c1cf4c959a14f98215a1a75022445a17d2e3b55437b58cdcef418e62e6622d580a4362d71f34a4ac92bc38bf04 EBUILD portage-3.0.18.ebuild 9180 BLAKE2B 34afef0b39a00f419f3320e3b89fd2d0a5c1ea96b6e7e001a3589483821a2ce0d1e564b3e08c075de77ef6b020733924e6fe1d96c84e50f4e5a88a4175ebe9a3 SHA512 9fd7428f55ebd53ac9c9b174f562e50a2c2085c9f5d4a40f39343ac6c830e84d29d96800fc2077191bbe5ba4c296e63df38c7fc5d2851496bebe79524fe6bea1 EBUILD portage-3.0.20.ebuild 10558 BLAKE2B cf023ea7bd0ccca2fae50869e9b6ebf2b944714f4058f17b55b42ade66272390c986ebbd55bb43ca4b0a03d3e4b89083f3f5b64f842835a5e1ec8cde967d5de9 SHA512 7f4e7c54476bb25b7890cce87a8b12fe554882df0a88e1b59bbb35d485aadca226fc88fabdfe04c4c55dd79989ccea975d7a8beaa543694c56d3f5a34cf47f22 +EBUILD portage-3.0.23.ebuild 9204 BLAKE2B 81b345b0334473ee1d4608f4ecf536cfc4fb82c209fac385491aa0d122cc49f37d646c9879d190e2b6211be419c99ef56f12ae2ed4073fb207ce62a3aeb3f745 SHA512 b15e87fe5261241a899f8d36eda06d82a539b4e83809e576a275b832608eb3ea1705e7ad5a99d0910a20245a644379fc96e4d213a792e57349a55ebdbec5b928 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a -----BEGIN PGP SIGNATURE----- -iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmIG0/lfFIAAAAAALgAo +iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmI4NelfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ -kGc9igP/d6SjlYY2whAktF8WKs/ze6uiS1MG14PrCXNUQwIi7qWDABNTCP3Uke2h -UbFF6ir2bPcMbRxwn1Q+0h3tox8wmh4wsaBAIWEfNr2Vrwqt6R2/kz4S3EXacz2B -58LG4KgpKcfJNr6ONxMh9Hn4PdD8juUUgct2hO2T7xkFHxZqpXc= -=JJGK +kGfbOQQAxSivu4RSxPCMoPmPAXydtE5E/duDGuAYUp4YxrdxufEgEGhcD1fqVIC+ +d4tRalhnemaKzGlvZgGE97uM+Bn375qeq1z1kM1jxYxFg9Xv9ciuXTibv9j0cl8Z +Z/rbtyTiJclZjkDwmsibyGpFAjvYlVIHZi81gVuZHf/HRZabeRw= +=raBn -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-3.0.23.ebuild b/sys-apps/portage/portage-3.0.23.ebuild new file mode 100644 index 000000000..f2df1b479 --- /dev/null +++ b/sys-apps/portage/portage-3.0.23.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2022 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 + +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="a7727547b795a3399883a2b7547657d43978d783" +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}] + >=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} 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 "" +} |