Fix X dep to modular X

Package-Manager: portage-2.1_pre6-r3

4 files changed, 36 insertions, 14 deletions

diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog
index 59d2c6a54aff..8c89fbf8f17d 100644
--- a/dev-lang/icon/ChangeLog
+++ b/dev-lang/icon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/icon
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.10 2005/11/03 12:26:56 grobian Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.11 2006/03/16 14:02:08 caleb Exp $
+
+  16 Mar 2006; Caleb Tennis <caleb@gentoo.org> icon-9.4.2.ebuild,
+  icon-9.40.ebuild:
+  Fix X dep to modular X
 
   03 Nov 2005; Fabian Groffen <grobian@gentoo.org> icon-9.4.2.ebuild:
   Note: 9.4.2 is newer than 9.40.  Marked 9.4.2 ~ppc-macos (bug #110834)
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index 38adea226cba..fd5896216afa 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -1,7 +1,21 @@
-MD5 c2824694e4de4b334644b76054f9e88d icon-9.4.2.ebuild 1402
-MD5 63ef0efc9bcc177e8b5e8d0cf3d62da0 ChangeLog 1419
-MD5 deb9f7760f1bb045b0b15a93e5297b80 icon-9.40.ebuild 1126
-MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
-MD5 fadf61644e614aee6ca9af4533791738 files/icon-9.40-gentoo.diff 244
-MD5 abd61a0d7e185c2ac47a4539c79e5d0c files/digest-icon-9.40 62
+MD5 a8c5b0c00fc86dd39366069f177b5e20 ChangeLog 1529
+RMD160 484db94b63b13674ed6bfe7ba3c9efdeacc05066 ChangeLog 1529
+SHA256 fccaa9b19d344dd8cf8a1f985bffbcbbf9d3ed722cd9e6b9dd930c1cb164e571 ChangeLog 1529
 MD5 640a91b011b92976911ea322c40e60f4 files/digest-icon-9.4.2 62
+RMD160 fdeda36fa0437bdf86d6e72be2f413e08e379bf9 files/digest-icon-9.4.2 62
+SHA256 1055b566090e20729e7fdec0229e5db227c17aa78d4b92f26f6cf513fbd3045b files/digest-icon-9.4.2 62
+MD5 abd61a0d7e185c2ac47a4539c79e5d0c files/digest-icon-9.40 62
+RMD160 170931a9b20968b692cc5ba73fcc037720a3e4c3 files/digest-icon-9.40 62
+SHA256 61bb5137f780d69d53c6a06338e4f3d1bcfb7b78d927c0766bde211987adf012 files/digest-icon-9.40 62
+MD5 fadf61644e614aee6ca9af4533791738 files/icon-9.40-gentoo.diff 244
+RMD160 05b871d84906131aa6fb11d765271c1a22b66390 files/icon-9.40-gentoo.diff 244
+SHA256 08d180626d40a7eddf76b6790164e01fb81762c35a491789e06ee560279c65f1 files/icon-9.40-gentoo.diff 244
+MD5 a7105bfe916d7df666490650aa3f6772 icon-9.4.2.ebuild 1446
+RMD160 df1ba8be8d22343f404abda0dded68119e05ab2d icon-9.4.2.ebuild 1446
+SHA256 3e2f0091f720234fd143308d2f1e5e46b78dba7b5e82443df267e351452c55e6 icon-9.4.2.ebuild 1446
+MD5 562c27300ac8f92312980ace689b090c icon-9.40.ebuild 1172
+RMD160 a3f27588016b2cc2b32b4fe468bfe96ff688fc80 icon-9.40.ebuild 1172
+SHA256 173558b0185dfd3ed2867ca160b6681be1145776fe4fdaaed50ac13961c7269d icon-9.40.ebuild 1172
+MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
+RMD160 359e0d4ecc394cc3fb84227087c1a518d9e6c347 metadata.xml 162
+SHA256 444ece0c3cb4908c78c6588147078383d3636d1b3da9a20111ec03c5640eefdb metadata.xml 162
diff --git a/dev-lang/icon/icon-9.4.2.ebuild b/dev-lang/icon/icon-9.4.2.ebuild
index 4fd27ec5836c..e91f73241455 100644
--- a/dev-lang/icon/icon-9.4.2.ebuild
+++ b/dev-lang/icon/icon-9.4.2.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/dev-lang/icon/icon-9.4.2.ebuild,v 1.3 2005/11/03 12:26:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.2.ebuild,v 1.4 2006/03/16 14:02:08 caleb Exp $
 
 MY_PV=${PV//./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -14,7 +14,9 @@ IUSE="X"
 
 S=${WORKDIR}/icon.v${MY_PV}src
 
-DEPEND="X? ( virtual/x11 )
+DEPEND="X? ( || (
+		( x11-libs/libX11 x11-libs/libXpm )
+	virtual/x11 ) )
 	sys-devel/gcc"
 
 src_unpack() {
diff --git a/dev-lang/icon/icon-9.40.ebuild b/dev-lang/icon/icon-9.40.ebuild
index 3d22a86467c7..f81397499d78 100644
--- a/dev-lang/icon/icon-9.40.ebuild
+++ b/dev-lang/icon/icon-9.40.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/dev-lang/icon/icon-9.40.ebuild,v 1.17 2005/04/22 09:19:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.40.ebuild,v 1.18 2006/03/16 14:02:08 caleb Exp $
 
 MY_PV=${PV/./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -14,7 +14,9 @@ IUSE="X"
 
 S=${WORKDIR}/icon.v${MY_PV}src
 
-DEPEND="X? ( virtual/x11 )
+DEPEND="X? ( || (
+		( x11-libs/libX11 x11-libs/libXpm )
+	virtual/x11 ) )
 	sys-devel/gcc"
 
 src_unpack() {