*portage-2.2.0_alpha15 (12 Jan 2011)

  12 Jan 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha15.ebuild:
  2.2.0_alpha15 version bump. This includes all of the fixes in
  portage-2.1.9.31. Bug #210077 tracks all bugs fixed since portage-2.1.x.

*portage-2.1.9.31 (12 Jan 2011)

  12 Jan 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.31.ebuild:
  2.1.9.31 version bump. This fixes bug #211529 (econf looks in configure
  --help output for disable-dependency-tracking in EAPI 4). Bug #349307
  tracks all bugs fixed since 2.1.9.25.

  12 Jan 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.29.ebuild,
  -portage-2.1.9.30.ebuild, -portage-2.2.0_alpha13.ebuild,
  -portage-2.2.0_alpha14.ebuild:
  Remove old versions.

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

6 files changed, 29 insertions, 696 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 9d532078e91f..5359e7fefe5d 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,24 @@
 # 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.788 2011/01/07 01:05:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.789 2011/01/12 16:03:22 zmedico Exp $
+
+*portage-2.2.0_alpha15 (12 Jan 2011)
+
+  12 Jan 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha15.ebuild:
+  2.2.0_alpha15 version bump. This includes all of the fixes in
+  portage-2.1.9.31. Bug #210077 tracks all bugs fixed since portage-2.1.x.
+
+*portage-2.1.9.31 (12 Jan 2011)
+
+  12 Jan 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.9.31.ebuild:
+  2.1.9.31 version bump. This fixes bug #211529 (econf looks in configure
+  --help output for disable-dependency-tracking in EAPI 4). Bug #349307
+  tracks all bugs fixed since 2.1.9.25.
+
+  12 Jan 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.9.29.ebuild,
+  -portage-2.1.9.30.ebuild, -portage-2.2.0_alpha13.ebuild,
+  -portage-2.2.0_alpha14.ebuild:
+  Remove old versions.
 
 *portage-2.2.0_alpha14 (07 Jan 2011)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index eee8e7c76ce4..48707163854b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,28 +9,24 @@ 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.1.9.24.tar.bz2 728502 RMD160 da48b121036c5e6821bd50be468fdf4e01d77a6a SHA1 ebfc559b9fddca57fa2bfb8e179f7f0f660d7e07 SHA256 744375b5239833fe4e57b4ff07003947fa94ac5b2cfe8108e1dd0919642635d2
 DIST portage-2.1.9.25.tar.bz2 736245 RMD160 96b8dc89ea2bcbe2932161e0604d31d97fe877af SHA1 d445211758bead0835e275b4e3534fb635dff38b SHA256 2d19a9bda3228852bf628cf5d4fe361eae2f531e729bd9a41b76fd57bf079ef5
-DIST portage-2.1.9.29.tar.bz2 746036 RMD160 519ba350208bc143f95fbaa01770ba0c7cd7fcc1 SHA1 d9bf4d4152fca65601c00c97e6d4ae5791c71e8f SHA256 d220b4cd5ea6059ace3987edf7f1c870ee2ab51b779e67068555f939ab0c60fc
-DIST portage-2.1.9.30.tar.bz2 746806 RMD160 8b426936647a66c4e2e6f89e9ac5cacf81924159 SHA1 d15d5799ff1419d178db47977770dca7376eabfc SHA256 f4b26f7f0504d5db43cda3d379bf5debb8de2be0aa7c390196608fc3215eaaab
-DIST portage-2.2.0_alpha11.tar.bz2 756802 RMD160 f09a674aa29e2ec4865aacbf6ff382a8cb0a09bd SHA1 24488caf1111a29fd87f1c001c1ef2ab6cafaa64 SHA256 cb5e0673d33f0c0ada8eba2732f23a76192e87d80ec06bb74e519c5721fa829f
-DIST portage-2.2.0_alpha13.patch.bz2 11141 RMD160 7286d8346c4643f8f9112bd893748a43258ef80d SHA1 b8b3e44d797097dc11136731f189c12f803d79fa SHA256 88e0247188afa0166b0299f77a8987946f8f8c5a18879f25ec0043d5bbea1c39
+DIST portage-2.1.9.31.tar.bz2 747639 RMD160 e987cc45cd7e4192b35e660d01be55190d9a9c40 SHA1 1d0fd42b1019e8a347833cd59e64a93945da94f5 SHA256 b8255ace538357e47dd9771474e9e54936203135f26444d1a306a8a776c17826
 DIST portage-2.2.0_alpha14.tar.bz2 759468 RMD160 684676aa13f3ce7e4c2d6c87c1ab56c215bd1048 SHA1 e14cce0bc56b11abcfde881f93acd3d84ab4f0a8 SHA256 dae53c7890623a9baceedad1c3e17130711ab7eb154b1a519f7e49ace457acc8
