2.2_rc68 version bump.

Package-Manager: portage-2.2_rc68/cvs/Linux i686

3 files changed, 410 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 6e114c840ef9..7147437b26ae 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.709 2010/08/14 18:55:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.710 2010/08/23 05:51:28 zmedico Exp $
+
+*portage-2.2_rc68 (23 Aug 2010)
+
+  23 Aug 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc68.ebuild:
+  2.2_rc68 version bump. This fixes bug #44796 (package.env for
+  per-package environment variables, bug #267103 (add /etc/portage to
+  CONFIG_PROTECT_MASK), bug #275789 (ignore CVS directories inside
+  package.* config directories), bug #278895 (emerge hangs due to
+  orphan ebuild subprocesses, bug #285191 (RDEPEND.implicit warning for
+  repoman), bug #292083 (package.accept_keywords for profiles), bug
+  #305035 (emerge -p support for PORTAGE_RO_DISTDIR), #308835 (econf
+  support for CONFIG_SHELL), bug #309149 (eend display adjustments),
+  bug #309699 (clarify emerge -e docs), bug #309907 (apply package moves
+  to package.license), bug #310135 (disable repoman changelog.ebuildadded
+  check for git), bug #310947 (prevent emerge atom arguments from expanding
+  to unavailable categories), bug #312085 (improved implicit IUSE support
+  for minimal profiles), bug #315615 (fix config file permission issues
+  with userpriv), bug #315709 and bug #315741 (whitespace and unicode
+  handling for PORTDIR_OVERLAY), bug #317133 (exeinto typo in man page),
+  bug #317775 (UnicodeEncodeError in merge list display), bug #317921
+  (variable typo in man page), bug #318241 (include LICENSE file in
+  tarball), bug #320755 (fix ebuild(1) to only run test phase once), bug
+  #321145 (fix error handling in ebuild.sh), bug #321871 (make repoman
+  check all manifest entries), bug #324075 (fix repoman copyright date
+  warnings for git), bug #324191 (FEATURES=compress-build-logs), bug #325505
+  (UnicodeEncodeError in emerge --info), bug #326553 (repoman warning for
+  preserve_old_lib), bug #326561 (emerge warning about unknown FEATURES
+  settings), bug #326787 (intermittent unsatisfied build-time dependencies
+  with --jobs), bug #327507 (make FEATURES=usersync drop privileges
+  for all rsync invocations), bug #327883 (intermittent loss of build
+  logs), bug #328099 (add warning in FEATURES=ccache docs), bug #328317
+  (merge os-headers before libc), bug #328935 (document  substitution in
+  PORTAGE_ELOG_MAILSUBJECT), bug #329159 (disable file owner lookup when
+  collision features are disabled), bug #329803 (make --depclean show a
+  machine-readable list of selected atoms), bug #330179 (fix emerge to show
+  a masking message instead of missing IUSE when appropriate), bug #330645
+  (autouse AttributeError triggered by missing portage group), bug #330937
+  (handle IOError raisedby array.fromfile() in recent python), bug #331271
+  (fix USE_EXPAND wildcards to work correctly with incremental negation),
+  bug #331413 (clarify atom operator docs), bug #332799 (fix emerge-webrsync
+  to only download bz2 snapshots if tarsync is installed), and bug #332967
+  (movefile issue with binary packages). Bug #210077 tracks all bugs
+  fixed since 2.1.8.3 and 2.2_rc67.
 
   14 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
   Use runtests.sh in src_test().
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cc41abe15d69..75c563e30ed3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,19 +11,21 @@ DIST portage-2.1.8.3.patch.bz2 11222 RMD160 43f99de135eccd78731dfa6105edca68497b
 DIST portage-2.1.8.tar.bz2 522621 RMD160 12a079f48552b78162a857b732ab8bfe76bd7b6e SHA1 390c97f3783af2d9e52482747ead3681655ea9c3 SHA256 9440bea218a059fc52c5639945c91c8ad6fdcd8d1d4a9dc7672d0da783345303
 DIST portage-2.2_rc64.tar.bz2 544483 RMD160 63ca64a564b3075542cd64410f2b2227de82bdb2 SHA1 93a104b5b03235af71db1f2fb924f37832a6dbba SHA256 409f424ab6e947c9005609807cd42233609d5845ed0461b55bae8b95b4135e8e
 DIST portage-2.2_rc67.patch.bz2 11199 RMD160 aacf56c1b54e0debe7cbf10b7a05fef073ac7eec SHA1 da2068ac61ba7c3ae5b1ecef298775a7a30841e0 SHA256 64dad166d418a313e4d001c1c9242c40b4e969c654df86c15d5d3ddcc166b899
