Version bump.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

24 files changed, 398 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 0c1a2494d254..d4bd8e06e836 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.121 2011/08/24 09:42:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.122 2011/09/28 13:48:26 pacho Exp $
+
+*emul-linux-x86-baselibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-baselibs-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-baselibs-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110928.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110928.ebuild
new file mode 100644
index 000000000000..d8616e84c363
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110928.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 13:48:26 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
+		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 GPL-3 LGPL-3
+		MIT MPL-1.1 OPENLDAP OpenSoftware openssl OracleDB ZLIB
+		tcp_wrappers_license as-is UoI-NCSA wxWinLL-3.1"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
+
+QA_DT_HASH="usr/lib32/.*"
+
+src_prepare() {
+	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
+	emul-linux-x86_src_prepare
+	rm -rf "${S}/etc/env.d/binutils/" \
+			"${S}/usr/i686-pc-linux-gnu/lib" \
+			"${S}/usr/lib32/engines/" \
+			"${S}/usr/lib32/openldap/" || die
+
+	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
+}
diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog
index f0ad91c58525..7e14750cb1dc 100644
--- a/app-emulation/emul-linux-x86-compat/ChangeLog
+++ b/app-emulation/emul-linux-x86-compat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-compat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.49 2011/08/24 09:43:25 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.50 2011/09/28 13:49:40 pacho Exp $
+
+*emul-linux-x86-compat-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-compat-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-compat-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20110928.ebuild b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20110928.ebuild
new file mode 100644
index 000000000000..8d64f53e2ef6
--- /dev/null
+++ b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-20110928.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 13:49:40 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86 eutils multilib
+DESCRIPTION="32 bit lib-compat, and also libgcc_s and libstdc++ from gcc 3.3 and 3.4 for non-multilib systems"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="strip"
+IUSE="multilib"
+
+DEPEND=""
+RDEPEND="multilib? ( sys-libs/libstdc++-v3 )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="usr/lib32/libg++.so.2.7.2.8
+	usr/lib32/libstdc++.so.2.7.2.8"
+QA_DT_HASH="usr/lib32/.*"
+
+src_prepare() {
+	emul-linux-x86_src_prepare
+	if has_multilib_profile ; then
+		rm -rf "${S}/usr/lib32/libstdc++.so.5.0.7" \
+			"${S}/usr/lib32/libstdc++.so.5" || die
+	fi
+}
+
+src_install() {
+	emul-linux-x86_src_install
+	doenvd "${FILESDIR}/99libstdc++32"
+}
diff --git a/app-emulation/emul-linux-x86-cpplibs/ChangeLog b/app-emulation/emul-linux-x86-cpplibs/ChangeLog
index 32d13dfd052b..55755a5c5b0f 100644
--- a/app-emulation/emul-linux-x86-cpplibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-cpplibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-cpplibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/ChangeLog,v 1.6 2011/07/22 19:12:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/ChangeLog,v 1.7 2011/09/28 13:50:35 pacho Exp $
+
+*emul-linux-x86-cpplibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-cpplibs-20110928.ebuild:
+  Version bump.
 
 *emul-linux-x86-cpplibs-20110722 (22 Jul 2011)
 