+DIST portage-2.2.0_alpha15.patch.bz2 2394 RMD160 99c4867c7b211d77f2d436afe2fe055a3c05ba7e SHA1 fbc67a247df5c2b3d3d11a6db222473fc2c5b3bd SHA256 2c3de0e938c569edcd1d290adcc47f9e8c616e74d54f97b0c3d91d0c70c82807
 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.8.3.ebuild 9288 RMD160 8a26eed38f21c7d9ba7cdc7b698bc3bb3e2082cc SHA1 f700cc590175eb370799fb233cb7c60131f5d063 SHA256 5e5f7d51fc0881a4e2a836ea27f2ef51378acf217bc8ec5302e82f780fe4c2c8
 EBUILD portage-2.1.9.24.ebuild 9611 RMD160 2149b3fbd07ac004709c754b3e3adc1564a003e7 SHA1 33f2e2dd5e6c7839a5a87323ecb5862711afc050 SHA256 f4ffd61393a4d9a3cce2b3e2f18239a514d9f64e7ed13bbe76cbd73869febedd
 EBUILD portage-2.1.9.25.ebuild 9652 RMD160 761662a698698432e926c37a00a37fb814dcd23d SHA1 b1f56e93719b7202179efd47f6316e4ccf1ddffc SHA256 e25a0be4d69f6a69c56cde8cf7f30ac613a6f6896b56861aaf7aee7ef0763099
-EBUILD portage-2.1.9.29.ebuild 9664 RMD160 bc68c811b37ce0026dd7b2d4b06e19c650ada3f3 SHA1 e91677f395d07052ad9c633af9cec4ccbbed7e34 SHA256 002e29554d65d69cd25da6f8862e9f2bc46f7b5003d60b2d85c49b7877bc375e
-EBUILD portage-2.1.9.30.ebuild 9664 RMD160 12537fa8284ba6dc856a2c438c2631b33578c406 SHA1 9e48e5e6c7359ec0bb3ab728a3e138b9aad7ea1b SHA256 26baa7f248ff3796950cf9a7110981f22f577d453f4eeb4d640480443a417add
-EBUILD portage-2.2.0_alpha13.ebuild 11426 RMD160 64e12e50be7ebecedd204b16c078d2021d9da280 SHA1 20a3b3924084aa01a600b305a0ad89f6aa5e9d30 SHA256 3cf763ae57e0be1f78962aa038d5690f5434669ed5d8031b51de4e003695a89a
-EBUILD portage-2.2.0_alpha14.ebuild 11426 RMD160 f6fa3538bc342fab1a15cb072454cbf5892a670e SHA1 919b92df14166d6ed488769f527e7afaf7505217 SHA256 805a0eb48f9d709afc5c83a81892bd7361aecc79a7f9e2ed0355e0aceb8f32a0
+EBUILD portage-2.1.9.31.ebuild 9664 RMD160 4528c135669d32cc1f09e4b03ca47b43c33a0342 SHA1 2d263140c1ec4700e6ad4f9fe36dda81148b32d9 SHA256 5e2962d6876fd77018c2da8f4241a6ace78d6538a36368a48c2c4cda36f98c46
+EBUILD portage-2.2.0_alpha15.ebuild 11426 RMD160 43c397b61d602710b5dfca43c8c086ea56784f3c SHA1 c1eb1053786d4dd08a93c25563e10b28829d6f19 SHA256 8718918254d055e948a851ddf96041f2c4c9ec94b174888f5b275c6ae04a0794
 EBUILD portage-9999.ebuild 10641 RMD160 88a29c154394f1a3b5aa1313dcb9533b99cd11c9 SHA1 a2b3f474ca80a6628847a2cea2919b4f95f16aef SHA256 accd165113a7f06f0485e485e926c542a42fd0b216e10b7a9220311b87d9f4ba
