modular X deps, remove old version

Package-Manager: portage-2.1_pre7-r5

6 files changed, 40 insertions, 64 deletions

diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index d7a9749723b8..3c5dda1864a8 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/glfw
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.3 2005/06/23 00:26:41 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.4 2006/04/12 19:51:50 tupone Exp $
+
+  12 Apr 2006; <Tupone@gentoo.org> -glfw-2.4.2.ebuild, glfw-2.5.0.ebuild:
+  Modular X dependency fix.
+  Dropping old version
 
   23 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> glfw-2.5.0.ebuild:
   stable for x86
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index aacdf99d344f..8ebb0fc55978 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 808991d324ba0b70e91dd45cb1ecf3cc ChangeLog 748
+RMD160 46bcbe90f9c0148a4ac8299dc55d19fe96128218 ChangeLog 748
+SHA256 6495eaa0a490a6578820b35a68f03e152de56c164d1d8088a677bd6801c8047a ChangeLog 748
+MD5 bfddea95a1430fd89f791461dbc49fd9 files/digest-glfw-2.5.0 235
+RMD160 b65c33155b66bd2e504539062db0cb4c436a34e6 files/digest-glfw-2.5.0 235
+SHA256 401c6e83eeaf787a42b5723c0894d3849f3fc78e6a4dfb1112b6c68662fdb15b files/digest-glfw-2.5.0 235
+MD5 6f06c9224fb972d76d4f82287c4e2012 glfw-2.5.0.ebuild 1602
+RMD160 5f66cb293a609373bced24dc012d5f8fd5e5136e glfw-2.5.0.ebuild 1602
+SHA256 e3aeea99fff16d6c346feae999963774c93de00743e47cea694dbb27f5b17c44 glfw-2.5.0.ebuild 1602
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 8622f72f42f083e848e7a2884b7048f9 glfw-2.4.2.ebuild 1247
-MD5 8877d4798ddb73731e658eaa9976ba6f glfw-2.5.0.ebuild 1500
-MD5 90bc0131d62d50bd047ec36c7ea22258 ChangeLog 625
-MD5 1fad19cb7b46e3dbec7240bd39d23df7 files/digest-glfw-2.4.2 62
-MD5 a6cebf70559446c06eb01836a754f37d files/digest-glfw-2.5.0 63
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEPVpn2CTtIKiFlQIRAoZCAJ4vZb4p4lGlMvBS8vp3AN+AvjXQAgCdGtl9
+N/hW+1asQ3NKWYz3YlRjx3I=
+=9dGL
+-----END PGP SIGNATURE-----
diff --git a/media-libs/glfw/files/digest-glfw-2.4.2 b/media-libs/glfw/files/digest-glfw-2.4.2
deleted file mode 100644
index 88d6e08cf7e6..000000000000
--- a/media-libs/glfw/files/digest-glfw-2.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1902cb8d56b78cd2b8c6df690ea76bcd glfw-2.4.2.tar.gz 620008
diff --git a/media-libs/glfw/files/digest-glfw-2.5.0 b/media-libs/glfw/files/digest-glfw-2.5.0
index 5d03109bbb14..4a0869948ce9 100644
--- a/media-libs/glfw/files/digest-glfw-2.5.0
+++ b/media-libs/glfw/files/digest-glfw-2.5.0
@@ -1 +1,3 @@
 MD5 c6dffefbfbe4415c915851b09e76edd9 glfw-2.5.0.tar.bz2 645993
+RMD160 4666e88285a20a74e1cbfecd1e6a918dbe88b817 glfw-2.5.0.tar.bz2 645993
+SHA256 cbf1164baebb00cc27039a406c873794e2b70caa0af0ae3348ed5062ecc26816 glfw-2.5.0.tar.bz2 645993
diff --git a/media-libs/glfw/glfw-2.4.2.ebuild b/media-libs/glfw/glfw-2.4.2.ebuild
deleted file mode 100644
index 3aef2cbc763e..000000000000
--- a/media-libs/glfw/glfw-2.4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.4.2.ebuild,v 1.1 2005/03/09 04:32:56 mr_bones_ Exp $
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="http://glfw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="examples"
-
-DEPEND="virtual/x11
-	virtual/opengl"
-
-src_compile() {
-	emake x11 || die "emake failed"
-}
-
-src_install() {
-	dolib.a lib/x11/libglfw.a || die "dolib.a failed"
-
-	insinto /usr/include/GL
-	doins include/GL/glfw.h || die "doins failed"
-	dohtml readme.html
-	insinto /usr/share/doc/${PF}/pdf
-	doins docs/*.pdf
-
-	if use examples; then
-		local f
-		local MY_EXAMPLES="boing gears keytest listmodes mipmaps
-			mtbench mthello particles pong3d splitview
-			triangle wave"
-		local MY_PICS="mipmaps.tga pong3d_field.tga pong3d_instr.tga
-			pong3d_menu.tga pong3d_title.tga
-			pong3d_winner1.tga pong3d_winner2.tga"
-
-		insinto /usr/share/doc/${PF}/examples
-
-		for f in $MY_EXAMPLES; do
-			doins examples/${f}.c
-		done
-		for f in $MY_PICS; do
-			doins examples/${f}
-		done
-
-		insopts -m0755
-		for f in $MY_EXAMPLES; do
-			doins examples/${f}
-		done
-	fi
-}
diff --git a/media-libs/glfw/glfw-2.5.0.ebuild b/media-libs/glfw/glfw-2.5.0.ebuild
index 7df00ac6159f..5e3fee96b5a3 100644
--- a/media-libs/glfw/glfw-2.5.0.ebuild
+++ b/media-libs/glfw/glfw-2.5.0.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/media-libs/glfw/glfw-2.5.0.ebuild,v 1.2 2005/06/23 00:26:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.5.0.ebuild,v 1.3 2006/04/12 19:51:50 tupone Exp $
 
 DESCRIPTION="The Portable OpenGL FrameWork"
 HOMEPAGE="http://glfw.sourceforge.net/"
@@ -11,8 +11,16 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="examples"
 
-DEPEND="virtual/x11
+RDEPEND="|| (
+		x11-libs/libXxf86vm
+		virtual/x11
+	)
 	virtual/opengl"
+DEPEND="${RDEPEND}
+	|| (
+		x11-proto/xf86vidmodeproto
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${P/.0/}