Make sure that LD_PRELOAD is not specifying a path for the libaoss.so library, to make it work on multilib setups.

Package-Manager: portage-2.1_pre1

4 files changed, 41 insertions, 6 deletions

diff --git a/media-libs/alsa-oss/ChangeLog b/media-libs/alsa-oss/ChangeLog
index 1dbc987ece03..efb9d46bde71 100644
--- a/media-libs/alsa-oss/ChangeLog
+++ b/media-libs/alsa-oss/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/alsa-oss
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.61 2005/11/23 19:15:42 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.62 2005/12/18 21:31:27 flameeyes Exp $
+
+*alsa-oss-1.0.10-r1 (18 Dec 2005)
+
+  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-oss-1.0.10-r1.ebuild:
+  Make sure that LD_PRELOAD is not specifying a path for the libaoss.so
+  library, to make it work on multilib setups.
 
   23 Nov 2005; Luis Medinas <metalgod@gentoo.org> alsa-oss-1.0.10.ebuild:
   Stable on amd64. See bug #111968.
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index b60000dc5d45..f878fd29deba 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7b0334a11608790d7fb8b68287ac6f04 ChangeLog 7534
+MD5 d3e136d4504420832a6be260571c28f3 ChangeLog 7773
+MD5 538839498f8c65b8addb5022207c5fd6 alsa-oss-1.0.10-r1.ebuild 722
 MD5 07089ed5393d669d85dfe5289118a122 alsa-oss-1.0.10.ebuild 734
 MD5 46be4caffaccdf4d6e938d3bd51c0a35 alsa-oss-1.0.10_rc2.ebuild 740
 MD5 a3ac8360e813d604b41434af39f47d14 alsa-oss-1.0.10_rc3.ebuild 738
 MD5 909610af901f23e1b0f286d2bcc61c4a alsa-oss-1.0.8-r1.ebuild 696
 MD5 963438feec93dbbc295faf1dfe92eb2b alsa-oss-1.0.9.ebuild 681
 MD5 70abfdcf57e22f6b01f8b1a8bb784973 files/digest-alsa-oss-1.0.10 68
+MD5 70abfdcf57e22f6b01f8b1a8bb784973 files/digest-alsa-oss-1.0.10-r1 68
 MD5 3f4059db2c2398219e73df0cd62c9594 files/digest-alsa-oss-1.0.10_rc2 71
 MD5 0d30d7934b2daea0a5d3225b3a2f3a29 files/digest-alsa-oss-1.0.10_rc3 71
 MD5 9bae02d9e262fe870be4d807f546ed55 files/digest-alsa-oss-1.0.8-r1 67
 MD5 5dc114304223294838436eab84acbccb files/digest-alsa-oss-1.0.9 67
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDhL+1wUpWvClEHQoRAlKuAJ9ELNSAZHpJIdvr7Xl3UAwWqyWcIACbBLlZ
-45E4guScPpHlSw/WMzGI9E4=
-=r1WD
+iD8DBQFDpdU8AiZjviIA2XgRAkUsAKCNaAAjGF6ENT2AsC/yyFlfwl+9MgCfV1RG
+jnqUPNgJ4qlvSgTCQe72uHQ=
+=KYNC
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.10-r1.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.10-r1.ebuild
new file mode 100644
index 000000000000..f9951b5e64f9
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.10-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-1.0.10-r1.ebuild,v 1.1 2005/12/18 21:31:27 flameeyes Exp $
+
+inherit multilib
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer."
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=media-libs/alsa-lib-1.0"
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	sed -i -e 's:\${exec_prefix}/\\$LIB/::' ${D}/usr/bin/aoss
+}
diff --git a/media-libs/alsa-oss/files/digest-alsa-oss-1.0.10-r1 b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.10-r1
new file mode 100644
index 000000000000..7f8f0f92b87c
--- /dev/null
+++ b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.10-r1
@@ -0,0 +1 @@
+MD5 0b3f9f95b989fc1f9305fa1e4e0227f0 alsa-oss-1.0.10.tar.bz2 224104