Modular X dependencies; Resolves Bug #122215.

(Portage version: 2.1_pre4-r1)

4 files changed, 21 insertions, 22 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 995fe898a50e..b78cc91b4c51 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.76 2006/01/10 10:46:24 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.77 2006/02/09 22:26:23 mkennedy Exp $
+
+  09 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org> emacs-18.59.ebuild:
+  Modular X dependencies; Resolves Bug #122215.
 
   10 Jan 2006; <ferringb@gentoo.org> -emacs-21.4.ebuild:
   Removing 21.4; stale version that is succeeded by 21.4-r1 in keywords.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 21bfdac3e646..ca75fe8bb2a6 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f1cad2d0e0705a13287fbab8b65d9a57 ChangeLog 11343
 RMD160 662d67df943d81429b802fb9a4801082e97752a5 ChangeLog 11343
 SHA256 dac43ab44eafa6036969558a1a305a69adfebf4660badf7be69972ce43e0e9ae ChangeLog 11343
-MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007
-RMD160 1ddfc20518d8a36185213c2fc6e2ed5e644c7f80 emacs-18.59.ebuild 2007
-SHA256 f5d70cdb1b207a075f93cd394885d7c8ead58631d3ea85de7d8693195ddf955b emacs-18.59.ebuild 2007
+MD5 a3e8b55e2356c0bc60d511f084564282 emacs-18.59.ebuild 2030
+RMD160 6763ea6732c467e544350b404f55e7f01bbbf0f4 emacs-18.59.ebuild 2030
+SHA256 00c1b508f69e2bca9f22695b669e76ed09ef907d54b6e5ffb904d7e948d157d5 emacs-18.59.ebuild 2030
 MD5 5c875ab13297dfc0030f9cf2b9cb714b emacs-21.4-r1.ebuild 4684
 RMD160 bac6fef1d36f03e9941e1bde5660ece2afadb729 emacs-21.4-r1.ebuild 4684
 SHA256 3964d2511a262b9f908b0b4af7d5143e9ba3b627922d045be3ab89b975f9c4aa emacs-21.4-r1.ebuild 4684
@@ -19,9 +16,9 @@ SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153 files/60
 MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
 RMD160 6264f1faa5b99e98251be427fd8ef60b52ca1370 files/60emacs-22.0.50.envd 39
 SHA256 5501f5818b4b88a34e93440e5fc6e2a44d2a1c83080358849b811b1d17234f43 files/60emacs-22.0.50.envd 39
-MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
-RMD160 db12d1a5b68b822a7357828542205aa8273c9567 files/digest-emacs-18.59 216
-SHA256 2480bb0387523a69ab18aa68df9db0b3a98e8a37394af8ac46b1209945b4459e files/digest-emacs-18.59 216
+MD5 cdf1056b9a063a480aa3cea60c81e7ca files/digest-emacs-18.59 786
+RMD160 2401442cd6d4c3de31a9f5c6aeaa10381cb19fda files/digest-emacs-18.59 786
+SHA256 766f5d73100b748fe6a53899007820d2ceb6c49ef219b0ee9c31623a5d517ce3 files/digest-emacs-18.59 786
 MD5 77362e2a2494f71a2869096cc89ca8f2 files/digest-emacs-21.4-r1 127
 RMD160 367d3baff638ed901d3635d41c4edfbfaa218219 files/digest-emacs-21.4-r1 127
 SHA256 c870001d3693d105f247fc9fe1a56c2acb2a9d2622dc3f4ad8c7bfec853ebca7 files/digest-emacs-21.4-r1 127
@@ -58,10 +55,3 @@ SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/em
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDw5IwvdBxRoA3VU0RAv6aAKC58rHLjkjTy82T4ZW8jY+tDnR+GgCg6doY
-EcTbrJZE1NAnzkEp1KZnHsg=
-=fSaR
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59.ebuild b/app-editors/emacs/emacs-18.59.ebuild
index 41c96b8b309a..3326886cf741 100644
--- a/app-editors/emacs/emacs-18.59.ebuild
+++ b/app-editors/emacs/emacs-18.59.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/app-editors/emacs/emacs-18.59.ebuild,v 1.5 2005/01/01 13:24:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59.ebuild,v 1.6 2006/02/09 22:26:23 mkennedy Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 IUSE="X"
 
 DEPEND="sys-libs/ncurses
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 PROVIDE="virtual/editor"
 
 MY_BASEDIR="/usr/share/emacs/${PV}"
diff --git a/app-editors/emacs/files/digest-emacs-18.59 b/app-editors/emacs/files/digest-emacs-18.59
index 00330da59b5c..e332ebcc79b4 100644
--- a/app-editors/emacs/files/digest-emacs-18.59
+++ b/app-editors/emacs/files/digest-emacs-18.59
@@ -1,3 +1,9 @@
-MD5 ca57ae095ef098faca135bca736e1ca8 emacs-18.59.tar.gz 2962652
-MD5 a7a4ed051dc232cdc9cf37208135302a emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
 MD5 13cde90d997b3c4611c57f11e16961e9 emacs-18.59-gentoo.tar.gz 11526
+RMD160 eae80651d4aae8c393e3fb08dadbcc01f5573cfb emacs-18.59-gentoo.tar.gz 11526
+SHA256 41b181f7c5c7644258fd9a2c22d81ea9389728f7ac01fb944576b505124c25a3 emacs-18.59-gentoo.tar.gz 11526
+MD5 a7a4ed051dc232cdc9cf37208135302a emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
+RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
+SHA256 8fc2c9b12f2c75e570b1e6ec4564b2dec9df106ec76ba2f5257cf9a8e782df5e emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
+MD5 ca57ae095ef098faca135bca736e1ca8 emacs-18.59.tar.gz 2962652
+RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc emacs-18.59.tar.gz 2962652
+SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e emacs-18.59.tar.gz 2962652