From cbe36d79d054750e6bd1d46df9d0260136d51be8 Mon Sep 17 00:00:00 2001
From: "Marcus D. Hanwell" <cryos@gentoo.org>
Date: Mon, 16 Jan 2006 01:12:09 +0000
Subject: Ported deps for modular X. Package-Manager: portage-2.1_pre3-r1

---
 dev-lang/R/ChangeLog      |  5 ++++-
 dev-lang/R/Manifest       | 10 +++++-----
 dev-lang/R/R-2.2.1.ebuild | 25 +++++++++++++++----------
 3 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'dev-lang')

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 14b5c1f7a2f3..d6c2969c50e8 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.66 2006/01/16 00:35:27 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.67 2006/01/16 01:12:09 cryos Exp $
+
+  16 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> R-2.2.1.ebuild:
+  Ported deps for modular X.
 
   16 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> R-2.2.1.ebuild:
   Add gfortran to the list of allowed Fortran compilers, closes bug 118147.
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index eab3fc517081..3b212c1e1a53 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cd348eedde9bfaf1fb465ee2d6964007 ChangeLog 10215
+MD5 741147898ceed1dadb6d7be4290349a7 ChangeLog 10313
 MD5 f4c46f25907c3aa68c31a150acaf151b R-2.1.1.ebuild 2644
 MD5 c47d2c1039131afdf9b275f9302e015f R-2.2.0-r1.ebuild 2985
-MD5 4ee6a0cf5a92b561e813937a0a587630 R-2.2.1.ebuild 3012
+MD5 a523557fadc1353ab1b5e689b170e2f0 R-2.2.1.ebuild 3125
 MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
@@ -15,7 +15,7 @@ MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyupfntT9W3vfTuoRAvH3AKCeWD6bpbd0TQxbcjlx7ptJ1fANpgCeIwcM
-80OvqHiVfDrjaPjcY3UmKwk=
-=nJI+
+iD8DBQFDyvL4ntT9W3vfTuoRAhjtAJ9+pZTA6c2wI+DrnxocqrgX5Tj6RgCgsN4I
+0FFFWmXF2yBB1lF4k+ceuU0=
+=LqJG
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.2.1.ebuild b/dev-lang/R/R-2.2.1.ebuild
index e779d0c6d161..f1d67bfdb518 100644
--- a/dev-lang/R/R-2.2.1.ebuild
+++ b/dev-lang/R/R-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.2 2006/01/16 00:35:27 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.3 2006/01/16 01:12:09 cryos Exp $
 
 inherit fortran toolchain-funcs
 
@@ -8,15 +8,20 @@ IUSE="blas jpeg nls png readline tcltk X lapack"
 DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
 SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz"
 HOMEPAGE="http://www.r-project.org/"
-DEPEND="virtual/libc
-		>=dev-lang/perl-5.6.1-r3
-		readline? ( >=sys-libs/readline-4.1-r3 )
-		jpeg? ( >=media-libs/jpeg-6b-r2 )
-		png? ( >=media-libs/libpng-1.2.1 )
-		blas? ( virtual/blas )
-		lapack? ( virtual/lapack )
-		X? ( virtual/x11 )
-		tcltk? ( dev-lang/tk )"
+RDEPEND=">=dev-lang/perl-5.6.1-r3
+	readline? ( >=sys-libs/readline-4.1-r3 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	tcltk? ( dev-lang/tk )
+	X? ( || ( ( x11-libs/libX11 )
+		virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xproto
+		x11-libs/libXt
+		x11-libs/libX11 )
+		virtual/x11 ) )"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-- 
cgit v1.2.3-65-gdbad