+DIST portage-2.2_rc68.tar.bz2 649525 RMD160 97112e4d84e00c6064089dee72acf52cdc5f04a4 SHA1 6a6953192fb5c3761003f4719f5e55b84008673c SHA256 c85c64f39b651bc82c6c8a4a38f671a09741fe196905d8a0e2655afafe79f134
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.6.13.ebuild 9824 RMD160 7105984fb918db107f8f5e5ecaa8cd6910ff560c SHA1 6d65368bd4505c5a2bdeda18472a75bc87fb401b SHA256 76f3ddc4e38208663ae5ba419ccaa11b6707307ef35c2db164779799f46b196e
 EBUILD portage-2.1.6.7.ebuild 8510 RMD160 d8f9213fda0f2c17ba6bb1c1c5a6ed67c37d5cd1 SHA1 4f9a08a66c46d06be85b1d0c17093e3ff9995978 SHA256 4f88b84d0c815802a1d9e8f0e7350f8bf100150b478508869dcd20475ec765dc
 EBUILD portage-2.1.7.17.ebuild 10217 RMD160 8f906f531b3bf7bff5731a1796e38818d347e112 SHA1 2797f16cfdeb7cd2cb2fc3018d3676bc231bb6df SHA256 0294eaa9108769ec3a1bd703ae4945b64a3db1615499ec4159efe4ed52630eab
 EBUILD portage-2.1.8.3.ebuild 9293 RMD160 28a02633a3be9a6259add5880bc34e4600614ba1 SHA1 51f6202e37b35e4b63d3ceb40d8bba7a7d6dfb69 SHA256 d27791c3ffc9dbcd28edb6266b8d2e8c95c41bf851910f7122e453f87185cd5d
 EBUILD portage-2.2_rc67.ebuild 10680 RMD160 ddeaadff894faed7f2f9e257e0a3ab608850eac9 SHA1 1b6775b7e7c5d98b01ec567dc43603f22f548405 SHA256 24300ce0d00c75c2975a6fedfdde25914986a1f6e8643ad19fc75a385cbc6747
+EBUILD portage-2.2_rc68.ebuild 11129 RMD160 1325df3546db839b960a01785e39b98f177f9cc6 SHA1 d98b49d8d6677ac749ceba2de6800baef4977a16 SHA256 03c798725f207c77c2b073138094d7e92c910cf765c21206f41a20c7fd28f040
 EBUILD portage-9999.ebuild 10026 RMD160 c317d1414dbdb02c2a8a6bfd08dc08b0e3fdf9a4 SHA1 54039540c90e2370eafcd33c69076c084be36439 SHA256 df996c47a88e66a30d37714ef72f57f7f2a2692003ba7df50ad7d0837cc281de
-MISC ChangeLog 12863 RMD160 292aeabac2e4fe63bc11e7ddc79b974b83dfd376 SHA1 38624b34ed3b16704617c09dbc97ddca36d0da92 SHA256 a5c71c7e76c7035e65e760550d15dc95af7d341b34d9ac42f8585e514920910e
+MISC ChangeLog 15738 RMD160 605bc1b48092558bc45c47b2c8c0211d2d4dac8e SHA1 c99a65b20d64b3cd2dbbc59c0fdbe71a2e898562 SHA256 64ed1053eee3ecd0545dd8f765a4e315788a692e5ef05eb4c2b70a97a67cf399
 MISC metadata.xml 564 RMD160 4f9c3f4c0b975b0bbd1fe5b7a329468933b7c659 SHA1 b6a2b47651924513f259cd1662ac0622989d684e SHA256 bfa29b06821ee879abc2f6fabce13a8a52f6fa306688f558972e441437de11c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxm5owACgkQ/ejvha5XGaObzACfdSL+9Gv/vkAmHDGujLTcIRyw
-kfAAoIuYLvG/uYU91mUXrDRxD3r9AZ5d
-=l2Zg
+iEYEARECAAYFAkxyDEYACgkQ/ejvha5XGaPf4ACfUCsEAhrZL12MyTjmoqJ0Hf3V
+OLkAoMqWYnQjsI9yD5rfxvDOtAfzIBgP
+=L9PH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc68.ebuild b/sys-apps/portage/portage-2.2_rc68.ebuild
new file mode 100644
index 000000000000..0d02ac0495ae
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc68.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc68.ebuild,v 1.1 2010/08/23 05:51:28 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+PROVIDE="virtual/portage"
+SLOT="0"
+IUSE="build doc epydoc linguas_pl python3 selinux"
+
+python_dep="python3? ( =dev-lang/python-3* )
+	!python3? (
+		build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) )
+		!build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+	)"
+
+# 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 )"
+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
+# rsync-2.6.4 rdep is for the --filter option #167668
+
+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_rc68
+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=
+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() {
+	if ! 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
+	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 -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+
+	if use python3; then
+		python_convert_shebangs -r 3 .
+	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
+	PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+		./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
+
+	# This allows config file updates that are applied for package
+	# moves to take effect immediately.
+	echo 'CONFIG_PROTECT_MASK="/etc/portage"' > "$T"/50portage \
+		|| die "failed to create 50portage"
+	doenvd "$T"/50portage || die "doenvd 50portage failed"
+	rm "$T"/50portage
+
+	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
+
+	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"
+		doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
+			die "doexe 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
+
+	cd "$S" || die "cd failed"
+	for x in $(find pym/* -type d) ; do
+		insinto $portage_base/$x || die "insinto failed"
+		cd "$S"/$x || die "cd failed"
+		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
+
+	# 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
+
+	exeinto ${portage_base}/pym/portage/tests
+	doexe  "${S}"/pym/portage/tests/runTests
+
+	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 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
+		quickpkg
+		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 ! 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/*_rc*}" ]; 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
+}