Removed old version. Changed oggvorbis to vorbis for bug #94254. Changed to using use_enable rather than manually adding to myconf.

Package-Manager: portage-2.0.53_rc7

7 files changed, 53 insertions, 126 deletions

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index 404015e37944..929ccd66aacf 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.49 2005/10/27 13:26:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.50 2005/11/29 14:18:37 wolf31o2 Exp $
+
+  29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -openal-20040817.ebuild, openal-20050504-r1.ebuild,
+  openal-20050504-r2.ebuild, openal-20051024.ebuild:
+  Removed old version. Changed oggvorbis to vorbis for bug #94254. Changed to
+  using use_enable rather than manually adding to myconf.
 
   27 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   openal-20051024.ebuild:
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 4061cbea441b..1e730ea9ab27 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,8 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 58f21cff5ea039c9f162ca2f813770e9 ChangeLog 6790
-MD5 7a79e920a2131ac669da96c4cf5e66e9 files/digest-openal-20040817 69
+MD5 ae69e6c882523c928a513ff41b132b42 ChangeLog 7088
 MD5 cb37c0311b2a968a888b843afb2d6b94 files/digest-openal-20050504-r1 69
 MD5 cb37c0311b2a968a888b843afb2d6b94 files/digest-openal-20050504-r2 69
 MD5 97a5e481613edc51dee250d88095df28 files/digest-openal-20051024 69
@@ -15,14 +11,6 @@ MD5 8f54e2a7d59c6bd9f0fb71e2534f0908 files/openal-20051024-alsa_dmix.patch 2136
 MD5 01e4c30898e39d8727af8c01bca7dd53 files/openal-20051024-amd64-configure.patch 841
 MD5 8072d11c3e5e44c43407bed8c67b4031 files/openalrc 221
 MD5 ec6dcddda50a0138e1f50eb0d1299798 metadata.xml 254
