Modular X deps

Package-Manager: portage-2.0.53_rc7

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 00e164a25dc628fb1de28dcb02e1206c368a6ccc..4a89b43d8e368977d27191234bfb1ab6393620b3 100644 (file)
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.129 2005/11/01 17:43:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.130 2005/11/04 21:21:08 dang Exp $
+
+  04 Nov 2005; <dang@gentoo.org> gdm-2.8.0.5.ebuild:
+  Modular X deps
 
   01 Nov 2005; <dang@gentoo.org> gdm-2.8.0.5.ebuild:
   Fix gdm.conf paths for new locations. bug #110495

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 802fbb520963b5522a9d7ecc1243f10c28499150..c438918d516094b21f2a8e9fa4e081b0e5e0ecd0 100644 (file)
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e3f7b93571bc52f95efd6da2845c736a ChangeLog 16735
+MD5 00f5445b11759dcd205a18b6c4be185e ChangeLog 16806
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 MD5 d0cb338160e3be8790524af8071cc4df files/2.2.5/pam.d/gdm 380
 MD5 89cc8ab9525284af6babcb9c86122443 files/2.2.5/pam.d/gdmconfig 288
@@ -25,12 +25,12 @@ MD5 37330f87e87c8fceb266a57f66bfdb81 gdm-2.6.0.9-r2.ebuild 3561
 MD5 65e67c78973b4878d1e6b700bb912ef8 gdm-2.8.0.1-r1.ebuild 3713
 MD5 b5feff9292f322953f1622bc2234f622 gdm-2.8.0.3.ebuild 3650
 MD5 94376baba0cbbf02a3297b7b4ea3a0ef gdm-2.8.0.4.ebuild 3654
-MD5 4364a980b8357e8a5c52d4506fba8483 gdm-2.8.0.5.ebuild 3755
+MD5 2a0f6f949a468e1c53e4b5a5c4ea2d5d gdm-2.8.0.5.ebuild 3854
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZ6lDomPajV0RnrERAmuKAJ9j3zJkVz3xRTgitvl9GFyRjs6rkwCfYUZf
-rdaxxnYq8l+kY9nSHgFKeCY=
-=YU2T
+iD8DBQFDa9DSomPajV0RnrERAs2tAJ98nWM1ui9CrzPydubWoHLIAxByDACeKsKo
+fjAbVs8bHdJ4GL4af25lnCQ=
+=IvTa
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gdm/gdm-2.8.0.5.ebuild b/gnome-base/gdm/gdm-2.8.0.5.ebuild
index 4cd31ea46f3a15b308b10931d156aefff94b8ad6..cee7f63ee113552d530f14656bb4432df06aee76 100644 (file)
--- a/gnome-base/gdm/gdm-2.8.0.5.ebuild
+++ b/gnome-base/gdm/gdm-2.8.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.5.ebuild,v 1.4 2005/11/01 17:43:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.5.ebuild,v 1.5 2005/11/04 21:21:09 dang Exp $
 
 inherit eutils pam gnome2
 
@@ -31,9 +31,16 @@ RDEPEND="pam? ( virtual/pam )
        >=gnome-base/librsvg-1.1.1
        >=dev-libs/libxml2-2.4.12
        >=media-libs/libart_lgpl-2.3.11
-       virtual/x11
        selinux? ( sys-libs/libselinux )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+       || ( (
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libXau
+       x11-libs/libXdmcp
+       x11-libs/libdmx
+       )
+       virtual/x11 )"
 
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.9