commit: 7d3f27a474ff2fc086c95440e29d0319b64f80b0 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu May 30 09:16:17 2019 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu May 30 09:16:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7d3f27a4
sys-apps/portage: remove interrevision Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.13 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/portage/portage-2.3.62-r00.1.ebuild | 271 --------------------------- sys-apps/portage/portage-2.3.62.ebuild | 1 + 2 files changed, 1 insertion(+), 271 deletions(-) diff --git a/sys-apps/portage/portage-2.3.62-r00.1.ebuild b/sys-apps/portage/portage-2.3.62-r00.1.ebuild deleted file mode 100644 index 8dab4da44e..0000000000 --- a/sys-apps/portage/portage-2.3.62-r00.1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_4 python3_5 python3_6 python3_7 - python2_7 -) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit eutils distutils-r1 multilib - -DESCRIPTION="Portage package manager used in Gentoo Prefix" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -LICENSE="GPL-2" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="build doc epydoc +ipc +native-extensions 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 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -RDEPEND=" - >=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 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) - ) - 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 ) - kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 ) - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !<app-admin/logrotate-3.8.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 - -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives https://dev.gentoo.org/~grobian/distfiles" - -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/prefix-${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives prefix-${PN}-${TARBALL_PV}.tar.bz2)" - -S="${WORKDIR}"/prefix-${PN}-${TARBALL_PV} - -pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - epatch "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572 - epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161 - - 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 [[ -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 -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 - - if [[ ${CHOST} == powerpc*-darwin* ]] ; then - # asyncio triggers some python bug, not worth fixing on - # ppc-macos, bug #656830 - sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \ - lib/portage/util/_eventloop/global_event_loop.py || die - fi - # 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 epydoc && targets+=( epydoc ) - - 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 epydoc && targets+=( - install_epydoc - --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() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #if [[ $ROOT == / ]] ; then - ## Run some minimal tests as a sanity check. - #local test_runner=$(find "${ED}" -name runTests) - #if [[ -n $test_runner && -x $test_runner ]] ; then - #einfo "Running preinst sanity tests..." - #"$test_runner" || die "preinst sanity tests failed" - #fi - #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_USER}:${PORTAGE_GROUP} "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi -} diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild index e2ca476f68..8dab4da44e 100644 --- a/sys-apps/portage/portage-2.3.62.ebuild +++ b/sys-apps/portage/portage-2.3.62.ebuild @@ -91,6 +91,7 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + epatch "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572 epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161 if use native-extensions; then