*portage-2.2_rc52 (25 Nov 2009)

  25 Nov 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc52.ebuild:
  2.2_rc52 bump. This includes all fixes in 2.1.7.7.

*portage-2.1.7.7 (25 Nov 2009)

  25 Nov 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.7.7.ebuild:
  2.1.7.7 bump. This fixes bug #293614 (suggest --backtrack option for
  slot conflict), and bug #293998 (TypeError with python3 in movefile).
  Bug #288499 tracks all bugs fixed since 2.1.6.x.
Package-Manager: portage-2.2_rc52/cvs/Linux i686

4 files changed, 614 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 24c8e319a105..7f1a6d3130bf 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.650 2009/11/24 19:40:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.651 2009/11/26 00:00:28 zmedico Exp $
+
+*portage-2.2_rc52 (25 Nov 2009)
+
+  25 Nov 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc52.ebuild:
+  2.2_rc52 bump. This includes all fixes in 2.1.7.7.
+
+*portage-2.1.7.7 (25 Nov 2009)
+
+  25 Nov 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.7.7.ebuild:
+  2.1.7.7 bump. This fixes bug #293614 (suggest --backtrack option for
+  slot conflict), and bug #293998 (TypeError with python3 in movefile).
+  Bug #288499 tracks all bugs fixed since 2.1.6.x.
 
   24 Nov 2009; Zac Medico <zmedico@gentoo.org> -portage-2.1.7.3.ebuild,
   -portage-2.1.7.4.ebuild, -portage-2.2_rc48.ebuild,
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 056f46cd128c..ed18d979cffe 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,26 +7,30 @@ DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0ef
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
 DIST portage-2.1.7.5.patch.bz2 47613 RMD160 0ace84fcccf817158b7d93a7eaed6503fdb101b7 SHA1 52a7542fd666bb4c11e2decd6ea4ff0c8db8ac48 SHA256 57afe8f54f81e4bb9f68a203e8b9d06e69616b3abf8de4f79de6062a8f8da902
 DIST portage-2.1.7.6.patch.bz2 49898 RMD160 57493d33c9f319018555003c4d21b4e406603da7 SHA1 f836ae9fe668abf237c45c145e8c1517b1fdd346 SHA256 82d707503ab5d109ba6fe88641e8490f48b3848c21ce86e79750833698abc905
+DIST portage-2.1.7.7.patch.bz2 50845 RMD160 3ccd849973b013989e3aaaf1a19f89a0e1246112 SHA1 e94700cb68e8a9941fa1aca0961aa5085d4f57da SHA256 5eaf423ecbbf6926c925e7299e6dfce10a4a3979ecabd8f1016bf04ba10e30c2
 DIST portage-2.1.7.tar.bz2 503459 RMD160 245d2b3d778b235e3814ea551a6115e8075d1da5 SHA1 db5b96dfd147954909331f58e24620c41df117e3 SHA256 62f7af85db0090afd424cb398d4b6b434ff1751c77e524dc8a1480e796f28599
 DIST portage-2.2_rc15.tar.bz2 685597 RMD160 ad814885c5c6b31899fd4cd7d5866d19132bbd9b SHA1 3b562f0a4157f2cc1cf492f46560e2600ec0681f SHA256 fc381120f77338d33d2e53eb2892eebae0b772233d05cf8a2443700d3d6754f6
 DIST portage-2.2_rc33.patch.bz2 200577 RMD160 48d46b6d103009087f0d296d9a428eb3e8059d7b SHA1 9a47ec278362741f2d12c030dc395f4323a974ad SHA256 b8e69329c6cc7b4516f5ed74efa648d1fb8392b644239f5bb4f7cec7a0cdd76e
 DIST portage-2.2_rc43.tar.bz2 527984 RMD160 3a0c69d0e008bbc50a0f66191820291477507013 SHA1 473e7941d6a29a0a6621267c1e8f55ecf4038b55 SHA256 85ecd07050baa4c86da8215c287d5ff6313a1d49dc6bc2d0d75acb2718cbcd22
 DIST portage-2.2_rc50.patch.bz2 66416 RMD160 51c856f578508eda30c8df5223898c79d608efca SHA1 1129f497ca877f59c42ce2abee7ecdbea71cfc67 SHA256 2067a0e95f4766dda9e64acecb9277497664cc8d2dcb400381602af0363652d2
 DIST portage-2.2_rc51.patch.bz2 68539 RMD160 908aea5d3bb18c89921ea8c92981c4bc5783743b SHA1 69be681b57ed0d420e4955ef98e5588138c08a77 SHA256 a370eea775ab3336e726edf8f3a7c75aa8b0c4e38238dc80ef21abec0143e1b9
+DIST portage-2.2_rc52.patch.bz2 70093 RMD160 59d1970377fad06258a811988acc6652296454bd SHA1 4b05cd699a79a69a201a04aaacb0b701850fd4fa SHA256 08d87992fb2a6e141209c1d8ed11254106c98c75a0bd74278ee7406455b927a3
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.6.13.ebuild 10249 RMD160 5b09a3d3eda1bebec6634d8735697bda8289d989 SHA1 131ca76d9630d3a832f003134093a9623028e795 SHA256 e51275ed74c2fd58dd987aba0ddb06b609e733eada680c7ed94440d45cf233af
 EBUILD portage-2.1.6.7.ebuild 8901 RMD160 5c40ca328a0e24bcc3b04a3c611c09f2f8248c23 SHA1 118de80c813cbd187ba33266b4bac32e43d7e46d SHA256 7478716e9c0d8e2c8deec1f5c6f47ba684b1a7efe3e5f3b9c544f28122fea300
 EBUILD portage-2.1.7.5.ebuild 8489 RMD160 f088a33cfd2a39da3e87eab7114bab99a7cb20dc SHA1 40d7df1fb6df77db9b457f5f5a9d50638a443303 SHA256 d6dea926e33d5c1edcea59baf119b03a2b257bd6fc773406ef786f690cdbbd8d
 EBUILD portage-2.1.7.6.ebuild 8489 RMD160 2b302c51aa0d90281926866c75abe804a883ffb0 SHA1 4e2585d120f603ce7babf081aba07b3937eef546 SHA256 44f5c0a3d653fc276ed4053cb07cbcea79c8d2b41a082db49973c28f2a313dc4
