Version bump, remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 11 insertions, 47 deletions

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 )