14 files changed, 35 insertions, 210 deletions
diff --git a/media-libs/libao/ChangeLog b/media-libs/libao/ChangeLog
index dc56bc22c6e3..9bcb54d71d4e 100644
--- a/media-libs/libao/ChangeLog
+++ b/media-libs/libao/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libao
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.51 2005/09/05 10:55:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.52 2005/10/07 13:42:02 matsuu Exp $
+
+*libao-0.8.6-r2 (07 Oct 2005)
+
+  07 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  -files/libao-0.8.3-r1.patch, -files/libao-0.8.4-esd.patch,
+  -files/alsa-1.0.patch, -libao-0.8.3-r1.ebuild, -libao-0.8.4.ebuild,
+  -libao-0.8.4-r1.ebuild, -libao-0.8.6.ebuild, +libao-0.8.6-r2.ebuild:
+  Removed old versions.
+  Added ALSA driver bug fix patch. Bug 98607.
 
   05 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> libao-0.8.6-r1.ebuild:
   Use autotools eclass, and call elibtoolize after all is clear.
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 518ada763ba1..651b64a74927 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,29 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 869b4a41f426650b97a7c1c5f098df99 libao-0.8.6.ebuild 1233
-MD5 717963b145966a698a918924145d7117 ChangeLog 6916
-MD5 06a915c89a29cebc68fee4182fa56cc7 libao-0.8.4.ebuild 876
-MD5 9b45423b224a6ca312675ce60925dbd9 libao-0.8.4-r1.ebuild 1281
 MD5 9ad75806e8d6849933bac54412d0c1ff libao-0.8.6-r1.ebuild 1449
+MD5 869b4a41f426650b97a7c1c5f098df99 libao-0.8.6.ebuild 1233
 MD5 b9c077f26586aadc00e9e212a01ad496 libao-0.8.5.ebuild 1229
-MD5 52a821ddc6df9002e54f63de7ca3e73b libao-0.8.3-r1.ebuild 844
+MD5 25d24c6c352c06641aeeb33991fd60f7 libao-0.8.6-r2.ebuild 1423
+MD5 717963b145966a698a918924145d7117 ChangeLog 6916
 MD5 c3f0408a07f0c5d2af3ebcffcd836154 metadata.xml 257
-MD5 e6273f789010799956933aad72d23a5c files/libao-0.8.6-ppc-macos.patch 1862
-MD5 7136898ef15fe566b6e7dd2b72183df1 files/libao-0.8.3-r1.patch 671
-MD5 1c57b32742f5d9c82ff22b45b1f5865e files/digest-libao-0.8.4 63
-MD5 e379fe3da46646e9aad3e91faea68606 files/alsa-1.0.patch 278
-MD5 e2d17570d5e260a709cfe3715107d94d files/digest-libao-0.8.5 63
-MD5 91ea6d44f5feb641704b813186508a0d files/libao-0.8.5-ppc-macos.patch 3038
-MD5 5d49f3e442bd95b0fe757ce978db12f9 files/digest-libao-0.8.3-r1 63
 MD5 483a5fe5056608b9c0d47a944670fc87 files/digest-libao-0.8.6-r1 129
-MD5 1c57b32742f5d9c82ff22b45b1f5865e files/digest-libao-0.8.4-r1 63
-MD5 2a007685813f036e268b422d430f1450 files/libao-0.8.4-esd.patch 437
+MD5 f0c7b22eb94ec3d7579323d160b6afeb files/digest-libao-0.8.6-r2 135
+MD5 91ea6d44f5feb641704b813186508a0d files/libao-0.8.5-ppc-macos.patch 3038
+MD5 e2d17570d5e260a709cfe3715107d94d files/digest-libao-0.8.5 63
 MD5 1fe9b2eddcd0bcc2bc223d29725f4b1b files/digest-libao-0.8.6 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHCRIj5H05b2HAEkRAtkDAJ0ayjPxzW6SAin+GEVDaFoJyaLukQCfYEBE
