From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E99F51382C5 for ; Sat, 10 Apr 2021 07:07:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78572E0872; Sat, 10 Apr 2021 07:06:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2526BE0872 for ; Sat, 10 Apr 2021 07:06:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB2D9335CA0 for ; Sat, 10 Apr 2021 07:06:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63E0BCC for ; Sat, 10 Apr 2021 07:06:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618038405.a931a268d96910397d3bfcf761b43b88325a853c.sam@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-apps/portage/Manifest sys-apps/portage/portage-2.3.100-r1.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a931a268d96910397d3bfcf761b43b88325a853c X-VCS-Branch: master Date: Sat, 10 Apr 2021 07:06:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f5c653d7-0aaf-4047-87fd-e0eaebec49d7 X-Archives-Hash: a89c42b34c9dd2248d78ac1dd663bda1 commit: a931a268d96910397d3bfcf761b43b88325a853c Author: Sam James gentoo org> AuthorDate: Sat Apr 10 07:06:13 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 10 07:06:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a931a268 sys-apps/portage: clena up EAPI 5 version (2.3.100-r1) Broken by EAPI 5 support removal from python-utils-r1. Signed-off-by: Sam James gentoo.org> sys-apps/portage/Manifest | 1 - sys-apps/portage/portage-2.3.100-r1.ebuild | 296 ----------------------------- 2 files changed, 297 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 3510a9dbf2..2bcf934896 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,4 +1,3 @@ -DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db SHA512 8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c DIST prefix-portage-3.0.12.0.2.tar.bz2 1321851 BLAKE2B 80e8596531800d690083bddc8363f74d295839d70c6f86da0b5c385260836e593136e5baa5bd07d745e8eb82c894d0c97441aa2a0eb28bab8f1b83876a9aa3e5 SHA512 7dc1167058eb9aec756b59479a055c85037f4a7924a7a2dccbaf405a5d8464e04aef8796b02c8b7402e1f3446676d4d94789a170ef6b7e597c09a9600c2d2dae DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c SHA512 8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e DIST prefix-portage-3.0.14.tar.bz2 1314909 BLAKE2B 5e5e0390466e5073795fece5d75800e7181f691d9fb81affdf5eb291b72a917a51976a83b9df5db6f5069a567c4c96e94e4ddb485cbff8b6827d281770006f2a SHA512 a41dee35ae3e5eb1c77801640d6cedd75a706993a38d3260348ad13d570c128101443bc761ef6f207a305c0d03aa45fb8a88c29237e116c426382f2e2fd265e6 diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild b/sys-apps/portage/portage-2.3.100-r1.ebuild deleted file mode 100644 index 8677cb5462..0000000000 --- a/sys-apps/portage/portage-2.3.100-r1.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( pypy3 python3_{7..9} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 epatch linux-info prefix - -DESCRIPTION="Portage package manager used in Gentoo Prefix" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr" - -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=" - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14[${PYTHON_USEDEP}] - >=app-crypt/openpgp-keys-gentoo-release-20180706 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) ) - elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) ) - elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) ) - kernel_linux? ( >=app-misc/pax-utils-0.1.17 ) - kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 ) - kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 ) - kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !> 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 - # PREFIX LOCAL: only hack const_autotool - local extrapath="/usr/sbin:/usr/bin:/sbin:/bin" - # ok, we can't rely on PORTAGE_ROOT_USER being there yet, as people - # tend not to update that often, as long as we are a separate ebuild - # we can assume when unset, it's time for some older trick - if [[ -z ${PORTAGE_ROOT_USER} ]] ; then - PORTAGE_ROOT_USER=$(python -c 'from portage.const import rootuser; print rootuser') - fi - # We need to probe for bash in the Prefix, because it may not - # exist, in which case we fall back to the currently in use - # bash. This logic is necessary in particular during bootstrap, - # where we pull ourselves out of a temporary place with tools - local bash="${EPREFIX}/bin/bash" - [[ ! -x ${bash} ]] && bash=${BASH} - - einfo "Adjusting sources for ${EPREFIX}" - find . -type f -exec \ - sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \ - -e "s|@PORTAGE_MV@|$(type -P mv)|" \ - -e "s|@PORTAGE_BASH@|${bash}|" \ - -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \ - -e "s|@EXTRA_PATH@|${extrapath}|" \ - -e "s|@portagegroup@|${PORTAGE_GROUP:-portage}|" \ - -e "s|@portageuser@|${PORTAGE_USER:-portage}|" \ - -e "s|@rootuser@|${PORTAGE_ROOT_USER:-root}|" \ - -e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER:-root})|" \ - -e "s|@rootgid@|$(id -g ${PORTAGE_ROOT_USER:-root})|" \ - -e "s|@sysconfdir@|${EPREFIX}/etc|" \ - -i '{}' + || \ - die "Failed to patch sources" - # We don't need the below, since setup.py deals with this (and - # more) so we don't have to make this correct - # -e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \ - - # remove Makefiles, or else they will get installed - find . -name "Makefile.*" -delete - - 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 "Setting gentoo_prefix as reponame for emerge-webrsync" - sed -i -e 's/repo_name=gentoo/repo_name=gentoo_prefix/' \ - bin/emerge-webrsync || die - - einfo "Making absent gemato non-fatal" - sed -i -e '/exitcode = 127/d' \ - lib/portage/sync/modules/rsync/rsync.py || die - # END PREFIX LOCAL - fi - - # PREFIX LOCAL: make.conf is written by bootstrap-prefix.sh - if use !prefix ; then - 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 - 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 - - # 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 \ - 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_USER}:${PORTAGE_GROUP} "${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 -}