commit:     9fa65eeb3a982ce4afe2f3ebba564edfd4e5f28d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  5 19:47:28 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug  5 19:48:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa65eeb

sys-apps/portage: remove old versions

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/portage/Manifest              |   4 -
 sys-apps/portage/portage-2.2.28.ebuild | 366 ---------------------------------
 sys-apps/portage/portage-2.3.0.ebuild  | 364 --------------------------------
 sys-apps/portage/portage-2.3.3.ebuild  | 277 -------------------------
 sys-apps/portage/portage-2.3.4.ebuild  | 277 -------------------------
 5 files changed, 1288 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bb0d7a0856d..6b411620c57 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,2 @@
-DIST portage-2.2.28.tar.bz2 969138 SHA256 
da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 
d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b
 WHIRLPOOL 
1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
-DIST portage-2.3.0.tar.bz2 907500 SHA256 
1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 
85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074
 WHIRLPOOL 
979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2
-DIST portage-2.3.3.tar.bz2 920984 SHA256 
beec3923e14fb98d9992ede0b7718df594c50f366c3e58c2f0ba10102e77271f SHA512 
7dec90a980ce6bb1266bb9c9c9979bc6cb8bdb4f37d8908c78cddf053979aef44424be86ea1fe16a072f6ed21b26233df84f6dd22d6f0c9435816090c675b53c
 WHIRLPOOL 
cc4a7e63b797766cc99ab712902b96e38fe22a482d7eeb3e29843a6070f6601b8bbe9c435b0a9c3cc1947e49c23291f1064f3d01c010d822dcb2686a103b4c3d
-DIST portage-2.3.4.tar.bz2 917183 SHA256 
e773c7c675e5e29213fc0431bb7e624677bed34367c9ac656623225fdfab97b8 SHA512 
ac658d8e0c3045b470efd990a088f3fc39cbdce6715299af8b111e911df90a5dc7c2b0a4fbb8403ac4608f361e853a843a8c15197e84c4cadaadb52cc6a9f3d8
 WHIRLPOOL 
0afca1fb4ab7a049f43a77df6bb4f08a830a21fec664adc62fe6e5990fff5bd12ef7eb381c5e46c0872c4db2afd1fd4aa54b9ff8fdc4d81348683e17147e7c7a
 DIST portage-2.3.5.tar.bz2 933047 SHA256 
9b3282eee8f7f5728a4a71864d6b34315d71d43c52b2b650cf0d8f412c871941 SHA512 
c403578caf40d97e8081c203d433b515cb2fdb14cb8b7d2652ed664bd079e65db32b54ce12ff495af6dd5fb468c5a1ef58d335e202ede5355d115049e21a6a35
 WHIRLPOOL 
25dbb6547d6488cebc1baf093a600e2034e17558306fd55f5502346330a78012e32d3c49dcf0445664c69d4e3e6b2580762417324ccd0bf3aa08575245165a24
 DIST portage-2.3.6.tar.bz2 943085 SHA256 
2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 
5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 WHIRLPOOL 
d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636

