*portage-2.2_rc95 (13 Oct 2010)

  13 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc95.ebuild:
  2.2_rc95 version bump. This fixes bug #340675 (enable repository atoms to
  work with wildcards) and bug #340817 (--sync fails with http_proxy).
  Bug #210077 tracks all bugs fixed since 2.1.x.

*portage-2.1.9.17 (13 Oct 2010)

  13 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.17.ebuild:
  2.1.9.17 version bump. This fixes bug #340817 (--sync fails with
  http_proxy). Bug #335925 tracks all bugs fixed since 2.1.8.x.

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

5 files changed, 28 insertions, 383 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e2c87a3868bd..d692e0b0c405 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,23 @@
 # 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.752 2010/10/13 01:30:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.753 2010/10/13 17:27:32 zmedico Exp $
+
+*portage-2.2_rc95 (13 Oct 2010)
+
+  13 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc95.ebuild:
+  2.2_rc95 version bump. This fixes bug #340675 (enable repository atoms to
+  work with wildcards) and bug #340817 (--sync fails with http_proxy).
+  Bug #210077 tracks all bugs fixed since 2.1.x.
+
+*portage-2.1.9.17 (13 Oct 2010)
+
+  13 Oct 2010; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.17.ebuild:
+  2.1.9.17 version bump. This fixes bug #340817 (--sync fails with
+  http_proxy). Bug #335925 tracks all bugs fixed since 2.1.8.x.
+
+  13 Oct 2010; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.14.ebuild,
+  -portage-2.2_rc91.ebuild, -portage-2.2_rc92.ebuild:
+  Remove old versions.
 
   13 Oct 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.6.7.ebuild,
   portage-2.1.6.13.ebuild, portage-2.1.7.17.ebuild, portage-2.1.8.3.ebuild,
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 95f78fac4c91..6c4609c419c6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,35 +9,33 @@ DIST portage-2.1.7.17.patch.bz2 86084 RMD160 86a4d457e8c0e0bfd9059e501d1952324ac
 DIST portage-2.1.7.tar.bz2 503459 RMD160 245d2b3d778b235e3814ea551a6115e8075d1da5 SHA1 db5b96dfd147954909331f58e24620c41df117e3 SHA256 62f7af85db0090afd424cb398d4b6b434ff1751c77e524dc8a1480e796f28599
 DIST portage-2.1.8.3.patch.bz2 11222 RMD160 43f99de135eccd78731dfa6105edca68497b6f38 SHA1 52ce6297abcbc82913eb179209b210b9334e1351 SHA256 8e0e1efbcf6a2d62125316970052987154656f3fda892c20b99b2270e2e8943f
 DIST portage-2.1.8.tar.bz2 522621 RMD160 12a079f48552b78162a857b732ab8bfe76bd7b6e SHA1 390c97f3783af2d9e52482747ead3681655ea9c3 SHA256 9440bea218a059fc52c5639945c91c8ad6fdcd8d1d4a9dc7672d0da783345303
-DIST portage-2.1.9.14.patch.bz2 127800 RMD160 faf886500a94955367dc21d200878c870496d057 SHA1 c9645e78268011b66c74a7429d6303e5160aefb1 SHA256 d4534f6a85b2b604ef4ac9afc5384a8cbc71b8a5dbaa52899897e8ffdf1a0639
 DIST portage-2.1.9.16.patch.bz2 132881 RMD160 1829348ffc88361c7a400b9ced6ff32de07c3aa5 SHA1 170a90312dfa4287b9f0415e76d0bb5262c42c39 SHA256 7cb312910748e80014423aac859a19fe7fddc1fbed9b04f18f9eae4e8ced677f
+DIST portage-2.1.9.17.patch.bz2 133131 RMD160 75b3c135274ceb18ce0e00034179014028c57daa SHA1 9cb59f735ec0910ebafb6f311533794bf8559c79 SHA256 707c749eee58ee5d6037822651bfc75fcc2b1c08004a526dcee62e15b5331336
 DIST portage-2.1.9.tar.bz2 681155 RMD160 ad16d592223b1d5bb7e9732b5ceb0479eee901bb SHA1 04f44bdb27af36964d83dd7fd8c580bbff1c4b17 SHA256 af98428220d0037fd908815a6e42d7ab390fe43e858d43e247556f6a2b65be25
 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-2.2_rc89.patch.bz2 216479 RMD160 762b7ae6aa718d5cb1ee0dd01030754f2fcb16e9 SHA1 fa932ae7095cd6ea595307365c6b1ada85fb791d SHA256 d79bc73525dc65d8567e4a0ff92324e0d1176bffe686a3bb2b24bd79fa71b4c4
