portage-2.1.1_rc1-r3 revbump for bug #146060 and other small fixes.

Package-Manager: portage-2.1.1_rc1-r3

3 files changed, 218 insertions, 296 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 9b72adf7f47b..8025412045e2 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.233 2006/08/30 05:56:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.234 2006/09/03 21:57:13 zmedico Exp $
+
+*portage-2.1.1_rc1-r3 (03 Sep 2006)
+
+  03 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_rc1-r3.ebuild:
+  portage-2.1.1_rc1-r3 revbump for bug #146060 and other small fixes.
 
 *portage-2.1.1_rc1-r2 (30 Aug 2006)
 
@@ -22,26 +27,6 @@
   portage-2.1.1_pre5-r1.ebuild, portage-2.1.1_pre5-r3.ebuild:
   Add append-lfs-flags to src_compile for bug #144754 and punt old 2.1-r1.
 
-*portage-2.1.1_pre5-r3 (21 Aug 2006)
-
-  21 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre5-r3.ebuild:
-  2.1.1_pre5-r3 revbump.  This fixes bugs #144331, #144381, and #144486.
-
-*portage-2.1.1_pre5-r2 (17 Aug 2006)
-
-  17 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre5-r2.ebuild:
-  2.1.1_pre5-r2 revbump. This fixes bugs #67179 and #143908.
-
-*portage-2.1.1_pre5-r1 (14 Aug 2006)
-
-  14 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre5-r1.ebuild:
-  2.1.1_pre5-r1 revbump.  This fixes bugs #142652 and #143730.
-
-*portage-2.1.1_pre5 (11 Aug 2006)
-
-  11 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre5.ebuild:
-  2.1.1_pre5 release.  This fixes bugs #107453, #141935, #143340, and #142853.
-
   11 Aug 2006; Brent Baude <ranger@gentoo.org> portage-2.1-r2.ebuild:
   Marking portage-2.1-r2 ppc64 stable wrt to bug # 142283
 
@@ -51,32 +36,15 @@
   06 Aug 2006; Luis Medinas <metalgod@gentoo.org> portage-2.1-r2.ebuild:
   Stable on amd64 see bug #142283.
 
-*portage-2.1.1_pre4-r4 (06 Aug 2006)
-
-  06 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre4-r4.ebuild:
-  2.1.1_pre4-r4 revbump. This fixes bugs #128598, #140163, #140552, #141185,
-  and #142909.
-
   05 Aug 2006; <nixnut@gentoo.org> portage-2.1-r2.ebuild:
   Stable on ppc. Bug #142283
 
-*portage-2.1.1_pre4-r3 (04 Aug 2006)
-
-  04 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre4-r3.ebuild:
-  2.1.1_pre4-r3 revbump.  This fixes bugs #96368, #136197, #142125, and
-  #142776.
-
   03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> portage-2.1-r2.ebuild:
   Stable on hppa wrt #142283
 
   03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> portage-2.1-r2.ebuild:
   Stable on sparc wrt #142283
 
