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.

Package-Manager: portage-2.1_pre10-r4

6 files changed, 63 insertions, 41 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/Manifest b/dev-games/simgear/Manifest
index a7a618173035..173e77d91c2b 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX simgear-0.3.9-gcc41.patch 503 RMD160 b79a59c64adc38b806c379e110ceb65ecc092d12 SHA1 be02b7c6f45057e34f8c61b065a939c94ff0941f SHA256 058566f8427b2b624104f0d7ce95d603008c1858bf333e7a64c1993094bc60a4 size 503
 MD5 2e8f7f95fa0a2247ad533d991a019933 files/simgear-0.3.9-gcc41.patch 503
 RMD160 b79a59c64adc38b806c379e110ceb65ecc092d12 files/simgear-0.3.9-gcc41.patch 503
@@ -9,26 +6,26 @@ DIST SimGear-0.3.10.tar.gz 752225 RMD160 11bfb77efab7562f14c9bc0688f99af9a45f4c8
 DIST SimGear-0.3.6.tar.gz 949406 RMD160 49d46b0f661acbc39ddd3104d0024e6ddea8359f SHA256 2e04937cedd22c1f422017a1756838a00697d74f070729d850baeab540b71a5d size 949406
 DIST SimGear-0.3.8.tar.gz 992609 RMD160 448260477b24c22f557ca94b24f259d5861724ad SHA256 51e27b73d984c12f5653df68877463037991f0532c3ef2d5d1c1dfc52d822831 size 992609
 DIST SimGear-0.3.9.tar.gz 907159 RMD160 a1e37f53171600f402dbc5679fc3385a85c6e351 SHA256 f29b2b418f81994c9aae9c6e71c49116e906e9b9a86ba820f44bf103c1a0d3a6 size 907159
