2.2.0_alpha71 version bump. This includes all of the fixes in
authorZac Medico <zmedico@gentoo.org>
Sun, 23 Oct 2011 22:57:36 +0000 (22:57 +0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 23 Oct 2011 22:57:36 +0000 (22:57 +0000)
portage-2.1.10.31. Bug #210077 tracks all bugs fixed since portage-2.1.x.

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

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

index 24efc5249ed2c45cd088111800e2aa952b45dc9e..6bbcdd0c290e562e71adfff8cea1feb9393d2994 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.893 2011/10/23 22:56:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.894 2011/10/23 22:57:36 zmedico Exp $
+
+*portage-2.2.0_alpha71 (23 Oct 2011)
+
+  23 Oct 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha71.ebuild:
+  2.2.0_alpha71 version bump. This includes all of the fixes in
+  portage-2.1.10.31. Bug #210077 tracks all bugs fixed since portage-2.1.x.
 
 *portage-2.1.10.31 (23 Oct 2011)
 
index 6d75887d0b0519e821104af591b9c630f10cd864..552955967d2b401598e8fbad1712e46bd773712f 100644 (file)
@@ -15,6 +15,7 @@ DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008
 DIST portage-2.2.0_alpha67.tar.bz2 892371 RMD160 9ebc7de9b595b116f590d14a596d5ad111c2424f SHA1 a79202de7e2d98fa74e859b01281f6b13d170421 SHA256 d276aeefc53c5d29debc2155f394b9ef75f958bdb416973fd03f09bd9c920f53
 DIST portage-2.2.0_alpha69.patch.bz2 38283 RMD160 05f8ee8064defca942edd4c5e9f69ff6be0913c4 SHA1 3e2950bddf3e42ea57bfdfd65d862511e766c49e SHA256 99d5663e42ea05e92b1ed2df3d39b1825dffe9d61c835f7f167ac9642c4bcef5
 DIST portage-2.2.0_alpha70.tar.bz2 901411 RMD160 3142f7cea259262b0af273b003b4219f80c96c0c SHA1 279b127420a390296f7c429e447ec0e0e01f58c1 SHA256 ffccddf079e69159e92993537738cccb7f20fb5711f15de6f4f23c40eb2308c0
+DIST portage-2.2.0_alpha71.patch.bz2 2031 RMD160 d8257b1c1f54d2c18e254384bff5fd3e30c644d3 SHA1 a07713ee5d4fde12dc5023166f8c8c37621e461b SHA256 f27272a6ba1991cbc2fced114051c0e3176ee4d9c523ab6ab52f4f52148bd90c
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11660 RMD160 4d52b4ce74bc553ec0f3502bdc03ebfa0d953825 SHA1 7767202cb8ecca952a31c2d5db89734a94561d61 SHA256 14b7bc6fd709f7a1f00de22bc8dfb3288e3cdfde561ff412d56621fc7a8126b5
 EBUILD portage-2.1.10.27.ebuild 11641 RMD160 702f2e04d2b35062315df1454bb6dd2cca80fffe SHA1 87106f71ba0951efc9f8374176273742f04bfe6b SHA256 2ff9011269e163fd74598f9ec01bf1d0e50acb97b11de6e060b871d9fcbcc252
@@ -28,13 +29,14 @@ EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9
 EBUILD portage-2.2.0_alpha67.ebuild 12906 RMD160 e3f26d94b1e36d00ec684cef550014edd7a67a70 SHA1 7f462966a539edc4e7e91a61006eea46e313dfd5 SHA256 9cdbb0bd39ea9fc039bc6d3dba75e1a4a36bce6da848bcbb76b7fb69b293545c
 EBUILD portage-2.2.0_alpha69.ebuild 12906 RMD160 75a15c7a9428148e2a58751ea215fa2de6878f07 SHA1 fcdc05cdbaa9473aaa6cdf686fe1fc33cb2faef4 SHA256 efe2d4c593c069b6ae8ce80c1cd7143596f664a9433be83adf273665ca68a9dc
 EBUILD portage-2.2.0_alpha70.ebuild 12906 RMD160 631bbf230f84a75d4ee137891624acf383a27b82 SHA1 1f4e4f9495d8ce4d8699d6a64f1f2de71b4aeb17 SHA256 6f60675f0d2a93f7b061476574de98efb39a74d54bf1b484587c1e5ce2b0552c
+EBUILD portage-2.2.0_alpha71.ebuild 12906 RMD160 62ce33175427d4e893be66fdd2705fe7a9488217 SHA1 9b8b09b2e7b7e1bd86443db63fe1d7d6f78f1538 SHA256 8895395a674ffd06a40dadab91b2bf99b4b850eef98f5e26b36a7be19e26464c
 EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7
-MISC ChangeLog 60306 RMD160 d54b24013655fdb905845f1bc006af88f5d5e69f SHA1 cfd76d83d954cda78ec00874d9415d7c457c027e SHA256 b86a02d0769409b007513224d80356dee92a2b08aa9e745a15b405d2d384351e
+MISC ChangeLog 60563 RMD160 18da8779457593cf03eaf74093d73cbf5e6752bd SHA1 3bb55edb97a21a98f54ca292554dd7f1d9ebee84 SHA256 b6b93950bfcc4a61f2b4206f1f00b48e4aa11b05bfd3de22a7156bcfaef6b22a
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6km20ACgkQ/ejvha5XGaO0JwCeIltKHoo4cj6QzMWe4gwtYjXV
-msAAoOY34pGuhDMsr1W6XyrWnNs62ngx
-=WGq6
+iEYEARECAAYFAk6km8cACgkQ/ejvha5XGaMCOQCfQniFZdxMIOx9NTU8mfG/25R0
+YrQAoJOW+OfQek3Po1cUoiIuQhXTsl0X
+=8wi4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.0_alpha71.ebuild b/sys-apps/portage/portage-2.2.0_alpha71.ebuild
new file mode 100644 (file)
index 0000000..816879f
--- /dev/null
@@ -0,0 +1,403 @@
+# 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_alpha71.ebuild,v 1.1 2011/10/23 22:57:36 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_alpha70
+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
+
+       einfo
+       einfo "For help with using portage please consult the Gentoo Handbook"
+       einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+       einfo
+
+       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
+
+       if [ -z "${PV/*_alpha*}" ]; then
+               elog "If you always want to use the latest development version of portage"
+               elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml"
+               elog
+       fi
+}
+
+pkg_postrm() {
+       python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}