Updated ebuilds for modular X deps.

(Portage version: 2.1_pre4-r1)

7 files changed, 106 insertions, 27 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 4536b3ce0d49..2e246a1db806 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.68 2006/01/20 04:37:07 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.69 2006/02/21 11:03:20 s4t4n Exp $
+
+  21 Feb 2006; Michele Noberasco <s4t4n@gentoo.org> rxvt-unicode-5.3.ebuild,
+  rxvt-unicode-5.1.ebuild,rxvt-unicode-4.0.ebuild,rxvt-unicode-3.0.ebuild,:
+  Updated for modular X deps.
 
 *rxvt-unicode-7.1 (20 Jan 2006)
 
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 10d1b817d570..182b82c0e899 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,27 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 703c502e97f62c2839ba1f256b743b1c ChangeLog 10786
+MD5 8d25ff6d6b5d5e6e0d0402737df019d2 ChangeLog 10908
+RMD160 aa351d829414163e3ea00d60d45f403757e47f52 ChangeLog 10908
+SHA256 2c69a0215893e99c27cafd7557c21cb5a8f7dfaa29210881916bcb9a1bab4d13 ChangeLog 10908
 MD5 ff186f769724f65b45dcedf2b9e7c9a3 files/digest-rxvt-unicode-3.0 69
+RMD160 f883534b49e9d7adac4e4501bb31cf0ab118d65a files/digest-rxvt-unicode-3.0 69
+SHA256 43aee00b8d8aa9258723409449e1bf57a400dde2535223d65fad85e538b35301 files/digest-rxvt-unicode-3.0 69
 MD5 0454b0e411ee7798e273a94fcabdc823 files/digest-rxvt-unicode-4.0 69
+RMD160 88af52f3442e13caf5ec8fd219506b404d89ea35 files/digest-rxvt-unicode-4.0 69
+SHA256 3a2f251c7f55f7eeceb4db2bda2457422e15f11c6eef1445a19b0cc92fa56990 files/digest-rxvt-unicode-4.0 69
 MD5 749b453f3a41c4bcc2e8706cad32f568 files/digest-rxvt-unicode-5.1 69
-MD5 b7923e2725d925a7ae5210a144a3eeaa files/digest-rxvt-unicode-5.3 69
+RMD160 e20ce29ff11a8584cc09ac37bce0ec86182637db files/digest-rxvt-unicode-5.1 69
+SHA256 2f5dd73bf62c85c81b52c472d2a27b7f81408d92135c66bd692ce544e47aa459 files/digest-rxvt-unicode-5.1 69
+MD5 4bd18842bfeb491461e9adc14e865781 files/digest-rxvt-unicode-5.3 253
+RMD160 b3f0ff8c911afa6ae760f51d79e82ae33c89b55c files/digest-rxvt-unicode-5.3 253
+SHA256 78532d9af300a362ace6bacf6cef3f0775ce708390d5e071250ca68ac58a04b9 files/digest-rxvt-unicode-5.3 253
 MD5 798e02cf317be51a6721a48f29cf5591 files/digest-rxvt-unicode-7.0 69
+RMD160 d208f69733688fa37b128a07fcd3e438268786c6 files/digest-rxvt-unicode-7.0 69
+SHA256 042d5dc62b1f32916c43ed5ffc04f7780e2c371e110df21b23c1d630b09620b3 files/digest-rxvt-unicode-7.0 69
 MD5 ef0128bf40e8bab59b43618810ac0109 files/digest-rxvt-unicode-7.1 69
+RMD160 bdaf70bd5fdf4953d3fe6099e26543d60731f975 files/digest-rxvt-unicode-7.1 69
+SHA256 e948878fea0092d9f3a73d5e4fe306eaa48b3a4dc74ae033232cc4cedae5c653 files/digest-rxvt-unicode-7.1 69
 MD5 27f475fce3946d48a23f36e0279a978c files/rxvt-unicode-2.3-font-fix.diff 431
