Modular X deps

Package-Manager: portage-2.0.53_rc7

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index ad73e6dc45c890ba0207f82c334495f569edea43..90cbce5e47bf617c0120aad9ce45ef93bb3e4b45 100644 (file)
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.159 2005/11/01 19:40:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.160 2005/11/06 21:11:58 dang Exp $
+
+  06 Nov 2005; <dang@gentoo.org> nautilus-2.12.1-r1.ebuild:
+  Modular X deps
 
 *nautilus-2.12.1-r1 (01 Nov 2005)
 

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index c084f13904c7252b0e28fe36bb1dbcd92428f7d5..f9e24ceadf52dcfa8b339dd80c14fe611c39cbd9 100644 (file)
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ca5365b0478c229991e74ea749cdc42e ChangeLog 21318
+MD5 42335ac3b64a6a76d90521af0acbf256 ChangeLog 21396
 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
 MD5 d3f1a79cced5768f96e22c17df92261b files/digest-nautilus-2.10.0 69
 MD5 567191aa3b9ef17acb8e3b0ba006afdf files/digest-nautilus-2.10.1-r1 69
@@ -22,12 +22,12 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398
 MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587
 MD5 30e03d96ad901727aced906beb36baf6 nautilus-2.10.1-r1.ebuild 2557
-MD5 8f4d82c427d4bfdb60fcd3612537d327 nautilus-2.12.1-r1.ebuild 1844
+MD5 e32b9dca56cdd213e985fca3066ded30 nautilus-2.12.1-r1.ebuild 1891
 MD5 a9bdda3fc643e7b3bb31396f58678770 nautilus-2.12.1.ebuild 2202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZ8SqomPajV0RnrERAi1+AJ9Q+ixIiDnuDGuaqSRyrdh2uB8zcQCeMCMu
-14v/dcEQLH3uPZOiI8Kvzko=
-=9IPu
+iD8DBQFDbnGsomPajV0RnrERApXhAJ4l30l2fOIG5hnITMRBp/AD/DDTlgCghNYB
+a0QmXfWdYuA1C1heDBOULtM=
+=FaB7
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild
index 268761ce9d3bed83da5a718e8f9a669c59a07c7c..33493b99f9ff225a3e117ec6385202f86623e453 100644 (file)
--- a/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.12.1-r1.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/nautilus/nautilus-2.12.1-r1.ebuild,v 1.1 2005/11/01 19:40:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild,v 1.2 2005/11/06 21:11:58 dang Exp $
 
 inherit virtualx gnome2 eutils
 
@@ -31,7 +31,10 @@ RDEPEND=">=media-libs/libart_lgpl-2.3.10
        >=media-libs/libexif-0.5.12
        >=gnome-base/gconf-2
        dev-libs/popt
-       virtual/x11
+       || ( (
+               x11-libs/libICE
+               x11-libs/libSM )
+       virtual/x11 )
        virtual/eject"
 #      !gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
 #      gstreamer? (