Version bump, remove old.

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

20 files changed, 80 insertions, 191 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 69ea20d00a29..f218b2da263d 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.81 2010/06/27 13:14:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.82 2010/09/15 11:42:05 pacho Exp $
+
+*emul-linux-x86-gtklibs-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-gtklibs-20100220-r2.ebuild,
+  -emul-linux-x86-gtklibs-20100409-r1.ebuild,
+  +emul-linux-x86-gtklibs-20100915.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-gtklibs-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild
deleted file mode 100644
index d56a601f7f4d..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 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-20100220-r2.ebuild,v 1.3 2010/03/22 13:58:58 pacho Exp $
-
-inherit emul-linux-x86
-
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libglade-2.0.so.0.0.7"
-
-LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}"
-
-src_unpack() {
-	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_unpack
-
-	# 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
-}
-
-src_install() {
-	emul-linux-x86_src_install
-	insinto /usr/lib32/
-	doins "${DISTDIR}"/libglade-2.0.so.0.0.7 || die
-	dosym libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so.0 || die
-	dosym libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so || 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}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-
-	# 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-gtklibs/emul-linux-x86-gtklibs-20100409-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild
index 17355832451e..c03296cfaf76 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100409-r1.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2010 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-20100409-r1.ebuild,v 1.2 2010/06/02 13:37:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild,v 1.1 2010/09/15 11:42:05 pacho Exp $
 
 inherit emul-linux-x86
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/gtk+-2.18.6.tbz2"
-
 LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 
 IUSE=""
 
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog b/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog
index 3f9638321637..3babba571ce5 100644
--- a/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtkmmlibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog,v 1.3 2010/06/11 14:40:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/ChangeLog,v 1.4 2010/09/15 11:43:29 pacho Exp $
+
+*emul-linux-x86-gtkmmlibs-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-gtkmmlibs-20100611.ebuild,
+  +emul-linux-x86-gtkmmlibs-20100915.ebuild:
+  Version bump, remove old.
 
 *emul-linux-x86-gtkmmlibs-20100611 (11 Jun 2010)
 
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20100611.ebuild b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20100915.ebuild
index 921cc54488b6..2dd173070979 100644
--- a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20100611.ebuild
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20100915.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-20100611.ebuild,v 1.1 2010/06/11 14:40:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20100915.ebuild,v 1.1 2010/09/15 11:43:29 pacho Exp $
 
 inherit emul-linux-x86
 
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 19ffdaf01f4a..179cfe865c61 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.41 2010/06/27 13:15:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.42 2010/09/15 11:40:04 pacho Exp $
+
+*emul-linux-x86-medialibs-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-medialibs-20100220.ebuild,
+  -emul-linux-x86-medialibs-20100409.ebuild,
+  +emul-linux-x86-medialibs-20100915.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-medialibs-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100220.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100220.ebuild
deleted file mode 100644
index d947640b7850..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100220.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 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-20100220.ebuild,v 1.2 2010/03/22 14:00:02 pacho Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2.1 BSD"
-KEYWORDS="-* amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-soundlibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}
-	!<=app-emulation/emul-linux-x86-sdl-20081109"
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100409.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915.ebuild
index c8f81edfd818..c5e0bac685a6 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100409.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2010 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-20100409.ebuild,v 1.2 2010/06/02 13:41:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915.ebuild,v 1.1 2010/09/15 11:40:04 pacho Exp $
 
 inherit emul-linux-x86
 
 LICENSE="GPL-2 LGPL-2.1 BSD"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 
 IUSE=""
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-soundlibs-${PV}
 	~app-emulation/emul-linux-x86-xlibs-${PV}
 	!<=app-emulation/emul-linux-x86-sdl-20081109"
+PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 45b0baa938f2..17b8e50ce513 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.6 2010/06/27 13:16:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.7 2010/09/15 11:47:19 pacho Exp $
+
+*emul-linux-x86-opengl-20100915-r99 (15 Sep 2010)
+*emul-linux-x86-opengl-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-opengl-20100409.ebuild,
+  -emul-linux-x86-opengl-20100611-r99.ebuild,
+  +emul-linux-x86-opengl-20100915.ebuild,
+  +emul-linux-x86-opengl-20100915-r99.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-opengl-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100611-r99.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915-r99.ebuild
index 809654803207..3b4f985172c3 100644
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100611-r99.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915-r99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-20100611-r99.ebuild,v 1.1 2010/06/11 14:44:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915-r99.ebuild,v 1.1 2010/09/15 11:47:19 pacho Exp $
 
 inherit emul-linux-x86
 
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild
index f4381475f537..e56e5ca810ac 100644
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2010 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-20100409.ebuild,v 1.3 2010/06/02 13:41:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild,v 1.1 2010/09/15 11:47:19 pacho Exp $
 
 inherit emul-linux-x86
 
 LICENSE="LGPL-2 MIT"
 
