*portage-2.2_rc86 (22 Sep 2010)

  22 Sep 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc86.ebuild:
  2.2_rc86 version bump. This includes all of the fixes in
  portage-2.1.9.10. Bug #210077 tracks all bugs fixed since 2.1.x.

*portage-2.1.9.10 (22 Sep 2010)

  22 Sep 2010; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.10.ebuild:
  2.1.9.10 version bump. This fixes bug #300455 (erroeous warinings about
  circular license groups), bug #337178 (make backtracking mask the higher
  version in slot conflicts), bug #337465 (ebuild-ipc does not work on
  FreeBSD yet), bug #338190 (EOFError triggered by faulty ftp server in
  referenced by PORTAGE_BINHOST), and bug #338267 (AssertionError when
  installing binary packages and PORTAGE_TMPDIR is a symlink). Bug #335925
  tracks all bugs fixed since 2.1.8.x.

  22 Sep 2010; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.7.ebuild,
  -portage-2.1.9.8.ebuild, -portage-2.2_rc83.ebuild,
  -portage-2.2_rc84.ebuild:
  Remove old versions.

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

6 files changed, 33 insertions, 686 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index cc7e22f12abf..1b9edfbbe082 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,28 @@
 # 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.735 2010/09/20 04:32:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.736 2010/09/22 03:35:33 zmedico Exp $
+
+*portage-2.2_rc86 (22 Sep 2010)
+
+  22 Sep 2010; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc86.ebuild:
+  2.2_rc86 version bump. This includes all of the fixes in
+  portage-2.1.9.10. Bug #210077 tracks all bugs fixed since 2.1.x.
+
+*portage-2.1.9.10 (22 Sep 2010)
+
+  22 Sep 2010; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.10.ebuild:
+  2.1.9.10 version bump. This fixes bug #300455 (erroeous warinings about
+  circular license groups), bug #337178 (make backtracking mask the higher
+  version in slot conflicts), bug #337465 (ebuild-ipc does not work on
+  FreeBSD yet), bug #338190 (EOFError triggered by faulty ftp server in
+  referenced by PORTAGE_BINHOST), and bug #338267 (AssertionError when
+  installing binary packages and PORTAGE_TMPDIR is a symlink). Bug #335925
+  tracks all bugs fixed since 2.1.8.x.
+
+  22 Sep 2010; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.7.ebuild,
+  -portage-2.1.9.8.ebuild, -portage-2.2_rc83.ebuild,
+  -portage-2.2_rc84.ebuild:
+  Remove old versions.
 
   20 Sep 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
   Bug #338006 - Omit --stat option when generating ChangeLog.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 068b23afca6a..e0e349aa4c8e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,35 +9,31 @@ 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.7.patch.bz2 77521 RMD160 0ae23c027f1e19d278739da01ff3eac437f3cded SHA1 c84224e6ff81907bd687d3fa70c9b89b4f60c20c SHA256 535eb9cc4fe28edbdf8b9c4ef95c4708fb4eaa62105268908a4e0bbc4ec00a80
-DIST portage-2.1.9.8.patch.bz2 90883 RMD160 7d7126dd1f3d403e99c4ee30d8880b48902bba3e SHA1 0abce89e92b176af2d60da7364f6ae2c62f0548b SHA256 c684ec5ed26e4eecf3065f8866e07630760fb1b9012fc467b6fad282bc0e8ecd
+DIST portage-2.1.9.10.patch.bz2 108789 RMD160 fe8dd63d4fca16d7389d34d0d83f8563e06de1b6 SHA1 abc53414649d0ace4707ac360eab60bd013cfc50 SHA256 5507919446e5d6333644d9dbfc0474304310f0f29c12b0a4fc6783791daf8534
 DIST portage-2.1.9.9.patch.bz2 92724 RMD160 60de0c889b020aa234a63297458fe3a2349f4ded SHA1 cfab4766f60fbb0912db11fbb08ce94bd01389e7 SHA256 4c0bc5f579bb1c493e8aca9d54eb28821de9f7c52523f81961b50fdf656abc3e
 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_rc83.patch.bz2 171826 RMD160 f85074fc839504fa68a81cc70303555188f4b139 SHA1 770fbe88b2e8eb2df1e580c3206fe764af9dea8f SHA256 e1436ecce54c479cf06e9e01e5d6156db05c010854d0ac399a6c169933996504
