stable on amd64

10 files changed, 51 insertions, 15 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 5d5096c4de72..7c52fca9ecff 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.15 2004/08/22 10:43:20 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.16 2004/08/29 03:45:50 lv Exp $
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org>
+  emul-linux-x86-baselibs-1.2.2.ebuild:
+  stable on amd64
 
 *emul-linux-x86-baselibs-1.2.2 (22 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2.ebuild
index 8bd0d41364ba..0095a467c2c6 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2.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/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2.ebuild,v 1.1 2004/08/22 10:43:20 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2.ebuild,v 1.2 2004/08/29 03:45:50 lv Exp $
 
 DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
 SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-baselibs-${PV}.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 # stop confusing portage 0.o
diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog
index a72f28c5b57a..5bab0c1faa8a 100644
--- a/app-emulation/emul-linux-x86-compat/ChangeLog
+++ b/app-emulation/emul-linux-x86-compat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/emul-linux-x86-compat
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.1 2004/08/16 22:53:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.2 2004/08/29 03:45:50 lv Exp $
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-compat-1.0.ebuild:
+  stable on amd64
 
 *emul-linux-x86-compat-1.0 (16 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild
index 0a86e4260170..5afeacb0ee69 100644
--- a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild
+++ b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.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/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild,v 1.1 2004/08/16 22:53:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0.ebuild,v 1.2 2004/08/29 03:45:50 lv Exp $
 
 DESCRIPTION="emul-linux-x86 version of lib-compat, with the addition of a 32bit libgcc_s and the libstdc++ versions provided by gcc 3.3 and 3.4 for non-multilib systems."
 SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-compat-1.0.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 # stop confusing portage 0.o
diff --git a/app-emulation/emul-linux-x86-glibc/ChangeLog b/app-emulation/emul-linux-x86-glibc/ChangeLog
index 124a81cc16d1..904c7af17760 100644
--- a/app-emulation/emul-linux-x86-glibc/ChangeLog
+++ b/app-emulation/emul-linux-x86-glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for <CATEGORY>/<PACKAGE_NAME>
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/ChangeLog,v 1.2 2004/08/16 20:40:54 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/ChangeLog,v 1.3 2004/08/29 03:45:50 lv Exp $
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-glibc-1.1.ebuild:
+  stable on amd64
 
 *emul-linux-x86-glibc-1.1 (16 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild
index 29d3c3c4c181..f5e37affd56f 100644
--- a/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild
+++ b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.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/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild,v 1.3 2004/08/22 20:41:42 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild,v 1.4 2004/08/29 03:45:50 lv Exp $
 
 DESCRIPTION="GNU C Library for emulation of 32bit x86 on amd64"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-glibc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -40,3 +40,22 @@ LDPATH=/lib32:/usr/lib32:/emul/linux/x86/lib:/emul/linux/x86/usr/lib
 ENDOFENV
 	chmod 644 ${D}/etc/env.d/40emul-linux-x86-glibc
 }
+
+run_verbose() {
+	echo "running $@"
+	$@ || die "unable to $@"
+}
+
+pkg_postinst() {
+	# for some reason we have users with lib32 as a directory and not a symlink.
+	# my guess is a broken version of opengl-update somewhere... but since
+	# having lib32 as a directory is definately broken, lets fix that here.
+	if [ -d /usr/lib32 ] ; then
+		ewarn "/usr/lib32 is a directory and not a symlink... fixing"
+		run_verbose mv /usr/lib32 /usr/lib32-bork-bork-bork
+		run_verbose ln -sf /emul/linux/x86/usr/lib /usr/lib32
+		run_verbose mv -v /usr/lib32-bork-bork-bork/* /usr/lib32/
+		run_verbose rm -rf /usr/lib32-bork-bork-bork
+		einfo "fixed!"
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 6d48c6e1182c..e509002bb6c0 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.4 2004/08/22 23:49:55 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.5 2004/08/29 03:45:50 lv Exp $
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org>
+  emul-linux-x86-gtklibs-1.2.ebuild:
+  stable on amd64
 
 *emul-linux-x86-gtklibs-1.2 (22 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2.ebuild
index a81bdb679f01..8a8523419d64 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2.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/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2.ebuild,v 1.1 2004/08/22 23:49:55 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2.ebuild,v 1.2 2004/08/29 03:45:50 lv Exp $
 
 DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
 SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-gtklibs-${PV}.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index b80750e8a795..bf359561b56f 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.10 2004/08/22 10:54:16 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.11 2004/08/29 03:45:50 lv Exp $
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-xlibs-1.2.ebuild:
+  stable on amd64
 
 *emul-linux-x86-xlibs-1.2 (22 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild
index eb42979c16e5..eea5884cf5b7 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.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/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild,v 1.2 2004/08/22 20:42:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild,v 1.3 2004/08/29 03:45:50 lv Exp $
 
 DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 DEPEND="virtual/libc