chicken-and-egg again...

diff --git a/profiles/default-linux/amd64/2005.0/README b/profiles/default-linux/amd64/2005.0/README
index 2f2f37015a0843c27604c8b07dcaf5869d87c4fa..83c2217b2b53fe8c931f89428b81d33e8fb1684f 100644 (file)
--- a/profiles/default-linux/amd64/2005.0/README
+++ b/profiles/default-linux/amd64/2005.0/README
@@ -5,16 +5,20 @@ HOWTO upgrade from 2004.3 and 2004.3/lib64 to 2005.0
  3) emerge -v '>=sys-devel/distcc-2.18.3-r1'
  4) emerge unmerge linux26-headers
  5) emerge -v linux-headers
- 6) (If you choose option 1 for step 13) emerge -v emul-linux-x86-glibc
+ 6) emerge unmerge emul-linux-x86-glibc
  7) rm /lib32 /usr/lib32 /usr/X11R6/lib32
  8) mkdir /lib32 /usr/lib32 /usr/X11R6/lib32
  9) cp /emul/linux/x86/lib32/libsandbox.so /lib32
 10) env-update
 11) rm /etc/make.profile
 12) ln -s /usr/portage/profiles/default-linux/amd64/2005.0 /etc/make.profile
--- Option 1: Recommended --
-13a) emerge -O -v glibc
-13b) emerge unmerge emul-linux-x86-glibc
+-- Option 1: Recommended - compile your own glibc--
+13a) cd /usr/tmp
+13b) wget http://dev.gentoo.org/~eradicator/grp/amd64/2005.0/glibc-2.3.4.20040808-r1-lib32.tbz2
+13c) lynx -source http://dev.gentoo.org/~eradicator/grp/amd64/2005.0/glibc-2.3.4.20040808-r1.tbz2-lib32.md5sum | md5sum -c -
+13d) cd /
+13e) tar xjf /usr/tmp/glibc-2.3.4.20040808-r1-lib32.tar.bz2
+13d) emerge -O -v glibc
 -- Option 2: Or if you want to use eradicator's prebuilt glibc (see note below first) --
 13a) mkdir /usr/tmp/All
 13b) cd /usr/tmp/All

diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask b/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask
new file mode 100644 (file)
index 0000000..b97f942
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask
@@ -0,0 +1,9 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask,v 1.1 2005/01/13 11:45:35 eradicator Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# multilib aware versions (install to / look in proper $(get_libdir))
+<app-editors/emacs-21.3-r5
+<dev-lang/tcl-8.4.6-r1
+<dev-lang/tk-8.4.6-r1
+<dev-tcltk/expect-5.42.1
+<net-libs/courier-authlib-0.52

diff --git a/profiles/default-linux/amd64/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask
index 9f6af4684cbc7d3b061bea6bf90a7bf717238ec6..b2f4ebc85abe94f26f4c5d21dfaf28c427abcdcd 100644 (file)
--- a/profiles/default-linux/amd64/2005.0/package.mask
+++ b/profiles/default-linux/amd64/2005.0/package.mask
@@ -1,12 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.6 2005/01/13 09:55:39 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# multilib aware versions (install to / look in proper $(get_libdir))
-<app-editors/emacs-21.3-r5
-<dev-lang/tcl-8.4.6-r1
-<dev-lang/tk-8.4.6-r1
-<dev-tcltk/expect-5.42.1
-<net-libs/courier-authlib-0.52
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.7 2005/01/13 11:45:35 eradicator Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Force binutils-config versions of binutils