-DIST portage-2.2_rc91.patch.bz2 250560 RMD160 36b05ec34c54b302e103acdc2d0e1711cab5d50a SHA1 a8706f52bd1cfd7fadf585aa0fc6c7b3608a3e72 SHA256 87bde4c6c6c1fda46ad97e6f07a30caeceafcd0bcbea166ea24951079cc7127f
-DIST portage-2.2_rc92.patch.bz2 254176 RMD160 8bddfd9631ce62c90e2d03da6f5ad8b3a8ee1802 SHA1 98c7525f98f5087ddfa185b3350c6a759283ead4 SHA256 e2f33d02cbc097ca028c00c3777b024aa419de0db66c7e809bd346bfbdca8bf3
 DIST portage-2.2_rc94.patch.bz2 256958 RMD160 54a64e03c9e0e638b631efebe2f26a84b78ebd7a SHA1 69ad1a44523672501cfd94ee86d8b4c3b7f49268 SHA256 02773890cb3483b140efe38b25b77269603826ece3bb36c47dd9ed43e01f66bf
+DIST portage-2.2_rc95.patch.bz2 257305 RMD160 361b7b6931a5f1b303a8cce94bfffb226bb882d4 SHA1 3b225cacd398da427c3c777530dcec5aeba9af2d SHA256 2b5ab194dd9bf0935ffecca9a2b0417f4d1e11451136ee50cb56b5d6262abf2c
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.6.13.ebuild 9886 RMD160 830a84ad6f5c8640f55351d67edeb1a1bf75e70a SHA1 29aa8a43789805fca31b5a32d98c082fe9f510a4 SHA256 e0ad29eeb0bda0c9c137bdc933e2b286990264364672498b56cc5e057ae7ba4a
 EBUILD portage-2.1.6.7.ebuild 8538 RMD160 af018f60721b1d1e581d48e4ecadea2e6fe2a4e7 SHA1 7b9a758aba1f35784f55f2a14ad59584456e5ee6 SHA256 d29ccc18665540c61e5f65f09bd66b71c60c7d6e3e69613cdb47ccc3a4758745
 EBUILD portage-2.1.7.17.ebuild 10211 RMD160 8ab7618313d82254e1ec0a096c6246c78249b01c SHA1 53be95b09e2017f3b27a4da5dd35ed13d318d46d SHA256 0c0a133bfaf1e8854a907d2898b34523bceb9c9c55d0b4a65477950aa27d861e
 EBUILD portage-2.1.8.3.ebuild 9288 RMD160 8a26eed38f21c7d9ba7cdc7b698bc3bb3e2082cc SHA1 f700cc590175eb370799fb233cb7c60131f5d063 SHA256 5e5f7d51fc0881a4e2a836ea27f2ef51378acf217bc8ec5302e82f780fe4c2c8
-EBUILD portage-2.1.9.14.ebuild 9760 RMD160 27657bf38b45aac9ddbdfabd5c4a107738c973e3 SHA1 1176140f2079129e6184c9a602b1112808b21c10 SHA256 8661f253166cd4bd4204bc674fc72ebdf533b0285ef58922f9e20bccd51571cc
 EBUILD portage-2.1.9.16.ebuild 9760 RMD160 6e34e37ddfaeaf136aa1447197c5c45a33937fb8 SHA1 49d32b01322af3d345698b05f3087c53ce8ce509 SHA256 08f1dc9bd6c5dcd9c0f4efd70dfeda96a4833c6d8f8f53b8781db67a2184aa95
+EBUILD portage-2.1.9.17.ebuild 9760 RMD160 a115f9c813579715436b74e9b7af41eef7401834 SHA1 1ca499c106ededdc8e17b8962a5e60dc7584e9b6 SHA256 00a9108ceccdf080690bdb9540d53f02018ecc0cf30a51714a457c68feab374d
 EBUILD portage-2.2_rc67.ebuild 10701 RMD160 09eeaf053c359828bb5597b68f32efc96e181116 SHA1 403132c4dc71450809a9f2f4b3c49ba0125a3223 SHA256 f4cc6bfaef1c0bdcf4afa533b82ab67fc3132f6e5f1916ed70a522a4c03310d3
 EBUILD portage-2.2_rc89.ebuild 11314 RMD160 8f3f77788eb8ad6a33b2caf9e76b6328087c3aab SHA1 f76162892105afa6764d7370b1b51522427f26fc SHA256 2d2bf43d49573709a68e03124e54916f851ab0034d2128e6f25091e1405fe6fa
