better mod X fix & dropping clanJavaScript, clanVoice

Package-Manager: portage-2.1_pre5

4 files changed, 37 insertions, 30 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index d6bd75c99027..80c550d2ef5b 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.28 2006/02/11 16:57:21 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.29 2006/02/26 15:25:45 tupone Exp $
+
+  26 Feb 2006; <Tupone@gentoo.org> clanlib-0.7.8-r1.ebuild:
+  Modular X dependency fix
+  clanJavaScript & clanVoice are not supported by clanlib-0.7.8
 
   11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   clanlib-0.6.5-r3.ebuild, clanlib-0.7.8-r1.ebuild:
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index b22957c5913b..d4d6c12a1680 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,12 +1,12 @@
-MD5 09726f6fd62abdcff6dc1e2cc1c73716 ChangeLog 6451
-RMD160 685605a62f6ce961df0694bdc23461b9fbe24cd9 ChangeLog 6451
-SHA256 e31071980756c327096a5e6a1e9cbfacf544e32bd9886d2eae6ae7006d7ef598 ChangeLog 6451
+MD5 16bb5c72357b71f446f8072698812d49 ChangeLog 6596
+RMD160 ee1f42cae0d086d4a2a77f398e673b1370e2c931 ChangeLog 6596
+SHA256 ad45dba5841985a3decd407099cccde3216a50ad9fae197d1669c78301c8b805 ChangeLog 6596
 MD5 4d124b4093673bd0bfb894c666147911 clanlib-0.6.5-r3.ebuild 2435
 RMD160 b129df10c3a59b7aade0fe13856f8e5f2a319064 clanlib-0.6.5-r3.ebuild 2435
 SHA256 72d703814b19baacc1ad6fd1772e42c108f7bb75019dae7a8283672be64c5d05 clanlib-0.6.5-r3.ebuild 2435
-MD5 c3c4cfa499e9f6aa56c763c25de26c65 clanlib-0.7.8-r1.ebuild 2414
-RMD160 990819578dd550ca13e73d915f30f519304497ba clanlib-0.7.8-r1.ebuild 2414
-SHA256 021dc795619e88e43a813926f45def4e82e575b115c60572fa589f089ec59331 clanlib-0.7.8-r1.ebuild 2414
+MD5 0a45bb3072bf6ac09557254ecfea03c2 clanlib-0.7.8-r1.ebuild 2337
+RMD160 1ea7f79ff3b93ce1b90d290e6f9e73805539ef06 clanlib-0.7.8-r1.ebuild 2337
+SHA256 b6270f6fd6bf44f302ddb2ee4fcfdcab92bbeaeb553a92447c69cae9aa943d63 clanlib-0.7.8-r1.ebuild 2337
 MD5 7c2e9c0016e1bcd9daaa26d1dd55228a files/0.7.8-install-opengl-wrap.patch 346
 RMD160 9bc4dbf6ef3e75381c8de3eff571385d34e6dec0 files/0.7.8-install-opengl-wrap.patch 346
 SHA256 771d196e405f3e3d68a27030c80e1fc0d7b4c34e27fa8ed697deadfda42b6082 files/0.7.8-install-opengl-wrap.patch 346
@@ -31,9 +31,9 @@ SHA256 9d092a6b3484c22d93fc066985ae092db37b3624ee9a11dec1046a48dc615815 files/cl
 MD5 3e439d751339f684be1c709644d71a4d files/digest-clanlib-0.6.5-r3 68
 RMD160 3ef0e3d707c3f4d3a176b2b43b2a72946f0c0bc8 files/digest-clanlib-0.6.5-r3 68
 SHA256 2b1272b156642f51d2c9de746284a62b1ec0b000bfac99a3ae2794a48f50679c files/digest-clanlib-0.6.5-r3 68
-MD5 96c4aa6ca05f84d43464c80d9e7565d9 files/digest-clanlib-0.7.8-r1 69
-RMD160 7fcf5e3d1fc09caf61eed1562d041091c2b3343f files/digest-clanlib-0.7.8-r1 69
-SHA256 525ce6f19260d3ed94f92fa36b0cdb097262a286fbe229a5985f18468f37c509 files/digest-clanlib-0.7.8-r1 69
+MD5 02ebcc5ba4f293b75824427ac799d514 files/digest-clanlib-0.7.8-r1 253
+RMD160 afe72e12986e2080029071e179370ba4ceb34471 files/digest-clanlib-0.7.8-r1 253
+SHA256 2d33b72d6157f3dc50ef950fdae218e425b0faf6e38220dd98a64d46774779ac files/digest-clanlib-0.7.8-r1 253
 MD5 33ee8adc6546aef9881086d98bfadb79 metadata.xml 3010
 RMD160 e619d1e2cbf474c526bf1deb3dd15a0117643e66 metadata.xml 3010
 SHA256 3b9b77c59757bc65889103949b95597432d5e00f69fdf4bdc909f50dcbff98ac metadata.xml 3010
diff --git a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
index 521bbbf876ca..8baee4322588 100644
--- a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.8-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/clanlib/clanlib-0.7.8-r1.ebuild,v 1.9 2006/02/11 16:57:21 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.10 2006/02/26 15:25:45 tupone Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,30 +11,33 @@ SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0.7"
 KEYWORDS="amd64 x86" #not big endian safe #82779
-IUSE="opengl X sdl vorbis doc mikmod clanVoice clanJavaScript ipv6"
+IUSE="opengl sdl vorbis doc mikmod ipv6"
 
-DEPEND="virtual/libc
-	media-libs/libpng
+# opengl keyword does not drop the GL/GLU requirement.
+# Autoconf files need to be fixed
+RDEPEND="media-libs/libpng
 	media-libs/jpeg
-	media-libs/freetype
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl )
-	X? (
-		|| (
-			( media-libs/mesa
-			x11-libs/libXt
-			x11-proto/inputproto
-			x11-proto/xf86vidmodeproto )
-			virtual/x11
+	virtual/opengl
+	virtual/glu
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-gfx
+	)
+	|| (
+		(
+			x11-libs/libXmu
+			x11-libs/libXxf86vm
 		)
+		virtual/x11
 	)
 	mikmod? ( >=media-libs/libmikmod-3.1.9 )
 	vorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	|| (
-		( media-libs/mesa
-		x11-libs/libXmu
-		x11-libs/libXxf86vm )
+		(
+			x11-libs/libXt
+			x11-proto/xf86vidmodeproto
+		)
 		virtual/x11
 	)"
 
@@ -67,8 +70,6 @@ src_compile() {
 		--disable-dependency-tracking \
 		$(use_enable x86 asm386) \
 		$(use_enable doc docs) \
-		$(use_enable clanVoice) \
-		$(use_enable clanJavaScript) \
 		$(use_enable opengl clanGL) \
 		$(use_enable sdl clanSDL) \
 		$(use_enable vorbis clanVorbis) \
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.8-r1 b/dev-games/clanlib/files/digest-clanlib-0.7.8-r1
index e274dd29062d..07d336d36cc7 100644
--- a/dev-games/clanlib/files/digest-clanlib-0.7.8-r1
+++ b/dev-games/clanlib/files/digest-clanlib-0.7.8-r1
@@ -1 +1,3 @@
 MD5 c034e1cf0485cdc377e1e4e83f99640b ClanLib-0.7.8-1.tar.bz2 6567261
+RMD160 b22dbb97010e7b514cbbe3da85a52a1aafe2c686 ClanLib-0.7.8-1.tar.bz2 6567261
+SHA256 742b027b75160d0f17b913f7b3089c901717081d12d3ed1d1c38c108939793b8 ClanLib-0.7.8-1.tar.bz2 6567261