2.1.10.35 version bump. This fixes bug #390711 (clean up previous build prior
authorZac Medico <zmedico@gentoo.org>
Thu, 17 Nov 2011 06:19:41 +0000 (06:19 +0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 17 Nov 2011 06:19:41 +0000 (06:19 +0000)
to pkg_pretend) and bug #390699 (support HOSTNAME variable for emerge quiet
mode xterm titles). Bug #381649 tracks all bugs fixed since portage-2.1.10.11.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux i686

sys-apps/portage/ChangeLog
sys-apps/portage/Manifest
sys-apps/portage/portage-2.1.10.35.ebuild [moved from sys-apps/portage/portage-2.1.10.32.ebuild with 94% similarity]
sys-apps/portage/portage-2.2.0_alpha72.ebuild [deleted file]

index ddc3f3336b065f343de0fbd59dfe83feb1053ce1..22bc5ed32b57db0480cbf5807fe913ad4164993d 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.907 2011/11/12 16:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.908 2011/11/17 06:19:41 zmedico Exp $
+
+*portage-2.1.10.35 (17 Nov 2011)
+
+  17 Nov 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.10.35.ebuild,
+  -portage-2.1.10.32.ebuild, -portage-2.2.0_alpha72.ebuild:
+  2.1.10.35 version bump. This fixes bug #390711 (clean up previous build prior
+  to pkg_pretend) and bug #390699 (support HOSTNAME variable for emerge quiet
+  mode xterm titles). Bug #381649 tracks all bugs fixed since portage-2.1.10.11.
 
   12 Nov 2011; Zac Medico <zmedico@gentoo.org> metadata.xml,
   portage-2.1.10.11.ebuild, portage-2.1.10.32.ebuild, portage-2.1.10.34.ebuild,
index f4b89de18388bd86320f966ab1a6a651f88dccbd..fdafff084fce38a6f9330099bf6b7657a6ba5171 100644 (file)
@@ -3,32 +3,30 @@ Hash: SHA1
 
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
-DIST portage-2.1.10.32.tar.bz2 907107 RMD160 69f6b34d051a1ba3bafe8c80b3cb4d376e334475 SHA1 ff1d7a47a6fc11f4ad95b11744decb8ebb523e00 SHA256 d67b3b9ae868e8e8087f43f146ae41431604cf0fcbd3a0495bd8167239c62da2
 DIST portage-2.1.10.34.tar.bz2 909716 RMD160 2c0e20e61610455de0052d4838234afc5ba9686b SHA1 4503f44f6ff8697278ff43d7e765395866771d80 SHA256 4fae827653cc4a8848d37fcc2194af3ac35b5372dcfa599e494c79bdf5d491a5
+DIST portage-2.1.10.35.tar.bz2 910465 RMD160 0acdc29ccbb065d37982391e4f35fe87aafa5f64 SHA1 cc74e62678900bb8a500381e56946ae1887dbb07 SHA256 b7a2f5157a93ee819313955eba2fc60680e15e6d3bb0beb6f97de58d04274581
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
 DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba
 DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5
-DIST portage-2.2.0_alpha72.tar.bz2 906984 RMD160 d7af4b5e566d2706fc5bb6334de0cde1d8b3adb1 SHA1 cd1ffa7b5a50a6b6f747cb238c1535530b08d061 SHA256 ca30c06aa33be96d67a05032e6cf0a34fee4454d5e5bc525e18e96fc764be9a3
 DIST portage-2.2.0_alpha74.tar.bz2 909710 RMD160 43bd737fed5afebdda6a9809e9ba7e442beb0357 SHA1 f70b309a80da4456663920eb21bc4219924895ba SHA256 9552511676e2b714631a1ef20073268bede65a073a0bde73b51d97b0dd9a0202
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11500 RMD160 b1bd438bf34fd97e28a881df86eb5f8e8ee96df9 SHA1 9b9bb0f9d9b0799eee7b0893968b47171a620e0d SHA256 794358ef93f1082061d2dd355cd5e000b7de1e77d6fe56d63019882362812e9c
-EBUILD portage-2.1.10.32.ebuild 11480 RMD160 c7a496dbb5346b454a3cc346099ef57ac6264ccc SHA1 4a4df03e4839e22498f0c7f8ffc211c375da1d27 SHA256 8297a74b0f2d193f90a643d55e9669174c658969efa26f7d5dea8ffa2160258d
 EBUILD portage-2.1.10.34.ebuild 11998 RMD160 b9a620ae1ac1b6f38fa9aefd33453a6cae227762 SHA1 d5cd86d2509b9631d36ea49ad7741b9a4f34263a SHA256 71912a3b8e1d5230881661c30688c33d7e8019b090f8bdd9bd94fb756f247db2
