touchups

Package-Manager: portage-2.1_pre7-r5

4 files changed, 68 insertions, 48 deletions

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index aa3c13572ece..735e3ec21aa6 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 MD5 7d9a5a35fbe66749091f686abb59853d ChangeLog 10402
 RMD160 87031baf8cbc1d886394b470a9bd156c57632e5b ChangeLog 10402
 SHA256 bce56ce3cfb664135087bb3a49d63062ce508669d72e063682ab5d031eef9b0b ChangeLog 10402
-MD5 f4c46f25907c3aa68c31a150acaf151b R-2.1.1.ebuild 2644
-RMD160 6a07bcfdf4b6a11fb115fd51df689dc8ffcc4db2 R-2.1.1.ebuild 2644
-SHA256 f711ca1a1dc228f9018767105f3b131a0c9624617ec71f988b7f4a25cced8da0 R-2.1.1.ebuild 2644
-MD5 c47d2c1039131afdf9b275f9302e015f R-2.2.0-r1.ebuild 2985
-RMD160 5361d3d63bf534049dcf7450ca96d48d92f8a375 R-2.2.0-r1.ebuild 2985
-SHA256 b5c45e54bd224d3dc10d4a79f92f918d9a0bcf275f2858624b93f18dc930f684 R-2.2.0-r1.ebuild 2985
-MD5 819fe0c02d20a256426c50c762387188 R-2.2.1.ebuild 3134
-RMD160 54a6e08e6d923135b42998e4ee95f338c1b54879 R-2.2.1.ebuild 3134
-SHA256 54d88d489be88a5826933590c7d9d9fd4f802707ec627c21cc0c436265f1f0d2 R-2.2.1.ebuild 3134
+MD5 5b97f356bea28c99b9bb5f2d7aa9ecdb R-2.1.1.ebuild 2785
+RMD160 50935617bd15536c7cbc6e22644737414516e426 R-2.1.1.ebuild 2785
+SHA256 f9e4300c9fb5dc2accb3da31f6deca2e7e86b33d90320e4d6867c0b9ff30814c R-2.1.1.ebuild 2785
+MD5 0d0161262665839e44dd3381243a087f R-2.2.0-r1.ebuild 3103
+RMD160 667ed98839a8440dbe9d182e8b4d32f2075d1c55 R-2.2.0-r1.ebuild 3103
+SHA256 59333cd0820cbfb557691ef34458b5535acc09d2f659247564a88c0746442b99 R-2.2.0-r1.ebuild 3103
+MD5 01381e43169026a55b4beea59d26954a R-2.2.1.ebuild 3137
+RMD160 080a1c83b82b3712827c68a0713b8e24ab4ed383 R-2.2.1.ebuild 3137
+SHA256 699ede8e0ca54fda2cb48ee3883ec69db2d8b6e93b69a2fd64d4b5c3a7238aff R-2.2.1.ebuild 3137
 MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 files/R-2.2.0-ifc-configure.patch 524
 SHA256 6a255a8f92b9e38619210b78ed26288db6d7177ff1eb47f12ab9528f2ce461e8 files/R-2.2.0-ifc-configure.patch 524
@@ -35,9 +35,9 @@ MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELo+WJrHF4yAQTrARAh9hAJ4sn0N4xY0SDH+3ld99/stHnlok2ACfYGDN
-Wo+nFh3FUoMuFuC1b3lybkw=
-=/HF9
+iD8DBQFEOt1H2+ySkm8kpY0RAp5eAJ0TsEuMxd/MdKl6ybprpbYBlKDI2wCdGGqa
+aAXeDFs/Ms7DvsxaMsyNAOY=
+=zpAV
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.1.1.ebuild b/dev-lang/R/R-2.1.1.ebuild
index ade9ce8771e0..c67ad2bc4aa9 100644
--- a/dev-lang/R/R-2.1.1.ebuild
+++ b/dev-lang/R/R-2.1.1.ebuild
@@ -1,30 +1,38 @@
-# 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/R/R-2.1.1.ebuild,v 1.6 2005/11/22 15:11:55 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.7 2006/04/10 22:33:28 vapier Exp $
 
 inherit fortran toolchain-funcs
 