-DIST portage-2.2_rc84.patch.bz2 186337 RMD160 ad03f502e2ab962763f5590e3f5ef03c3bdf633a SHA1 903da588293f7b8d6ffc3ed236629d1311789982 SHA256 024082499468619881fc030b2072df127b4b744e85a8ede004b6aff64888a6b8
 DIST portage-2.2_rc85.patch.bz2 188892 RMD160 87e35fbef9c11486e9f421450442154ae2cdf5b3 SHA1 637341b39b152efe03067715b142a74444d8c08c SHA256 4fbace09aba92a4713f2f6cb3ddeaf5811bcd94d1928679e24ae007f556635ba
+DIST portage-2.2_rc86.patch.bz2 207627 RMD160 338269a04dcceb66a5bb3ac2d710e41145b1fca4 SHA1 4f6a4d4591a9cd6fb66d9effcb3bf33dab0ee5c2 SHA256 a9bf3bd6952432e56c791130d10ad1d60633a77e6b9f8678ae4fbf53f87c676d
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.6.13.ebuild 9835 RMD160 9156cb9799ccb3e90c547bf31e4a5d19bac0a922 SHA1 9ac95c12ad9adae2cbfbb8260a98d966b41c5145 SHA256 366b35c2a71f7fb656f0d13834e41cb6b8012a96887c36be97388983c0b03a5c
 EBUILD portage-2.1.6.7.ebuild 8512 RMD160 eb3e345ca2913e32911283820cf24a1353cbf32e SHA1 5d6f7ceae47cebb7fcf53d0dc3e2c76568e615a7 SHA256 6ad25eec2c4333685eed9aa39d3e323c9941c2ee6143b87837775c1f59c15190
 EBUILD portage-2.1.7.17.ebuild 10144 RMD160 d0f7754a886adb1ca5f67191850b5c3e55323a77 SHA1 28b5972adae5aee10181301860b2bbd375ca3662 SHA256 1ae99d927e265405bcb61c48fc6acb72ce86fc0a7b313ad354b1f32312ee1701
 EBUILD portage-2.1.8.3.ebuild 9220 RMD160 490daac2cc4a22597c399ba524ae40b608c7fefb SHA1 c675fb28e9830672d58e8a531130e0a823d92250 SHA256 54311690ec2ccead2ce49d7ada878a6b2f08a81e0f00336288069bd206b2a325
-EBUILD portage-2.1.9.7.ebuild 9491 RMD160 0ff435c7237356a548ba92fd1e2af266e213fcf3 SHA1 573c51e9fd305c31b7958493fa852f2315e362ba SHA256 545500bddcf384116275fd8e35b72c87f6072fea52fb8bd1e3d81aa3c43691d2
-EBUILD portage-2.1.9.8.ebuild 9491 RMD160 9a51fe46f4431deb73284ee4f542f5043c2bf98c SHA1 37e6ca8c7624fce1aef6f0e7a8f5c55a015ae5dd SHA256 73bb11c3ece6bebb2a22b7dfb4179ae777ce4fff04befaf0b879069e87ff4887
+EBUILD portage-2.1.9.10.ebuild 9492 RMD160 0cc67331becd5d16fcffa96221f0c4c0e6ae49ba SHA1 96060431f48443ef3ef8160bfd0b3757d429fc5a SHA256 b5e7d6abf4fa267fbfebab6c2d1dbb2de01d4d948206117cb948c5c62c336eb7
 EBUILD portage-2.1.9.9.ebuild 9491 RMD160 c8a079c3fbc191788a8e12075dc91bd7d40f34e9 SHA1 7c72cb308097c2ed0afa3d641cf7fb7a35781b28 SHA256 bbd5da3097296a3b4779265557722ed64eb57955346dcd4ea6c4fafc0767c228
 EBUILD portage-2.2_rc67.ebuild 10634 RMD160 3e9604c6105b684625ff72446cc1915ed4a2610a SHA1 391ee47e7850b29070492b07b68c84b30e0ebdcd SHA256 516c4abf53797fc96eb72c7004b83895246f0827385ed095d78bea4171370815