-*portage-2.1.1_pre4-r2 (02 Aug 2006)
-
-  02 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre4-r2.ebuild:
-  2.1.1_pre4-r2 revbump.  This fixes bugs #108517 and #142271.
-
   02 Aug 2006; Fabian Groffen <grobian@gentoo.org> portage-2.1-r2.ebuild:
   Marked ppc-macos stable (bug #142283)
 
@@ -87,131 +55,15 @@
   #137607, #137965, #138394, #138911, #139449, #139662, #140041, #140591,
   #141643, and #141843.
 
-*portage-2.1.1_pre4-r1 (30 Jul 2006)
-
-  30 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre4-r1.ebuild:
-  2.1.1_pre4-r1 revbump.  This fixes bugs #51370 and #105384.
-
-*portage-2.1.1_pre4 (28 Jul 2006)
-
-  28 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre4.ebuild:
-  2.1.1_pre4 release.  This fixes bugs #37455, #141843, and #141865.
-
-*portage-2.1.1_pre3-r5 (25 Jul 2006)
-
-  25 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3-r5.ebuild:
-  2.1.1_pre3-r5 release.  This fixes bugs #116955, #126748, and #141643.
-
-*portage-2.1.1_pre3-r4 (23 Jul 2006)
-
-  23 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3-r4.ebuild:
-  2.1.1_pre3-r4 revbump.  This fixes bugs #141397 and #141445.
-
-*portage-2.1.1_pre3-r3 (20 Jul 2006)
-
-  20 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3-r3.ebuild,
-  +files/2.1.1_pre3-r3-fixes.patch:
-  2.1.1_pre3-r3 regression fix revbump for a syntax error in etc-update.
-
-*portage-2.1.1_pre3-r2 (20 Jul 2006)
-
-  20 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3-r2.ebuild,
-  +files/2.1.1_pre3-r2-fixes.patch:
-  2.1.1_pre3-r2 revbump. This fixes bugs #68612, #97074, #101695, #102436,
-  #103092, #110900, #114713, #119807, #131787, #140591, #140731, #140971, and
-  #141110.
-
-*portage-2.1.1_pre3-r1 (17 Jul 2006)
-
-  17 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3-r1.ebuild:
-  2.1.1_pre3-r1 revbump.  This fixes bugs #37124 and #140694.
-
-*portage-2.1.1_pre3 (15 Jul 2006)
-
-  15 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3.ebuild:
-  2.1.1_pre3 release.  This fixes bug #140159.
-
-*portage-2.1.1_pre2-r8 (12 Jul 2006)
-
-  12 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r8.ebuild,
-  +files/bug_140045.patch:
-  2.1.1_pre2-r8 regression fix revbump for bug #140045.
-
-  12 Jul 2006; Zac Medico <zmedico@gentoo.org> -portage-2.1.1_pre2-r7.ebuild:
-  Remove 2.1.1_pre2-r7 due to bug #140045.
-
-*portage-2.1.1_pre2-r7 (11 Jul 2006)
-
-  11 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r7.ebuild:
-  2.1.1_pre2-r7 revbump.  This fixes bugs #95741, #120653, and #135834.
-
-*portage-2.1.1_pre2-r6 (08 Jul 2006)
-
-  08 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r6.ebuild,
-  +files/depend_phase_category.patch:
-  2.1.1_pre2-r6 regression fix revbump. This fixes an issue with the ebuild
-  environment having an incorrect $CATEGORY value during the depend phase.
-
-*portage-2.1.1_pre2-r5 (07 Jul 2006)
-
-  07 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r5.ebuild:
-  2.1.1_pre2-r5 regression fix revbump for bug #139580.
-
   06 Jul 2006; Marius Mauch <genone@gentoo.org> portage-2.0.51.22-r3.ebuild,
   portage-2.0.54-r2.ebuild, portage-2.1.ebuild, portage-2.1-r1.ebuild,
   portage-2.1.1_pre1-r5.ebuild, portage-2.1.1_pre2-r2.ebuild,
   portage-2.1.1_pre2-r4.ebuild:
   replace einfo with elog
 
-*portage-2.1.1_pre2-r4 (05 Jul 2006)
-
-  05 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r4.ebuild,
-  +files/bug_132601-2.patch:
-  2.1.1_pre2-r4 revbump.  This only includes one more patch for bug #132601.
-
-*portage-2.1.1_pre2-r3 (05 Jul 2006)
-
-  05 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r3.ebuild,
-  +files/bug_132601.patch:
-  2.1.1_pre2-r3 revbump. This fixes bugs #108449, #121106, #131319, #137446,
-  and #139240.  Hopefully bug #132601 is also fixed.
-
-*portage-2.1.1_pre2-r2 (03 Jul 2006)
-
-  03 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r2.ebuild:
-  2.1.1_pre2-r2 revbump.  This fixes bugs #137975, #138837, and #138911.
-
-*portage-2.1.1_pre2-r1 (02 Jul 2006)
-
-  02 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r1.ebuild:
-  2.1.1_pre2-r1 regression fix revbump for bug #138793.
-
-*portage-2.1.1_pre2 (01 Jul 2006)
-
-  01 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2.ebuild:
-  2.1.1_pre2 release.  This fixes bugs #138394, #138600, and #138611.
-
   30 Jun 2006; Thomas Cort <tcort@gentoo.org> portage-2.1-r1.ebuild:
   Stable on alpha wrt Bug #137445.
 
-*portage-2.1.1_pre1-r5 (27 Jun 2006)
-
-  27 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1-r5.ebuild,
-  +files/bugs_138246_138259.patch:
-  2.1.1_pre1-r5 regression fix revbump for #138195, #138246, and #138259.
-
-*portage-2.1.1_pre1-r4 (27 Jun 2006)
-
-  27 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1-r4.ebuild,
-  +files/bug_138131.patch:
-  2.1.1_pre1-r4 regression fix revbump for #138131.
-
-*portage-2.1.1_pre1-r3 (26 Jun 2006)
-
-  26 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1-r3.ebuild:
-  2.1.1_pre1-r3 revbump.  This fixes bugs #129054, #137786, #137864, and
-  #137965.
-
   25 Jun 2006; Guy Martin <gmsoft@gentoo.org> portage-2.1-r1.ebuild:
   Stable on hppa.
 
@@ -228,12 +80,6 @@
   23 Jun 2006; Markus Rothe <corsair@gentoo.org> portage-2.1-r1.ebuild:
   Stable on ppc64; bug #137445
 
-*portage-2.1.1_pre1-r2 (23 Jun 2006)
-
-  23 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1-r2.ebuild:
-  2.1.1_pre1-r2 revbump. This fixes bugs #137177, #137206, #137269, #137565,
-  and #137607.
-
   23 Jun 2006; Fabian Groffen <grobian@gentoo.org> portage-2.1-r1.ebuild:
   Marked ppc-macos (bug #137445)
 
@@ -252,18 +98,6 @@
   with catalyst, the change in unmerge behavior from bug #118515 has been
   reverted.
 
-*portage-2.1.1_pre1-r1 (18 Jun 2006)
-
-  18 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1-r1.ebuild:
-  2.1.1_pre1-r1 revbump.  This fixes bugs #136818, #137032, and #137105.
-
-*portage-2.1.1_pre1 (16 Jun 2006)
-
-  16 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre1.ebuild:
-  2.1.1_pre1 release. This fixes bugs #85576, #96331, #116637, #123677,
-  #126793, #132385, #133740, #136199, #136208, #136236, #136278, #136285,
-  #136313, #136404, #136532, #136705, and #136947.
-
   11 Jun 2006; Zac Medico <zmedico@gentoo.org> portage-2.1.ebuild:
   Add einfo about the default USE_ORDER change.
 
@@ -290,120 +124,17 @@
   09 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.ebuild:
   2.1 final release.
 
-*portage-2.1_rc4-r5 (08 Jun 2006)
-
-  08 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc4-r5.ebuild:
-  Revbump for bug #136031 and other fixes.
-
-*portage-2.1_rc4-r4 (07 Jun 2006)
-
-  07 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc4-r4.ebuild:
-  Revbump for #135398 and #135856.
-
-*portage-2.1_rc4-r3 (06 Jun 2006)
-
-  06 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc4-r3.ebuild:
-  Revbump for #108393 and #135639.
-
-*portage-2.1_rc4-r2 (05 Jun 2006)
-
-  05 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc4-r2.ebuild,
-  +files/repoman_livevcs_fixes.patch:
-  Revbump for #108393 and other fixes.
-
-*portage-2.1_rc4-r1 (04 Jun 2006)
-
-  04 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc4-r1.ebuild:
-  Revbump for #135429, #135446, and other fixes.
-
-  03 Jun 2006; Zac Medico <zmedico@gentoo.org> portage-2.1_rc4.ebuild:
-  Remove pointless compilation of python bytecodes and the missingos module
-  in order to fix cross compiles for bug #135398.
-
-*portage-2.1_rc4 (03 Jun 2006)
-
-  03 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc4.ebuild:
-  2.1_rc4 release candidate.  This fixes bugs #135241 and #135278.
-
-*portage-2.1_rc3-r5 (02 Jun 2006)
-
-  02 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3-r5.ebuild:
-  Revbump to fix bugs #135132 and #135134.
-
-*portage-2.1_rc3-r4 (01 Jun 2006)
-
-  01 Jun 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3-r4.ebuild:
-  Revbump to fix bug #109739.
-
-*portage-2.1_rc3-r3 (31 May 2006)
-
-  31 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3-r3.ebuild:
-  Revbump to fix bug #134885.
-
-*portage-2.1_rc3-r2 (30 May 2006)
-
-  30 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3-r2.ebuild:
-  Revbump to fix bugs #133420 and #134743.
-
   29 May 2006; Joshua Kinard <kumba@gentoo.org> portage-2.0.54-r2.ebuild:
   Marked stable on mips to plug Bug #131207.
 
-  29 May 2006; Zac Medico <zmedico@gentoo.org>
-  +files/bug_134743_selinux.patch, portage-2.1_rc3-r1.ebuild:
-  Add a patch for bug #134743 which only affects selinux users.
-
-*portage-2.1_rc3-r1 (29 May 2006)
-
-  29 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3-r1.ebuild:
-  Revbump for bug #134466 and other minor fixes.
-
-*portage-2.1_rc3 (27 May 2006)
-
-  27 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc3.ebuild:
-  2.1_rc3 release candidate.  This fixes bugs #112612, #122517, #124638,
-  #134362, and #134466.
-
   25 May 2006; Zac Medico <zmedico@gentoo.org>
   portage-2.0.54-r2.ebuild, portage-2.1_rc2-r3.ebuild:
   Make bash-3.0 conditional on !userland_Darwin for bug #133218.
 
-*portage-2.1_rc2-r3 (25 May 2006)
-
-  25 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc2-r3.ebuild,
-  +files/bug_101196_wget_timeout.patch:
-  Revbump for bugs #84150, #101196, #131779, and #133804.  The ELIBC and
-  USERLAND expansions have been added to IUSE.  In >=portage-2.1_rc2-r1 they
-  are hidden from emerge output by USE_EXPAND_HIDDEN (see make.conf.5).
-
   25 May 2006; Petteri Räty <betelgeuse@gentoo.org>
   portage-2.0.54-r2.ebuild, portage-2.1_rc2-r2.ebuild:
   Portage now depends on >=app-shells/bash-3.0. Fixes bug #133218.
 
-*portage-2.1_rc2-r2 (24 May 2006)
-
-  24 May 2006; <zmedico@gentoo.org> +portage-2.1_rc2-r2.ebuild:
-  Revbump to fix bug #109961.  Pruned some ChangeLog cruft.
-
-*portage-2.1_rc2-r1 (23 May 2006)
-
-  23 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc2-r1.ebuild,
-  +files/bug_134135.patch,
-  +files/use_expand_hidden_kernel.patch:
-  Revbump to fix bugs #134086 and #134135.
-
-  23 May 2006; Zac Medico <zmedico@gentoo.org> portage-2.1_rc2.ebuild:
-  Temporarily remove ELIBC and USERLAND expansions from IUSE for bug #134086.
-
-*portage-2.1_rc2 (22 May 2006)
-
-  22 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc2.ebuild:
-  2.1_rc2 release candidate.  This includes bug fixes for #133995 and #134004.
-
-*portage-2.1_rc1-r4 (22 May 2006)
-
-  22 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc1-r4.ebuild:
-  Bug fix revbump for #133731, #133734, and #133977.
-
   20 May 2006; Bryan Østergaard <kloeri@gentoo.org>
   portage-2.0.54-r2.ebuild:
   Stable on ia64.
@@ -412,30 +143,9 @@
   portage-2.0.54-r2.ebuild:
   Stable on alpha.
 
-*portage-2.1_rc1-r3 (18 May 2006)
-
-  18 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc1-r3.ebuild:
-  Bug fix revbump for #133288, #133363, #133528, #133606, and #133628.
-
-*portage-2.1_rc1-r2 (15 May 2006)
-
-  15 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc1-r2.ebuild:
-  Bug fix revbump for bugs #133157 and #133307.
-
   14 May 2006; Luis Medinas <metalgod@gentoo.org> portage-2.0.54-r2.ebuild:
   Stable on amd64. See bug #130527.
 
-*portage-2.1_rc1-r1 (14 May 2006)
-
-  14 May 2006; <zmedico@gentoo.org> +portage-2.1_rc1-r1.ebuild,
-  +files/bug_133287.patch:
-  Regression fix revbump for #133287.
-
-*portage-2.1_rc1 (13 May 2006)
-
-  13 May 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_rc1.ebuild:
-  2.1_rc1 release candidate.
-
   13 May 2006; Joseph Jezak <josejx@gentoo.org> portage-2.0.54-r2.ebuild:
   Marked ppc stable for bug #130527.
 
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r3 b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r3
new file mode 100644
index 000000000000..4faf2c952e10
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r3
@@ -0,0 +1,12 @@
+MD5 283b65a51b36b23409f933cdcdcb7e45 portage-2.1.1_rc1-r3.patch.bz2 4394
+RMD160 3b0949cf71204141e04bc75483ff2bd29341b288 portage-2.1.1_rc1-r3.patch.bz2 4394
+SHA256 82c552476efd6f22245c4771f0f1b4468c9d29fb807ba10364e576daeee005f9 portage-2.1.1_rc1-r3.patch.bz2 4394
+MD5 ad76c9fb311fd603e7c3c75f7d5b09c0 portage-2.1.1_rc1.tar.bz2 295029
+RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 portage-2.1.1_rc1.tar.bz2 295029
+SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d portage-2.1.1_rc1.tar.bz2 295029
+MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
+RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
+SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
+MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
+RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
+SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425
diff --git a/sys-apps/portage/portage-2.1.1_rc1-r3.ebuild b/sys-apps/portage/portage-2.1.1_rc1-r3.ebuild
new file mode 100644
index 000000000000..2b0a1066e2fd
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_rc1-r3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_rc1-r3.ebuild,v 1.1 2006/09/03 21:57:13 zmedico Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+PROVIDE="virtual/portage"
+SLOT="0"
+# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
+IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
+IUSE_USERLAND="userland_Darwin userland_GNU"
+IUSE="build doc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
+DEPEND=">=dev-lang/python-2.3
+	!build? ( >=sys-apps/sed-4.0.5 )"
+RDEPEND=">=dev-lang/python-2.3
+	!build? ( >=sys-apps/sed-4.0.5
+		dev-python/python-fchksum
+		!userland_Darwin? ( >=app-shells/bash-3.0 ) )
+	elibc_glibc? ( sys-apps/sandbox )
+	elibc_uclibc? ( sys-apps/sandbox )
+	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
+	selinux? ( >=dev-python/python-selinux-2.16 )
+	doc? ( app-portage/portage-manpages )
+	>=dev-python/pycrypto-2.0.1-r5"
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+PV_PL="2.1"
+PATCHVER_PL="-r1"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+
+PATCHVER=""
+[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
+	${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
+fi
+
+if [ -n "${PATCHVER_PL}" ]; then
+	SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
+	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
+fi
+
+S="${WORKDIR}"/${PN}-${PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+portage_docs() {
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if [ -n "${PATCHVER}" ]; then
+		cd "${S}"
+		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
+	fi
+	if [ "${PR}" != "r0" ]; then
+		elog "Setting portage.VERSION to ${PVR} ..."
+		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+			die "Failed to patch portage.VERSION"
+		eend 0
+	fi
+	if [ -n "${PATCHVER_PL}" ]; then
+		use linguas_pl && \
+			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
+	fi
+}
+
+src_compile() {
+	append-lfs-flags
+
+	cd "${S}"/src
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
+		die "Failed to build tbz2tool"
+
+	if use elibc_FreeBSD; then
+		cd "${S}"/src/bsd-flags
+		chmod +x setup.py
+		./setup.py build || die "Failed to install bsd-chflags module"
+	fi
+}
+
+src_install() {
+	local portage_base="/usr/lib/portage"
+	cd "${S}"/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf make.globals
+	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
+	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
+	fi
+
+	if use elibc_FreeBSD; then
+		cd "${S}"/src/bsd-flags
+		./setup.py install --root "${D}" || \
+			die "Failed to install bsd-chflags module"
+	fi
+
+	dodir ${portage_base}/bin
+	exeinto ${portage_base}/bin
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
+	fi
+	cd "${S}"/bin
+	doexe *
+	doexe "${S}"/src/tbz2tool
+	dosym newins ${portage_base}/bin/donewins
+
+	for mydir in pym pym/cache pym/elog_modules; do
+		dodir ${portage_base}/${mydir}
+		insinto ${portage_base}/${mydir}
+		cd "${S}"/${mydir}
+		doins *.py
+	done
+
+	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
+	dodoc "${S}"/NEWS
+	dodoc "${S}"/RELEASE-NOTES
+
+	dodir /usr/bin
+	for x in ebuild emerge portageq repoman tbz2tool xpak; do
+		dosym ../lib/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 ../lib/portage/bin/${x} /usr/sbin/${x}
+	done
+
+	dodir /etc/portage
+	keepdir /etc/portage
+
+	doenvd "${FILESDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+	local portage_base="/usr/lib/portage"
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf "${IMAGE}"/${portage_base}/pym/*
+		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${IMAGE}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+	else
+		for mydir in pym pym/cache pym/elog_modules; do
+			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
+			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
+		done
+	fi
+}
+
+pkg_postinst() {
+	local x
+
+	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
+	   [ -f "${ROOT}"/var/cache/edb/world ] &&
+	   [ ! -h "${ROOT}"/var/cache/edb/world ]; then
+		mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
+		ln -s ../../lib/portage/world /var/cache/edb/world
+	fi
+
+	for x in "${ROOT}"/etc/._cfg????_make.globals; do
+		# Overwrite the globals file automatically.
+		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
+	done
+
+	portage_docs
+}