-BF1NCRJ0QOoYUklrv9d244Q=
-=CesB
------END PGP SIGNATURE-----
+MD5 e6273f789010799956933aad72d23a5c files/libao-0.8.6-ppc-macos.patch 1862
diff --git a/media-libs/libao/files/alsa-1.0.patch b/media-libs/libao/files/alsa-1.0.patch
deleted file mode 100644
index 4cef6ede2ffc..000000000000
--- a/media-libs/libao/files/alsa-1.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ao_alsa09.c~	2003-09-10 16:21:15.000000000 +0200
-+++ ao_alsa09.c	2003-11-22 01:55:52.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
- #include <string.h>
- 
-+#define ALSA_PCM_OLD_HW_PARAMS_API
- #include <alsa/asoundlib.h>
- #include <ao/ao.h>
- #include <ao/plugin.h>
diff --git a/media-libs/libao/files/digest-libao-0.8.3-r1 b/media-libs/libao/files/digest-libao-0.8.3-r1
deleted file mode 100644
index 4826f09dcd10..000000000000
--- a/media-libs/libao/files/digest-libao-0.8.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1422a6ff7f58131921b9f2fabe2295c libao-0.8.3.tar.gz 210690
diff --git a/media-libs/libao/files/digest-libao-0.8.4 b/media-libs/libao/files/digest-libao-0.8.4
deleted file mode 100644
index 37133cc32768..000000000000
--- a/media-libs/libao/files/digest-libao-0.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0525549b0bf665f617913c916064cc87 libao-0.8.4.tar.gz 272670
diff --git a/media-libs/libao/files/digest-libao-0.8.4-r1 b/media-libs/libao/files/digest-libao-0.8.4-r1
deleted file mode 100644
index 37133cc32768..000000000000
--- a/media-libs/libao/files/digest-libao-0.8.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0525549b0bf665f617913c916064cc87 libao-0.8.4.tar.gz 272670
diff --git a/media-libs/libao/files/digest-libao-0.8.6 b/media-libs/libao/files/digest-libao-0.8.6
deleted file mode 100644
index 4d7bee7a2031..000000000000
--- a/media-libs/libao/files/digest-libao-0.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12e136a4c0995068ff134997c84421ed libao-0.8.6.tar.gz 387583
diff --git a/media-libs/libao/files/digest-libao-0.8.6-r2 b/media-libs/libao/files/digest-libao-0.8.6-r2
new file mode 100644
index 000000000000..066a04c6682f
--- /dev/null
+++ b/media-libs/libao/files/digest-libao-0.8.6-r2
@@ -0,0 +1,2 @@
+MD5 12e136a4c0995068ff134997c84421ed libao-0.8.6.tar.gz 387583
+MD5 455504ca87e577cee440ba181289499b libao-0.8.6-patches-3.tar.bz2 2496
diff --git a/media-libs/libao/files/libao-0.8.3-r1.patch b/media-libs/libao/files/libao-0.8.3-r1.patch
deleted file mode 100644
index 027d29c29004..000000000000
--- a/media-libs/libao/files/libao-0.8.3-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/plugins/alsa09/ao_alsa09.c	2001-12-19 07:39:24.000000000 +0900
-+++ ao_alsa09.c	2003-03-23 17:30:40.000000000 +0900
-@@ -192,18 +192,6 @@
- 	if (err < 0)
- 		goto error;
- 
--	cmd = "snd_pcm_hw_params_set_period_size";
--	err = snd_pcm_hw_params_set_period_size(internal->pcm_handle, hwparams,
--			internal->buf_size / internal->sample_size, 0);
--	if (err < 0)
--		goto error;
--
--	cmd = "snd_pcm_hw_params_set_periods";
--	err = snd_pcm_hw_params_set_periods(internal->pcm_handle, hwparams,
--			internal->periods * format->channels, 0);
--	if (err < 0)
--		goto error;
--
- 	cmd = "snd_pcm_hw_params";
- 	err = snd_pcm_hw_params(internal->pcm_handle, hwparams);
- 	if (err < 0)
diff --git a/media-libs/libao/files/libao-0.8.4-esd.patch b/media-libs/libao/files/libao-0.8.4-esd.patch
deleted file mode 100644
index 1214b24c9fb3..000000000000
--- a/media-libs/libao/files/libao-0.8.4-esd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruwN libao-0.8.4-old/configure.in libao-0.8.4/configure.in
---- libao-0.8.4-old/configure.in	2003-10-04 17:34:10.000000000 +0200
-+++ libao-0.8.4/configure.in	2003-12-28 16:44:40.518164170 +0100
-@@ -174,8 +174,8 @@
- 
- if test "$BUILD_ESD" = "yes"; then
-   AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)
--  AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
- fi
-+AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
- 
- 
- dnl Check for OSS
diff --git a/media-libs/libao/libao-0.8.3-r1.ebuild b/media-libs/libao/libao-0.8.3-r1.ebuild
deleted file mode 100644
index 190242500872..000000000000
--- a/media-libs/libao/libao-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.3-r1.ebuild,v 1.12 2005/01/30 00:00:26 chainsaw Exp $
-
-inherit eutils
-
-IUSE="esd"
-
-DESCRIPTION="the audio output library"
-SRC_URI="http://fatpipe.vorbis.com/files/1.0/unix/${P}.tar.gz"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-
-DEPEND="virtual/libc
-	esd? ( >=media-sound/esound-0.2.22 )"
-
-src_compile() {
-	cd ${S}
-	[ ${PR} = "r0" ] || epatch ${FILESDIR}/${P}-${PR}.patch
-	econf \
-		--enable-shared \
-		--enable-static || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS CHANGES COPYING README TODO
-	dohtml -A c doc/*.html
-}
diff --git a/media-libs/libao/libao-0.8.4-r1.ebuild b/media-libs/libao/libao-0.8.4-r1.ebuild
deleted file mode 100644
index 4512845b8fc4..000000000000
--- a/media-libs/libao/libao-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.4-r1.ebuild,v 1.17 2005/08/25 22:16:11 vapier Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="the audio output library"
-HOMEPAGE="http://www.xiph.org/ao/"
-SRC_URI="http://www.xiph.org/ao/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 mips ~ppc sparc x86"
-IUSE="alsa arts esd nas mmap"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.22 )
-	nas? ( media-libs/nas )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/plugins/alsa09
-	epatch ${FILESDIR}/alsa-1.0.patch
-	cd ${S}
-	epatch ${FILESDIR}/${P}-esd.patch
-	WANT_AUTOCONF=2.5 autoconf || die
-
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		`use_enable alsa alsa09` \
-		`use_enable mmap alsa09-mmap` \
-		`use_enable arts` \
-		`use_enable esd` \
-		`use_enable nas` \
-		--enable-shared \
-		--enable-static || die
-
-	# See bug #37218.  Build problems with parallel make.
-	emake -j1 || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS CHANGES COPYING README TODO
-	dohtml -A c doc/*.html
-}
diff --git a/media-libs/libao/libao-0.8.4.ebuild b/media-libs/libao/libao-0.8.4.ebuild
deleted file mode 100644
index b2c00e1e1cba..000000000000
--- a/media-libs/libao/libao-0.8.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.4.ebuild,v 1.13 2005/08/25 22:16:11 vapier Exp $
-
-inherit eutils
-
-IUSE="esd"
-
-DESCRIPTION="the audio output library"
-SRC_URI="http://www.xiph.org/ao/src/${P}.tar.gz"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-
-DEPEND="virtual/libc
-	!mips? ( esd? ( >=media-sound/esound-0.2.22 ) )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/plugins/alsa09
-	epatch ${FILESDIR}/alsa-1.0.patch
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		--enable-static || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS CHANGES COPYING README TODO
-	dohtml -A c doc/*.html
-}
diff --git a/media-libs/libao/libao-0.8.6.ebuild b/media-libs/libao/libao-0.8.6-r2.ebuild
index 95ae6ab3be23..79fc0f7b8476 100644
--- a/media-libs/libao/libao-0.8.6.ebuild
+++ b/media-libs/libao/libao-0.8.6-r2.ebuild
@@ -1,28 +1,38 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.6.ebuild,v 1.2 2005/08/25 22:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.6-r2.ebuild,v 1.1 2005/10/07 13:42:02 matsuu Exp $
 
-inherit libtool eutils
+inherit libtool eutils autotools
+
+PATCHLEVEL="3"
 
 DESCRIPTION="the audio output library"
 HOMEPAGE="http://www.xiph.org/ao/"
-SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="alsa arts esd nas mmap static"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	esd? ( >=media-sound/esound-0.2.22 )
 	nas? ( media-libs/nas )"
 
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-ppc-macos.patch
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
+	AT_M4DIR="${WORKDIR}/${PV}/m4" eautoreconf
 	elibtoolize
 }
 
@@ -45,6 +55,6 @@ src_install () {
 	make DESTDIR=${D} install || die
 
 	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS CHANGES COPYING README TODO
+	dodoc AUTHORS CHANGES README TODO
 	dohtml -A c doc/*.html
 }