2.2.0_alpha79 version bump. This includes all of the fixes in
authorZac Medico <zmedico@gentoo.org>
Sun, 27 Nov 2011 21:39:39 +0000 (21:39 +0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 27 Nov 2011 21:39:39 +0000 (21:39 +0000)
portage-2.1.10.39. Bug #210077 tracks all bugs fixed since portage-2.1.x.

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

sys-apps/portage/ChangeLog
sys-apps/portage/Manifest
sys-apps/portage/portage-2.2.0_alpha79.ebuild [new file with mode: 0644]

index a5f92a0eab27810c96e01b11ffe72c104a1c3f2e..8d75cf8fdc81d1bc347bb489f0f9a6a518d05545 100644 (file)
@@ -1,6 +1,12 @@
 # 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.918 2011/11/27 21:38:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.919 2011/11/27 21:39:39 zmedico Exp $
+
+*portage-2.2.0_alpha79 (27 Nov 2011)
+
+  27 Nov 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha79.ebuild:
+  2.2.0_alpha79 version bump. This includes all of the fixes in
+  portage-2.1.10.39. Bug #210077 tracks all bugs fixed since portage-2.1.x.
 
 *portage-2.1.10.39 (27 Nov 2011)
 
index 7b73a3dd03cfd1493e740b5f278df13f81cd2144..48e48048bdf762b3f643dfbd0005cc23d2381a51 100644 (file)
@@ -11,6 +11,7 @@ DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c6
 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_alpha78.tar.bz2 911048 RMD160 97cab04d106c943e971c348e57c6d17cd30d8a8f SHA1 ff23bdce099542f89d689672b6498523cef332cb SHA256 00442fa1632aa1b1a01113a426e943b87bd1130414aa3aeea111d25cceeee547
+DIST portage-2.2.0_alpha79.patch.bz2 1663 RMD160 4267c37c0376ba1a4e1f2da25a9f029dcfbd6e50 SHA1 b33b8c7a570dc25923d1cdc7b44751640fd57b01 SHA256 6fa5ab086669e37342ab755e8ffaafc14375164d110ce01e832f8a896bfa8d19
 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.38.ebuild 11998 RMD160 19e24c57ff43cb6351411acfa93ce6864190066d SHA1 309ebd6738b2567fa6ca6421c0e1789851045778 SHA256 952e18ead5e4457c66172a427386130ffe6e7ecd6b89bda3cf605cd98e3ed05a
@@ -20,13 +21,14 @@ EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27
 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_alpha78.ebuild 12669 RMD160 b07104d33bffb337a2cf1909c9d52ae3d77cdac4 SHA1 60b520f702d42d97da53c30e587edad6f69a58a5 SHA256 63a14fa602c127ae9bac0bb0574e05b3d0b0c3a954ccd3a21e04710f31567890
+EBUILD portage-2.2.0_alpha79.ebuild 12669 RMD160 09b7a25498b5d366ca147fc2329cb418687e2dc7 SHA1 2fd323dc6f3008f9c50e3883527f249b7e731cbd SHA256 0ef068435e4baf492472415f181071ae4edb3ca1e1f0bcf55e51f7da0cc523fb
 EBUILD portage-9999.ebuild 11849 RMD160 87132d026feba8b701455736a564d9c2f8bdf4d0 SHA1 b1f1246590c049dfbdbe45830911e9eaaff1ad5f SHA256 2f26d44da7ee096dd8cfc277ca01afa0e06158d3040cc581a1cba03e936951b3
-MISC ChangeLog 67899 RMD160 f56629058bced5fd99772f93bb81525688f268b3 SHA1 cf03b25b4c1390e380ae012ff15604d8267cce75 SHA256 20f05a59c36a996677f68244bdc3e55efba8ffdcbceea57a4ce9b5323add2279
+MISC ChangeLog 68156 RMD160 a3f1ea4c3d4b173efd81fb2366c4cf3d53ba0a20 SHA1 97e10a068752a19ed2be3daf6ada235a679ef8c5 SHA256 b31a51584e39e8b7befa1ab2aa0fb03c6c18cdd0fa68f1956b7d92ed6dd263fd
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7Sre8ACgkQ/ejvha5XGaNqXgCfYytngxIGPbh2qk63dpuNddlR
-FkMAn06bzquwR0KTQ+3shoUQA8hjZJiS
-=r6v5
+iEYEARECAAYFAk7SriEACgkQ/ejvha5XGaNyBwCfV/UWIWxr5B+1OU989IVROOGW
+tZUAoKbB0Gk22wWy9CzS2hUGxx9uN7FH
+=5kG1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.0_alpha79.ebuild b/sys-apps/portage/portage-2.2.0_alpha79.ebuild
new file mode 100644 (file)
index 0000000..42bebc6
--- /dev/null
@@ -0,0 +1,392 @@
+# 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_alpha79.ebuild,v 1.1 2011/11/27 21:39:39 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_alpha78
+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=true || MINOR_UPGRADE=false
+
+       has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
+               && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
+
+       # 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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+               has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+               && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
+
+       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+               && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
+}
+
+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 ; 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 ; 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 ; 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 ; 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
+}