commit:     3e3f1963e8e81bfd3888e017babd801ab88b4dce
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 17:48:27 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 17:48:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3f1963

sys-apps/portage: remove old versions

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/portage/Manifest              |   3 -
 sys-apps/portage/portage-2.3.14.ebuild | 262 -------------------------------
 sys-apps/portage/portage-2.3.20.ebuild | 260 -------------------------------
 sys-apps/portage/portage-2.3.6.ebuild  | 277 ---------------------------------
 4 files changed, 802 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c8d99f2f072..c166e991e4d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,8 +1,5 @@
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 
0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c
 SHA512 
71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
-DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 
765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df
 SHA512 
36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732
 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B 
f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060
 SHA512 
5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B 
e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240
 SHA512 
94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
-DIST portage-2.3.20.tar.bz2 956633 BLAKE2B 
cf166a10522c5fab6b273674be4d7a673b961fe1c2ca649c7fa6d3759364dd1454ea57edd1e99fd2648b47244fde6f311fb925f50b9a118a1d2880048eb9f39e
 SHA512 
e4fde56f5293b25ef5f484cf601c1db71c350603987e1b2736d9b8434158e8778c637dd5891401e6d484c7a11f1982bbe8213a352c185fc4c6b0039006756764
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B 
bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8
 SHA512 
fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
-DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 
5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091
 SHA512 
5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 
3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3
 SHA512 
4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8

diff --git a/sys-apps/portage/portage-2.3.14.ebuild 
b/sys-apps/portage/portage-2.3.14.ebuild
deleted file mode 100644
index c60736c0528..00000000000
--- a/sys-apps/portage/portage-2.3.14.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       python3_4 python3_5 python3_6
-       python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-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? ( 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/~zmedico/portage/archives";
-
-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
-
-       sed -e "s|user_options = install_data.user_options$|\0 + [\n\
-               ('htmldir=', None, 'HTML documentation install directory')]|" 
-i \
-               setup.py || die #638046
-
-       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|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -i cnf/repos.conf || die "sed failed"
-               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 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: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
-}
-
-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.20.ebuild 
b/sys-apps/portage/portage-2.3.20.ebuild
deleted file mode 100644
index 777f27ef0d5..00000000000
--- a/sys-apps/portage/portage-2.3.20.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       python3_4 python3_5 python3_6
-       python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-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? ( 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/~zmedico/portage/archives";
-
-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|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -i cnf/repos.conf || die "sed failed"
-               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 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
-
-       systemd_dotmpfilesd "${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() {
-       # 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
-}
-
-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.6.ebuild 
b/sys-apps/portage/portage-2.3.6.ebuild
deleted file mode 100644
index 6ed03281333..00000000000
--- a/sys-apps/portage/portage-2.3.6.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-       pypy
-       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 ~x86-fbsd"
-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
-       )
-       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