Updated for modular X; bug #115992.

Package-Manager: portage-2.0.53

4 files changed, 26 insertions, 21 deletions

diff --git a/x11-terms/rxvt/ChangeLog b/x11-terms/rxvt/ChangeLog
index 03b920b84a9a..b78235effb6e 100644
--- a/x11-terms/rxvt/ChangeLog
+++ b/x11-terms/rxvt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/rxvt
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.41 2005/12/25 15:43:04 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.42 2006/01/02 20:08:08 usata Exp $
+
+  02 Jan 2006; Mamoru KOMACHI <usata@gentoo.org> rxvt-2.7.10-r3.ebuild:
+  Updated for modular X; bug #115992.
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> rxvt-2.7.10-r3.ebuild:
   Use bindnow-flags function instead of -Wl,-z,now.
diff --git a/x11-terms/rxvt/Manifest b/x11-terms/rxvt/Manifest
index 6170eed03ba0..54ca21ecf6c6 100644
--- a/x11-terms/rxvt/Manifest
+++ b/x11-terms/rxvt/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 041fdb2c1d2e5697380ce45d1c73dafe ChangeLog 7060
+MD5 4c26c23bdebf15a111377b9b3721ddd8 ChangeLog 7167
 MD5 783f67501d23b6516ec6a923b96e2b6a files/digest-rxvt-2.7.10 63
 MD5 291517d74d27db9317081ea6cdbea0bb files/digest-rxvt-2.7.10-r2 133
-MD5 291517d74d27db9317081ea6cdbea0bb files/digest-rxvt-2.7.10-r3 133
+MD5 64e685d793a86feb44cc43a7f82e2cc6 files/digest-rxvt-2.7.10-r3 133
 MD5 a38b2f365a55cad915e1e503466ab029 files/rxvt-2.7.10-azz4.diff 5072
 MD5 bbc012ce17c6e34803302e82cdf0a082 files/rxvt-2.7.10-line-scroll.patch 432
 MD5 16be90450ba268312bb146b3d4e7b6e9 files/rxvt-2.7.10-rk.patch 2772
 MD5 cd46a87805d1d53c2c0e5f9d9169b9ae metadata.xml 491
 MD5 5b62d172156de076b267b91b6ebc5dc4 rxvt-2.7.10-r2.ebuild 2073
-MD5 6f693712494a91b73ad331042510bafb rxvt-2.7.10-r3.ebuild 2166
+MD5 f7d3e8d1836488ef6fa343fb6204923b rxvt-2.7.10-r3.ebuild 2300
 MD5 dcc6040c07751ed76667a361cacbb05c rxvt-2.7.10.ebuild 1731
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrr4UAiZjviIA2XgRAlpKAJ9OfoUpXMeR33dphPVkE3TudDukLQCgpojh
-OdIc0TMdo8jqTNP+Q4QSz1w=
-=VQ6e
------END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3 b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3
index bf6f14517115..20d4f02b5882 100644
--- a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3
+++ b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3
@@ -1,2 +1,2 @@
-MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
 MD5 299ecbc322232d4031c02c72981fb193 rxvt-2.7.10-xim-fix.patch.gz 602
+MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
index efce325b6347..9fc374d33fa5 100644
--- a/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.10-r3.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/rxvt-2.7.10-r3.ebuild,v 1.3 2005/12/25 15:43:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild,v 1.4 2006/01/02 20:08:08 usata Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -15,9 +15,21 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~amd64 ~ppc64"
 IUSE="motif cjk xgetdefault linuxkeys"
 
-DEPEND="virtual/libc
-	virtual/x11
+RDEPEND="virtual/libc
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXext
+		)
+		virtual/x11
+	)
 	motif? ( x11-libs/openmotif )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		)
+		virtual/x11
+	)"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -32,7 +44,7 @@ src_unpack() {
 		fi
 	fi
 
-	uclibctoolize
+	elibtoolize
 }
 
 src_compile() {