From 960fee247bb60d0afd2174aa8ab527a1fb83a353 Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 11 May 2006 20:50:19 +0000
Subject: Added blocker on freealut to 20050504 versions of openal since they
 include an internal alut. Package-Manager: portage-2.1_pre10-r2

---
 media-libs/openal/ChangeLog                 | 7 ++++++-
 media-libs/openal/openal-20050504-r1.ebuild | 5 +++--
 media-libs/openal/openal-20050504-r2.ebuild | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'media-libs/openal')

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index 26ab88550c97..a870b674797c 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openal
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.54 2006/04/17 21:47:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.55 2006/05/11 20:50:19 wolf31o2 Exp $
+
+  11 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  openal-20050504-r1.ebuild, openal-20050504-r2.ebuild:
+  Added blocker on freealut to 20050504 versions of openal since they include
+  an internal alut.
 
 *openal-0.0.8 (17 Apr 2006)
 
diff --git a/media-libs/openal/openal-20050504-r1.ebuild b/media-libs/openal/openal-20050504-r1.ebuild
index e69677931d87..439a640260da 100644
--- a/media-libs/openal/openal-20050504-r1.ebuild
+++ b/media-libs/openal/openal-20050504-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.7 2006/02/26 14:26:34 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r1.ebuild,v 1.8 2006/05/11 20:50:19 wolf31o2 Exp $
 
 inherit eutils gnuconfig
 
@@ -18,7 +18,8 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 )
 	esd? ( media-sound/esound )
 	sdl? ( media-libs/libsdl )
 	vorbis? ( media-libs/libvorbis )
-	mpeg? ( media-libs/smpeg )"
+	mpeg? ( media-libs/smpeg )
+	!media-libs/freealut"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
diff --git a/media-libs/openal/openal-20050504-r2.ebuild b/media-libs/openal/openal-20050504-r2.ebuild
index 3d27279c279c..cdd9a7fa1f87 100644
--- a/media-libs/openal/openal-20050504-r2.ebuild
+++ b/media-libs/openal/openal-20050504-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5 2006/02/14 15:50:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r2.ebuild,v 1.6 2006/05/11 20:50:19 wolf31o2 Exp $
 
 inherit eutils gnuconfig
 
@@ -18,7 +18,8 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 )
 	esd? ( media-sound/esound )
 	sdl? ( media-libs/libsdl )
 	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	mpeg? ( media-libs/smpeg )"
+	mpeg? ( media-libs/smpeg )
+	!media-libs/freealut"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
-- 
cgit v1.2.3-65-gdbad