+EBUILD portage-2.1.10.35.ebuild 11998 RMD160 0858c70de6f21a473b57707e315ee92a87c1ab51 SHA1 88d8c4e294d6f2c6995ba79319194d68a04f2cf4 SHA256 de8290e85c3e1ba4bc7453d4750a569c5d5682cb6e2ae814acc27e454a3a31dd
 EBUILD portage-2.1.6.13.ebuild 9923 RMD160 d27d0aec5dca631deb00f9dc0d415e5d3b3b8140 SHA1 c88f3873cdb95dea9dc2f66101d43ad370254bf9 SHA256 6b4794c017d59118697193c9cb208285c13eb6bf377eb97546c5c072b7073048
 EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27c1 SHA1 4f6b8bac1f951311382b1c8f92969c71e54fb4f1 SHA256 08a1ef8de3117a1e48d7650cbce7828c8d1e8855ebfb5081b4069086bc189d26
 EBUILD portage-2.1.9.42.ebuild 10122 RMD160 04081079c4b31d0a17fec1baae9707ded83adfd9 SHA1 ad9bcaa30ad2dd93f0b92e61161e9d19fdb5f317 SHA256 29a246ddf895613410c30e9d1f43ee123e852b21b19904dfd053c563648b7cc9
 EBUILD portage-2.2.0_alpha51.ebuild 12569 RMD160 06fd93ba44e0477a2caaead573621adead90db63 SHA1 13c52b8df1b6cb30e8ef8ad1586c16393e515a27 SHA256 58a0b18d8cb971504b34c3666ceb09536ad91bc6f29f6aa02443eaa76f6c0691
-EBUILD portage-2.2.0_alpha72.ebuild 12547 RMD160 8062d623407774b2440ae2916fe5ed288b84f33e SHA1 5fedef3bed94e136bcab65249162e50ba21df778 SHA256 9050ab9923e044fe092efbdb8d75fbc8aa261d960ce0c7cd0b5705cbd17f570b
 EBUILD portage-2.2.0_alpha74.ebuild 12669 RMD160 6baf23c54fe856b92907b03bf071a208edaeb1d8 SHA1 30d816987a234505f1a677001f28d1e20117f393 SHA256 e2700fac65bf1380dfa6a7bced8a583b182da09488622b3101cefa99008d5546
 EBUILD portage-9999.ebuild 11849 RMD160 87132d026feba8b701455736a564d9c2f8bdf4d0 SHA1 b1f1246590c049dfbdbe45830911e9eaaff1ad5f SHA256 2f26d44da7ee096dd8cfc277ca01afa0e06158d3040cc581a1cba03e936951b3
-MISC ChangeLog 64759 RMD160 e841408b8d0c68c7b05ff06f9af7cb4f262f6b7c SHA1 fd3ee642af6edaaaa254a433416616f9e0897575 SHA256 69572a671f87a275e480137494593aad9ffbcb2041782fc2e15f101f7eefa7c7
+MISC ChangeLog 65167 RMD160 37d1eb1d693364b41cd9ac221deaa49d49286dd1 SHA1 59aecd2bd35311642cfd6d8e882b790aaad0bd48 SHA256 3f3a3f7b28d8ade1c68f6f749a7167de3d03299875623c0290f2bd6a225230e6
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6+m9MACgkQ/ejvha5XGaO+wgCg4Y23Bb9h7LDBouN1o6OPlwqA
-hyMAnjTvKjJLPXvXgMjNLuq3z49n6Szr
-=6E5u
+iEYEARECAAYFAk7Ep4QACgkQ/ejvha5XGaP01QCfbr4K4dBz0bkyDIYUUrGu0U3U
+MlQAoKRbKCZxMyIitvv+sSqEMY9wnUr1
+=4oMs
 -----END PGP SIGNATURE-----