-KEYWORDS="-* amd64 ~amd64-linux"
+KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE=""
 
 DEPEND="app-admin/eselect-opengl"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100409
-	!<app-emulation/emul-linux-x86-xlibs-20100409
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+	!<app-emulation/emul-linux-x86-xlibs-20100611
 	media-libs/mesa"
 
 src_unpack() {
diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
index a0c57aef3ed0..9f7c49a6a02a 100644
--- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-qtlibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.63 2010/06/27 13:18:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.64 2010/09/15 11:49:02 pacho Exp $
+
+*emul-linux-x86-qtlibs-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-qtlibs-20100220.ebuild,
+  -emul-linux-x86-qtlibs-20100409.ebuild,
+  +emul-linux-x86-qtlibs-20100915.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-qtlibs-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100220.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100220.ebuild
deleted file mode 100644
index 5c7d12ebfb5c..000000000000
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100220.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 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-20100220.ebuild,v 1.2 2010/03/22 14:01:21 pacho Exp $
-
-inherit eutils emul-linux-x86
-
-LICENSE="LGPL-2.1 GPL-3"
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${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-qtlibs/emul-linux-x86-qtlibs-20100409.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild
index b6c6223dedd2..17dc9bf7b3c9 100644
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100409.ebuild
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 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-20100409.ebuild,v 1.2 2010/06/02 13:42:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild,v 1.1 2010/09/15 11:49:02 pacho Exp $
 
 inherit eutils emul-linux-x86
 
 LICENSE="LGPL-2.1 GPL-3"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/emul-linux-x86-sdl/ChangeLog b/app-emulation/emul-linux-x86-sdl/ChangeLog
index d858a9a24a5d..44fb2a602382 100644
--- a/app-emulation/emul-linux-x86-sdl/ChangeLog
+++ b/app-emulation/emul-linux-x86-sdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-sdl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.48 2010/06/27 13:21:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.49 2010/09/15 11:50:32 pacho Exp $
+
+*emul-linux-x86-sdl-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-sdl-20100220.ebuild, -emul-linux-x86-sdl-20100409.ebuild,
+  +emul-linux-x86-sdl-20100915.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-sdl-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100409.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100409.ebuild
deleted file mode 100644
index d47606f908fb..000000000000
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100409.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2010 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-20100409.ebuild,v 1.2 2010/06/02 13:43:10 pacho Exp $
-
-inherit emul-linux-x86
-
-LICENSE="LGPL-2 LGPL-2.1"
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-soundlibs-${PV}
-	~app-emulation/emul-linux-x86-medialibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100220.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild
index f5e05b692d9c..24c66196343b 100644
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100220.ebuild
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 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-20100220.ebuild,v 1.2 2010/03/22 14:00:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild,v 1.1 2010/09/15 11:50:32 pacho Exp $
 
 inherit emul-linux-x86
 
 LICENSE="LGPL-2 LGPL-2.1"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 4ca809c919ec..49ec28f78609 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.63 2010/06/27 13:20:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.64 2010/09/15 11:39:26 pacho Exp $
+
+*emul-linux-x86-soundlibs-20100915 (15 Sep 2010)
+
+  15 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-soundlibs-20100220-r1.ebuild,
+  -emul-linux-x86-soundlibs-20100409-r1.ebuild,
+  +emul-linux-x86-soundlibs-20100915.ebuild:
+  Version bump, remove old.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-soundlibs-20100611.ebuild:
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100220-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100220-r1.ebuild
deleted file mode 100644
index 39ec5ffce093..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100220-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 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-20100220-r1.ebuild,v 1.2 2010/03/22 14:02:08 pacho Exp $
-
-inherit emul-linux-x86
-
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libmikmod.so.2"
-
-LICENSE="as-is BSD GPL-2 LGPL-2 LGPL-2.1 gsm"
-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_unpack() {
-	_ALLOWED="${S}/etc/env.d"
-	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
-	ALLOWED="(${_ALLOWED})"
-
-	emul-linux-x86_src_unpack
-
-	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
-}
-
-src_install() {
-	emul-linux-x86_src_install
-	insinto /usr/lib32/
-	doins "${DISTDIR}"/libmikmod.so.2 || die
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100409-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild
index 6518bd2514bf..aa2ceb7f8acb 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100409-r1.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2010 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-20100409-r1.ebuild,v 1.2 2010/06/02 13:43:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild,v 1.1 2010/09/15 11:39:26 pacho Exp $
 
 inherit emul-linux-x86
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libao-0.8.8.tbz2"
-
 LICENSE="as-is BSD GPL-2 LGPL-2 LGPL-2.1 gsm"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 IUSE="alsa pulseaudio"
 
 RDEPEND="pulseaudio? ( media-sound/pulseaudio )