diff --git a/sys-apps/portage/portage-2.2.28.ebuild 
b/sys-apps/portage/portage-2.2.28.ebuild
deleted file mode 100644
index 7251192714a..00000000000
--- a/sys-apps/portage/portage-2.2.28.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       python3_3 python3_4 python3_5
-       python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-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 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru 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
-       )
-       elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-       elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-       elibc_musl? ( >=sys-apps/sandbox-2.2 )
-       elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-       >=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
-               $(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/~dolsen/releases/portage";
-
-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)"
-
-pkg_setup() {
-       use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = 
False:" \
-                       -i pym/_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
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e 
"s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e 
"s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
-               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 "Adjusting make.globals ..."
-               sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-                       -e 
"s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-                       -i cnf/make.globals || die "sed failed"
-
-               einfo "Adjusting repos.conf ..."
-               sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-                       -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-                       -e "s|^\(location = 
\)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-                       -i cnf/repos.conf || die "sed failed"
-
-               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 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 )
-       use epydoc && targets+=( install_epydoc )
-
-       # 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: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.1.13" || \
-               {
-                       has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-                       has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-               } ; then
-               USERPRIV_UPGRADE=true
-               USERSYNC_UPGRADE=true
-               REPOS_CONF_UPGRADE=true
-               REPOS_CONF_SYNC=
-               type -P portageq >/dev/null 2>&1 && \
-                       REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-       else
-               USERPRIV_UPGRADE=false
-               USERSYNC_UPGRADE=false
-               REPOS_CONF_UPGRADE=false
-       fi
-}
-
-get_ownership() {
-       case ${USERLAND} in
-               BSD)
-                       stat -f '%Su:%Sg' "${1}"
-                       ;;
-               *)
-                       stat -c '%U:%G' "${1}"
-                       ;;
-       esac
-}
-
-new_config_protect() {
-       # Generate a ._cfg file even if the target file
-       # does not exist, ensuring that the user will
-       # notice the config change.
-       local basename=${1##*/}
-       local dirname=${1%/*}
-       local i=0
-       while true ; do
-               local filename=$(
-                       echo -n "${dirname}/._cfg"
-                       printf "%04d" ${i}
-                       echo -n "_${basename}"
-               )
-               [[ -e ${filename} ]] || break
-               (( i++ ))
-       done
-       echo "${filename}"
-}
-
-pkg_postinst() {
-
-       if ${REPOS_CONF_UPGRADE} ; then
-               einfo "Generating repos.conf"
-               local repo_name=
-               [[ -f ${PORTDIR}/profiles/repo_name ]] && \
-                       repo_name=$(< "${PORTDIR}/profiles/repo_name")
-               if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-                       REPOS_CONF_SYNC=$(grep "^sync-uri =" 
"${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-                       REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-               fi
-               local sync_type=
-               [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-               if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-                       sync_type=cvs
-                       REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-               fi
-
-               cat <<-EOF > "${T}/repos.conf"
-               [DEFAULT]
-               main-repo = ${repo_name:-gentoo}
-
-               [${repo_name:-gentoo}]
-               location = ${PORTDIR:-${EPREFIX}/usr/portage}
-               sync-type = ${sync_type:-rsync}
-               sync-uri = ${REPOS_CONF_SYNC}
-               EOF
-
-               [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = 
$(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-               local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-               if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-                       
dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-               fi
-               # Don't install the config update if the desired repos.conf 
directory
-               # and config file exist, since users may accept it blindly and 
break
-               # their config (bug #478726).
-               [[ -e 
${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-                       mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-               if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-                       einfo "Generating make.conf PORTDIR setting for 
backward compatibility"
-                       for dest in "${EROOT:-${ROOT}}etc/make.conf" 
"${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-                               [[ -e ${dest} ]] && break
-                       done
-                       [[ -d ${dest} ]] && dest=${dest}/portdir.conf
-                       rm -rf "${T}/make.conf"
-                       [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-                       cat <<-EOF >> "${T}/make.conf"
-
-                       # Set PORTDIR for backward compatibility with various 
tools:
-                       #   gentoo-bashcomp - bug #478444
-                       #   euse - bug #474574
-                       #   euses and ufed - bug #478318
-                       PORTDIR="${EPREFIX}/usr/portage"
-                       EOF
-                       mkdir -p "${dest%/*}"
-                       mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-               fi
-       fi
-
-       local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-       if ${USERSYNC_UPGRADE} && \
-               [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-               local ownership=$(get_ownership "${PORTDIR}")
-               if [[ -n ${ownership} ]] ; then
-                       einfo "Adjusting PORTDIR permissions for usersync"
-                       find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-                               ! \( -user "${ownership%:*}" -a -group 
"${ownership#*:}" \) \
-                               -exec chown "${ownership}" {} +
-               fi
-       fi
-
-       # Do this last, since it could take a long time if there
-       # are lots of live sources, and the user may be tempted
-       # to kill emerge while it is running.
-       if ${USERPRIV_UPGRADE} && \
-               [[ -d ${distdir} && -w ${distdir} ]] ; then
-               local ownership=$(get_ownership "${distdir}")
-               if [[ ${ownership#*:} == portage ]] ; then
-                       einfo "Adjusting DISTDIR permissions for userpriv"
-                       find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 
0 \
-                               -exec chown -R portage:portage {} +
-               fi
-       fi
-
-       einfo ""
-       einfo "This release of portage contains the new repoman code base"
-       einfo "This code base is still being developed.  So its API's are"
-       einfo "not to be considered stable and are subject to change."
-       einfo "The code released has been tested and considered ready for use."
-       einfo "This however does not guarantee it to be completely bug free."
-       einfo "Please report any bugs you may encounter."
-       einfo ""
-}

diff --git a/sys-apps/portage/portage-2.3.0.ebuild 
b/sys-apps/portage/portage-2.3.0.ebuild
deleted file mode 100644
index aeee63f60e8..00000000000
--- a/sys-apps/portage/portage-2.3.0.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       python3_3 python3_4 python3_5
-       python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-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 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru 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
-       )
-       elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-       elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-       elibc_musl? ( >=sys-apps/sandbox-2.2 )
-       elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-       >=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
-               $(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/~dolsen/releases/portage";
-
-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)"
-
-pkg_setup() {
-       use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = 
False:" \
-                       -i pym/_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
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e 
"s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e 
"s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
-               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 "Adjusting make.globals ..."
-               sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-                       -e 
"s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-                       -i cnf/make.globals || die "sed failed"
-
-               einfo "Adjusting repos.conf ..."
-               sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-                       -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-                       -e "s|^\(location = 
\)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-                       -i cnf/repos.conf || die "sed failed"
-
-               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 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 )
-       use epydoc && targets+=( install_epydoc )
-
-       # 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: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.1.13" || \
-               {
-                       has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-                       has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-               } ; then
-               USERPRIV_UPGRADE=true
-               USERSYNC_UPGRADE=true
-               REPOS_CONF_UPGRADE=true
-               REPOS_CONF_SYNC=
-               type -P portageq >/dev/null 2>&1 && \
-                       REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-       else
-               USERPRIV_UPGRADE=false
-               USERSYNC_UPGRADE=false
-               REPOS_CONF_UPGRADE=false
-       fi
-}
-
-get_ownership() {
-       case ${USERLAND} in
-               BSD)
-                       stat -f '%Su:%Sg' "${1}"
-                       ;;
-               *)
-                       stat -c '%U:%G' "${1}"
-                       ;;
-       esac
-}
-
-new_config_protect() {
-       # Generate a ._cfg file even if the target file
-       # does not exist, ensuring that the user will
-       # notice the config change.
-       local basename=${1##*/}
-       local dirname=${1%/*}
-       local i=0
-       while true ; do
-               local filename=$(
-                       echo -n "${dirname}/._cfg"
-                       printf "%04d" ${i}
-                       echo -n "_${basename}"
-               )
-               [[ -e ${filename} ]] || break
-               (( i++ ))
-       done
-       echo "${filename}"
-}
-
-pkg_postinst() {
-
-       if ${REPOS_CONF_UPGRADE} ; then
-               einfo "Generating repos.conf"
-               local repo_name=
-               [[ -f ${PORTDIR}/profiles/repo_name ]] && \
-                       repo_name=$(< "${PORTDIR}/profiles/repo_name")
-               if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-                       REPOS_CONF_SYNC=$(grep "^sync-uri =" 
"${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-                       REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-               fi
-               local sync_type=
-               [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-               if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-                       sync_type=cvs
-                       REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-               fi
-
-               cat <<-EOF > "${T}/repos.conf"
-               [DEFAULT]
-               main-repo = ${repo_name:-gentoo}
-
-               [${repo_name:-gentoo}]
-               location = ${PORTDIR:-${EPREFIX}/usr/portage}
-               sync-type = ${sync_type:-rsync}
-               sync-uri = ${REPOS_CONF_SYNC}
-               EOF
-
-               [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = 
$(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-               local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-               if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-                       
dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-               fi
-               # Don't install the config update if the desired repos.conf 
directory
-               # and config file exist, since users may accept it blindly and 
break
-               # their config (bug #478726).
-               [[ -e 
${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-                       mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-               if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-                       einfo "Generating make.conf PORTDIR setting for 
backward compatibility"
-                       for dest in "${EROOT:-${ROOT}}etc/make.conf" 
"${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-                               [[ -e ${dest} ]] && break
-                       done
-                       [[ -d ${dest} ]] && dest=${dest}/portdir.conf
-                       rm -rf "${T}/make.conf"
-                       [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-                       cat <<-EOF >> "${T}/make.conf"
-
-                       # Set PORTDIR for backward compatibility with various 
tools:
-                       #   gentoo-bashcomp - bug #478444
-                       #   euse - bug #474574
-                       #   euses and ufed - bug #478318
-                       PORTDIR="${EPREFIX}/usr/portage"
-                       EOF
-                       mkdir -p "${dest%/*}"
-                       mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-               fi
-       fi
-
-       local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-       if ${USERSYNC_UPGRADE} && \
-               [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-               local ownership=$(get_ownership "${PORTDIR}")
-               if [[ -n ${ownership} ]] ; then
-                       einfo "Adjusting PORTDIR permissions for usersync"
-                       find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-                               ! \( -user "${ownership%:*}" -a -group 
"${ownership#*:}" \) \
-                               -exec chown "${ownership}" {} +
-               fi
-       fi
-
-       # Do this last, since it could take a long time if there
-       # are lots of live sources, and the user may be tempted
-       # to kill emerge while it is running.
-       if ${USERPRIV_UPGRADE} && \
-               [[ -d ${distdir} && -w ${distdir} ]] ; then
-               local ownership=$(get_ownership "${distdir}")
-               if [[ ${ownership#*:} == portage ]] ; then
-                       einfo "Adjusting DISTDIR permissions for userpriv"
-                       find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 
0 \
-                               -exec chown -R portage:portage {} +
-               fi
-       fi
-
-       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 ""
-}

diff --git a/sys-apps/portage/portage-2.3.3.ebuild 
b/sys-apps/portage/portage-2.3.3.ebuild
deleted file mode 100644
index b061595e4ab..00000000000
--- a/sys-apps/portage/portage-2.3.3.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       python3_3 python3_4 python3_5 python3_6
-       python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 multilib
-
-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 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +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
-       )
-       elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-       elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-       elibc_musl? ( >=sys-apps/sandbox-2.2 )
-       elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-       >=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
-               $(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/~dolsen/releases/portage";
-
-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)"
-
-pkg_setup() {
-       use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-
-       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 pym/_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
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e 
"s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e 
"s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
-               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 "Adjusting make.globals ..."
-               sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-                       -e 
"s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-                       -i cnf/make.globals || die "sed failed"
-
-               einfo "Adjusting repos.conf ..."
-               sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-                       -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-                       -e "s|^\(location = 
\)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-                       -i cnf/repos.conf || die "sed failed"
-
-               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 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 )
-       use epydoc && targets+=( install_epydoc )
-
-       # 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: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.1" && \
-               has_version "<${CATEGORY}/${PN}-2.3.3"; then
-               SYNC_DEPTH_UPGRADE=true
-       else
-               SYNC_DEPTH_UPGRADE=false
-       fi
-}
-
-get_ownership() {
-       case ${USERLAND} in
-               BSD)
-                       stat -f '%Su:%Sg' "${1}"
-                       ;;
-               *)
-                       stat -c '%U:%G' "${1}"
-                       ;;
-       esac
-}
-
-new_config_protect() {
-       # Generate a ._cfg file even if the target file
-       # does not exist, ensuring that the user will
-       # notice the config change.
-       local basename=${1##*/}
-       local dirname=${1%/*}
-       local i=0
-       while true ; do
-               local filename=$(
-                       echo -n "${dirname}/._cfg"
-                       printf "%04d" ${i}
-                       echo -n "_${basename}"
-               )
-               [[ -e ${filename} ]] || break
-               (( i++ ))
-       done
-       echo "${filename}"
-}
-
-pkg_postinst() {
-       if ${SYNC_DEPTH_UPGRADE}; then
-               ewarn "Please note that this release no longer respects 
sync-depth for"
-               ewarn "git repositories.  There have been too many problems and"
-               ewarn "performance issues.  See bugs 552814, 559008"
-       fi
-       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 ""
-}

diff --git a/sys-apps/portage/portage-2.3.4.ebuild 
b/sys-apps/portage/portage-2.3.4.ebuild
deleted file mode 100644
index 8611b2060ec..00000000000
--- a/sys-apps/portage/portage-2.3.4.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       python3_3 python3_4 python3_5 python3_6
-       python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 multilib
-
-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 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru +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
-       )
-       elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-       elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-       elibc_musl? ( >=sys-apps/sandbox-2.2 )
-       elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-       >=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
-               $(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/~dolsen/releases/portage";
-
-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)"
-
-pkg_setup() {
-       use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-
-       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 pym/_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
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e 
"s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e 
"s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|"
 \
-                       -e 
"s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
-               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 "Adjusting make.globals ..."
-               sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-                       -e 
"s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-                       -i cnf/make.globals || die "sed failed"
-
-               einfo "Adjusting repos.conf ..."
-               sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-                       -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-                       -e "s|^\(location = 
\)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-uri = 
\).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-                       -i cnf/repos.conf || die "sed failed"
-
-               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 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 )
-       use epydoc && targets+=( install_epydoc )
-
-       # 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: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.1" && \
-               has_version "<${CATEGORY}/${PN}-2.3.3"; then
-               SYNC_DEPTH_UPGRADE=true
-       else
-               SYNC_DEPTH_UPGRADE=false
-       fi
-}
-
-get_ownership() {
-       case ${USERLAND} in
-               BSD)
-                       stat -f '%Su:%Sg' "${1}"
-                       ;;
-               *)
-                       stat -c '%U:%G' "${1}"
-                       ;;
-       esac
-}
-
-new_config_protect() {
-       # Generate a ._cfg file even if the target file
-       # does not exist, ensuring that the user will
-       # notice the config change.
-       local basename=${1##*/}
-       local dirname=${1%/*}
-       local i=0
-       while true ; do
-               local filename=$(
-                       echo -n "${dirname}/._cfg"
-                       printf "%04d" ${i}
-                       echo -n "_${basename}"
-               )
-               [[ -e ${filename} ]] || break
-               (( i++ ))
-       done
-       echo "${filename}"
-}
-
-pkg_postinst() {
-       if ${SYNC_DEPTH_UPGRADE}; then
-               ewarn "Please note that this release no longer respects 
sync-depth for"
-               ewarn "git repositories.  There have been too many problems and"
-               ewarn "performance issues.  See bugs 552814, 559008"
-       fi
-       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 ""
-}

Reply via email to