similarity index 94%
rename from sys-apps/portage/portage-2.1.10.32.ebuild
rename to sys-apps/portage/portage-2.1.10.35.ebuild
index 9a5dabda4091ee815c8df1906b57c60df7c45c32..abee4283b6b5aaf717c1fb6148d88d5630feb192 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.32.ebuild,v 1.2 2011/11/12 16:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.35.ebuild,v 1.1 2011/11/17 06:19:41 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -329,8 +329,11 @@ pkg_preinst() {
                chmod g+ws "${ROOT}var/log/portage"
        fi
 
-       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
-       REPO_LAYOUT_CONF_WARN=$?
+       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+               && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
+
+       has_version "<${CATEGORY}/${PN}-2.1.10.34" \
+               && QUIET_BUILD_WARN=true || QUIET_BUILD_WARN=false
 }
 
 pkg_postinst() {
@@ -338,7 +341,7 @@ pkg_postinst() {
        # will be identified and removed in postrm.
        python_mod_optimize /usr/$(get_libdir)/portage/pym
 
-       if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+       if $REPO_LAYOUT_CONF_WARN ; then
                ewarn
                echo "If you want overlay eclasses to override eclasses from" \
                        "other repos then see the portage(5) man page" \
@@ -347,6 +350,17 @@ pkg_postinst() {
                        | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
                ewarn
        fi
+
+       if $QUIET_BUILD_WARN ; then
+               elog
+               echo "NOTE: Beginning with portage-2.1.10.34, the emerge" \
+                       "--quiet-build option is enabled by default." \
+                       "Set --quiet-build=n in EMERGE_DEFAULT_OPTS if" \
+                       "you want to disable it by default. See the emerge(1)" \
+                       "man page for more information about this option." \
+                       | fmt -w 75 | while read -r ; do elog "$REPLY" ; done
+               elog
+       fi
 }
 
 pkg_postrm() {
diff --git a/sys-apps/portage/portage-2.2.0_alpha72.ebuild b/sys-apps/portage/portage-2.2.0_alpha72.ebuild
deleted file mode 100644 (file)
index 6cafdff..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha72.ebuild,v 1.3 2011/11/12 16:16:11 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-       !build? ( >=sys-apps/sed-4.0.5 )
-       doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-       epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-RDEPEND="${python_dep}
-       !build? ( >=sys-apps/sed-4.0.5
-               >=app-shells/bash-3.2_p17
-               >=app-admin/eselect-1.2 )
-       elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-       elibc_glibc? ( >=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] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<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=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://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
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha72
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-       $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-       linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-               $(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-       SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-       $(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       fi
-}
-
-src_prepare() {
-       if [ -n "${PATCHVER}" ] ; then
-               if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-                       rm "$S/bin/ebuild-helpers/portageq" \
-                               || die "failed to remove portageq helper symlink"
-               fi
-               epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-       fi
-       einfo "Setting portage.VERSION to ${PVR} ..."
-       sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       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 python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       fi
-}
-
-src_compile() {
-       if use doc; then
-               cd "${S}"/doc
-               touch fragment/date
-               make xhtml xhtml-nochunks || die "failed to make docs"
-       fi
-
-       if use epydoc; then
-               einfo "Generating api docs"
-               mkdir "${WORKDIR}"/api
-               local my_modules epydoc_opts=""
-               my_modules="$(find "${S}/pym" -name "*.py" \
-                       | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-                        -e 's:/:.:g' | sort)" || die "error listing modules"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-                       epydoc -o "${WORKDIR}"/api \
-                       -qqqqq --no-frames --show-imports $epydoc_opts \
-                       --name "${PN}" --url "${HOMEPAGE}" \
-                       ${my_modules} || die "epydoc failed"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
-       local libdir=$(get_libdir)
-       local portage_base="/usr/${libdir}/portage"
-       local portage_share_config=/usr/share/portage/config
-
-       cd "${S}"/cnf
-       insinto /etc
-       doins etc-update.conf dispatch-conf.conf || die
-
-       insinto "$portage_share_config/sets"
-       doins "$S"/cnf/sets/*.conf || die
-       insinto "$portage_share_config"
-       doins "$S/cnf/make.globals" || die
-       if [ -f "make.conf.${ARCH}".diff ]; then
-               patch make.conf "make.conf.${ARCH}".diff || \
-                       die "Failed to patch make.conf.example"
-               newins make.conf make.conf.example || die
-       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 ""
-               newins make.conf make.conf.example || die
-       fi
-
-       dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-       insinto /etc/logrotate.d
-       doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
-       # BSD and OSX need a sed wrapper so that find/xargs work properly
-       if use userland_GNU; then
-               rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
-       fi
-
-       local x symlinks files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               doins *.py || die "doins failed"
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # Symlinks to directories cause up/downgrade issues and the use of these
-       # modules outside of portage is probably negligible.
-       for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
-               [ ! -L "${x}" ] && continue
-               die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-       done
-
-       doman "${S}"/man/*.[0-9]
-       if use linguas_pl; then
-               doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-               doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-       fi
-
-       dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
-       use doc && dohtml -r "${S}"/doc/*
-       use epydoc && dohtml -r "${WORKDIR}"/api
-
-       dodir /usr/bin
-       for x in ebuild egencache emerge portageq quickpkg repoman ; do
-               dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-       done
-
-       dodir /usr/sbin
-       local my_syms="archive-conf
-               dispatch-conf
-               emaint
-               emerge-webrsync
-               env-update
-               etc-update
-               fixpackages
-               regenworld"
-       local x
-       for x in ${my_syms}; do
-               dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-       done
-       dosym env-update /usr/sbin/update-env
-       dosym etc-update /usr/sbin/update-etc
-
-       dodir /etc/portage
-       keepdir /etc/portage
-}
-
-pkg_preinst() {
-       if [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       if ! use build && ! has_version dev-python/pycrypto && \
-               ! has_version '>=dev-lang/python-2.6[ssl]' ; then
-               ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-               ewarn "with this system then please install dev-python/pycrypto or"
-               ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-               ewarn "to enable RMD160 hash support."
-               ewarn "See bug #198398 for more information."
-       fi
-       if [ -f "${ROOT}/etc/make.globals" ]; then
-               rm "${ROOT}/etc/make.globals"
-       fi
-
-       has_version "<${CATEGORY}/${PN}-2.2_alpha"
-       MINOR_UPGRADE=$?
-
-       has_version "<=${CATEGORY}/${PN}-2.2_pre5"
-       WORLD_MIGRATION_UPGRADE=$?
-
-       # If portage-2.1.6 is installed and the preserved_libs_registry exists,
-       # assume that the NEEDED.ELF.2 files have already been generated.
-       has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-               ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
-               has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
-       NEEDED_REBUILD_UPGRADE=$?
-
-       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
-       REPO_LAYOUT_CONF_WARN=$?
-}
-
-pkg_postinst() {
-       # Compile all source files recursively. Any orphans
-       # will be identified and removed in postrm.
-       python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-       if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
-               einfo "moving set references from the worldfile into world_sets"
-               cd "${ROOT}/var/lib/portage/"
-               grep "^@" world >> world_sets
-               sed -i -e '/^@/d' world
-       fi
-
-       if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
-               einfo "rebuilding NEEDED.ELF.2 files"
-               for cpv in "${ROOT}/var/db/pkg"/*/*; do
-                       if [ -f "${cpv}/NEEDED" ]; then
-                               rm -f "${cpv}/NEEDED.ELF.2"
-                               while read line; do
-                                       filename=${line% *}
-                                       needed=${line#* }
-                                       needed=${needed//+/++}
-                                       needed=${needed//#/##}
-                                       needed=${needed//%/%%}
-                                       newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-                                       newline=${newline//  -  }
-                                       echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-                               done < "${cpv}/NEEDED"
-                       fi
-               done
-       fi
-
-       if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
-               ewarn
-               echo "If you want overlay eclasses to override eclasses from" \
-                       "other repos then see the portage(5) man page" \
-                       "for information about the new layout.conf and repos.conf" \
-                       "configuration files." \
-                       | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-               ewarn
-       fi
-
-       if [ $MINOR_UPGRADE = 0 ] ; then
-               elog "If you're upgrading from a pre-2.2 version of portage you might"
-               elog "want to remerge world (emerge -e world) to take full advantage"
-               elog "of some of the new features in 2.2."
-               elog "This is not required however for portage to function properly."
-               elog
-       fi
-}
-
-pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}