-IUSE="blas jpeg nls png readline tcltk X"
 DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
+HOMEPAGE="http://www.r-project.org/"
 SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz"
 #There are daily release patches, don't know how to utilize these
 #"ftp://ftp.stat.math.ethz.ch/Software/${PN}/${PN}-release.diff.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 )
-		X? ( virtual/x11 )
-		tcltk? ( dev-lang/tk )"
-SLOT="0"
+
 LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="blas jpeg nls png readline tcltk X"
+
+DEPEND=">=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 )
+	tcltk? ( dev-lang/tk )
+	X? ( || ( ( x11-libs/libX11 )
+		virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xproto
+		x11-libs/libXt
+		x11-libs/libX11 )
+		virtual/x11 ) )"
 
 pkg_setup() {
 	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
 	# Thanks to vapier for providing the test.
+	cd "${T}"
 	echo 'int main(){}' > test.c
 	$(tc-getCC) -c test.c -o test.o
 	if file test.o | grep -qs 64-bit ; then
@@ -33,6 +41,7 @@ pkg_setup() {
 	else
 		FORTRAN="g77 f2c"
 	fi
+	rm -f test.{c,o}
 	fortran_pkg_setup
 }
 
diff --git a/dev-lang/R/R-2.2.0-r1.ebuild b/dev-lang/R/R-2.2.0-r1.ebuild
index 0d8b5bd7ccfb..a7fd19799ad9 100644
--- a/dev-lang/R/R-2.2.0-r1.ebuild
+++ b/dev-lang/R/R-2.2.0-r1.ebuild
@@ -1,31 +1,39 @@
-# 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/R/R-2.2.0-r1.ebuild,v 1.1 2005/12/12 19:56:13 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.0-r1.ebuild,v 1.2 2006/04/10 22:33:28 vapier Exp $
 
 inherit fortran toolchain-funcs
 
-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 )"
-SLOT="0"
+SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz"
+
 LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blas jpeg nls png readline tcltk X lapack"
+
+DEPEND=">=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 ) )"
+
 AT_M4DIR="${S}/m4"
 
 pkg_setup() {
 	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
 	# Thanks to vapier for providing the test.
-	cd ${T}
+	cd "${T}"
 	echo 'int main(){}' > test.c
 	$(tc-getCC) -c test.c -o test.o
 	if file test.o | grep -qs 64-bit ; then
diff --git a/dev-lang/R/R-2.2.1.ebuild b/dev-lang/R/R-2.2.1.ebuild
index 863b48b53033..e00cd2053ea4 100644
--- a/dev-lang/R/R-2.2.1.ebuild
+++ b/dev-lang/R/R-2.2.1.ebuild
@@ -1,13 +1,18 @@
 # 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.4 2006/04/01 14:34:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.5 2006/04/10 22:33:28 vapier Exp $
 
 inherit fortran toolchain-funcs
 
-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/"
+SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blas jpeg nls png readline tcltk X lapack"
+
 RDEPEND=">=dev-lang/perl-5.6.1-r3
 	readline? ( >=sys-libs/readline-4.1-r3 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
@@ -22,15 +27,13 @@ DEPEND="${RDEPEND}
 		x11-libs/libXt
 		x11-libs/libX11 )
 		virtual/x11 ) )"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
 AT_M4DIR="${S}/m4"
 
 pkg_setup() {
 	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
 	# Thanks to vapier for providing the test.
-	cd ${T}
+	cd "${T}"
 	echo 'int main(){}' > test.c
 	$(tc-getCC) -c test.c -o test.o
 	if file test.o | grep -qs 64-bit ; then