Modular X deps

Package-Manager: portage-2.0.53_rc7

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 7bde952c9fb3c92512558a17507d57823c573c45..006a93e6931be85f902539875c81c716584cc71a 100644 (file)
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.139 2005/11/06 04:23:37 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.140 2005/11/06 21:54:27 dang Exp $
+
+  06 Nov 2005; <dang@gentoo.org> control-center-2.12.1.ebuild:
+  Modular X deps
 
 *control-center-1.4.0.5-r2 (06 Nov 2005)
 

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index ebcc30d489378d076d51c89dd502a829801d2417..ec1bafc4793b1f06094ee361fb205aef7d476b3e 100644 (file)
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,16 +1,26 @@
-MD5 c2f9837fa0e285c242254804a8980bc4 control-center-1.4.0.5-r2.ebuild 1411
-MD5 4c51b1cfa94b30d5b65e740eaf9f12fe control-center-2.12.1.ebuild 2294
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f971423f8b7e754d897ffff52d622206 ChangeLog 18243
 MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
+MD5 c2f9837fa0e285c242254804a8980bc4 control-center-1.4.0.5-r2.ebuild 1411
 MD5 411bb0502e1a779a850ab4bb0d582e5c control-center-2.10.2.ebuild 2015
-MD5 a33c1de61ac964f2b6ecba8811655bc2 ChangeLog 18167
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
-MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
-MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
+MD5 acf67c6e6c5166d61f21b2859a38619e control-center-2.12.1.ebuild 2518
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
+MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
+MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r2 76
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
+MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbnuaomPajV0RnrERApkFAJ0Z9O+VNpnJEGn7YzGTEFmAOcS49wCfVuYE
+Zn8TVHrBEUC09yE97BLSJv4=
+=Zw57
+-----END PGP SIGNATURE-----

diff --git a/gnome-base/control-center/control-center-2.12.1.ebuild b/gnome-base/control-center/control-center-2.12.1.ebuild
index f810059f0d4996cd3fbc7279892782f9198cece9..076493c2f198dfee40302e6b4d25686cbc359334 100644 (file)
--- a/gnome-base/control-center/control-center-2.12.1.ebuild
+++ b/gnome-base/control-center/control-center-2.12.1.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/control-center/control-center-2.12.1.ebuild,v 1.2 2005/10/28 17:21:28 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.1.ebuild,v 1.3 2005/11/06 21:54:27 dang Exp $
 
 inherit eutils gnome2
 
@@ -15,7 +15,13 @@ IUSE="alsa eds gstreamer"
 RDEPEND=">=gnome-base/gnome-vfs-2.2
        >=media-libs/fontconfig-1
        virtual/xft
-       virtual/x11
+       || ( (
+               x11-libs/libXdmcp
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libXxf86misc
+               x11-libs/libXau )
+       virtual/x11 )
        >=x11-libs/gtk+-2.6
        >=gnome-base/libbonobo-2
        >=gnome-base/libgnomeui-2.2
@@ -37,6 +43,12 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
        gstreamer? ( =media-libs/gst-plugins-0.8* )"
 
 DEPEND="${RDEPEND}
+       || ( (
+               x11-libs/libxkbfile
+               x11-proto/kbproto
+               x11-proto/xf86miscproto
+               x11-proto/scrnsaverproto )
+       virtual/x11 )
        app-text/scrollkeeper
        >=dev-util/pkgconfig-0.9
        >=dev-util/intltool-0.28