+RMD160 1a5ea32112dd166e76905133c29672628ff99b9d files/rxvt-unicode-2.3-font-fix.diff 431
+SHA256 7274d9db13b42beabb2c438dc41868da62076d1dbd5b0db1cc8b3b2ea42d1c14 files/rxvt-unicode-2.3-font-fix.diff 431
 MD5 8d13934dc747f15f11334bd642c342cd files/rxvt-unicode-3.9-64bit.patch 632
+RMD160 8fecfa6271bd12af69e516480f616469ef3192be files/rxvt-unicode-3.9-64bit.patch 632
+SHA256 829ce5f219b4d394ebf238a214b072efe7af99e01717319b0dbc4aa87f50fad2 files/rxvt-unicode-3.9-64bit.patch 632
 MD5 63548e76ee03f6dc4fee9e2239453ca1 files/rxvt-unicode-4.0-64bit.patch 728
+RMD160 86ad89860b77d8e89c4f817f6caf56786a15d1d0 files/rxvt-unicode-4.0-64bit.patch 728
+SHA256 d140c04f786df0fe597a746846c1f1e37f0f4061697bd8c4556e56a2d08d945e files/rxvt-unicode-4.0-64bit.patch 728
 MD5 ae6f4504c04a4a030d1028340a2f4f9a metadata.xml 226
+RMD160 6f2bcba5e169f4219ce334fa4a3326d25c4e9955 metadata.xml 226
+SHA256 1bcb550b8b5c6c67b63898ecec6fbbf0d1e78c7b21a99776057c1eae946d0215 metadata.xml 226
 MD5 ae0e078fda7b29d36a2b6d5233c16cda rxvt-unicode-3.0.ebuild 1751
+RMD160 a1ccfe365e1185cc340e2e89d39c846867e819c9 rxvt-unicode-3.0.ebuild 1751
+SHA256 3c48097cfc2fca94d44e4679592b148625740949a20be4554f7e5593c5bab658 rxvt-unicode-3.0.ebuild 1751
 MD5 2e49f34769297a5cdf516e44c8aa40c2 rxvt-unicode-4.0.ebuild 1587
+RMD160 c66b4b4778018f5fe7759842a7742f7c69b74a64 rxvt-unicode-4.0.ebuild 1587
+SHA256 906fca9346fa0afa39a302ea266435253ee1cc8a031f54fb86a6d90f05431285 rxvt-unicode-4.0.ebuild 1587
 MD5 4a59732c305c41e1347aa674334213a1 rxvt-unicode-5.1.ebuild 1571
-MD5 a85edd99140d01a457111d8d28f52bf9 rxvt-unicode-5.3.ebuild 1919
+RMD160 bea8d4035adacc684e55963c6490ae493df17bb9 rxvt-unicode-5.1.ebuild 1571
+SHA256 d78210cac996a627f6c835daee157f221926724dfd7fab33ca8279b88aa380ab rxvt-unicode-5.1.ebuild 1571
+MD5 702b5b4e347c281c133d706b84914bc0 rxvt-unicode-5.3.ebuild 2126
+RMD160 d143d543674e01ed5dd7cf849f227b28c88d045d rxvt-unicode-5.3.ebuild 2126
+SHA256 d35c9cf94a3858c2bc7fed5a9aa444866f3f4a9120a3cfa27470f43bb2975b95 rxvt-unicode-5.3.ebuild 2126
 MD5 cc24832ec26d951a22457f59193b2d23 rxvt-unicode-7.0.ebuild 2057
+RMD160 9cc06abd56735da17b96bbbba88f1931704fbb47 rxvt-unicode-7.0.ebuild 2057
+SHA256 203701bf0f8c1225dac1dd62927fe8361c1166b2664692a02324b418d1214d8d rxvt-unicode-7.0.ebuild 2057
 MD5 0cbedb63683ebc560e23b3f904bce7c6 rxvt-unicode-7.1.ebuild 1629
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0oJMLLFUmVNQ7rkRAtQvAJ99zgRy3xD8Ib3dMLjXsCbpAaEnswCfeZm4
-SJAyNRLpk1nQCh9evYFFWfE=
-=W00l
------END PGP SIGNATURE-----
+RMD160 63c9865295212068f73ad496951bd29523e30463 rxvt-unicode-7.1.ebuild 1629
+SHA256 194699296b6e42b9287e8f2a575da8ff0655efdc0481ed55fdc41f498b9f3c8a rxvt-unicode-7.1.ebuild 1629
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-5.3 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-5.3
index 63ff64023580..a65992785713 100644
--- a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-5.3
+++ b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-5.3
@@ -1 +1,3 @@
 MD5 1a5372a40d728c8a50e059b5d826490e rxvt-unicode-5.3.tar.bz2 840944
+RMD160 e09b7c4e48896bc34509716e815c18f84aef35e0 rxvt-unicode-5.3.tar.bz2 840944
+SHA256 1906326e75c27e2e7ad9a530e92d104359488c7b1bb7b1d113dd6a2efa8a60ca rxvt-unicode-5.3.tar.bz2 840944
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-3.0.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-3.0.ebuild
index 5c680ba18d09..165d2a49efc6 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-3.0.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-3.0.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/x11-terms/rxvt-unicode/rxvt-unicode-3.0.ebuild,v 1.12 2005/05/05 02:53:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.0.ebuild,v 1.13 2006/02/21 11:03:20 s4t4n Exp $
 
 DESCRIPTION="rxvt clone with XFT and Unicode support"
 HOMEPAGE="http://software.schmorp.de/"
@@ -13,7 +13,18 @@ IUSE="xgetdefault"
 
 DEPEND="dev-util/pkgconfig
 	sys-devel/libtool
-	virtual/x11"
+	sys-devel/libtool
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXft
+			x11-libs/libXpm
+			x11-libs/libXrender
+			x11-proto/xproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 src_compile() {
 
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild
index 08f3b1d434c7..f7fdb8f679ea 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-4.0.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/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild,v 1.10 2005/05/05 02:53:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild,v 1.11 2006/02/21 11:03:20 s4t4n Exp $
 
 inherit eutils 64-bit
 
@@ -15,7 +15,17 @@ IUSE="xgetdefault"
 
 DEPEND="dev-util/pkgconfig
 	sys-devel/libtool
-	virtual/x11
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXft
+			x11-libs/libXpm
+			x11-libs/libXrender
+			x11-proto/xproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)
 	dev-lang/perl"
 
 src_unpack() {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild
index a5ac6bf02e5c..baac78a9638f 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-5.1.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/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild,v 1.7 2005/07/14 23:38:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-5.1.ebuild,v 1.8 2006/02/21 11:03:20 s4t4n Exp $
 
 DESCRIPTION="rxvt clone with XFT and Unicode support"
 HOMEPAGE="http://software.schmorp.de/"
@@ -14,7 +14,17 @@ IUSE="xgetdefault"
 DEPEND="virtual/libc
 	dev-util/pkgconfig
 	sys-devel/libtool
-	virtual/x11
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXft
+			x11-libs/libXpm
+			x11-libs/libXrender
+			x11-proto/xproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)
 	dev-lang/perl"
 
 src_unpack() {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-5.3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-5.3.ebuild
index f95da4df6c9d..7147aaf39f49 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-5.3.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-5.3.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/x11-terms/rxvt-unicode/rxvt-unicode-5.3.ebuild,v 1.11 2005/10/01 12:35:13 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-5.3.ebuild,v 1.12 2006/02/21 11:03:20 s4t4n Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,30 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="xgetdefault tabs"
 
-RDEPEND="virtual/x11
+# see bug #115992 for modular x deps
+RDEPEND="
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXft
+			x11-libs/libXpm
+			x11-libs/libXrender
+		)
+		virtual/x11
+	)
 	dev-lang/perl
 	tabs? ( dev-perl/gtk2-perl )"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	sys-devel/libtool"
+	sys-devel/libtool
+	|| (
+		(
+			x11-proto/xproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 pkg_setup() {
 	filter-flags -mno-accumulate-outgoing-args