First off, I would like to really, really apologise to anyone who looks at these dependencies. It's ugly. I know it. However, this is actually correct for the craziness in the tree with openal. At any rate, the idea is to fix this now, then remove all of the openal ebuilds except 0.0.8, then revisit this and clean up all of the extra cruft. Anyway, I apologise again. Enjoy.

(Portage version: 2.1_pre10-r4)

5 files changed, 43 insertions, 11 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index 50acd3cbee3f..a6d1c13e5237 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-games/simgear
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.22 2006/04/27 15:15:30 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.23 2006/05/09 20:16:07 wolf31o2 Exp $
+
+  09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> simgear-0.3.6.ebuild,
+  simgear-0.3.8.ebuild, simgear-0.3.9.ebuild, simgear-0.3.10.ebuild:
+  First off, I would like to really, really apologise to anyone who looks at
+  these dependencies. It's ugly. I know it. However, this is actually correct
+  for the craziness in the tree with openal. At any rate, the idea is to fix
+  this now, then remove all of the openal ebuilds except 0.0.8, then revisit
+  this and clean up all of the extra cruft. Anyway, I apologise again. Enjoy.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-simgear-0.3.6,
   files/digest-simgear-0.3.8, Manifest:
diff --git a/dev-games/simgear/simgear-0.3.10.ebuild b/dev-games/simgear/simgear-0.3.10.ebuild
index 9165c3357892..9cfea9e82916 100644
--- a/dev-games/simgear/simgear-0.3.10.ebuild
+++ b/dev-games/simgear/simgear-0.3.10.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/dev-games/simgear/simgear-0.3.10.ebuild,v 1.1 2006/04/08 01:36:40 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.10.ebuild,v 1.2 2006/05/09 20:16:07 wolf31o2 Exp $
 
 MY_P="SimGear-${PV/_/-}"
 DESCRIPTION="Development library for simulation games"
@@ -13,7 +13,13 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/plib-1.8.4
-	media-libs/openal"
+	|| (
+		(
+			|| (
+				~media-libs/openal-0.0.8
+				~media-libs/openal-20051024 )
+			media-libs/freealut )
+		~media-libs/openal-20050504 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-games/simgear/simgear-0.3.6.ebuild b/dev-games/simgear/simgear-0.3.6.ebuild
index d5766927250e..afba14197cba 100644
--- a/dev-games/simgear/simgear-0.3.6.ebuild
+++ b/dev-games/simgear/simgear-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.6.ebuild,v 1.5 2005/02/05 20:05:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.6.ebuild,v 1.6 2006/05/09 20:16:07 wolf31o2 Exp $
 
 MY_P="SimGear-${PV}"
 DESCRIPTION="Development library for simulation games"
@@ -13,7 +13,13 @@ KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
 DEPEND=">=media-libs/plib-1.6.0
-	media-libs/openal"
+	|| (
+		(
+			|| (
+				~media-libs/openal-0.0.8
+				~media-libs/openal-20051024 )
+			media-libs/freealut )
+		~media-libs/openal-20050504 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-games/simgear/simgear-0.3.8.ebuild b/dev-games/simgear/simgear-0.3.8.ebuild
index 94f52201af9f..eddac003d039 100644
--- a/dev-games/simgear/simgear-0.3.8.ebuild
+++ b/dev-games/simgear/simgear-0.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.8.ebuild,v 1.4 2005/04/21 19:13:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.8.ebuild,v 1.5 2006/05/09 20:16:07 wolf31o2 Exp $
 
 MY_P="SimGear-${PV/_/-}"
 DESCRIPTION="Development library for simulation games"
@@ -13,7 +13,13 @@ KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
 DEPEND=">=media-libs/plib-1.8.4
-	media-libs/openal"
+	|| (
+		(
+			|| (
+				~media-libs/openal-0.0.8
+				~media-libs/openal-20051024 )
+			media-libs/freealut )
+		~media-libs/openal-20050504 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-games/simgear/simgear-0.3.9.ebuild b/dev-games/simgear/simgear-0.3.9.ebuild
index 4f313453cb86..47cf9be2878c 100644
--- a/dev-games/simgear/simgear-0.3.9.ebuild
+++ b/dev-games/simgear/simgear-0.3.9.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/dev-games/simgear/simgear-0.3.9.ebuild,v 1.2 2006/04/04 18:46:46 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-0.3.9.ebuild,v 1.3 2006/05/09 20:16:07 wolf31o2 Exp $
 
 inherit eutils
 
@@ -15,7 +15,13 @@ KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
 DEPEND=">=media-libs/plib-1.8.4
-	media-libs/openal"
+	|| (
+		(
+			|| (
+				~media-libs/openal-0.0.8
+				~media-libs/openal-20051024 )
+			media-libs/freealut )
+		~media-libs/openal-20050504 )"
 
 S=${WORKDIR}/${MY_P}