+EBUILD portage-2.1.7.7.ebuild 8489 RMD160 caf589bad499c8bafdacd15bc019dd8a9577c6a2 SHA1 d204c3f8b95174b7fe03719116ead7db878bef1b SHA256 fcb762d223246eed37716bd7f6e4c61ff07b9bafa9653dcfefe74d30eb63ecd7
 EBUILD portage-2.2_rc33.ebuild 10657 RMD160 cbec6b53aee00d355c8965cb967d557467705dda SHA1 91b4acc0c25014324eb0cb4c8117a8e3a47b1103 SHA256 7ac2424fea034a979caa48bc5c2596cf0a6511271b4f81b8e9c26f2aee80e4b7
 EBUILD portage-2.2_rc50.ebuild 10221 RMD160 35b33d48fa174c3fc839f889ca89b9287f56d4ed SHA1 cc3d7ca57e4793f8aa51c32ffe586b635c1af975 SHA256 97b8aecda4cb0ca58ec83c8925c6b9465c7b4274be5c8bbb39774d69c857b797
 EBUILD portage-2.2_rc51.ebuild 10221 RMD160 43d1605b4ca699ec6f1721ae7e282e35cc54d465 SHA1 508405a285317e9d101532117c975177a1658711 SHA256 67482c7672985bc9d0af049dfddc54bbef24f2d5318526b43dc15e23539e4eb2
-MISC ChangeLog 48770 RMD160 b5a638e05c15479164c8d83a5601ab9d0bf312bf SHA1 9af778ec9bf4b7df7d4cec4c05fa5ee464878a18 SHA256 3debbc251c5fa1847c5fe656c8e84042134ea56395d4eeb9084e5667e5cb7450
+EBUILD portage-2.2_rc52.ebuild 10221 RMD160 b1fe068fad389ea3ad076b825141aee8da792e9a SHA1 319fd48cd3cfa1cc762f18b6e1241a930ba430f1 SHA256 ee00dee0029567478dd59c713b06cf704a1b1016582ce2929c54eb73e76f2546
+MISC ChangeLog 49229 RMD160 d01b780ff1556b044285daf62e4fa259c2394f53 SHA1 dcfcada3268411919308a985cd9755ce08025c9e SHA256 fd430fb03b38b971a204afdc99cfe2624d3443336d9b9f295b484bd917221807
 MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksMNs4ACgkQ/ejvha5XGaOfyQCcCGkltPTG9Z9tnv0iIEpFWX67
-B9wAn1IU7Jbhfh/latthYS12xuvYMLXD
-=N2Lz
+iEYEARECAAYFAksNxSEACgkQ/ejvha5XGaMORACfRwYMwSEtJnEZWDd17U+Lx5xs
+RgQAoJIEMCmKOoM3nmzEN1mNTlWPUy/e
+=WuQj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.7.7.ebuild b/sys-apps/portage/portage-2.1.7.7.ebuild
new file mode 100644
index 000000000000..6fc74833159a
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.7.7.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.7.ebuild,v 1.1 2009/11/26 00:00: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? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=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 )"
+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.7
+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}
+
+pkg_setup() {
+	if [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') != good ]] ; then
+		die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+	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
+		sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed"
+	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=""
+		# A name collision between the portage.dbapi class and the
+		# module with the same name triggers an epydoc crash unless
+		# portage.dbapi is excluded from introspection.
+		ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \
+			epydoc_opts='--exclude-introspect portage\.dbapi'
+		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"
+		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"
+	fi
+}
+
+src_test() {
+	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
+
+	dodir "${portage_share_config}"
+	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
+	for x in $(find "$S"/bin -type d) ; do
+		x=${x#$S/}
+		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
+
+	for x in $(find "$S"/pym -type d) ; do
+		x=${x#$S/}
+		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
+
+	[[ -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_rc52.ebuild b/sys-apps/portage/portage-2.2_rc52.ebuild
new file mode 100644
index 000000000000..b0eb6f72c85f
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc52.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc52.ebuild,v 1.1 2009/11/26 00:00: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? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=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_rc43
+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}
+
+pkg_setup() {
+	if [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') != good ]] ; then
+		die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+	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
+		sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed"
+	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=""
+		# A name collision between the portage.dbapi class and the
+		# module with the same name triggers an epydoc crash unless
+		# portage.dbapi is excluded from introspection.
+		ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \
+			epydoc_opts='--exclude-introspect portage\.dbapi'
+		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"
+		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"
+	fi
+}
+
+src_test() {
+	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/"{sets.conf,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
+	for x in $(find "$S"/bin -type d) ; do
+		x=${x#$S/}
+		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
+
+	for x in $(find "$S"/pym -type d) ; do
+		x=${x#$S/}
+		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
+}