Needs opengl and glu to build examples, bug #153033

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 38 insertions, 33 deletions

diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index d82182d12508..892de074607e 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ode
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.33 2006/10/17 22:09:43 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.34 2006/10/30 10:11:06 nyhm Exp $
+
+  30 Oct 2006; Tristan Heaven <nyhm@gentoo.org> ode-0.6-r1.ebuild,
+  ode-0.7.ebuild:
+  Needs opengl and glu to build examples, bug #153033
 
 *ode-0.7 (17 Oct 2006)
 
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index 84d5b36df045..3680b066cfc1 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -20,22 +20,22 @@ EBUILD ode-0.5-r4.ebuild 2241 RMD160 401d94a4d43d385e9d17febe3995d64291ddcc47 SH
 MD5 ae3e992cf550836fa834836a67a2b8c6 ode-0.5-r4.ebuild 2241
 RMD160 401d94a4d43d385e9d17febe3995d64291ddcc47 ode-0.5-r4.ebuild 2241
 SHA256 894503adf32f4048e224fd660de928eac84e7067ed520f77973225fceb490ca8 ode-0.5-r4.ebuild 2241
-EBUILD ode-0.6-r1.ebuild 2246 RMD160 704bc6896505a252f4ecd12fec93ca1cbd34a41f SHA1 af8c16d180da0614bb59a51126dbcb9296cdac10 SHA256 e460c2e363e36d0cdc01e57634f7318c5b20b0515b207fdd55596d4c553cd980
-MD5 bc825c3d7801f10f0ab62111ebfdc1f8 ode-0.6-r1.ebuild 2246
-RMD160 704bc6896505a252f4ecd12fec93ca1cbd34a41f ode-0.6-r1.ebuild 2246
-SHA256 e460c2e363e36d0cdc01e57634f7318c5b20b0515b207fdd55596d4c553cd980 ode-0.6-r1.ebuild 2246
+EBUILD ode-0.6-r1.ebuild 2251 RMD160 c24e2e174461f83d7fdc596a88bc67a6fbfc9fc2 SHA1 72fa25197c6545bad0a053049a116f96778d71a7 SHA256 6126d791ab1b43984c4406f988e34c167dad99f83087e7122d61c350b1526e34
+MD5 c95bb5e778f38cc9173f37929cdb14bc ode-0.6-r1.ebuild 2251
+RMD160 c24e2e174461f83d7fdc596a88bc67a6fbfc9fc2 ode-0.6-r1.ebuild 2251
+SHA256 6126d791ab1b43984c4406f988e34c167dad99f83087e7122d61c350b1526e34 ode-0.6-r1.ebuild 2251
 EBUILD ode-0.6.ebuild 2144 RMD160 450949844284f9c669616308089aa9ed287eedc7 SHA1 427e64af47efa6b464b5ba2f3f3f41dd7c11add0 SHA256 77284c3b5ce189963ae2f6f7b62d781212a2b3d93f38599d853fa4910a8b82ed
 MD5 d7f33b30174ba077a3233ed97da5c99e ode-0.6.ebuild 2144
 RMD160 450949844284f9c669616308089aa9ed287eedc7 ode-0.6.ebuild 2144
 SHA256 77284c3b5ce189963ae2f6f7b62d781212a2b3d93f38599d853fa4910a8b82ed ode-0.6.ebuild 2144
