Fix hardcoded 'lib' in ao.m4. Drop ~mips keywords from older versions.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

diff --git a/media-libs/libao/ChangeLog b/media-libs/libao/ChangeLog
index ce86de891e44323f78f6c02502d85ddb6ce6e288..7f9831658653a187c80dde67fa5c32f1bcfd3e57 100644 (file)
--- 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/Manifest b/media-libs/libao/Manifest
index 2eb0386842512d7ffae57a97bb274b46d4abcf21..5caacacd3f507733b787ecf155c68f515029a65e 100644 (file)
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -4,14 +4,15 @@ Hash: SHA1
 AUX libao-1.0.0-pulseaudio.patch 1047 RMD160 645e73723e27e27dbecc6c9a3f3bc03f3f756c6c SHA1 ec42ae41a7631a2b457e3f33c883f5ad83f85076 SHA256 e7679754f8c30482ba65f4c48bdc9dc737ca312373cc722cb7393f274e82cc37
 DIST libao-1.0.0.tar.gz 394204 RMD160 3fa5bfcad9a5d6b09b46b2f32e52a261fe277d27 SHA1 47798bb0fad0c68cd2913ae8c6094aeaa18a23ca SHA256 d0fe2c7e4afb8e45e8a3693fe9fde5402dbc2faecfb68a25e9c0cd711817b82a
 DIST libao-1.1.0.tar.gz 397102 RMD160 374078af926bb0744fb2301e128a1c5276fdf4ee SHA1 9301bc4886f170c7122ab62677fb71cf001c04fd SHA256 29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4
-EBUILD libao-1.0.0-r1.ebuild 1291 RMD160 9f7f72e6fad69c6c2f27edc237d3c55da9ab75a8 SHA1 a8105449ed06c564a945fb02b14762dc125d4229 SHA256 f11c0758fb91e07bf554884d03918148dd0db4ba71e01ddadfdf93608eeeb611
-EBUILD libao-1.1.0.ebuild 1257 RMD160 3eefb1fd43b5c2e6645fabc13292594c4b72de3c SHA1 2859e3dcd25d5cf9b4a93124d860f592d7106c86 SHA256 7ccb5301e0a7e43cc3b9171aaa61ef2f60ef32415386167956441fc1a510ae18
-MISC ChangeLog 13816 RMD160 69d857ada1c6f92f6546ae6b15e89a6b940643ae SHA1 41547f951df312f25f78fad599f9034e1e047c63 SHA256 9d8c5b41409098c08e0c38b686e9260b11215e6955c276ab0a063ddfe7fd4e12
+EBUILD libao-1.0.0-r1.ebuild 1287 RMD160 41d54b2ac7578c679ce1904a9049b6e5cc0a923c SHA1 29b6bdee59ca85760d4b95228f96304be918b026 SHA256 e89d1c36d6f8b0d12190a7d589209d62840cecb64aa3188c5ba3412df22f2299
+EBUILD libao-1.1.0-r1.ebuild 1313 RMD160 741bffca92e9ac89871b9ffc5e785e1c3ecb0387 SHA1 da4fc41963a6b50e19fa29bc9b7b90001a2e3932 SHA256 6a1572ea69f2d45452241f40338fbd795a73f608341039df5be938f1fec65864
+EBUILD libao-1.1.0.ebuild 1251 RMD160 9e76f52147db973a62a1e61e6dfd73285b2c2332 SHA1 6d6ad9aafcf61631e1a54af126a8141c6063c67f SHA256 c20bdb87b07a40a6860f7989e6994f60b277a5ddb9cc603e7c07f0c59517464a
+MISC ChangeLog 14039 RMD160 c51ca66ef279afbe83560811d4529367911a44f8 SHA1 cd9091756d60ee1972c2dedbeb6b53a6c0de03e1 SHA256 dad49c7b540292739169683aea81781688a10473c52e88236e561d4f0bdfb7c6
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1/vVkACgkQvFcC4BYPU0r5KACcC7IvaQs3D829mEeRhmK90kry
-7zgAniPLEgj2doG1qt2IYOTclO2tJrqR
-=Ysai
+iEYEARECAAYFAk5QR9oACgkQTVUdg23rv53DygCfe6JSHvfBp3DwG9Pk29oh+REn
+dbcAniXcMi3cUfMOQRI55R5sxnO7BxM9
+=BNmL
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libao/libao-1.0.0-r1.ebuild b/media-libs/libao/libao-1.0.0-r1.ebuild
index d990dbe8e86df475606f61427e7a36b400426bb6..598a4ba349cd03928376e6c07061b0250b3ea854 100644 (file)
--- 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 (file)
index 0000000..199eb2c
--- /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 7393c2caf7f5f188ff2f15b8f1159e52d144cf13..0790264dee032e9f24e73e8eed6f3b41a0e9b275 100644 (file)
--- 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 )