6 files changed, 115 insertions, 2 deletions
diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 31795ded1f16..6537554cadbd 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.184 2006/08/29 16:08:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.185 2006/08/31 09:15:34 flameeyes Exp $
+
+*alsa-lib-1.0.12 (31 Aug 2006)
+
+  31 Aug 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -alsa-lib-1.0.12_rc1.ebuild, -alsa-lib-1.0.12_rc1-r1.ebuild,
+  +alsa-lib-1.0.12.ebuild:
+  Version bump to latest version, and remove release candidate.
 
   29 Aug 2006; Joseph Jezak <josejx@gentoo.org> alsa-lib-1.0.11-r1.ebuild:
   Marked ppc stable for bug #145021.
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.12.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.12.ebuild
new file mode 100644
index 000000000000..54af871433df
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.12.ebuild,v 1.1 2006/08/31 09:15:34 flameeyes Exp $
+
+inherit eutils autotools libtool
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/alsa
+	>=media-sound/alsa-headers-${PV}"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.0.10_rc3-hardened.patch"
+	epatch "${FILESDIR}/${PN}-1.0.10-no-wordexp-header.patch"
+
+	eautomake
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	# needed to avoid gcc looping internaly
+	use hppa && export CFLAGS="-O1 -pipe"
+
+	econf \
+		--enable-static \
+		--enable-shared \
+		|| die "configure failed"
+
+	emake || die "make failed"
+
+	if use doc; then
+		emake doc || die "failed to generate docs"
+		fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog TODO
+	use doc && dohtml -r doc/doxygen/html/*
+}
+
+pkg_postinst() {
+	ewarn "Starting from alsa 1.0.11_rc3 the configuration for dmix is changed."
+	ewarn "Leaving around old asound.conf or ~/.asoundrc might make all apps"
+	ewarn "using ALSA output crash."
+	ewarn "Note that dmix output is enabled by default on the 'default' device"
+	ewarn "since ALSA 1.0.9."
+	einfo ""
+	einfo "Please try media-sound/alsa-driver before filing bugs about unstable"
+	einfo "or missing output with in-kernel drivers. Misaligned versions of"
+	einfo "alsa-lib and drivers used can cause problems."
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.12 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.12
new file mode 100644
index 000000000000..d94869e27445
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.12
@@ -0,0 +1,3 @@
+MD5 d351d46c5e415d4c8448487737939c72 alsa-lib-1.0.12.tar.bz2 707665
+RMD160 d6d226ff1b4f25dbf15b378afb1291d728ab95fd alsa-lib-1.0.12.tar.bz2 707665
+SHA256 b056f9ceaaf47bf3f7c01fa358fb67b5448503deb8552e5ca07ef10209dd4977 alsa-lib-1.0.12.tar.bz2 707665
diff --git a/media-libs/alsa-oss/ChangeLog b/media-libs/alsa-oss/ChangeLog
index 33414c416c77..d5b8b3c0d158 100644
--- a/media-libs/alsa-oss/ChangeLog
+++ b/media-libs/alsa-oss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/alsa-oss
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.77 2006/05/14 03:30:01 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.78 2006/08/31 09:16:23 flameeyes Exp $
+
+*alsa-oss-1.0.12 (31 Aug 2006)
+
+  31 Aug 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-oss-1.0.12.ebuild:
+  Version bump to latest version, and remove release candidate.
 
   14 May 2006; Luis Medinas <metalgod@gentoo.org> alsa-oss-1.0.11.ebuild:
   Stable on amd64. Bug #130535.
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.12.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.12.ebuild
new file mode 100644
index 000000000000..4bd2365e5792
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 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.12.ebuild,v 1.1 2006/08/31 09:16:23 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=">=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.12 b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.12
new file mode 100644
index 000000000000..5c513ac24362
--- /dev/null
+++ b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.12
@@ -0,0 +1,3 @@
+MD5 d4d18bbf63a866d6e065b90e16acd676 alsa-oss-1.0.12.tar.bz2 236300
+RMD160 717299f479e4c80d6156e3dc1081e7b3b0c7f1a6 alsa-oss-1.0.12.tar.bz2 236300
+SHA256 de7e492931c53339443dfdddfd1833f5fdd20f83e3a86d73940ae430dd809586 alsa-oss-1.0.12.tar.bz2 236300