Added modular X dependencies and closing bug #127701.

Package-Manager: portage-2.1_pre6-r6

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 213730f3b5a40f42bc049ba73a4453bbe3ff9b86..9cae311be9a2287c630f24e2854b44de48413371 100644 (file)
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quakeforge
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.10 2005/09/06 12:57:29 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.11 2006/03/27 20:34:50 wolf31o2 Exp $
+
+  27 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quakeforge-0.5.5.ebuild:
+  Added modular X dependencies and closing bug #127701.
 
   06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   quakeforge-0.5.5.ebuild:

diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index e0171e9b4d92317b608f76dc232cffe2d5800786..e4f67e2a089600ca795b035ee35062ac51bf341d 100644 (file)
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 93ddcb7b41fc1be471c3db9136e80dbc ChangeLog 2389
+MD5 b24c5901886746c5a9a46e3c16c1f9f4 ChangeLog 2527
+RMD160 db1d9854939f91c400cd73edd45f20a3a324ef03 ChangeLog 2527
+SHA256 1dde84733d33af8e41e2ae5c4479d86bf73e58a6c49869fc73485e1d86415b7e ChangeLog 2527
 MD5 7c7c8315f5a4a12c1c7009e0e5a674ea files/0.5.5-ipv6.patch 302
+RMD160 7e1255c42df1c6c6ee59e87fa034324bfe2a83b5 files/0.5.5-ipv6.patch 302
+SHA256 8b473c335e6dc191e4aae7e7ada09ea5fc6d649e1132bb6230c1427fa0692e7a files/0.5.5-ipv6.patch 302
 MD5 4b19724389aab51f2894c5bf5b0a615c files/digest-quakeforge-0.5.5 70
+RMD160 e7c8959eacd6ad0c241f91805ecad5e7d91852c2 files/digest-quakeforge-0.5.5 70
+SHA256 065c91698ce01e35e0af73ca9c9d7880328aedbd01678611e7fb460123deda5d files/digest-quakeforge-0.5.5 70
 MD5 3f7a2b4d0f9510d4ab1be5cb3f6de976 metadata.xml 1486
-MD5 58dd3746cbf64c68bf2f07dcab4aa4a8 quakeforge-0.5.5.ebuild 3674
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZGF4gIKl8Uu19MoRAllwAJ4lF1yEPm+bJyzFReMWS0wVayF3zgCePa4S
-6xWA1uQL3MZpz89B/WsYl20=
-=VCXd
------END PGP SIGNATURE-----
+RMD160 ec42888731d2ed1e27e6a6360a3b425667dbd586 metadata.xml 1486
+SHA256 4f75b5ee6da95cbd8a04c8a627f03774162b7c45f7586613b696fd05fd97a3d1 metadata.xml 1486
+MD5 2e60f612d2a4cb91a58fd935c22a590a quakeforge-0.5.5.ebuild 3881
+RMD160 7d021e3bbcd7cd76901ea0187fd4bb00cbbcb90f quakeforge-0.5.5.ebuild 3881
+SHA256 0169456fe023db8de910d99d63552701d80291417c09dcf077399bea626db2b0 quakeforge-0.5.5.ebuild 3881

diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index 724d4a30d8bbc3255d06e202d1f8b9c5baa2624a..40339ef277a8dacf148b4d88aaeda68befaecb30 100644 (file)
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5.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/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.8 2005/10/30 06:00:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.9 2006/03/27 20:34:51 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,12 +18,27 @@ RDEPEND="3dfx? ( media-libs/glide-v3 )
        opengl? ( virtual/opengl )
        sdl? ( media-libs/libsdl )
        svga? ( media-libs/svgalib )
-       X? ( virtual/x11 )
+       X? (
+               || (
+                       (
+                               x11-libs/libX11
+                               x11-libs/libXext
+                               x11-libs/libXxf86vm )
+                       virtual/x11 ) )
        ncurses? ( sys-libs/ncurses )
        vorbis? ( media-libs/libogg media-libs/libvorbis )
        zlib? ( sys-libs/zlib )
-       xv? ( virtual/x11 )
-       dga? ( virtual/x11 )
+       xv? ( 
+               || (
+                       (
+                               x11-libs/libX11
+                               x11-libs/libXext
+                               x11-libs/libXxf86vm )
+                       virtual/x11 ) )
+       dga? (
+               || (
+                       x11-libs/libXxf86dga
+                       virtual/x11 ) )
        xmms? ( media-sound/xmms )
        alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}