-EBUILD ode-0.7.ebuild 2166 RMD160 ee987eddcb7e539c9fd7bb5025cc0e26a10abf51 SHA1 7a4222eace0f1efd2dd9a28189cb307576d77b2e SHA256 fcd4719bec7352f18eab0ed9831fe7b0fd81673efcc43466db947cd1e31dcff9
-MD5 8983db6957acce90ec3b2e5d014345fc ode-0.7.ebuild 2166
-RMD160 ee987eddcb7e539c9fd7bb5025cc0e26a10abf51 ode-0.7.ebuild 2166
-SHA256 fcd4719bec7352f18eab0ed9831fe7b0fd81673efcc43466db947cd1e31dcff9 ode-0.7.ebuild 2166
-MISC ChangeLog 4920 RMD160 a00a4b94d50d17c124a8983f2e2d6f71931cbaad SHA1 d289e7e83785b7471932da27efe8c581b8f9d85d SHA256 9d2702f2c6666e52fb20f2fb2c85db77da0ff793daf2a57ce0fef4ac3574819d
-MD5 935e1b64f1137533d26da67763e49b88 ChangeLog 4920
-RMD160 a00a4b94d50d17c124a8983f2e2d6f71931cbaad ChangeLog 4920
-SHA256 9d2702f2c6666e52fb20f2fb2c85db77da0ff793daf2a57ce0fef4ac3574819d ChangeLog 4920
+EBUILD ode-0.7.ebuild 2229 RMD160 ce724fa619a9e950d0342d9777d46a13bc70b672 SHA1 e6b5d202eba75d49e6c1fb905392a38a15f4b1df SHA256 ba5a87d52967d335d45eba2e1d40cbd40c8d61e4a5098b6667836d66138ad8c2
+MD5 9b60a82aafefa4ad98e7008aa7a34f51 ode-0.7.ebuild 2229
+RMD160 ce724fa619a9e950d0342d9777d46a13bc70b672 ode-0.7.ebuild 2229
+SHA256 ba5a87d52967d335d45eba2e1d40cbd40c8d61e4a5098b6667836d66138ad8c2 ode-0.7.ebuild 2229
+MISC ChangeLog 5058 RMD160 497f805443500131c1db8cf913d9567e41d98ac1 SHA1 46a20c48ba2aa1056a070136459e352cfe94f6bd SHA256 e4d4cc4573f6bee5398d86b87179eab6f4bbe0ae7ebd4f2d61408f8474b50957
+MD5 ddfa983e4d65b10e951b93021d712e61 ChangeLog 5058
+RMD160 497f805443500131c1db8cf913d9567e41d98ac1 ChangeLog 5058
+SHA256 e4d4cc4573f6bee5398d86b87179eab6f4bbe0ae7ebd4f2d61408f8474b50957 ChangeLog 5058
 MISC metadata.xml 507 RMD160 fc35b374510850c6916d280578c4b9fad69d2f6a SHA1 2844b71e1f83503d096e912d5d61d6b69b296a99 SHA256 b8638b82f39c6329cfeeab46ec0a1cf325a28f880ce4b87e19b0586d41bd58de
 MD5 2149b6065a52ec18bd6db2bea63d5b9a metadata.xml 507
 RMD160 fc35b374510850c6916d280578c4b9fad69d2f6a metadata.xml 507
@@ -55,7 +55,7 @@ SHA256 1e961751b99ad3d6ede233ab170ec1dff47d6b2bde0ad034f41cd57f1e6e20fd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNVS3bfN2jvlVAhwRAoqyAKCEPA2M/YYpyfvTRpLrHb/56m/ViACeLOJb
-GveURlhVjJ7IQgWHmzzii98=
-=TmdU
+iD8DBQFFRc/Bdz7hIScOURERApuEAJ4zCMyg8Vw3Y3iXmzqsKARCtnvGhwCfXlsN
+3+w4DA1xXajdZeM4JRemOCE=
+=fBnd
 -----END PGP SIGNATURE-----
diff --git a/dev-games/ode/ode-0.6-r1.ebuild b/dev-games/ode/ode-0.6-r1.ebuild
index 4fb25d1e29bf..8eb48e1c67fe 100644
--- a/dev-games/ode/ode-0.6-r1.ebuild
+++ b/dev-games/ode/ode-0.6-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/dev-games/ode/ode-0.6-r1.ebuild,v 1.5 2006/10/05 16:19:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.6-r1.ebuild,v 1.6 2006/10/30 10:11:06 nyhm Exp $
 
 inherit eutils autotools
 
@@ -16,17 +16,14 @@ IUSE="double-precision examples nogyroscopic noopcode"
 RDEPEND="examples? (
 		virtual/opengl
 		virtual/glu
-		|| (
-			(
-				x11-libs/libXmu
-				x11-libs/libXi
-			)
-			virtual/x11
-		)
+		x11-libs/libXmu
+		x11-libs/libXi
 	)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="app-arch/unzip
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	x11-libs/libXi"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-games/ode/ode-0.7.ebuild b/dev-games/ode/ode-0.7.ebuild
index 19d17898596f..bbebe1ea0a18 100644
--- a/dev-games/ode/ode-0.7.ebuild
+++ b/dev-games/ode/ode-0.7.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.7.ebuild,v 1.1 2006/10/17 22:09:43 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.7.ebuild,v 1.2 2006/10/30 10:11:06 nyhm Exp $
 
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
 inherit eutils autotools
 
 DESCRIPTION="Open Dynamics Engine SDK"
@@ -19,9 +21,11 @@ RDEPEND="examples? (
 		x11-libs/libXmu
 		x11-libs/libXi
 	)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="app-arch/unzip
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	x11-libs/libXi"
 
 src_unpack() {
 	unpack ${A}
@@ -41,13 +45,13 @@ src_compile() {
 		$(use_enable !noopcode opcode) \
 		$(use_enable !nogyroscopic gyroscopic) \
 		--enable-release \
-		|| die "ODE configuration failed"
+		|| die
 
 	emake || die "ODE compile failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
+	emake DESTDIR="${D}" install || die "Install failed!"
 	dodoc CHANGELOG.txt README.txt
 	# Install API docs
 	dohtml docs/*