stable on amd64; a bit preliminary as we need this in the 2007.0 release

Package-Manager: portage-2.1.2-r13

27 files changed, 56 insertions, 777 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 1f414db9073b..a17669b00726 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,379 +1,9 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.72 2007/02/27 10:54:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.73 2007/03/02 15:01:34 blubb Exp $
 
-*emul-linux-x86-baselibs-10.2 (27 Feb 2007)
-
-  27 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-10.2.ebuild:
-  move giflib from medialibs to baselibs as gtklibs depends on it; bug 168501
-
-  26 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-10.1-r1.ebuild:
-  improve coding style; bug 168386
-
-*emul-linux-x86-baselibs-10.1-r1 (21 Feb 2007)
-
-  21 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-10.1-r1.ebuild:
-  use new emul-libs eclass
-
-  19 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-10.1.ebuild:
-  it's RESTRICT=strip
-
-  16 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  -emul-linux-x86-baselibs-2.5.1.ebuild,
-  -emul-linux-x86-baselibs-2.5.2.ebuild,
-  -emul-linux-x86-baselibs-2.5.4.ebuild,
-  -emul-linux-x86-baselibs-2.5.5.ebuild,
-  -emul-linux-x86-baselibs-10.0-r1.ebuild,
-  emul-linux-x86-baselibs-10.1.ebuild:
-  stablize 10.1 for security bug 153704 & clean up old versions
-
-*emul-linux-x86-baselibs-10.1 (14 Feb 2007)
-
-  14 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  -emul-linux-x86-baselibs-10.0.ebuild,
-  +emul-linux-x86-baselibs-10.1.ebuild:
-  drop =db-4.0*
-
-*emul-linux-x86-baselibs-10.0-r1 (13 Feb 2007)
-
-  13 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-10.0-r1.ebuild:
-  built cups without ssl & clean out more junk; bug 166584
-
-  13 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-10.0.ebuild:
-  kill some unneeded files; partly fixes bug 166584
-
-  12 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-10.0.ebuild:
-  version bump; bugs 146037, 158826, 127337
-
-*emul-linux-x86-baselibs-10.0 (11 Feb 2007)
-
-  11 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-2.5.5-r3.ebuild:
-  stable on amd64 as dep of soundlibs
-
-*emul-linux-x86-baselibs-2.5.5-r3 (05 Jan 2007)
-
-  05 Jan 2007; Mike Frysinger <vapier@gentoo.org>
-  +emul-linux-x86-baselibs-2.5.5-r3.ebuild:
-  Dont install patch #143390 by Bernard Cafarelli.
-
-*emul-linux-x86-baselibs-2.5.5-r2 (05 Jan 2007)
-
-  05 Jan 2007; Mike Frysinger <vapier@gentoo.org>
-  +emul-linux-x86-baselibs-2.5.5-r2.ebuild:
-  Fix encoded /emul to point to lib32 #143390.
-
-*emul-linux-x86-baselibs-2.5.5-r1 (03 Jan 2007)
-
-  03 Jan 2007; Mike Frysinger <vapier@gentoo.org>
-  +emul-linux-x86-baselibs-2.5.5-r1.ebuild:
-  Move /emul to /lib32 #143390.
-
-*emul-linux-x86-baselibs-2.5.5 (11 Dec 2006)
-
-  11 Dec 2006; Daniel Gryniewicz <dang@gentoo.org>
-  +emul-linux-x86-baselibs-2.5.5.ebuild:
-  Bump to openssl-0.9.8d for bug #152640
-
-  07 Dec 2006; Olivier Crête <tester@gentoo.org>
-  emul-linux-x86-baselibs-2.5.4.ebuild:
-  Stable on amd64 to follow gtk+-2.10, fixed bug #157359
-
-*emul-linux-x86-baselibs-2.5.4 (23 Nov 2006)
-
-  23 Nov 2006; Olivier Crête <tester@gentoo.org>
-  -emul-linux-x86-baselibs-2.5.3.ebuild,
-  +emul-linux-x86-baselibs-2.5.4.ebuild:
-  Re-added symlinks and upgrade libpng for security bug #155278
-
-*emul-linux-x86-baselibs-2.5.3 (11 Nov 2006)
-
-  11 Nov 2006; Olivier Crête <tester@gentoo.org>
-  +emul-linux-x86-baselibs-2.5.3.ebuild:
-  Upgraded glib 2.12.4-r1 to for GTK+ 2.10
-
-*emul-linux-x86-baselibs-2.5.2 (06 Sep 2006)
-
-  06 Sep 2006; <blubb@gentoo.org> +emul-linux-x86-baselibs-2.5.2.ebuild:
-  version bump directly to stable wrt bug 146438
-
-  20 Jul 2006; Simon Stelling <blubb@gentoo.org>
-  -emul-linux-x86-baselibs-2.4.2.ebuild,
-  -emul-linux-x86-baselibs-2.5.ebuild:
-  removing vulnerable versions
-
-  05 Jul 2006; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-2.5.1.ebuild:
-  marked stable on amd64 wrt bug 138672
-
-*emul-linux-x86-baselibs-2.5.1 (01 Jul 2006)
-
-  01 Jul 2006; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-2.5.1.ebuild:
-  version bump to update libpng per bug 138672
-
-*emul-linux-x86-baselibs-2.5 (17 Mar 2006)
-
-  17 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-baselibs-2.4.1.ebuild,
-  +emul-linux-x86-baselibs-2.5.ebuild:
-  Bump versions of glib and dbus, add libart_lgpl and libidn.
-
-  15 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
-  emul-linux-x86-baselibs-2.4.2.ebuild:
-  Stable on amd64.
-
-  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
-  emul-linux-x86-baselibs-2.4.1.ebuild,
-  emul-linux-x86-baselibs-2.4.2.ebuild:
-  Use nostrip instead of strip restriction for compatibility with older portage.
-
-  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
-  emul-linux-x86-baselibs-2.4.1.ebuild,
-  emul-linux-x86-baselibs-2.4.2.ebuild:
-  Add strip restriction, as the binaries are already stripped.
-
-  03 Mar 2006; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-2.4.1.ebuild,
-  emul-linux-x86-baselibs-2.4.2.ebuild:
-  remove the dependency on app-emulation/emul-linux-x86-glibc since 2004.3 has
-  been deprecated a while ago
-
-*emul-linux-x86-baselibs-2.4.2 (11 Jan 2006)
-
-  11 Jan 2006; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-baselibs-2.3.ebuild, -emul-linux-x86-baselibs-2.4.ebuild,
-  +emul-linux-x86-baselibs-2.4.2.ebuild:
-  Add libcups as required by latest acroread, bug 118417. Prune old versions.
-
-  05 Jan 2006; Herbie Hopkins <herbs@gentoo.org>
-  emul-linux-x86-baselibs-2.4.1.ebuild:
-  Marked stable (early stabilization as current stable contains openldap libs
-  affected by security bug 105380).
-
-*emul-linux-x86-baselibs-2.4.1 (03 Jan 2006)
-
-  03 Jan 2006; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.4.1.ebuild:
-  Fix small problem with libslang (install both unicode and -unicode versions)
-
-  06 Dec 2005; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-baselibs-2.1.4.ebuild:
-  remove old version
-
-*emul-linux-x86-baselibs-2.4 (06 Dec 2005)
-
-  06 Dec 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.4.ebuild:
-  New release with serveral library versions bumped, see
-  emul-libs-contents.txt for more info
-
-  19 Oct 2005; Herbie Hopkins <herbs@gentoo.org>
-  emul-linux-x86-baselibs-2.3.ebuild:
-  Stable on amd64.
-
-  19 Oct 2005; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-baselibs-2.1.2.ebuild,
-  -emul-linux-x86-baselibs-2.1.3.ebuild:
-  Prune old versions
-
-  09 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
-  emul-linux-x86-baselibs-2.1.4.ebuild:
-  Marked stable.
-
-*emul-linux-x86-baselibs-2.3 (07 Sep 2005)
-
-  07 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-baselibs-2.2.ebuild, +emul-linux-x86-baselibs-2.3.ebuild:
-  Renamed 2.2 release to 2.3 to avoid conflict with the old buggy 2.2 release,
-  bug 105169. My appologies to everyone that had to install this twice.
-
-  06 Sep 2005; Herbie Hopkins <herbs@gentoo.org> metadata.xml,
-  +emul-linux-x86-baselibs-2.2.ebuild:
-  New release with updated versions of included libs.
-
-*emul-linux-x86-baselibs-2.1.4 (09 Aug 2005)
-
-  09 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.1.4.ebuild:
-  Add libfam as needed by maya-6.5.
-
-*emul-linux-x86-baselibs-2.1.3 (05 Aug 2005)
-
-  05 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.1.3.ebuild:
-  Add libnss_ldap as needed by openoffice2 snapshots, thanks to kanaka.
-
-  01 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-baselibs-1.2.2-r2.ebuild,
-  -emul-linux-x86-baselibs-1.2.3.ebuild,
-  -emul-linux-x86-baselibs-2.1.ebuild,
-  -emul-linux-x86-baselibs-2.1.1.ebuild:
-  Prune old versions.
-
-*emul-linux-x86-baselibs-2.1.2 (31 Jul 2005)
-
-  31 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.1.2.ebuild,
-  -emul-linux-x86-baselibs-2.2.ebuild,
-  -emul-linux-x86-baselibs-2.2.2.ebuild,
-  -emul-linux-x86-baselibs-2.2.3.ebuild:
-  Made 2.1.2 release based on 2.1.1 with upgraded libz (to satisfy security
-  bug #100686). Shunted 2.2* as they proved to be too buggy.
-
-*emul-linux-x86-baselibs-2.2.3 (31 Jul 2005)
-
-  31 Jul 2005; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-2.2.3.ebuild:
-  another bump to fix bug 100795
-
-*emul-linux-x86-baselibs-2.2.2 (30 Jul 2005)
-
-  30 Jul 2005; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-2.2.2.ebuild:
-  version bump to fix bug #100795 and other possible breakages
-
-*emul-linux-x86-baselibs-2.2 (29 Jul 2005)
-
-  29 Jul 2005; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-2.2.ebuild:
-  version bump wrt bug #100686
-
-  22 May 2005; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-baselibs-2.1.1.ebuild:
-  stable on amd64
-
-*emul-linux-x86-baselibs-2.1.1 (25 Apr 2005)
-
-  25 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.1.1.ebuild:
-  Added libdbus (required by new skype)
-
-  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
-  files/75emul-linux-x86-base, -emul-linux-x86-baselibs-1.0.ebuild,
-  -emul-linux-x86-baselibs-1.1-r3.ebuild,
-  -emul-linux-x86-baselibs-1.2.2-r1.ebuild,
-  -emul-linux-x86-baselibs-2.0.ebuild, emul-linux-x86-baselibs-2.1.ebuild:
-  Switched to using doenvd. Remove old versions.
-
-*emul-linux-x86-baselibs-2.1 (18 Apr 2005)
-
-  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-baselibs-2.1.ebuild:
-  Fixed bug #89245, error loading libncurses.so. Removed unneccasary .a files.
-  Fixed SRC_URI.
-
-*emul-linux-x86-baselibs-2.0 (15 Apr 2005)
-
-  15 Apr 2005; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-baselibs-2.0.ebuild:
-  new version provided by Herbie Hopkins
-
-*emul-linux-x86-baselibs-1.2.3 (21 Mar 2005)
-
-  21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +emul-linux-x86-baselibs-1.2.3.ebuild:
-  Updated zlib to 1.2.2.  Updated openssl to 0.9.7e-r1.
-
-  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  emul-linux-x86-baselibs-1.2.2-r2.ebuild:
-  Don't install libsandbox.so if we don't need it.
-
-*emul-linux-x86-baselibs-1.2.2-r2 (17 Jan 2005)
-
-  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +emul-linux-x86-baselibs-1.2.2-r2.ebuild:
-  Set LDPATH in 75emul-linux-x86-base.
-
-*emul-linux-x86-baselibs-1.2.2-r1 (26 Sep 2004)
-
-  26 Sep 2004; Travis Tilley <lv@gentoo.org>
-  +emul-linux-x86-baselibs-1.2.2-r1.ebuild,
-  -emul-linux-x86-baselibs-1.2.2.ebuild:
-  fixed the libz.so symlink
-
-  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)
-
-  22 Aug 2004; Travis Tilley <lv@gentoo.org>
-  -emul-linux-x86-baselibs-1.2.1.ebuild,
-  +emul-linux-x86-baselibs-1.2.2.ebuild:
-  moved libpng and libmng over from xlibs, fixed glib+openssl
-
-*emul-linux-x86-baselibs-1.2.1 (19 Aug 2004)
-
-  19 Aug 2004; Travis Tilley <lv@gentoo.org>
-  +emul-linux-x86-baselibs-1.2.1.ebuild, -emul-linux-x86-baselibs-1.2.ebuild:
-  forgot to include expat and libjpeg
-
-*emul-linux-x86-baselibs-1.2 (16 Aug 2004)
-
-  16 Aug 2004; Travis Tilley <lv@gentoo.org>
-  +emul-linux-x86-baselibs-1.2.ebuild:
-  moved glibc into emul-linux-x86-glibc, moved libgcc_s and libstdc++ into
-  emul-linux-x86-compat, compiled using gcc 3.4 with -march=k8 -m32
-
-*emul-linux-x86-baselibs-1.1-r2 (16 Aug 2004)
-
-  16 Aug 2004; Travis Tilley <lv@gentoo.org>
-  -emul-linux-x86-baselibs-1.1-r2.ebuild:
-  removed old ebuild
-
-  15 Aug 2004; Travis Tilley <lv@gentoo.org>
-  emul-linux-x86-baselibs-1.1-r3.ebuild:
-  stable on amd64 to fix bug 60355
-
-  29 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  emul-linux-x86-baselibs-1.1-r3.ebuild:
-  glibc -> libc, add sed-4 dep
-
-*emul-linux-x86-baselibs-1.1-r3 (29 Jun 2004)
-
-  29 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
-  +emul-linux-x86-baselibs-1.1-r3.ebuild:
-  Version bump to fix BUG #55247. ALL ld scripts need to be changed to point
-  towards lib32 instead lib.
-
-*emul-linux-x86-baselibs-1.1-r1 (03 May 2004)
-
-  03 May 2004; Danny van Dyk <kugelfang@gentoo.org>
-  +emul-linux-x86-baselibs-1.1-r1.ebuild:
-  /lib was missing in image directory, so all symlinks there couldn't be
-  created. Version bump necessary. (BUG #49678)
-
-  15 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> emul-linux-x86-baselibs-1.1.ebuild:
-  Fixed BUG #47819
-
-*emul-linux-x86-baselibs-1.1 (13 Apr 2004)
-
-  13 Apr 2004; <dvandyk@gentoo.org> emul-linux-x86-baselibs-1.1.ebuild:
-  Repackaged baselibs, compiled with CFLAGS="-mcpu=athlon-xp -msse -msse2".
-  GCC Version 3.3.2, all libraries used are stable on x86.
-
-  16 Oct 2003; Brad House <brad_mssw@gentoo.org> files/75emul-linux-x86-base:
-  wrong gcc lib path
-
-  15 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  emul-linux-x86-baselibs-1.0.ebuild:
-  stable on amd64
-
-  04 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  emul-linux-x86-baselibs-1.0.ebuild:
-  add version to downloads
-
-*emul-linux-x86-baselibs-1.0 (04 Oct 2003)
-
-  04 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  emul-linux-x86-baselibs-1.0.ebuild, files/75emul-linux-x86-base:
-  initial release
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-baselibs-10.1-r1.ebuild,
+  emul-linux-x86-baselibs-10.2.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1-r1.ebuild
deleted file mode 100644
index f4b0f0123ddf..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 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-10.1-r1.ebuild,v 1.2 2007/02/26 10:02:37 blubb Exp $
-
-inherit emul-libs
-
-SRC_URI="mirror://gentoo/binutils-2.16.1-r3.tbz2
-		mirror://gentoo/bzip2-1.0.3-r6.tbz2
-		mirror://gentoo/com_err-1.39.tbz2
-		mirror://gentoo/cracklib-2.8.9-r1.tbz2
-		mirror://gentoo/cups-1.2.6-nossl.tbz2
-		mirror://gentoo/db-4.2.52_p4-r2.tbz2
-		mirror://gentoo/dbus-1.0.2.tbz2
-		mirror://gentoo/dbus-glib-0.72.tbz2
-		mirror://gentoo/dbus-qt3-old-0.70.tbz2
-		mirror://gentoo/e2fsprogs-1.39.tbz2
-		mirror://gentoo/expat-1.95.8.tbz2
-		mirror://gentoo/file-4.18.tbz2
-		mirror://gentoo/gamin-0.1.8.tbz2
-		mirror://gentoo/gdbm-1.8.3-r3.tbz2
-		mirror://gentoo/glib-1.2.10-r5.tbz2
-		mirror://gentoo/glib-2.12.7.tbz2
-		mirror://gentoo/gpm-1.20.1-r5.tbz2
-		mirror://gentoo/jpeg-6b-r7.tbz2
-		mirror://gentoo/lcms-1.14-r1.tbz2
-		mirror://gentoo/libart_lgpl-2.3.17.tbz2
-		mirror://gentoo/libidn-0.5.15.tbz2
-		mirror://gentoo/libmng-1.0.9-r1.tbz2
-		mirror://gentoo/libperl-5.8.8-r1.tbz2
-		mirror://gentoo/libpng-1.2.15.tbz2
-		mirror://gentoo/libtool-1.5.22.tbz2
-		mirror://gentoo/libxml2-2.6.27.tbz2
-		mirror://gentoo/ncurses-5.5-r3.tbz2
-		mirror://gentoo/nss_ldap-253.tbz2
-		mirror://gentoo/openldap-2.3.30-r2.tbz2
-		mirror://gentoo/openssl-0.9.8d.tbz2
-		mirror://gentoo/pam-0.78-r5.tbz2
-		mirror://gentoo/pwdb-0.62.tbz2
-		mirror://gentoo/readline-5.1_p4.tbz2
-		mirror://gentoo/slang-1.4.9-r2.tbz2
-		mirror://gentoo/ss-1.39.tbz2
-		mirror://gentoo/tiff-3.8.2-r2.tbz2
-		mirror://gentoo/zlib-1.2.3-r1.tbz2"
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	emul-libs_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo ${S}/usr/lib32/terminfo
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild
index fc0e194c551a..894e0cf6c29a 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-10.2.ebuild,v 1.1 2007/02/27 10:54:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild,v 1.2 2007/03/02 15:01:34 blubb Exp $
 
 inherit emul-libs
 
@@ -46,7 +46,7 @@ SRC_URI="mirror://gentoo/binutils-2.16.1-r3.tbz2
 LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
 		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
 		PAM ZLIB as-is"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.1-r1 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.1-r1
deleted file mode 100644
index a96ff71cad13..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.1-r1
+++ /dev/null
@@ -1,111 +0,0 @@
-MD5 fed24f0c5e2cce04955c9ae20cedcdac binutils-2.16.1-r3.tbz2 2629093
-RMD160 3b2edfc89f305d34a90ffd037fe4d6953a40a2d9 binutils-2.16.1-r3.tbz2 2629093
-SHA256 cddedfc331ba18b129d670159bfdffe307e6c774a1a0ef69e468c97a82fccc9c binutils-2.16.1-r3.tbz2 2629093
-MD5 9844ee67ece0582dadb6441a23a0f837 bzip2-1.0.3-r6.tbz2 415886
-RMD160 e0bcc162152734941e11f2904377968ec617061e bzip2-1.0.3-r6.tbz2 415886
-SHA256 d0d8344e384f91c8deabb5dfa452d8bb9a44e66a03cd2ffd973451eec505c1cc bzip2-1.0.3-r6.tbz2 415886
-MD5 6b250a3cb9ff2b2a10106b82d344a9af com_err-1.39.tbz2 47417
-RMD160 c4461a6c77da9521008e00b80e2f609b698997ef com_err-1.39.tbz2 47417
-SHA256 78ea521c95c95c1fe23e8a4b0cdac2d923a085a16d7f152c01bc0d27e34e4ff2 com_err-1.39.tbz2 47417
-MD5 2c0a0ef022ee7a8e6a6737a5cccaafe4 cracklib-2.8.9-r1.tbz2 270339
-RMD160 d1c623ca5bd0cf0fe5e815015ca71baf7be80715 cracklib-2.8.9-r1.tbz2 270339
-SHA256 8dd89b018d31573f6bf5aea273f4147e8bbbc4711dd1c9c0cdd60f3a14b67185 cracklib-2.8.9-r1.tbz2 270339
-MD5 d77e54712dd3b96782e6cafdff3df37a cups-1.2.6-nossl.tbz2 2350315
-RMD160 bd970a9c5830fe886c56b973444df2a2b07aff2b cups-1.2.6-nossl.tbz2 2350315
-SHA256 0081ac624ac39276bf69809d82d3263d6bc2709b754f76ee1f1c37b178c55c37 cups-1.2.6-nossl.tbz2 2350315
-MD5 92f6549bf3f3a0aeb07fbb8c8fe81d74 db-4.2.52_p4-r2.tbz2 1517284
-RMD160 0dcc49736c88d6072a5a4d66f736f008d42dff20 db-4.2.52_p4-r2.tbz2 1517284
-SHA256 b215b71a50c49312392b549f4398273abc6d40f86ed87a0d7f41757206d2a795 db-4.2.52_p4-r2.tbz2 1517284
-MD5 f47de17809c8cee44c6100d8a4fa9945 dbus-1.0.2.tbz2 512875
-RMD160 96205fcb574c9c59f9b0710e05bad4856318c413 dbus-1.0.2.tbz2 512875
-SHA256 579ce552280bf9dfeec71280a11495fa76b8eb27e2ece22f8013167804eb594a dbus-1.0.2.tbz2 512875
-MD5 e93a51b7643b4215255b8ece989f4c78 dbus-glib-0.72.tbz2 233589
-RMD160 724830f790831ade98cd2f05f75b4ba08cd9ca6b dbus-glib-0.72.tbz2 233589
-SHA256 692194433e32699ea485ed717dbc1086b107cf022895dc5304645e1a334e4ce9 dbus-glib-0.72.tbz2 233589
-MD5 33cd0bab602c35f728b083b9e2fc6271 dbus-qt3-old-0.70.tbz2 66969
-RMD160 fce44c0e28d5be1888fd3b2ee9f4f37d629ebb50 dbus-qt3-old-0.70.tbz2 66969
-SHA256 f8d995ef95f4cb701ec8aebc6041d5d3154090313e67c955e10311f655557ea0 dbus-qt3-old-0.70.tbz2 66969
-MD5 3c372004464188f5d432c135981fc66b e2fsprogs-1.39.tbz2 625641
-RMD160 7835954c56798e82b6998e4a86f8a8d0ebe6eb5e e2fsprogs-1.39.tbz2 625641
-SHA256 ef8b28441f1a9a326cbf9625a41a429f1fb1d467a3ac1b26ba46d7c35f7aad7e e2fsprogs-1.39.tbz2 625641
-MD5 86d7be122575b8f4766abcd84d6db31f expat-1.95.8.tbz2 182048
-RMD160 b6b1a7c8a159196918fdc04cf0cb32d6bfd31792 expat-1.95.8.tbz2 182048
-SHA256 90d022a2b64ac9b64c60905f2a4347fde076c93624412b3146c3abae9e9c9c3b expat-1.95.8.tbz2 182048
-MD5 f936cda7ac9d21ddb1c191ee3299be01 file-4.18.tbz2 295850
-RMD160 ab40fc5b5b4b5fcd2f7538e14212b67fdab8f636 file-4.18.tbz2 295850
-SHA256 aeb624118ee42da094f0ad2d614c43f2df539f0890de4eb65c48f3d29cc50d69 file-4.18.tbz2 295850
-MD5 6a4a22902d6d4ab8e74b23686c6e98e0 gamin-0.1.8.tbz2 119544
-RMD160 d55b3a559e9c5ff24e5008cdc61540f84d7c6919 gamin-0.1.8.tbz2 119544
-SHA256 7a6a25e3ae91e5392f1c885cc368a058676aecbc7e9ffa0978eb4ef198e6e5b7 gamin-0.1.8.tbz2 119544
-MD5 f425e95de56cadf12470ffe8f85684cd gdbm-1.8.3-r3.tbz2 71138
-RMD160 41af244fa15566f212ed490d15f5e02e24848b08 gdbm-1.8.3-r3.tbz2 71138
-SHA256 bfbb430417de27af6d859dce5c0d76a5536df2777f68a2d64e08d731e3601b94 gdbm-1.8.3-r3.tbz2 71138
-MD5 3606a57d2f9ef566058f074267a567d8 glib-1.2.10-r5.tbz2 244984
-RMD160 f1353a7c37a38b04b16741dc740ff6f2754c99ad glib-1.2.10-r5.tbz2 244984
-SHA256 02d9609906ec7080bea8f2095f57a3701a0eb450683e551923bb43a45511d6ff glib-1.2.10-r5.tbz2 244984
-MD5 5fe1b63940ea51bb0e7f646faa65c955 glib-2.12.7.tbz2 1788958
-RMD160 cbd503a57b4e0a538caa7bb1a4e3d0199a40a8e5 glib-2.12.7.tbz2 1788958
-SHA256 48d224474892848ee3f5d26d0b147433431c6232812bf80d76fbd54fd41ffff9 glib-2.12.7.tbz2 1788958
-MD5 410ad5a093caef0839efdc6f266bc73b gpm-1.20.1-r5.tbz2 167722
-RMD160 21c84796b861040ab27d8242209a7e74eeec4c6d gpm-1.20.1-r5.tbz2 167722
-SHA256 1ef4520ef8c606d85c391cbba168551a850cefe45ecd365eb921987d93cbb23f gpm-1.20.1-r5.tbz2 167722
-MD5 5d3d14872b969393b14978f690ce8a19 jpeg-6b-r7.tbz2 333753
-RMD160 bc7d0651b0467642b042f5382c079df5b8fb897c jpeg-6b-r7.tbz2 333753
-SHA256 06daaec9e6ed3965c862d1fadc430d6afd59a9e3857306819432710e77e20af1 jpeg-6b-r7.tbz2 333753
-MD5 94d98abe9d3175f78090f7bc6e942796 lcms-1.14-r1.tbz2 290429
-RMD160 f314babdebfb744507bffdac549dbae81fde9a9a lcms-1.14-r1.tbz2 290429
-SHA256 73f3f76c8fe45873f1db4b01b54b57161a55f0b9e536916874aa79d5efedff86 lcms-1.14-r1.tbz2 290429
-MD5 49f91a2f97f87744e45926b43767e6f5 libart_lgpl-2.3.17.tbz2 136524
-RMD160 eab91638e10966416a9f788ac6dd28fcb9336dda libart_lgpl-2.3.17.tbz2 136524
-SHA256 e13b67d402e2e2ffd8c8fab29cd4e5293a0b6f6eb57d39dee4947ca81bd17fd5 libart_lgpl-2.3.17.tbz2 136524
-MD5 810d5e2208439eb4c8e0a821c2baea37 libidn-0.5.15.tbz2 188712
-RMD160 02379d5cdca649604f779c71054f03469b96151a libidn-0.5.15.tbz2 188712
-SHA256 7c32fd4138d16f64a407e193964130c28b5974ac7f38767d4e34c36394575d70 libidn-0.5.15.tbz2 188712
-MD5 0f52e6ad56d1c943ece9a5991a3bdd09 libmng-1.0.9-r1.tbz2 351839
-RMD160 d6fb99fe1c6705e844042d7607adb29af06162a2 libmng-1.0.9-r1.tbz2 351839
-SHA256 8c62a9284318154e3cb55ba7ade9c6671546a4313fa8fc93afea98ce77ec2c70 libmng-1.0.9-r1.tbz2 351839
-MD5 25340cac48ee1c3829de295e451f1411 libperl-5.8.8-r1.tbz2 1837619
-RMD160 318de060f437f5d9e81a2d184aed13fd83451734 libperl-5.8.8-r1.tbz2 1837619
-SHA256 c556c9f0230aa5aea70a191e7bf74644707efb7d4ff6a1feb952a2a8c17bde5b libperl-5.8.8-r1.tbz2 1837619
-MD5 556e3c7fc5ae9e70e18e25cff8c91fb2 libpng-1.2.15.tbz2 260739
-RMD160 d4d4238022ecad29186087a42ef030d0f922632c libpng-1.2.15.tbz2 260739
-SHA256 09567e8c3531b4b03d32d5388cf3a585945e34e0586acd97bfd598bc712ba862 libpng-1.2.15.tbz2 260739
-MD5 89248e2601e32ea32c77c2ea9c1a3707 libtool-1.5.22.tbz2 516123
-RMD160 0175b97f33cf51f23d35e96149ffddd4a781430e libtool-1.5.22.tbz2 516123
-SHA256 7a342ec2cc094252574fe86e19c395e08f76faebcb6d9b08cc03be229190b2c0 libtool-1.5.22.tbz2 516123
-MD5 f38715d940ff470a9525f079e17f93e0 libxml2-2.6.27.tbz2 1345515
-RMD160 bfa01ab0c722187003feacbb46ef3452dd3763e2 libxml2-2.6.27.tbz2 1345515
-SHA256 9a6157d76c4baddae8d29b5739f1a3173a64844133717cf85ab7ca4d79bb6055 libxml2-2.6.27.tbz2 1345515
-MD5 fe4069a17781c5e9738808e092c80d5e ncurses-5.5-r3.tbz2 1398990
-RMD160 cf2e487fa7219e7ed4eff2bc847721c8844b68c5 ncurses-5.5-r3.tbz2 1398990
-SHA256 a994b48bb1003736049056853b252c21ef9784b18ee18fe4c2a416be9ca48f6a ncurses-5.5-r3.tbz2 1398990
-MD5 6b58fd87cbdcdcadd79a65fad3b4ca9c nss_ldap-253.tbz2 132958
-RMD160 0365248db022ae3b8d419f449ebd43b62fbcbe7f nss_ldap-253.tbz2 132958
-SHA256 1f51d98e9476a1a0196d89b45a9807fee7c7a424edd60ecd03834779364cb599 nss_ldap-253.tbz2 132958
-MD5 f2f60daf7156d34f24870a204a4e2f2f openldap-2.3.30-r2.tbz2 1763134
-RMD160 e27bbca9a239046e1eee075e3d34e95dae880194 openldap-2.3.30-r2.tbz2 1763134
-SHA256 f7884c1b40e748893fc2ae66916bb5659cfb6b91a89d7c6cbd83468b16a558b4 openldap-2.3.30-r2.tbz2 1763134
-MD5 aa8ef215729b1d5296f2eb0902e5798d openssl-0.9.8d.tbz2 1858485
-RMD160 c4db43259c12cc7c4c03aed3f2888f621ad2a0fa openssl-0.9.8d.tbz2 1858485
-SHA256 1e94df0e62b2ee683e772e13c384463ab6745cdc574533e4c85b196b9d6b4854 openssl-0.9.8d.tbz2 1858485
-MD5 2a740743aefdb4191f046af862a6effa pam-0.78-r5.tbz2 637955
-RMD160 8cb0a9653c1d286d88c91347f4319dc252c30a4e pam-0.78-r5.tbz2 637955
-SHA256 6c83b172a423d000c34483cd7f3bc8b8a2ef707a7ed629ef715183f32df5875f pam-0.78-r5.tbz2 637955
-MD5 daa38a652d07d1491ea96ad83a957129 pwdb-0.62.tbz2 145947
-RMD160 2cadd3f5e167dd71584fee2b1f6845e4d4988512 pwdb-0.62.tbz2 145947
-SHA256 78cddf2877f58f6056969b07eeafc4dccf8a712945bae3742853427ce651b373 pwdb-0.62.tbz2 145947
-MD5 54acd1c8565cfdab9e311570a0b79f15 readline-5.1_p4.tbz2 859488
-RMD160 18a6153d0eb35bf40c3f6b59d5b67e2bc2f8e851 readline-5.1_p4.tbz2 859488
-SHA256 7250c201a2a3e29d8528a82b525e69e9c1359ce6e4895187c607f8db50deacd3 readline-5.1_p4.tbz2 859488
-MD5 42f64638677a1a1a8b39846a8404f3b2 slang-1.4.9-r2.tbz2 539603
-RMD160 3914da02bda58712768f2c8b15fb1876cdbdbe70 slang-1.4.9-r2.tbz2 539603
-SHA256 6ec62087bfdafa11f922726767d86780d8ac90d2cadc415731762a006f775317 slang-1.4.9-r2.tbz2 539603
-MD5 a4fc61a587c9f493f8e5c85435e00502 ss-1.39.tbz2 58154
-RMD160 65c3084e278316b0f14407aa1af6c9fd1d1ce48a ss-1.39.tbz2 58154
-SHA256 e10bdd93be1c5d184184e0a4fad0b590e06c7c56d1d102fd3114a126c1c73286 ss-1.39.tbz2 58154
-MD5 dd99d62853100262195ffd01fdc31b74 tiff-3.8.2-r2.tbz2 679608
-RMD160 d76ef0e93eed015e6bd71d090ad3bbbb538e5fa2 tiff-3.8.2-r2.tbz2 679608
-SHA256 dfcda25af16ea41c039a4d514d044df41cbe2a259a3d3eeee7e70c940231851c tiff-3.8.2-r2.tbz2 679608
-MD5 04373de069c43bd22a18c956774b17ff zlib-1.2.3-r1.tbz2 144220
-RMD160 4570d2369f611d7d78e2a3ab4a68f2e55e2b7067 zlib-1.2.3-r1.tbz2 144220
-SHA256 ef8e3113fde60c1e68d9a52401558ee2d7089643e4ff09a0c636f979d26c554d zlib-1.2.3-r1.tbz2 144220
diff --git a/app-emulation/emul-linux-x86-compat/Manifest b/app-emulation/emul-linux-x86-compat/Manifest
index cfdbdca3a4af..5179e9338791 100644
--- a/app-emulation/emul-linux-x86-compat/Manifest
+++ b/app-emulation/emul-linux-x86-compat/Manifest
@@ -7,18 +7,14 @@ EBUILD emul-linux-x86-compat-1.0-r1.ebuild 953 RMD160 e23b2cb91e7c6c5714fb6e8c2f
 MD5 d93016c20b3bdc67b12d3c6b0073a757 emul-linux-x86-compat-1.0-r1.ebuild 953
 RMD160 e23b2cb91e7c6c5714fb6e8c2f758f60637a5d1a emul-linux-x86-compat-1.0-r1.ebuild 953
 SHA256 a3120dbf95c034e6c940881706ef328ad22e0ac4d17d377595223bd8997d1713 emul-linux-x86-compat-1.0-r1.ebuild 953
-EBUILD emul-linux-x86-compat-1.0-r2.ebuild 916 RMD160 fe8e31d18dbc32797bed1b53440959fca23a2e3d SHA1 4a90d937e70d1515daaeab0bb71b9cf5b75a1834 SHA256 2f6e4f8fa5650fec5b23605d09998ce78ec5ea12559feaf1f05b92ebaec5b75d
-MD5 b844d8e50c57ef773f287e65e7f30dfe emul-linux-x86-compat-1.0-r2.ebuild 916
-RMD160 fe8e31d18dbc32797bed1b53440959fca23a2e3d emul-linux-x86-compat-1.0-r2.ebuild 916
-SHA256 2f6e4f8fa5650fec5b23605d09998ce78ec5ea12559feaf1f05b92ebaec5b75d emul-linux-x86-compat-1.0-r2.ebuild 916
-EBUILD emul-linux-x86-compat-1.0-r3.ebuild 979 RMD160 8f92adb36f4929ce0f754e942b40c14c894fb483 SHA1 86b54f46cfbf7e7ca2f6a47177ae5245c5c6f805 SHA256 f2429d718b37ac2d1d2b20af3640ddc4db394f310206d42a77dc7148edd4ae1c
-MD5 6c87a0b71879ceb6c4da1e01bf591c29 emul-linux-x86-compat-1.0-r3.ebuild 979
-RMD160 8f92adb36f4929ce0f754e942b40c14c894fb483 emul-linux-x86-compat-1.0-r3.ebuild 979
-SHA256 f2429d718b37ac2d1d2b20af3640ddc4db394f310206d42a77dc7148edd4ae1c emul-linux-x86-compat-1.0-r3.ebuild 979
-MISC ChangeLog 2714 RMD160 0c8db62d629df6ef00b4d4b539e640d56ce23c81 SHA1 18b33d6f9975f52ba279510f0c8ff5bfd339083b SHA256 e17bc844a27dffe3a4af1de9b273153a616b21ba76ef57ce4eb09dba09998c09
-MD5 3446242c4ba400e0a12665b9c955745e ChangeLog 2714
-RMD160 0c8db62d629df6ef00b4d4b539e640d56ce23c81 ChangeLog 2714
-SHA256 e17bc844a27dffe3a4af1de9b273153a616b21ba76ef57ce4eb09dba09998c09 ChangeLog 2714
+EBUILD emul-linux-x86-compat-1.0-r3.ebuild 978 RMD160 9b288dfad09f938b8dbd6772a1fbddcc4014114b SHA1 7351216b06804dcfc4979d8cc4e3f77860af3379 SHA256 30ff7053cb00ee75007cc03aad8e5b8781e77a324b1c5036089786ace140e720
+MD5 152c84b89829f9c50decae147d54996f emul-linux-x86-compat-1.0-r3.ebuild 978
+RMD160 9b288dfad09f938b8dbd6772a1fbddcc4014114b emul-linux-x86-compat-1.0-r3.ebuild 978
+SHA256 30ff7053cb00ee75007cc03aad8e5b8781e77a324b1c5036089786ace140e720 emul-linux-x86-compat-1.0-r3.ebuild 978
+MISC ChangeLog 2859 RMD160 f5f832e2593cb4ed6068d9e5e40bda8ffc8f0be0 SHA1 9e5e4532cb63544cad9693f34c660eb6112d6418 SHA256 18350453dca5d83efbbc2b4948eaaf5ab771ed078b2d6b7cb02132661bb06cf4
+MD5 caf07245d34e2a71395a4cf1950a0574 ChangeLog 2859
+RMD160 f5f832e2593cb4ed6068d9e5e40bda8ffc8f0be0 ChangeLog 2859
+SHA256 18350453dca5d83efbbc2b4948eaaf5ab771ed078b2d6b7cb02132661bb06cf4 ChangeLog 2859
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -26,9 +22,6 @@ SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata
 MD5 c9fb4a2c6f68ff747501a9169d19b328 files/digest-emul-linux-x86-compat-1.0-r1 283
 RMD160 bf7160a735daad1bc793a9d40b762e7e6b12b611 files/digest-emul-linux-x86-compat-1.0-r1 283
 SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/digest-emul-linux-x86-compat-1.0-r1 283
-MD5 c9fb4a2c6f68ff747501a9169d19b328 files/digest-emul-linux-x86-compat-1.0-r2 283
-RMD160 bf7160a735daad1bc793a9d40b762e7e6b12b611 files/digest-emul-linux-x86-compat-1.0-r2 283
-SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/digest-emul-linux-x86-compat-1.0-r2 283
 MD5 c9fb4a2c6f68ff747501a9169d19b328 files/digest-emul-linux-x86-compat-1.0-r3 283
 RMD160 bf7160a735daad1bc793a9d40b762e7e6b12b611 files/digest-emul-linux-x86-compat-1.0-r3 283
 SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/digest-emul-linux-x86-compat-1.0-r3 283
diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 0756e0ea9c1d..5e0c92b4cdee 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 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.41 2007/03/01 17:32:38 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.42 2007/03/02 15:03:15 blubb Exp $
+
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  emul-linux-x86-gtklibs-10.0-r1.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
   01 Mar 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-gtklibs-10.0-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
index 87ed53432ff9..eb5f6ff749ad 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-10.0-r1.ebuild,v 1.2 2007/03/01 17:32:38 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild,v 1.3 2007/03/02 15:03:15 blubb Exp $
 
 inherit emul-libs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/atk-1.12.3.tbz2
 	mirror://gentoo/pango-1.14.9.tbz2"
 
 LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 IUSE="qt3"
 
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index a45ba2ac8417..2d09f55e4be8 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.16 2007/02/27 10:55:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.17 2007/03/02 15:04:15 blubb Exp $
+
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-medialibs-1.1-r1.ebuild,
+  -emul-linux-x86-medialibs-1.2.ebuild,
+  emul-linux-x86-medialibs-10.2.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
 *emul-linux-x86-medialibs-10.2 (27 Feb 2007)
 
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild
deleted file mode 100644
index a083e46c3b3c..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild,v 1.4 2006/03/09 01:48:18 flameeyes Exp $
-
-DESCRIPTION="Media libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-	>=app-emulation/emul-linux-x86-soundlibs-2.0"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	# Remove this to avoid confict with emul-soundlibs
-	rm -f ${WORKDIR}/emul/linux/x86/usr/lib/libesd.so*
-
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild
deleted file mode 100644
index 338ed484e19e..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild,v 1.4 2006/10/04 16:38:37 dang Exp $
-
-DESCRIPTION="Media libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-	>=app-emulation/emul-linux-x86-soundlibs-2.0"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild
index 267af50a6106..fee2977a4eac 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild,v 1.1 2007/02/27 10:55:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild,v 1.2 2007/03/02 15:04:15 blubb Exp $
 
 inherit emul-libs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/fribidi-0.10.7.tbz2
 		mirror://gentoo/xvid-1.1.0-r3.tbz2"
 
 LICENSE="GPL-2 LGPL-2.1 as-is xiph"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2
diff --git a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.1-r1 b/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.1-r1
deleted file mode 100644
index ce7116227cb6..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05cc1e1ca964002039ecaee61d09eab3 emul-linux-x86-medialibs-1.1.tar.bz2 1594464
-RMD160 6d159dbd6df3aac8f168831a98e7935febaba1d6 emul-linux-x86-medialibs-1.1.tar.bz2 1594464
-SHA256 b215807b7e2535bcf0d7d3210bc7ea08a34f4fd5c990e8e11ae4299c04d50839 emul-linux-x86-medialibs-1.1.tar.bz2 1594464
diff --git a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.2 b/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.2
deleted file mode 100644
index 83660a4fe749..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc8d1af8a07dc81ddc2484fac7d4e3d0 emul-linux-x86-medialibs-1.2.tar.bz2 1586690
-RMD160 c9d1761da566371c5bf11a05659b6618ac588f63 emul-linux-x86-medialibs-1.2.tar.bz2 1586690
-SHA256 86cc74ce768aa90389682b6e1528c07def773dde4f1b7e7633a16329c5fe73a1 emul-linux-x86-medialibs-1.2.tar.bz2 1586690
diff --git a/app-emulation/emul-linux-x86-sdl/ChangeLog b/app-emulation/emul-linux-x86-sdl/ChangeLog
index 1ba05a1da347..c44b85732102 100644
--- a/app-emulation/emul-linux-x86-sdl/ChangeLog
+++ b/app-emulation/emul-linux-x86-sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-sdl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.23 2007/02/27 10:27:13 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.24 2007/03/02 15:04:44 blubb Exp $
+
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  emul-linux-x86-sdl-10.1.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
 *emul-linux-x86-sdl-10.1 (26 Feb 2007)
 
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-10.1.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-10.1.ebuild
index a501ce6f2255..a5fab51d8592 100644
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-10.1.ebuild
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-10.1.ebuild,v 1.1 2007/02/27 10:27:13 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-10.1.ebuild,v 1.2 2007/03/02 15:04:44 blubb Exp $
 
 inherit emul-libs
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/libsdl-1.2.11-emul2.tbz2
 	mirror://gentoo/smpeg-0.4.4-r8.tbz2"
 
 LICENSE="LGPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND=">=app-emulation/emul-linux-x86-xlibs-10.0
diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 122f26a0d589..353b80db197f 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.25 2007/03/01 18:17:45 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.26 2007/03/02 15:04:01 blubb Exp $
+
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-soundlibs-2.3.ebuild,
+  -emul-linux-x86-soundlibs-2.4.ebuild,
+  -emul-linux-x86-soundlibs-2.5.ebuild,
+  -emul-linux-x86-soundlibs-10.0.ebuild,
+  emul-linux-x86-soundlibs-10.0-r1.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
   01 Mar 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-soundlibs-10.0-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0-r1.ebuild
index 1e8bde9f3351..1f347a69da1a 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0-r1.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0-r1.ebuild,v 1.2 2007/03/01 18:17:45 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0-r1.ebuild,v 1.3 2007/03/02 15:04:01 blubb Exp $
 
 inherit emul-libs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/alsa-lib-1.0.14_rc1.tbz2
 	mirror://gentoo/libvorbis-1.1.2.tbz2"
 
 LICENSE="as-is BSD GPL-2 LGPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 IUSE="arts"
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0.ebuild
deleted file mode 100644
index f921b1ed1acb..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-10.0.ebuild,v 1.1 2007/02/21 19:22:11 blubb Exp $
-
-inherit emul-libs
-
-SRC_URI="mirror://gentoo/alsa-lib-1.0.14_rc1.tbz2
-	mirror://gentoo/alsa-oss-1.0.12.tbz2
-	mirror://gentoo/arts-3.5.5.tbz2
-	mirror://gentoo/audiofile-0.2.6-r2.tbz2
-	mirror://gentoo/esound-0.2.36-r2.tbz2
-	mirror://gentoo/jack-audio-connection-kit-0.101.1-r1.tbz2
-	mirror://gentoo/libmikmod-3.1.11-r2.tbz2
-	mirror://gentoo/libogg-1.1.2.tbz2
-	mirror://gentoo/libsndfile-1.0.17.tbz2
-	mirror://gentoo/libvorbis-1.1.2.tbz2"
-
-LICENSE="as-is BSD GPL-2 LGPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.0
-		!<app-emulation/media-libs-1.1"
-
-src_unpack() {
-	ALLOWED="(${S}/etc/env.d|${S}/usr/bin/esddsp|${S}/usr/kde/.*/bin/artsdsp|${S}/usr/bin/aoss)"
-	emul-libs_src_unpack
-
-	for f in ${S}/usr/bin/esddsp ${S}/usr/bin/aoss ${S}/usr/kde/*/bin/artsdsp ; do
-		mv -f "$f"{,32}
-	done
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.3.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.3.ebuild
deleted file mode 100644
index 9b2e12647404..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.3.ebuild,v 1.4 2006/03/09 01:43:18 flameeyes Exp $
-
-DESCRIPTION="Sound libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~herbs/emul/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-		!<=app-emulation/emul-linux-x86-medialibs-1.1"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.4.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.4.ebuild
deleted file mode 100644
index dee3bae2bfcd..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.4.ebuild,v 1.1 2006/05/18 13:18:39 dang Exp $
-
-DESCRIPTION="Sound libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~herbs/emul/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-		!<=app-emulation/emul-linux-x86-medialibs-1.1"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.5.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.5.ebuild
deleted file mode 100644
index 86fc03c5f565..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-2.5.ebuild,v 1.1 2006/12/23 17:15:08 peper Exp $
-
-DESCRIPTION="Sound libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-		!<=app-emulation/emul-linux-x86-medialibs-1.1"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-10.0 b/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-10.0
deleted file mode 100644
index 08bde6736b8f..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-10.0
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 8819694c61a395ab674eeee56e93cd44 alsa-lib-1.0.14_rc1.tbz2 772701
-RMD160 7984288ebb0a48a4142fd2f686e8ed0efb25e292 alsa-lib-1.0.14_rc1.tbz2 772701
-SHA256 04756622a7b63ae3f4212494b7f7c6c62d8486315b8269bbeb7b1e3446bc8bc0 alsa-lib-1.0.14_rc1.tbz2 772701
-MD5 fb26cf7695b85399daa09774e02e5a5e alsa-oss-1.0.12.tbz2 76991
-RMD160 d283ec5cca9e33a110492ca91463655d919fa5b6 alsa-oss-1.0.12.tbz2 76991
-SHA256 b184901340e40a874e445e97d86c205f712be6deaea43487205eef6fa8e59150 alsa-oss-1.0.12.tbz2 76991
-MD5 32d9283e8e73ce7a7ef4cac3bb83e425 arts-3.5.5.tbz2 1258953
-RMD160 af2df07cb6608d348061b4bc5e7545fd1e4bfa9a arts-3.5.5.tbz2 1258953
-SHA256 cadf694ed7e2134ee92c5970c69d79a84c95f2ab3a7f0cd999bdc5354438dcb2 arts-3.5.5.tbz2 1258953
-MD5 3ea5f0030c52f3c8eff08c31d0da969f audiofile-0.2.6-r2.tbz2 183393
-RMD160 37b2de371023d4ab7199984f1928a5dd78d7ccff audiofile-0.2.6-r2.tbz2 183393
-SHA256 934f8a0621c1888fa3c7f7e897bd6f1ad09e20777cf75a659971508fe3920e47 audiofile-0.2.6-r2.tbz2 183393
-MD5 0bd62951b9280c744d97bdbd91373c78 esound-0.2.36-r2.tbz2 143868
-RMD160 c35df277b54206b1146d129cd2d7db4a73c38a60 esound-0.2.36-r2.tbz2 143868
-SHA256 a8660552d1d040638b7a38caafd3a625d96eb803873162149ed44532873a2b15 esound-0.2.36-r2.tbz2 143868
-MD5 90dc47cde23e25b07c257cf00cb08f9b jack-audio-connection-kit-0.101.1-r1.tbz2 158550
-RMD160 d68b3fce11afa6ef95569502e969c5178a709e57 jack-audio-connection-kit-0.101.1-r1.tbz2 158550
-SHA256 545de013c984d89c1b2229ecaffdca92e1f66eff928a8b335fa3213f57b950f4 jack-audio-connection-kit-0.101.1-r1.tbz2 158550
-MD5 2da52203dda92985e114bacc062f6c04 libmikmod-3.1.11-r2.tbz2 281036
-RMD160 cda7fe6b40037d62e6313873883c3c13b5b7a263 libmikmod-3.1.11-r2.tbz2 281036
-SHA256 f9fd7e53eed7a7c892918e95394583fb2dd4451cf5da87f23b55a145288647db libmikmod-3.1.11-r2.tbz2 281036
-MD5 63ab9f1a906363d6b6e1ed8d419be6d0 libogg-1.1.2.tbz2 95976
-RMD160 e922d1461626c8faa3f7754f5c62d13897c96d44 libogg-1.1.2.tbz2 95976
-SHA256 7ca516d5fcfb3f9f06eea5ba81f19f497e288a2aea6fa72c65ca1c309a3cdd76 libogg-1.1.2.tbz2 95976
-MD5 721a01584c7ed3948d6363a3c9ea3218 libsndfile-1.0.17.tbz2 385828
-RMD160 4267e6306c956b49662e3f6b35c656eebca084e3 libsndfile-1.0.17.tbz2 385828
-SHA256 49820a3e2a4e5482b67ca6e8c3c26589ace3e5621ece7e6b13a64636ef2a87d3 libsndfile-1.0.17.tbz2 385828
-MD5 660039a2040791f1f48526f3420b0b68 libvorbis-1.1.2.tbz2 632014
-RMD160 330107f965b8100a98c8235ba26dafe1d882be1b libvorbis-1.1.2.tbz2 632014
-SHA256 336855195bb86159284f05a62c59946746b53ebf848f770c65a92972a13501e3 libvorbis-1.1.2.tbz2 632014
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.3 b/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.3
deleted file mode 100644
index ff26150d8860..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fc3b00005893262da6c62fd436d70084 emul-linux-x86-soundlibs-2.3.tar.bz2 844922
-RMD160 2300c85742462288c72a82c62e3852244e02250a emul-linux-x86-soundlibs-2.3.tar.bz2 844922
-SHA256 8d1d4411c7e371c6ae9b777446baca4ee3ca1c353447d46dd309ec9f1646d2d2 emul-linux-x86-soundlibs-2.3.tar.bz2 844922
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.4 b/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.4
deleted file mode 100644
index 7322bcaad07a..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb390e2c5dd31e2c764acbe2c9bc0b76 emul-linux-x86-soundlibs-2.4.tar.bz2 852204
-RMD160 21850d7ba5c87c692f65b7c6309dfc47c1124b9d emul-linux-x86-soundlibs-2.4.tar.bz2 852204
-SHA256 be5bb1a3f69c61ca26eb33a7bc2b6b8dff0601a4c7137e4dbf98c12cfe2397d9 emul-linux-x86-soundlibs-2.4.tar.bz2 852204
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.5 b/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.5
deleted file mode 100644
index 0fa4945826f1..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/files/digest-emul-linux-x86-soundlibs-2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dc247da8c5b9b83213e898e32fe4d0d8 emul-linux-x86-soundlibs-2.5.tar.bz2 865179
-RMD160 72ce56bede26765b7963994cd2e746648c72c107 emul-linux-x86-soundlibs-2.5.tar.bz2 865179
-SHA256 caa0d8ac3ca6af57b25cf8f525fafe29bcb074b975692959282c5efcf0770540 emul-linux-x86-soundlibs-2.5.tar.bz2 865179
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index bcb6a6c035e6..b586a7e0472c 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.58 2007/02/21 09:29:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.59 2007/03/02 15:02:25 blubb Exp $
+
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  emul-linux-x86-xlibs-10.0.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
   21 Feb 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-xlibs-10.0.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild
index 3a61c99a820d..7db2cc9e2cd3 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-10.0.ebuild,v 1.3 2007/02/21 09:29:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-10.0.ebuild,v 1.4 2007/03/02 15:02:25 blubb Exp $
 
 inherit emul-libs
 
@@ -41,7 +41,7 @@ LICENSE="fontconfig FTL GPL-2 LGPL-2 glut libdrm libICE libSM libX11 libXau
 		libXaw libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXft
 		libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXScrnSaver libXt
 		libXtst libXv libXvMC libXxf86dga libXxf86dga libXxf86vm"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="opengl"
 
 DEPEND=""