-MISC ChangeLog 51370 RMD160 fc780217fb1414c50a8d0670949bc1093a74ed4c SHA1 b89d20f98b132f0ba90d048a17652742a6fd4a76 SHA256 791a7595e526b7b5fb911073be5c02477fe7f1fdbd5d2eaa607ad58c82984c6d
+MISC ChangeLog 52108 RMD160 e9b0e34bc9fc30bac0b651667387b4c5cb0aa230 SHA1 318c79e3228cad9a31db1d4e98b9eb56e33825a2 SHA256 43c787a070129fe0c4978cec4b35edd894e8b8684ea48c49b9dd589586a635ce
 MISC metadata.xml 659 RMD160 7ee0e47eb8f485c2a0d45164b90e0aa4f91bd738 SHA1 afeb226c303b15eb2157cf9f97293c77f92a2919 SHA256 e141c1ecbca4c7c97009ecf16a70628c0470f291683c788dfed5d06efcd6ae2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0mZvgACgkQ/ejvha5XGaMWagCaA8xD9WnODhzxnKGy+ZNqjQhl
-jBQAoKfRvVyox27HpPqOPVFF3NPHqxvs
-=qnX2
+iEYEARECAAYFAk0t0NIACgkQ/ejvha5XGaMnrwCfc9XG/tI02f/spzHukM6sJ74Z
+WCoAn3M4wX4R0r+DBuDdqn4R7itPwK34
+=/RoJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.9.30.ebuild b/sys-apps/portage/portage-2.1.9.30.ebuild
deleted file mode 100644
index 9911b0c6b6f4..000000000000
--- a/sys-apps/portage/portage-2.1.9.30.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# 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.1.9.30.ebuild,v 1.1 2011/01/07 01:05:54 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 ~x86 ~sparc-fbsd ~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 )"
-
-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=$PV
-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() {
-	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"
-	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"
-		# __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
-
-	[[ -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.1.9.29.ebuild b/sys-apps/portage/portage-2.1.9.31.ebuild
index 040415ee3893..46698e46ee97 100644
--- a/sys-apps/portage/portage-2.1.9.29.ebuild
+++ b/sys-apps/portage/portage-2.1.9.31.ebuild
@@ -1,6 +1,6 @@
 # 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.1.9.29.ebuild,v 1.1 2011/01/05 02:05:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.31.ebuild,v 1.1 2011/01/12 16:03:22 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.0_alpha13.ebuild b/sys-apps/portage/portage-2.2.0_alpha13.ebuild
deleted file mode 100644
index 910e361b925a..000000000000
--- a/sys-apps/portage/portage-2.2.0_alpha13.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# 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_alpha13.ebuild,v 1.1 2011/01/05 02:05:37 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"
-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.0_alpha11
-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() {
-	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
-
-	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/*_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
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha14.ebuild b/sys-apps/portage/portage-2.2.0_alpha15.ebuild
index 289bad5d9e1c..cc03e80c938a 100644
--- a/sys-apps/portage/portage-2.2.0_alpha14.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha15.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha14.ebuild,v 1.1 2011/01/07 01:05:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha15.ebuild,v 1.1 2011/01/12 16:03:22 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.