-EBUILD simgear-0.3.10.ebuild 711 RMD160 fe3b350235d17409feeee5daf3128bb568fff488 SHA1 df90f7405d04cdd54f79b5d696952d06867e8e5c SHA256 7c5b2c91947b059026ceca23ec7762285bddbac5b08453fc665ad7cf69cb643b size 711
-MD5 ecc3a864ec8c46f51116265138a84c08 simgear-0.3.10.ebuild 711
-RMD160 fe3b350235d17409feeee5daf3128bb568fff488 simgear-0.3.10.ebuild 711
-SHA256 7c5b2c91947b059026ceca23ec7762285bddbac5b08453fc665ad7cf69cb643b simgear-0.3.10.ebuild 711
-EBUILD simgear-0.3.6.ebuild 706 RMD160 6ad38d09685bd4984f120ae3f7655f4dd6fffa49 SHA1 58ca6df7997e79723bb2c42bdf456c0455d20ab4 SHA256 1fb28ec45f53de8e48ecf47e6b8126579f77f44703c643bd6549c05844a92cae size 706
-MD5 7eac0e53c5d86f1bcdc17450a9f5b042 simgear-0.3.6.ebuild 706
-RMD160 6ad38d09685bd4984f120ae3f7655f4dd6fffa49 simgear-0.3.6.ebuild 706
-SHA256 1fb28ec45f53de8e48ecf47e6b8126579f77f44703c643bd6549c05844a92cae simgear-0.3.6.ebuild 706
-EBUILD simgear-0.3.8.ebuild 708 RMD160 800a436d0988d17a2030034241a0cc29b545e76a SHA1 67200b23b4aca769c8a52641947e0c2ec0b98295 SHA256 a0880108a73a15cfd7e359848f2a8a01987ca2f68a28580515b370f19b3fd456 size 708
-MD5 d9d34a68d4f2f9eb313f956d669015d2 simgear-0.3.8.ebuild 708
-RMD160 800a436d0988d17a2030034241a0cc29b545e76a simgear-0.3.8.ebuild 708
-SHA256 a0880108a73a15cfd7e359848f2a8a01987ca2f68a28580515b370f19b3fd456 simgear-0.3.8.ebuild 708
-EBUILD simgear-0.3.9.ebuild 805 RMD160 f1286b35c312763e8a0a46dad16e9c6b9582dab9 SHA1 1d768157f62f11aa5e64561da226a367a01ab4d3 SHA256 ed6f9582a3dd0122cbe4f91f0557596856f48b3bbb290a765c00a7ac64afe5a4 size 805
-MD5 d225ed7b338fbfe505da0d79e28cd7e8 simgear-0.3.9.ebuild 805
-RMD160 f1286b35c312763e8a0a46dad16e9c6b9582dab9 simgear-0.3.9.ebuild 805
-SHA256 ed6f9582a3dd0122cbe4f91f0557596856f48b3bbb290a765c00a7ac64afe5a4 simgear-0.3.9.ebuild 805
-MISC ChangeLog 3921 RMD160 de78871eaa98d2b73b109a0836240bea7f2d1efd SHA1 ab90ce6929bb721ce47318b4315c48ae718dfd3d SHA256 53d41d09780e75021e9a48a3b411ea121268c5ae1a564a1b7b0be13b738056f4 size 3921
-MD5 d4c0f03de3c130b81c057ba23fc5d2c7 ChangeLog 3921
-RMD160 de78871eaa98d2b73b109a0836240bea7f2d1efd ChangeLog 3921
-SHA256 53d41d09780e75021e9a48a3b411ea121268c5ae1a564a1b7b0be13b738056f4 ChangeLog 3921
+EBUILD simgear-0.3.10.ebuild 832 RMD160 9d7ed0cbc4489984b34a75934743fef66f950001 SHA1 dba7e7bb068ce25fdd50dd8237b1efbda9857ef5 SHA256 858084085bb5ad85b473a914b4c4e2bb6cf644d4fb50ba736347ea5ca9444a43 size 832
+MD5 2c9ad4711cc221e8d3f5f5b3bbc71b6d simgear-0.3.10.ebuild 832
+RMD160 9d7ed0cbc4489984b34a75934743fef66f950001 simgear-0.3.10.ebuild 832
+SHA256 858084085bb5ad85b473a914b4c4e2bb6cf644d4fb50ba736347ea5ca9444a43 simgear-0.3.10.ebuild 832
+EBUILD simgear-0.3.6.ebuild 825 RMD160 0a6dc4a6c902f83b3027aa24012d2ad913364202 SHA1 17b51285bb157f3f65071c139497ea71f1a1ac4c SHA256 ce201ab17f97b606a636b79a82bd5e1b3146d3cd5095225aecb95e98fdee22e1 size 825
+MD5 241537f194426564a8b2795f7422ce94 simgear-0.3.6.ebuild 825
+RMD160 0a6dc4a6c902f83b3027aa24012d2ad913364202 simgear-0.3.6.ebuild 825
+SHA256 ce201ab17f97b606a636b79a82bd5e1b3146d3cd5095225aecb95e98fdee22e1 simgear-0.3.6.ebuild 825
+EBUILD simgear-0.3.8.ebuild 829 RMD160 da8b2150ffbaa99fa76097bebbcbf7b512bfad19 SHA1 bacb12842b6832dff0dab3e25e4c503c2fdc9d94 SHA256 2889ed721c51d45b662c4a3c88e5fc7b17af4544da2773e4008309c8e4db0cb4 size 829
+MD5 391cf59c4c639379730f4764b55c6677 simgear-0.3.8.ebuild 829
+RMD160 da8b2150ffbaa99fa76097bebbcbf7b512bfad19 simgear-0.3.8.ebuild 829
+SHA256 2889ed721c51d45b662c4a3c88e5fc7b17af4544da2773e4008309c8e4db0cb4 simgear-0.3.8.ebuild 829
+EBUILD simgear-0.3.9.ebuild 926 RMD160 da2a848ca2191f6dd024c92b60c6f11fa3722344 SHA1 1f12a6c13945566bdef9838c3b8d898edcbc2a67 SHA256 6be3556411a8bf50b235cc4b222ca0b68272242bece9a3cc14a8711c13a68191 size 926
+MD5 6c0b116ab5be70fb4b04f5c79c3f8555 simgear-0.3.9.ebuild 926
+RMD160 da2a848ca2191f6dd024c92b60c6f11fa3722344 simgear-0.3.9.ebuild 926
+SHA256 6be3556411a8bf50b235cc4b222ca0b68272242bece9a3cc14a8711c13a68191 simgear-0.3.9.ebuild 926
+MISC ChangeLog 4455 RMD160 688fd086a4ea12ad630adae6628eda6a58d9faf0 SHA1 f0931570b7fe19f43e3f4bc6b7f05eebdbebe7ae SHA256 077bd1d1db227f2d8b15e62d01c5d01b956422bb6b0e30373a2616e45218befa size 4455
+MD5 966b5df506f03d18cff2a5cc02dab5a5 ChangeLog 4455
+RMD160 688fd086a4ea12ad630adae6628eda6a58d9faf0 ChangeLog 4455
+SHA256 077bd1d1db227f2d8b15e62d01c5d01b956422bb6b0e30373a2616e45218befa ChangeLog 4455
 MISC metadata.xml 538 RMD160 ad9da47ba8d1df3750dfedc20cb0d385d9118084 SHA1 b7e65e3f3441922661bc0f73de9e844e4acfe43b SHA256 0e2b83bd660e0709ada2f3e9b5d9db161e505ad9baf7c56dd6ee3299f5ce1963 size 538
 MD5 d1a4776c70e916317e93f7b34e541be5 metadata.xml 538
 RMD160 ad9da47ba8d1df3750dfedc20cb0d385d9118084 metadata.xml 538
@@ -45,10 +42,3 @@ SHA256 c18966d73cd6b7bd175051c6696caa9732a1efc375d99e447a349e420ac60b63 files/di
 MD5 75204492a52a2be8eceb4ca253314c86 files/digest-simgear-0.3.9 241
 RMD160 c06d585f3cd55bd45cf53091f7fd2812a461c744 files/digest-simgear-0.3.9 241
 SHA256 73196fac0457137e655bb467a37f091ffc2b36eb2910ed507191a38c96854426 files/digest-simgear-0.3.9 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUOAYW78445TWHXcRAuEuAJ9Q7HPr8i8x9Bpq9iSieWTUu9+/SgCcCEuI
-KcmmoPriRzGNH7JfIed1R/E=
-=nVk9
------END PGP SIGNATURE-----
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}