-EBUILD portage-2.2_rc83.ebuild 11316 RMD160 8a72144a0992be33edefb685f3c54523e0453eb3 SHA1 4875a78ac56db40fb974cea699454c2b6b07cf51 SHA256 91f8da251b563d5230c91fcfbd91b97bdeaed6fde0ebd77fe8c88e3d184902ef
-EBUILD portage-2.2_rc84.ebuild 11316 RMD160 bb4b29315b5d947389b2b8625fb986cf6be18c51 SHA1 f17749eaced6d7b925c577cdd116f44c60fbf0df SHA256 dcb847403b3bf68afbdca33c528d505460d35d34d41bb7f39888c5922af5c70c
 EBUILD portage-2.2_rc85.ebuild 11316 RMD160 0a09a3dda2650800112d83cd7077c90d9ca1adf8 SHA1 7c4305aa4cf44478eab59210e361710ab8d0da19 SHA256 7d44b4230066991c4c7fe3b9daf1097f7d55c63c976e35d1b047fecb8d58c05e
+EBUILD portage-2.2_rc86.ebuild 11316 RMD160 5d0d961e094c67e135070aef3af9155cfdfac22a SHA1 c1c6ac56499580377addcfe04921478bf1234350 SHA256 70fa241c1823f327aee18e21849d0f00be3dcd9b82763bce453e6673100c6a5a
 EBUILD portage-9999.ebuild 10373 RMD160 4f0254b4ea7876749bc3dc12795f2e4ed43ce7f8 SHA1 f6e699459d9496da5cf62094555a78a8e365ec58 SHA256 d9a029a7f4907bd89f9faae2844c5e40ef2fe0389c1dd24964c89b40148ec20b
-MISC ChangeLog 29808 RMD160 d4a2e91a9d22161b82339a29a2c1801f4a306db0 SHA1 c334c7f9c056c0a4d63f74b58a50aed3f2b27047 SHA256 f13314929e59ae9a19ba1efc1942518663e144c2a0cfe6d7f3637e557aa99a09
+MISC ChangeLog 30802 RMD160 7fc13e7af84bd15589d625d6af3ff6d8e7910e3d SHA1 0881c9e5120cd5347dbe311ae003c8bc3653cefc SHA256 e372786336697a513be6d6538792cc2e9123ed0eda50beecfabc6fa15e7954fa
 MISC metadata.xml 564 RMD160 4f9c3f4c0b975b0bbd1fe5b7a329468933b7c659 SHA1 b6a2b47651924513f259cd1662ac0622989d684e SHA256 bfa29b06821ee879abc2f6fabce13a8a52f6fa306688f558972e441437de11c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkyW5AoACgkQ/ejvha5XGaOqBACg6RrMbiLW5qkcm9JFjIuQL+dH
-s+oAnj0TI0wmkT5ZcKYqt+U4rnqSd3Zy
-=geIM
+iEYEARECAAYFAkyZeXQACgkQ/ejvha5XGaMFhwCg3OIXd/RmsHOmRNVF2FI8Mc5z
+f2QAn34o+bX8v2NOe/7qRB9kuq9g1Pjz
+=cjCf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.9.7.ebuild b/sys-apps/portage/portage-2.1.9.10.ebuild
index 35b67adfa0b7..88fdb7fc76b3 100644
--- a/sys-apps/portage/portage-2.1.9.7.ebuild
+++ b/sys-apps/portage/portage-2.1.9.10.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.7.ebuild,v 1.2 2010/09/17 07:24:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.10.ebuild,v 1.1 2010/09/22 03:35:33 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.1.9.8.ebuild b/sys-apps/portage/portage-2.1.9.8.ebuild
deleted file mode 100644
index efbf4dc84a47..000000000000
--- a/sys-apps/portage/portage-2.1.9.8.ebuild
+++ /dev/null
@@ -1,308 +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.1.9.8.ebuild,v 1.1 2010/09/19 07:12:44 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 )"
-
-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-1.6 )
-	elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
-	>=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.1.9
-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 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
-
-	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 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
-
-	[[ -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 [ $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
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2_rc84.ebuild b/sys-apps/portage/portage-2.2_rc84.ebuild
deleted file mode 100644
index 2e2904a63564..000000000000
--- a/sys-apps/portage/portage-2.2_rc84.ebuild
+++ /dev/null
@@ -1,363 +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_rc84.ebuild,v 1.1 2010/09/19 07:12:44 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 )
-	!<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 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
-
-	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 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
-}
diff --git a/sys-apps/portage/portage-2.2_rc83.ebuild b/sys-apps/portage/portage-2.2_rc86.ebuild
index 4c25ec35ece8..ce96e332e15c 100644
--- a/sys-apps/portage/portage-2.2_rc83.ebuild
+++ b/sys-apps/portage/portage-2.2_rc86.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_rc83.ebuild,v 1.2 2010/09/17 07:24:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc86.ebuild,v 1.1 2010/09/22 03:35:33 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.