-MD5 3bf1037b4a549bb486b65602e073e0db openal-20040817.ebuild 1942
-MD5 180aec9d8b31090126293bd6434ce24c openal-20050504-r1.ebuild 2109
-MD5 dcf4efbec0387cb25d97b9b6aec88ffe openal-20050504-r2.ebuild 2154
-MD5 225475a3f78dcb02e8c85a40e0566801 openal-20051024.ebuild 2159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDi8jZgIKl8Uu19MoRAoAmAJ903TkfRxJIepScsW5YsleQd6TpwwCggBBC
-j+OAkJFSOKdptVx2e7KSlo4=
-=RE7I
------END PGP SIGNATURE-----
+MD5 5b5e03c96ca602392aa84d64f9ff1cb9 openal-20050504-r1.ebuild 1937
+MD5 7f582ea0ee96063179c012ff445a1813 openal-20050504-r2.ebuild 2007
+MD5 4fed322669c829a6d7237f73fffd3201 openal-20051024.ebuild 1996
diff --git a/media-libs/openal/files/digest-openal-20040817 b/media-libs/openal/files/digest-openal-20040817
deleted file mode 100644
index 0ac7f58a48f0..000000000000
--- a/media-libs/openal/files/digest-openal-20040817
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cde13725d4bd4960207e56e5c715513e openal-20040817.tar.bz2 8134703
diff --git a/media-libs/openal/openal-20040817.ebuild b/media-libs/openal/openal-20040817.ebuild
deleted file mode 100644
index 7f0777141b25..000000000000
--- a/media-libs/openal/openal-20040817.ebuild
+++ /dev/null
@@ -1,66 +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/openal/openal-20040817.ebuild,v 1.8 2005/02/22 08:07:23 dholm Exp $
-
-inherit eutils gnuconfig
-
-IUSE="alsa arts esd sdl debug oggvorbis mpeg"
-DESCRIPTION="OpenAL, the Open Audio Library, is an open, vendor-neutral, cross-platform API for interactive, primarily spatialized audio"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://opensource.creative.com/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc amd64 ppc64"
-
-DEPEND="x86? ( dev-lang/nasm )
-	alsa? ( >=media-libs/alsa-lib-1.0.2 )
-	arts? ( kde-base/arts )
-	esd? ( media-sound/esound )
-	sdl? ( media-libs/libsdl )
-	oggvorbis? ( media-libs/libvorbis )
-	mpeg? ( media-libs/smpeg )"
-
-src_compile() {
-	gnuconfig_update
-	local myconf
-
-	use esd && myconf="${myconf} --enable-esd"
-	use sdl && myconf="${myconf} --enable-sdl"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use arts && myconf="${myconf} --enable-arts"
-	use mpeg && myconf="${myconf} --enable-smpeg"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use debug && myconf="${myconf} --enable-debug-maximus"
-
-	cd ${S}/linux
-	use alsa && epatch ${FILESDIR}/${P}-alsa_capture.diff
-	epatch ${FILESDIR}/${P}-destdir.patch
-
-	WANT_AUTOCONF=2.5 ./autogen.sh || die
-	econf ${myconf} --enable-paranoid-locks --libdir=/usr/$(get_libdir) \
-		--enable-capture --enable-optimize || die
-	emake all || die
-}
-
-src_install() {
-	cd ${S}/linux
-
-	make install DESTDIR="${D}" || die
-
-	dodoc CREDITS ChangeLog INSTALL NOTES PLATFORM TODO
-	dodoc ${FILESDIR}/openalrc
-	makeinfo doc/openal.texi
-	doinfo doc/openal.info
-
-	cd ${S}
-	dodoc CHANGES COPYING CREDITS
-	dohtml docs/*.html
-}
-
-pkg_postinst() {
-	einfo "There is a sample openalrc file in /usr/share/doc/${P} which"
-	einfo "sets up 4 speaker surround sound with ALSA.  Simply copy it to your:"
-	einfo " ~/.openalrc"
-	einfo "to use it."
-}
diff --git a/media-libs/openal/openal-20050504-r1.ebuild b/media-libs/openal/openal-20050504-r1.ebuild
index 6fadd2f38187..751b9a3236eb 100644
--- a/media-libs/openal/openal-20050504-r1.ebuild
+++ b/media-libs/openal/openal-20050504-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r1.ebuild,v 1.4 2005/08/13 23:44:05 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r1.ebuild,v 1.5 2005/11/29 14:18:37 wolf31o2 Exp $
 
 inherit eutils gnuconfig
 
-IUSE="alsa arts esd sdl debug oggvorbis mpeg"
+IUSE="alsa arts esd sdl debug vorbis mpeg"
 DESCRIPTION="OpenAL, the Open Audio Library, is an open, vendor-neutral, cross-platform API for interactive, primarily spatialized audio"
 SRC_URI="http://dev.gentoo.org/~eradicator/openal/${P}.tar.bz2"
 HOMEPAGE="http://www.openal.org"
@@ -17,7 +17,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
 	sdl? ( media-libs/libsdl )
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	mpeg? ( media-libs/smpeg )"
 
 DEPEND="${RDEPEND}
@@ -43,18 +43,18 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use esd && myconf="${myconf} --enable-esd"
-	use sdl && myconf="${myconf} --enable-sdl"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use arts && myconf="${myconf} --enable-arts"
-	use mpeg && myconf="${myconf} --enable-smpeg"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use debug && myconf="${myconf} --enable-debug-maximus"
-
-	econf ${myconf} --enable-paranoid-locks --libdir=/usr/$(get_libdir) \
-		--enable-capture --enable-optimize || die
+	econf \
+		--enable-paranoid-locks \
+		--libdir=/usr/$(get_libdir) \
+		--enable-capture \
+		--enable-optimize \
+		$(use_enable esd) \
+		$(use_enable sdl) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable mpeg smpeg) \
+		$(use_enable vorbis) \
+		$(use_enable debug debug-maximus) || die
 	emake all || die
 }
 
diff --git a/media-libs/openal/openal-20050504-r2.ebuild b/media-libs/openal/openal-20050504-r2.ebuild
index 8e1dd8b6368b..f951be137855 100644
--- a/media-libs/openal/openal-20050504-r2.ebuild
+++ b/media-libs/openal/openal-20050504-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r2.ebuild,v 1.3 2005/10/11 23:55:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r2.ebuild,v 1.4 2005/11/29 14:18:37 wolf31o2 Exp $
 
 inherit eutils gnuconfig
 
@@ -17,7 +17,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 )
 	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
 	sdl? ( media-libs/libsdl )
-	vorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
 	mpeg? ( media-libs/smpeg )"
 
 DEPEND="${RDEPEND}
@@ -44,18 +44,18 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use esd && myconf="${myconf} --enable-esd"
-	use sdl && myconf="${myconf} --enable-sdl"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use arts && myconf="${myconf} --enable-arts"
-	use mpeg && myconf="${myconf} --enable-smpeg"
-	use vorbis && myconf="${myconf} --enable-vorbis"
-	use debug && myconf="${myconf} --enable-debug-maximus"
-
-	econf ${myconf} --enable-paranoid-locks --libdir=/usr/$(get_libdir) \
-		--enable-capture --enable-optimize || die
+	econf \
+		--enable-paranoid-locks \
+		--libdir=/usr/$(get_libdir) \
+		--enable-capture \
+		--enable-optimize \
+		$(use_enable esd) \
+		$(use_enable sdl) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable mpeg smpeg) \
+		$(use_enable vorbis) \
+		$(use_enable debug debug-maximus) || die
 	emake all || die
 }
 
diff --git a/media-libs/openal/openal-20051024.ebuild b/media-libs/openal/openal-20051024.ebuild
index 44bd4249494e..17c15f907fe5 100644
--- a/media-libs/openal/openal-20051024.ebuild
+++ b/media-libs/openal/openal-20051024.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20051024.ebuild,v 1.5 2005/11/29 03:17:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20051024.ebuild,v 1.6 2005/11/29 14:18:37 wolf31o2 Exp $
 
 inherit eutils gnuconfig
 
@@ -43,18 +43,18 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use esd && myconf="${myconf} --enable-esd"
-	use sdl && myconf="${myconf} --enable-sdl"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use arts && myconf="${myconf} --enable-arts"
-	use mpeg && myconf="${myconf} --enable-smpeg"
-	use vorbis && myconf="${myconf} --enable-vorbis"
-	use debug && myconf="${myconf} --enable-debug-maximus"
-
-	econf ${myconf} --enable-paranoid-locks --libdir=/usr/$(get_libdir) \
-		--enable-capture --enable-optimization || die
+	econf \
+		--enable-paranoid-locks \
+		--libdir=/usr/$(get_libdir) \
+		--enable-capture \
+		--enable-optimization \
+		$(use_enable esd) \
+		$(use_enable sdl) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable mpeg smpeg) \
+		$(use_enable vorbis) \
+		$(use_enable debug debug-maximus) || die
 	emake all || die
 }