-EBUILD portage-2.2_rc91.ebuild 11584 RMD160 d50944019de56667b1400bdf4bf2f4ba5f89c565 SHA1 ff36a97730786ac0935f2da179c47fd37ba3ef44 SHA256 86903b436f3fd937e7085fdcd4bbc79cdd1d79ded58b92ded1bfd1c6f11ebac4
-EBUILD portage-2.2_rc92.ebuild 11584 RMD160 8e7e53b600b91d24467d571b2ca892bf69da75cf SHA1 c036c514bff860035b68293414e55a37c7132bf2 SHA256 9342c5bb43c605d7adc38b42cc5dc0da7502952f94886c95bada6d9de7c83014
 EBUILD portage-2.2_rc94.ebuild 11584 RMD160 bceb5e640947e5133537e14acff07facce17e25c SHA1 fc10baba31c575111e6ca4189a9b107589192795 SHA256 1382088f631f449cdd4ed6c39ff6fd888178947cf8dacfe23fbcbf6647fd17e0
+EBUILD portage-2.2_rc95.ebuild 11584 RMD160 cd6139768e23797fcf1717bea57dcd85295ab25d SHA1 54070e24c698297e4be0854abdc76f2cfca9cb71 SHA256 365e12c70d85f26875aec77ee05d3230162ff54d1f5bcd6df176e7200741bd9a
 EBUILD portage-9999.ebuild 10641 RMD160 88a29c154394f1a3b5aa1313dcb9533b99cd11c9 SHA1 a2b3f474ca80a6628847a2cea2919b4f95f16aef SHA256 accd165113a7f06f0485e485e926c542a42fd0b216e10b7a9220311b87d9f4ba
-MISC ChangeLog 36497 RMD160 ee2c71c45dbc7d3ff5cd91530770e9e11e085077 SHA1 fef538071f3ffca68778b89efd70d9e904910f4d SHA256 bef76f3ccb4e3975cbac55901204a1bf95aa2f9fb1ec06181ba26d1211fb4fe7
+MISC ChangeLog 37189 RMD160 deb9b9f5481cb1347680302844144c3ce678c168 SHA1 2d97d1b7ec290eb8ce4015613403a94a602ede58 SHA256 f9b4c7e5256b4a23c8008b75e980c9a7d127b045f5d90a0972dbf1fa988216ed
 MISC metadata.xml 659 RMD160 7ee0e47eb8f485c2a0d45164b90e0aa4f91bd738 SHA1 afeb226c303b15eb2157cf9f97293c77f92a2919 SHA256 e141c1ecbca4c7c97009ecf16a70628c0470f291683c788dfed5d06efcd6ae2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky1C8QACgkQ/ejvha5XGaPo3gCdFD/lTUj3CgyBelnHLEnUFSTu
-/xQAoLBKREavaf8vdg94YQOpSfFW/O6+
-=PffP
+iEYEARECAAYFAky17AgACgkQ/ejvha5XGaNJOgCggExjZZo5rSL1s2aHtdLh1pnZ
+EVkAn2Nk8MwwVDF0F+K0W8/3AvzD+OjW
+=g1mD
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.9.14.ebuild b/sys-apps/portage/portage-2.1.9.17.ebuild
index 9046c3f7a6f8..af03538693f8 100644
--- a/sys-apps/portage/portage-2.1.9.14.ebuild
+++ b/sys-apps/portage/portage-2.1.9.17.ebuild
@@ -1,6 +1,6 @@
 # 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.1.9.14.ebuild,v 1.1 2010/10/08 02:31:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.17.ebuild,v 1.1 2010/10/13 17:27:32 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
diff --git a/sys-apps/portage/portage-2.2_rc92.ebuild b/sys-apps/portage/portage-2.2_rc92.ebuild
deleted file mode 100644
index 268afa4cd4b2..000000000000
--- a/sys-apps/portage/portage-2.2_rc92.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# 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_rc92.ebuild,v 1.1 2010/10/11 00:15:40 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 +ipc 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 )
-	!<app-shells/bash-3.2_p17"
-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=$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() {
-	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 -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 .
-	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
-
-	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
-
-	# create this manually until it's in a release tarball
-	dosym ../../banned-helper $portage_base/bin/ebuild-helpers/4/prepalldocs
-
-	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"
-		# __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
-
-	# 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 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 ! 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
-}
diff --git a/sys-apps/portage/portage-2.2_rc91.ebuild b/sys-apps/portage/portage-2.2_rc95.ebuild
index 4af7f0da4121..afc716c8cee0 100644
--- a/sys-apps/portage/portage-2.2_rc91.ebuild
+++ b/sys-apps/portage/portage-2.2_rc95.ebuild
@@ -1,6 +1,6 @@
 # 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_rc91.ebuild,v 1.1 2010/10/08 02:31:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc95.ebuild,v 1.1 2010/10/13 17:27:32 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.