From 15ff9c7ad8f956c8bae68213af0aae48cb111391 Mon Sep 17 00:00:00 2001
From: Nicholas Jones <carpaski@gentoo.org>
Date: Thu, 21 Oct 2004 05:37:34 +0000
Subject: [PATCH] Fix for python2.2 slowness and error messages.

---
 sys-apps/portage/Manifest              | 8 ++++----
 sys-apps/portage/portage-2.0.51.ebuild | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d4a99289955e..b432f516e6f2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,7 +6,7 @@ MD5 00db015217d8e61934c033d1e27d40b7 portage-2.0.51_rc7.ebuild 11788
 MD5 c2319f5f50294b32c0d1b9cfa1bee9d3 portage-2.0.50-r11.ebuild 11543
 MD5 48e3a06d54b4afb8b3aac23b90e383ea portage-2.0.51_rc9.ebuild 11788
 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
-MD5 0ab7e3167254989b9ed5945bdc5ffe2e portage-2.0.51.ebuild 11934
+MD5 137fc150ea14ad701b4469a87c123c4c portage-2.0.51.ebuild 12211
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
 MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
 MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
@@ -17,7 +17,7 @@ MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBdyePBDOEqLMd+jQRAkhQAJ9cT86eRfojAPyND1trR4aoAkHQqgCfQTLR
-3BwoKbFVAtPfYF5w4EIWmuQ=
-=RDmD
+iD8DBQFBd0swBDOEqLMd+jQRAtekAJ4syTymEMONZ3YxcCPXzfe4C1vSkACdG46E
+ncXBQisyG3AheTK56jPw0Mw=
+=2M1j
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51.ebuild b/sys-apps/portage/portage-2.0.51.ebuild
index d3a26f9ac0a2..1891ce67199d 100644
--- a/sys-apps/portage/portage-2.0.51.ebuild
+++ b/sys-apps/portage/portage-2.0.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.ebuild,v 1.3 2004/10/21 03:05:34 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.ebuild,v 1.4 2004/10/21 05:37:34 carpaski Exp $
 
 IUSE="build selinux"
 inherit flag-o-matic
@@ -182,6 +182,12 @@ pkg_preinst() {
 			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
 		fi
 	fi
+	
+	# If we return true, then we don't have HIGHEST_PROTOCOL.
+	# We need to modify the source for this case.
+	if python -c "import cPickle,sys; sys.exit('HIGHEST_PROTOCOL' in dir(cPickle))"; then
+		sed -i "s:cPickle.HIGHEST_PROTOCOL:-1:" "${IMAGE}"/usr/lib/portage/pym/*.py
+	fi
 }
 
 pkg_postinst() {
-- 
2.26.2