diff --git a/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20110928.ebuild b/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20110928.ebuild
new file mode 100644
index 000000000000..17ddb6834f1c
--- /dev/null
+++ b/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20110928.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20110928.ebuild,v 1.1 2011/09/28 13:50:35 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="Boost-1.0 LGPL-2.1"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 681803d51555..dbd72ae6d914 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.88 2011/08/24 10:01:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.89 2011/09/28 13:55:16 pacho Exp $
+
+*emul-linux-x86-gtklibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-gtklibs-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-gtklibs-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild
new file mode 100644
index 000000000000..8bf24944121f
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 13:55:16 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-xlibs-${PV}
+	~app-emulation/emul-linux-x86-opengl-${PV}"
+# RDEPEND on opengl stuff shouldn't be needed, but add it anyway until bug #354943 is properly solved
+
+src_prepare() {
+	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
+	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
+	emul-linux-x86_src_prepare
+
+	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
+	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
+	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
+	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
+}
+
+pkg_preinst() {
+	#bug 169058
+	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
+		[[ -L ${l} ]] && rm -f ${l}
+	done
+}
+
+pkg_postinst() {
+	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+	if [[ ${ROOT} == "/" ]] ; then
+		einfo "Generating pango modules listing..."
+		mkdir -p ${PANGO_CONFDIR}
+		pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
+	fi
+
+	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+	mkdir -p ${GTK2_CONFDIR}
+	gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	gdk-pixbuf-query-loaders32 > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
+	if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then
+		ewarn
+		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
+		ewarn "multilib systems, please remove it by hand."
+		ewarn
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog b/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog
index e2950658ce00..604115755622 100644
--- a/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtkmmlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog,v 1.6 2011/07/22 19:18:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog,v 1.7 2011/09/28 13:56:30 pacho Exp $
+
+*emul-linux-x86-gtkmmlibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-gtkmmlibs-20110928.ebuild:
+  Version bump.
 
 *emul-linux-x86-gtkmmlibs-20110722 (22 Jul 2011)
 
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110928.ebuild b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110928.ebuild
new file mode 100644
index 000000000000..40c3d8cb5237
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110928.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110928.ebuild,v 1.1 2011/09/28 13:56:30 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1 GPL-2"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-cpplibs-${PV}
+	~app-emulation/emul-linux-x86-gtklibs-${PV}
+	~app-emulation/emul-linux-x86-xlibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 302dfaddd9b2..c338b5d1fab0 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.49 2011/08/24 10:04:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.50 2011/09/28 13:58:28 pacho Exp $
+
+*emul-linux-x86-medialibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-medialibs-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-medialibs-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild
new file mode 100644
index 000000000000..9fd313797d91
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 13:58:28 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-xlibs-${PV}
+	!<=app-emulation/emul-linux-x86-sdl-20081109"
+PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
+
+src_prepare() {
+	# Include all libv4l libs, bug #348277
+	ALLOWED="${S}/usr/lib32/libv4l/"
+	emul-linux-x86_src_prepare
+}
diff --git a/app-emulation/emul-linux-x86-motif/ChangeLog b/app-emulation/emul-linux-x86-motif/ChangeLog
index 49187adbfd36..3546d2535d68 100644
--- a/app-emulation/emul-linux-x86-motif/ChangeLog
+++ b/app-emulation/emul-linux-x86-motif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-motif
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/ChangeLog,v 1.2 2011/07/22 19:22:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/ChangeLog,v 1.3 2011/09/28 13:59:22 pacho Exp $
+
+*emul-linux-x86-motif-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-motif-20110928.ebuild:
+  Version bump.
 
 *emul-linux-x86-motif-20110722 (22 Jul 2011)
 
diff --git a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110928.ebuild b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110928.ebuild
new file mode 100644
index 000000000000..e41bb7f74b62
--- /dev/null
+++ b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110928.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110928.ebuild,v 1.1 2011/09/28 13:59:22 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="MIT MOTIF"
+
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
+	!<app-emulation/emul-linux-x86-xlibs-20110129"
diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 7d8a2c3467d3..b71939c16ce8 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.15 2011/09/17 19:04:19 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.16 2011/09/28 13:54:29 pacho Exp $
+
+*emul-linux-x86-opengl-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-opengl-20110928.ebuild:
+  Version bump.
 
   17 Sep 2011; Matt Turner <mattst88@gentoo.org>
   emul-linux-x86-opengl-20110129-r1.ebuild,
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110928.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110928.ebuild
new file mode 100644
index 000000000000..06c65708b46e
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110928.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110928.ebuild,v 1.1 2011/09/28 13:54:29 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="BSD LGPL-2 MIT"
+
+KEYWORDS="-* ~amd64 ~amd64-linux"
+
+DEPEND="app-admin/eselect-opengl
+	>=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+	!<app-emulation/emul-linux-x86-xlibs-20100611
+	media-libs/mesa"
+
+src_prepare() {
+	emul-linux-x86_src_prepare
+	rm -f "${S}/usr/lib32/libGL.so" || die
+	rm -f "${S}/usr/lib32/libGL.so.1" || die
+}
+
+pkg_postinst() {
+	# Update GL symlinks
+	eselect opengl set --use-old || die
+	# And the same for mesa (bug #355393)
+	eselect mesa set 32bit --auto || die
+}
diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
index 72f7937b7a2b..4e8da0837840 100644
--- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-qtlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.69 2011/08/24 10:05:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.70 2011/09/28 14:00:25 pacho Exp $
+
+*emul-linux-x86-qtlibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-qtlibs-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-qtlibs-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110928.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110928.ebuild
new file mode 100644
index 000000000000..3f4fc85633b4
--- /dev/null
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110928.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110928.ebuild,v 1.1 2011/09/28 14:00:25 pacho Exp $
+
+EAPI="4"
+
+inherit eutils emul-linux-x86
+
+LICENSE="LGPL-2.1 GPL-3"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-medialibs-${PV}
+	~app-emulation/emul-linux-x86-xlibs-${PV}"
+
+src_install() {
+	emul-linux-x86_src_install
+
+	# Set LDPATH for not needing x11-libs/qt-core
+	cat <<-EOF > "${T}/44qt4-emul"
+	LDPATH=/usr/lib32/qt4
+	EOF
+	doenvd "${T}/44qt4-emul"
+}
diff --git a/app-emulation/emul-linux-x86-sdl/ChangeLog b/app-emulation/emul-linux-x86-sdl/ChangeLog
index 20bbb49ca7a1..cacacd30d200 100644
--- a/app-emulation/emul-linux-x86-sdl/ChangeLog
+++ b/app-emulation/emul-linux-x86-sdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-sdl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.54 2011/08/24 10:07:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.55 2011/09/28 14:01:26 pacho Exp $
+
+*emul-linux-x86-sdl-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-sdl-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-sdl-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110928.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110928.ebuild
new file mode 100644
index 000000000000..7c2fc1cf0595
--- /dev/null
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110928.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 14:01:26 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1"
+KEYWORDS="-* ~amd64"
+IUSE="pulseaudio"
+
+SRC_URI="${SRC_URI}
+	!pulseaudio? ( http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libsdl-1.2.14-r6_${PV}.tbz2 )"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
+	~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-soundlibs-${PV}[pulseaudio?]
+	~app-emulation/emul-linux-x86-medialibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index d6056dc53a82..30a538b3a828 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.69 2011/08/24 10:03:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.70 2011/09/28 13:58:00 pacho Exp $
+
+*emul-linux-x86-soundlibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-soundlibs-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-soundlibs-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110928.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110928.ebuild
new file mode 100644
index 000000000000..7690cd5d6ff8
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110928.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 13:58:00 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="as-is BSD FDL-1.2 GPL-2 LGPL-2 LGPL-2.1 gsm public-domain"
+KEYWORDS="-* ~amd64"
+IUSE="alsa pulseaudio"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+	~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-medialibs-${PV}"
+
+QA_DT_HASH="usr/lib32/.*"
+
+src_prepare() {
+	_ALLOWED="${S}/etc/env.d"
+	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+	ALLOWED="(${_ALLOWED})"
+
+	emul-linux-x86_src_prepare
+
+	if use alsa; then
+		mv -f "${S}"/usr/bin/aoss{,32} || die
+	fi
+
+	# libs without the rest of pulseaudio cause problems, bug 302003
+	if ! use pulseaudio; then
+		rm -rf $(find "${S}" -name '*pulse*' -not -name '*impulse*') || die
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 6522d418333c..ac253d9f6205 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.106 2011/08/24 09:57:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.107 2011/09/28 13:53:08 pacho Exp $
+
+*emul-linux-x86-xlibs-20110928 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-xlibs-20110928.ebuild:
+  Version bump.
 
   24 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   emul-linux-x86-xlibs-20110722.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110928.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110928.ebuild
new file mode 100644
index 000000000000..f5a16cc6a573
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110928.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 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-20110928.ebuild,v 1.1 2011/09/28 13:53:08 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="FTL GPL-2 MIT"
+
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	x11-libs/libX11
+	opengl? ( app-emulation/emul-linux-x86-opengl )"