4 files changed, 58 insertions, 6 deletions
diff --git a/media-libs/libao/ChangeLog b/media-libs/libao/ChangeLog
index ce86de891e44..7f9831658653 100644
--- a/media-libs/libao/ChangeLog
+++ b/media-libs/libao/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libao
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.103 2011/03/15 19:26:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.104 2011/08/20 23:48:38 mattst88 Exp $
+
+*libao-1.1.0-r1 (20 Aug 2011)
+
+  20 Aug 2011; Matt Turner <mattst88@gentoo.org> libao-1.0.0-r1.ebuild,
+  libao-1.1.0.ebuild, +libao-1.1.0-r1.ebuild:
+  Fix hardcoded 'lib' in ao.m4. Drop ~mips keywords from older versions.
 
   15 Mar 2011; Alexis Ballier <aballier@gentoo.org> libao-1.1.0.ebuild:
   prepend eprefix to docdir, by Nathan Phillip Brink (binki), bug #359009
diff --git a/media-libs/libao/libao-1.0.0-r1.ebuild b/media-libs/libao/libao-1.0.0-r1.ebuild
index d990dbe8e86d..598a4ba349cd 100644
--- a/media-libs/libao/libao-1.0.0-r1.ebuild
+++ b/media-libs/libao/libao-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.0.0-r1.ebuild,v 1.8 2010/10/15 13:39:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.0.0-r1.ebuild,v 1.9 2011/08/20 23:48:38 mattst88 Exp $
 
 EAPI=3
 inherit eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/media-libs/libao/libao-1.1.0-r1.ebuild b/media-libs/libao/libao-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..199eb2cbf078
--- /dev/null
+++ b/media-libs/libao/libao-1.1.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.1.0-r1.ebuild,v 1.1 2011/08/20 23:48:38 mattst88 Exp $
+
+EAPI=4
+
+inherit libtool multilib
+
+DESCRIPTION="The Audio Output library"
+HOMEPAGE="http://www.xiph.org/ao/"
+SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="alsa nas mmap pulseaudio static-libs"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	sed -i -e 's:-O20::' configure || die
+	sed -i -e "s:/lib:/$(get_libdir):g" ao.m4 || die
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-dependency-tracking \
+		--disable-esd \
+		$(use_enable alsa alsa) \
+		$(use_enable mmap alsa-mmap) \
+		--disable-arts \
+		$(use_enable nas) \
+		$(use_enable pulseaudio pulse)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS CHANGES README TODO
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libao/libao-1.1.0.ebuild b/media-libs/libao/libao-1.1.0.ebuild
index 7393c2caf7f5..0790264dee03 100644
--- a/media-libs/libao/libao-1.1.0.ebuild
+++ b/media-libs/libao/libao-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.1.0.ebuild,v 1.2 2011/03/15 19:26:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.1.0.ebuild,v 1.3 2011/08/20 23:48:38 mattst88 Exp $
 
 EAPI=3
 inherit libtool
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )