stablize 7.0-r8 for security bug 153704 & clean up old versions

(Portage version: 2.1.2-r9)

8 files changed, 7 insertions, 594 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 82901dfcb31d..e1b38ef7693b 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,275 +1,9 @@
 # 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.54 2007/02/11 23:07:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.55 2007/02/16 10:28:27 blubb Exp $
 
-  11 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-xlibs-7.0-r8.ebuild:
-  TEXTREL & EXECSTACK stuff; bug 144801
-
-*emul-linux-x86-xlibs-7.0-r8 (05 Jan 2007)
-
-  05 Jan 2007; Mike Frysinger <vapier@gentoo.org>
-  +emul-linux-x86-xlibs-7.0-r8.ebuild:
-  Dont install patch #143390 by Bernard Cafarelli.
-
-*emul-linux-x86-xlibs-7.0-r7 (05 Jan 2007)
-
-  05 Jan 2007; Mike Frysinger <vapier@gentoo.org>
-  +emul-linux-x86-xlibs-7.0-r7.ebuild:
-  Fix encoded /emul to point to lib32 #143390.
-
-*emul-linux-x86-xlibs-7.0-r6 (03 Jan 2007)
-
-  03 Jan 2007; Mike Frysinger <vapier@gentoo.org>
-  +emul-linux-x86-xlibs-7.0-r6.ebuild:
-  Move /emul to /lib32 #143390.
-
-*emul-linux-x86-xlibs-7.0-r5 (23 Dec 2006)
-
-  23 Dec 2006; Piotr Jaroszyński <peper@gentoo.org>
-  -emul-linux-x86-xlibs-7.0-r4.ebuild, +emul-linux-x86-xlibs-7.0-r5.ebuild:
-  Fix accidently derefenced symlinks for libfontconfig.
-
-*emul-linux-x86-xlibs-7.0-r4 (23 Dec 2006)
-
-  23 Dec 2006; Piotr Jaroszyński <peper@gentoo.org>
-  +emul-linux-x86-xlibs-7.0-r4.ebuild:
-  Update fontconfig to 2.4.2 wrt bug #157184.
-
-  07 Dec 2006; Olivier Crête <tester@gentoo.org>
-  emul-linux-x86-xlibs-7.0-r3.ebuild:
-  Stable on amd64 to follow gtk+-2.10, fixed bug #157359
-
-*emul-linux-x86-xlibs-7.0-r3 (23 Nov 2006)
-
-  23 Nov 2006; Olivier Crête <tester@gentoo.org>
-  +emul-linux-x86-xlibs-7.0-r3.ebuild:
-  New version of freetype
-
-  25 Aug 2006; <blubb@gentoo.org> -emul-linux-x86-xlibs-2.2.2.ebuild,
-  -emul-linux-x86-xlibs-2.2.2-r1.ebuild:
-  remove vulnerable versions
-
-*emul-linux-x86-xlibs-7.0-r2 (19 Aug 2006)
-
-  19 Aug 2006; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-xlibs-7.0-r1.ebuild, +emul-linux-x86-xlibs-7.0-r2.ebuild:
-  update libX11 due to security bug
-
-  30 Jul 2006; Herbie Hopkins <herbs@gentoo.org>
-  emul-linux-x86-xlibs-7.0-r1.ebuild:
-  Stable on amd64 wrt bug #138766.
-
-  31 May 2006; Mike Doty <kingtaco@gentoo.org>
-  files/digest-emul-linux-x86-xlibs-7.0-r1, Manifest:
-  Attempting to fix bad digest, bug 127058
-
-  11 May 2006; Diego Pettenò <flameeyes@gentoo.org>
-  emul-linux-x86-xlibs-7.0-r1.ebuild:
-  Add parenthesis on SRC_URI conditionals. Fix bug #133009 thanks to Jakub Moc.
-
-  16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  emul-linux-x86-xlibs-7.0-r1.ebuild:
-  Split out ATI cards into mach64, r128 and radeon.
-
-  05 Apr 2006; Patrick McLean <chutzpah@gentoo.org>
-  emul-linux-x86-xlibs-7.0-r1.ebuild:
-  Fixed RDEPEND syntax (Bug #128774), thanks to Patrick Borjesson
-  <psycho@rift.ath.cx> for pointing this out.
-
-*emul-linux-x86-xlibs-7.0-r1 (17 Mar 2006)
-
-  17 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-xlibs-7.0.ebuild, +emul-linux-x86-xlibs-7.0-r1.ebuild:
-  Oops, add missing libXtst and libXaw.
-
-*emul-linux-x86-xlibs-7.0 (17 Mar 2006)
-
-  17 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-xlibs-2.2.1.ebuild, -emul-linux-x86-xlibs-2.2.1-r1.ebuild,
-  +emul-linux-x86-xlibs-7.0.ebuild:
-  Bump with libs from xorg-7.0, include clientside dri modules (bug 115605) to
-  better support 32bit opengl apps with oss drivers. Don't install opengl
-  header files so as not to confuse eselect-opengl (bug 109922).
-
-  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
-  emul-linux-x86-xlibs-2.2.1.ebuild, emul-linux-x86-xlibs-2.2.1-r1.ebuild,
-  emul-linux-x86-xlibs-2.2.2.ebuild, emul-linux-x86-xlibs-2.2.2-r1.ebuild:
-  Add strip restriction, as the binaries are already stripped.
-
-*emul-linux-x86-xlibs-2.2.2-r1 (17 Feb 2006)
-*emul-linux-x86-xlibs-2.2.2 (17 Feb 2006)
-
-  17 Feb 2006; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-xlibs-2.2.2.ebuild, +emul-linux-x86-xlibs-2.2.2-r1.ebuild:
-  version bump regarding security bug 114234 (comment 38)
-
-  05 Jan 2006; Herbie Hopkins <herbs@gentoo.org>
-  -emul-linux-x86-xlibs-2.1.ebuild, -emul-linux-x86-xlibs-2.1-r1.ebuild,
-  -emul-linux-x86-xlibs-2.2.ebuild, -emul-linux-x86-xlibs-2.2-r1.ebuild:
-  Prune old versions.
-
-*emul-linux-x86-xlibs-2.2.1-r1 (23 Dec 2005)
-*emul-linux-x86-xlibs-2.2.1 (23 Dec 2005)
-
-  23 Dec 2005; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-xlibs-2.2.1.ebuild, +emul-linux-x86-xlibs-2.2.1-r1.ebuild:
-  version bump to fix security bug 116481
-
-*emul-linux-x86-xlibs-2.2-r1 (06 Dec 2005)
-*emul-linux-x86-xlibs-2.2 (06 Dec 2005)
-
-  06 Dec 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-xlibs-2.2.ebuild, +emul-linux-x86-xlibs-2.2-r1.ebuild:
-  Bump with libs from updated version of xorg-x11.
-
-  06 Sep 2005; Herbie Hopkins <herbs@gentoo.org> -files/XI18N_OBJS,
-  -files/XLC_LOCALE, metadata.xml, -emul-linux-x86-xlibs-1.2-r7.ebuild:
-  Remove old version.
-
-*emul-linux-x86-xlibs-2.1-r1 (26 Aug 2005)
-
-  26 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +emul-linux-x86-xlibs-2.1-r1.ebuild:
-  Cleaned up ebuild and use eselect opengl instead of opengl-update.
-
-  22 May 2005; Simon Stelling <blubb@gentoo.org>
-  emul-linux-x86-xlibs-2.1.ebuild:
-  stable on amd64
-
-  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> -files/75emul-linux-x86-x,
-  -emul-linux-x86-xlibs-1.2-r3.ebuild, -emul-linux-x86-xlibs-1.2-r6.ebuild,
-  -emul-linux-x86-xlibs-2.0.ebuild:
-  Removed old versions.
-
-*emul-linux-x86-xlibs-2.1 (18 Apr 2005)
-
-  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
-  +emul-linux-x86-xlibs-2.1.ebuild:
-  Added openmotif libs to keep opera happy, bug #89278. Removed unneccesary .a
-  files. Fixed SRC_URI.
-
-*emul-linux-x86-xlibs-2.0 (15 Apr 2005)
-
-  15 Apr 2005; Simon Stelling <blubb@gentoo.org>
-  +emul-linux-x86-xlibs-2.0.ebuild:
-  added new version provided by Herbie Hopkins
-
-  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r7.ebuild:
-  Added an extra check for a bad symlink, bug 84441.
-
-  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r7.ebuild:
-  Marked stable on amd64.
-
-  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r7.ebuild:
-  Fixed the extra symlinking a bit, thanks to Herbie Hopkins
-  <herbie@hopkins.net>.
-
-*emul-linux-x86-xlibs-1.2-r7 (09 Mar 2005)
-
-  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  +emul-linux-x86-xlibs-1.2-r7.ebuild:
-  Fixed pkg_postrm() function logic not to remove the symlink on upgrades,
-  closes bug 84441. Also added some extra symlinks as requested in bug 81045.
-
-  08 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r6.ebuild:
-  Added pkg_postrm() to remove symlink, corrected false warning message.
-
-*emul-linux-x86-xlibs-1.2-r6 (08 Feb 2005)
-
-  08 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  -emul-linux-x86-xlibs-1.0.ebuild, -emul-linux-x86-xlibs-1.1-r1.ebuild,
-  -emul-linux-x86-xlibs-1.1.ebuild, -emul-linux-x86-xlibs-1.2-r1.ebuild,
-  -emul-linux-x86-xlibs-1.2-r2.ebuild, -emul-linux-x86-xlibs-1.2-r4.ebuild,
-  -emul-linux-x86-xlibs-1.2-r5.ebuild, +emul-linux-x86-xlibs-1.2-r6.ebuild,
-  -emul-linux-x86-xlibs-1.2.ebuild:
-  Cleaned out old ebuilds, tidied up the symlink logic and bumped.
-
-  07 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r5.ebuild:
-  Added some extra logic to remove stale locale lib symlinks.
-
-*emul-linux-x86-xlibs-1.2-r5 (07 Feb 2005)
-
-  07 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
-  +emul-linux-x86-xlibs-1.2-r5.ebuild:
-  Ebuild patched to rectify locale problems, bumped to propagate fix, thanks to
-  Herbie Hopkins <herbie@hopkins.net> for the patch, bug 80420.
-
-*emul-linux-x86-xlibs-1.2-r4 (05 Feb 2005)
-
-  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +emul-linux-x86-xlibs-1.2-r4.ebuild:
-  Don't put stuff in the X11R6 directories.  Closes bug #80740.
-
-*emul-linux-x86-xlibs-1.2-r3 (17 Jan 2005)
-
-  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +emul-linux-x86-xlibs-1.2-r3.ebuild:
-  Properly create opengl-update profile.
-
-*emul-linux-x86-xlibs-1.2-r2 (17 Jan 2005)
-
-  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +emul-linux-x86-xlibs-1.2-r2.ebuild:
-  Use the emul dir in LDPATH.
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r1.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-  31 Aug 2004; Travis Tilley <lv@gentoo.org>
-  emul-linux-x86-xlibs-1.2-r1.ebuild:
-  fix the locale fix so that it works for apps other than adobe acrobat
-
-*emul-linux-x86-xlibs-1.2-r1 (30 Aug 2004)
-
-  30 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> +files/XI18N_OBJS,
-  +files/XLC_LOCALE, +emul-linux-x86-xlibs-1.2-r1.ebuild:
-  Fixed BUG #62110. Workaround by Evgeny Stambulchik.
-
-  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)
-
-  22 Aug 2004; Travis Tilley <lv@gentoo.org> +emul-linux-x86-xlibs-1.2.ebuild:
-  recompiled with gcc 3.4, moved libpng and libmng to baselibs, added openmotif
-
-*emul-linux-x86-xlibs-1.1-r1 (17 Jul 2004)
-
-  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +emul-linux-x86-xlibs-1.1-r1.ebuild:
-  Fixing LDPATH for new opengl-update; it will now handle 32bit GL libs
-
-  14 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild:
-  Ebuild now adds /etc/env.d/75emul-linux-x86-xlibs "on the fly", I forgot to
-  include that into the tarball. Fixes BUG #47773.
-  Also fixed libxrx.so[.6] to be symlinks and not copies of libxrx.so.6.3. (Also BUG #47773)
-
-  14 Apr 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild:
-  it seems xlibs 1.1 is broken for some people, so i'm going to mask it for now
-
-*emul-linux-x86-xlibs-1.1 (13 Apr 2004)
-
-  13 Apr 2004; <dvandyk@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild:
-  Repackaged baselibs, compiled with CFLAGS="-mcpu=athlon-xp -msse -msse2".
-  X11R6.7 from x11-base/xorg-x11.
-
-  29 Nov 2003; Brad House <brad_mssw@gentoo.org> files/75emul-linux-x86-x:
-  forgot path for libGL.so.1 for environment
-
-  04 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  emul-linux-x86-xlibs-1.0.ebuild:
-  version the downloads
-
-*emul-linux-x86-xlibs-1.0 (04 Oct 2003)
-
-  04 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  emul-linux-x86-xlibs-1.0.ebuild, files/75emul-linux-x86-x:
-  initial release
+  16 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-xlibs-7.0-r2.ebuild, -emul-linux-x86-xlibs-7.0-r3.ebuild,
+  -emul-linux-x86-xlibs-7.0-r5.ebuild, emul-linux-x86-xlibs-7.0-r8.ebuild:
+  stablize 7.0-r8 for security bug 153704 & clean up old versions
 
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r2.ebuild
deleted file mode 100644
index 3ecc71eeb62a..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r2.ebuild
+++ /dev/null
@@ -1,77 +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-xlibs/emul-linux-x86-xlibs-7.0-r2.ebuild,v 1.1 2006/08/19 17:46:35 herbs Exp $
-
-inherit multilib
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PVR}.tar.bz2
-		video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 )
-		video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 )
-		video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 )
-		video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 )
-		video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 )
-		video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 )
-		video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 )
-		video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )"
-
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-
-IUSE="opengl ${IUSE_VIDEO_CARDS}"
-
-DEPEND=""
-
-RDEPEND="opengl? ( app-admin/eselect-opengl )
-	 virtual/libc
-	 >=app-emulation/emul-linux-x86-baselibs-2.5"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-pkg_preinst() {
-	# Check for bad symlink before installing, bug 84441.
-	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
-		rm -f /emul/linux/x86/usr/lib/X11
-	fi
-}
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	local libdir="lib32"
-	if has_multilib_profile; then
-		libdir=$(get_abi_LIBDIR x86)
-	fi
-
-	dodir /usr/${libdir}/opengl
-	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
-}
-
-pkg_postinst() {
-	#update GL symlinks
-	if use opengl ; then
-		/usr/bin/eselect opengl set --use-old
-	fi
-}
-
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r3.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r3.ebuild
deleted file mode 100644
index 3190774e0a3d..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r3.ebuild
+++ /dev/null
@@ -1,77 +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-xlibs/emul-linux-x86-xlibs-7.0-r3.ebuild,v 1.2 2006/12/07 04:02:27 tester Exp $
-
-inherit multilib
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PVR}.tar.bz2
-		video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 )
-		video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 )
-		video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 )
-		video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 )
-		video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 )
-		video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 )
-		video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 )
-		video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )"
-
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-
-IUSE="opengl ${IUSE_VIDEO_CARDS}"
-
-DEPEND=""
-
-RDEPEND="opengl? ( app-admin/eselect-opengl )
-	 virtual/libc
-	 >=app-emulation/emul-linux-x86-baselibs-2.5"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-pkg_preinst() {
-	# Check for bad symlink before installing, bug 84441.
-	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
-		rm -f /emul/linux/x86/usr/lib/X11
-	fi
-}
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	local libdir="lib32"
-	if has_multilib_profile; then
-		libdir=$(get_abi_LIBDIR x86)
-	fi
-
-	dodir /usr/${libdir}/opengl
-	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
-}
-
-pkg_postinst() {
-	#update GL symlinks
-	if use opengl ; then
-		/usr/bin/eselect opengl set --use-old
-	fi
-}
-
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r5.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r5.ebuild
deleted file mode 100644
index 1294bc216bec..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r5.ebuild
+++ /dev/null
@@ -1,77 +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-xlibs/emul-linux-x86-xlibs-7.0-r5.ebuild,v 1.1 2006/12/23 20:36:59 peper Exp $
-
-inherit multilib
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${PF}.tar.bz2
-		video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 )
-		video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 )
-		video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 )
-		video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 )
-		video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 )
-		video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 )
-		video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 )
-		video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )"
-
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-
-IUSE="opengl ${IUSE_VIDEO_CARDS}"
-
-DEPEND=""
-
-RDEPEND="opengl? ( app-admin/eselect-opengl )
-	 virtual/libc
-	 >=app-emulation/emul-linux-x86-baselibs-2.5"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-pkg_preinst() {
-	# Check for bad symlink before installing, bug 84441.
-	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
-		rm -f /emul/linux/x86/usr/lib/X11
-	fi
-}
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	local libdir="lib32"
-	if has_multilib_profile; then
-		libdir=$(get_abi_LIBDIR x86)
-	fi
-
-	dodir /usr/${libdir}/opengl
-	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
-}
-
-pkg_postinst() {
-	#update GL symlinks
-	if use opengl ; then
-		/usr/bin/eselect opengl set --use-old
-	fi
-}
-
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild
index 649f5eb83138..e4771c8fbec7 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.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-7.0-r8.ebuild,v 1.2 2007/02/11 23:07:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r8.ebuild,v 1.3 2007/02/16 10:28:27 blubb Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 IUSE_VIDEO_CARDS="
 	video_cards_i810
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r2
deleted file mode 100644
index e0adfae82bfb..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 b9f5054ec0462aa850ac6324a461c374 emul-linux-x86-xlibs-7.0-r2.tar.bz2 3232574
-RMD160 84a00d0359e05f7e62259871bfd9106bfa25b946 emul-linux-x86-xlibs-7.0-r2.tar.bz2 3232574
-SHA256 97a3bf82aa66ed71068dbeac5531dd763eb082b01cad956886b3291e769b6279 emul-linux-x86-xlibs-7.0-r2.tar.bz2 3232574
-MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r3 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r3
deleted file mode 100644
index 5b08cc45d011..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r3
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 8dbd67efd26f94d5484d41038e513d0f emul-linux-x86-xlibs-7.0-r3.tar.bz2 3221125
-RMD160 a0acb4e4f67fe7a204e6f4ac74c517a942995fc3 emul-linux-x86-xlibs-7.0-r3.tar.bz2 3221125
-SHA256 b50346ea7f4d581c3bea982051936da3a3c9b4a66ea70f3f47af1bc6ad3c4b41 emul-linux-x86-xlibs-7.0-r3.tar.bz2 3221125
-MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r5 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r5
deleted file mode 100644
index 743a0a89ca53..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r5
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 5c6bd3cd5efa00ad7a650a43f13b655e emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393
-RMD160 e778ad9600bc573b650f87da440722ad680b9836 emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393
-SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4 emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393
-MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605