Added patch from Debian to fix insecure tempfile handling in javareconf (fixes bug #235822). NOTE: R-2.2.1-r1.ebuild is not vulnerable since it does not include the javereconf script. Also removed old ebuilds and removed two tests from the test suite since they fail with portage.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686

8 files changed, 223 insertions, 150 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 6f1459daa3a7..66d3204181be 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.125 2008/07/18 12:45:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.126 2008/08/27 23:01:40 markusle Exp $
+
+*R-2.7.2 (27 Aug 2008)
+
+  27 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/R-javareconf.patch, +files/R-2.7.1-test-fix.patch,
+  -2.6.1-r1.ebuild, -R-2.6.2.ebuild, -R-2.7.0.ebuild, 
+  R-2.7.1.ebuild, +R-2.7.2.ebuild:
+  Added patch from Debian to fix insecure tempfile handling in 
+  javareconf (fixes bug #235822). NOTE: R-2.2.1-r1.ebuild is not 
+  vulnerable since it does not include the javereconf script. 
+  Also removed old ebuilds and removed two tests from the test
+  suite since they fail with portage.
 
   18 Jul 2008; Markus Dittrich <markusle@gentoo.org> R-2.7.1.ebuild:
   Added missing cairo use flag (see bug #231970).
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 2a38f6d2768d..afb0ff4530f9 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,13 +1,13 @@
+AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91
+AUX R-javareconf.patch 1180 RMD160 03a013dcaadc145771bd4e094215adcf936b1513 SHA1 05ad264be84fbc20228b0b17b72e3fe1b9f68212 SHA256 8459571c3979967b5a97aafb3934516a5725f67161851d6f5800354af609afa6
 DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624
 DIST R-2.6.1.tar.gz 15519691 RMD160 0e50237916e03c9b88ab558c39a9a587aabf4991 SHA1 6f2c8694f1935fda382796d225e45bd6f8f7755b SHA256 8fe505cbd9562cc84422475bc5c0b8e1b88b14d0c9e11d0de4f9e83ae8ce2563
-DIST R-2.6.2.tar.gz 15569391 RMD160 7956c284aad3c2d4fc85d566b45e2ba308dffefb SHA1 3d06b12cbf1dab25ddd759522157e6cc6a8eae19 SHA256 7364415bb2b382110a0b94c4c894b1c7b032561dad8b1456cc27382ad496fe03
-DIST R-2.7.0.tar.gz 16396250 RMD160 c3c9cf0c0a1eb6191492f1be19e277e8223a42c9 SHA1 d0a3193e474696ad767845ef6b8ee1555a26b898 SHA256 15cba2e295dfabaa9a7b7490ec0db489691fbbc769274980eed7e5d48a0c149f
 DIST R-2.7.1.tar.gz 16413667 RMD160 ac98e39d46ebc7581dd53da7f69a1e7abad269a4 SHA1 cdf5f6f85463c7be007306add2f4ca7cf7babfb7 SHA256 f0449d23257f98d71ed7749a2ed30f69023a05259f392e4c5fd8fac9db485de7
+DIST R-2.7.2.tar.gz 16466658 RMD160 948e379f07cbfeda13c46947791f755e1faabbf7 SHA1 0de9f00ae58e67840fc2daab8973d37d97d78535 SHA256 7184c1f85fafce518e6dbccb5a64ba47a62d8694c7019da0e1c1e83ff98c3ff4
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.2.1-r1.ebuild 3273 RMD160 d0611bf5cb4561a1f663c78dc6e19ef445425db7 SHA1 efaec8f322ce1651bc34ce4f2168aeb9271309cb SHA256 bbb423385fe2336e6f809972f44b8d4ce86e3f54dbb14e8120294b664d8af123
-EBUILD R-2.6.1-r1.ebuild 3401 RMD160 83da6e2bc36766c9a7101473623a441ba32e808e SHA1 3f6bfcc0d0ee71431df82096a0164eb8fc62d862 SHA256 0d6da8fba7056cb620d68fa5b7d1c4cdd607345cedd7fad8ece669da08d1e6c7
-EBUILD R-2.6.2.ebuild 3307 RMD160 a85d1b2f18cb4743c5fbd4d058548caebbf942b9 SHA1 074ebe6ec27ee0c7cd55aa4c34ce75301d9934c5 SHA256 6a1776092f35312942b29a03e706cd5bc7bc1b7a32b74daa612b7945013b402d
-EBUILD R-2.7.0.ebuild 3446 RMD160 d15dc63c9e0805ddddbc91a85dc065b49406d9c3 SHA1 1f5da6cf10ddc60eab1ebb51d5210639a9595922 SHA256 1908afb3b14c255be41c7ebeb86d8d2252bf3dd063632a83b69f2596246cf82d
-EBUILD R-2.7.1.ebuild 3867 RMD160 ebf8e7bd5f12b39eb335e7775f138a8128dff494 SHA1 b13846011082cf575b0617c93c31d04b00915ba3 SHA256 a22e1e41e5923a5a7442a128b6d1b156f9f7d1fd9dc57654684fdd7ad57ae59a
-MISC ChangeLog 18590 RMD160 a740cf2c4ece74c1956c63d2f71e269b94e063cd SHA1 5340bff69a35efe4d4057d96aa1058ead36de314 SHA256 4e85d8e6debbabfc6cb3adefb6802417b367791f0e9bd06015fb29a2ab62833d
+EBUILD R-2.6.1-r1.ebuild 3490 RMD160 b279569299a4fb207e212dd87e4fce9d9f60c44c SHA1 ac6a79cfbce6d955a4dd97dfd3dcca1a679679d4 SHA256 0cf9fa915cad07b5a243c1cbdfbaae0c3dcc8314ef1002af108cafb7ad200bae
+EBUILD R-2.7.1.ebuild 4174 RMD160 acadb77ba20bd318144704c0addeb7a2c38c32a6 SHA1 699177efd13a08e81c81d4720a434b8c0b34544c SHA256 f1e3d33b99a4c6f83055fd0e033741406d8502777a1c319354edfc7d0af2426f
+EBUILD R-2.7.2.ebuild 4179 RMD160 86b91c3277cba96300c6b0edd9b142d11bd063b0 SHA1 9de0add24b2340574fcf74db0cefe0295f585588 SHA256 3930c967568b3eee56ad8e0ecc91d4d8737d576efdf68482bc0d5842c43f4659
+MISC ChangeLog 19112 RMD160 1ccd1dbaa1023453c0bb27fa87645a4aa73cd5fb SHA1 e29f1de2d239eb91e4cb87ae593672b99b3da151 SHA256 be6428691637394ff498a1f00634868ceae8ac2ea231a6603bbfdb0e5f16734f
 MISC metadata.xml 1019 RMD160 7bafb2129d1666600d4324d7979f98d4afe896e8 SHA1 7f8e029d6edce5402c81eb9b6fb088e545dc91b4 SHA256 8dbe1befd1f6009b4c346f090c07edb79ca14b04ca5cd02dbd5ba0a4c0106ace
diff --git a/dev-lang/R/R-2.6.1-r1.ebuild b/dev-lang/R/R-2.6.1-r1.ebuild
index 950c7d54912c..8f190f240cf5 100644
--- a/dev-lang/R/R-2.6.1-r1.ebuild
+++ b/dev-lang/R/R-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1-r1.ebuild,v 1.12 2008/04/15 15:27:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1-r1.ebuild,v 1.13 2008/08/27 23:01:40 markusle Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -57,6 +57,13 @@ pkg_setup() {
 	use ppc64 && append-flags -mminimal-toc
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-javareconf.patch
+}
+
+
 src_compile() {
 	# fix packages.html for doc (bug #205103)
 	# check in later versions if fixed
diff --git a/dev-lang/R/R-2.6.2.ebuild b/dev-lang/R/R-2.6.2.ebuild
deleted file mode 100644
index 4ccaefc8cf00..000000000000
--- a/dev-lang/R/R-2.6.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.2.ebuild,v 1.2 2008/02/26 17:32:40 bicatali Exp $
-
-inherit fortran flag-o-matic bash-completion
-
-DESCRIPTION="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
-	bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="doc java jpeg lapack minimal nls png readline tk X"
-
-# common depends
-CDEPEND="dev-lang/perl
-	>=dev-libs/libpcre-7.3
-	app-arch/bzip2
-	virtual/blas
-	virtual/ghostscript
-	readline? ( sys-libs/readline )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )
-	lapack? ( virtual/lapack )
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXmu x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? ( virtual/latex-base
-	  || ( dev-texlive/texlive-fontsrecommended virtual/tetex ) )"
-
-RDEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	java? ( >=virtual/jre-1.5 )"
-
-R_HOME=/usr/$(get_libdir)/R
-
-pkg_setup() {
-	FORTRAN="gfortran ifc g77"
-	fortran_pkg_setup
-	export FFLAGS="${FFLAGS:--O2}"
-	[[ ${FORTRANC} = gfortran || ${FORTRANC} = if* ]] && \
-		export FCFLAGS="${FCFLAGS:-${FFLAGS}}"
-
-	filter-ldflags -Wl,-Bdirect -Bdirect
-
-	# this is needed to properly compile additional R packages
-	# (see bug #152379)
-	append-flags -std=gnu99
-}
-
-src_compile() {
-	# fix packages.html for doc (bug #205103)
-	# check in later versions if fixed
-	sed -i \
-		-e "s:../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/packageshtml.R \
-		|| die "sed failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$(pkg-config --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-
-	econf \
-		--enable-R-profiling \
-		--enable-memory-profiling \
-		--enable-R-shlib \
-		--enable-linux-lfs \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-blas="$(pkg-config --libs blas)" \
-		--docdir=/usr/share/doc/${PF} \
-		rdocdir=/usr/share/doc/${PF} \
-		$(use_enable nls) \
-		$(use_with lapack) \
-		$(use_with tk tcltk) \
-		$(use_with jpeg jpeglib) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die "emake failed"
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake info pdf || die "emake docs failed"
-	fi
-
-	emake -j1 -C src/nmath/standalone || die "emake math library failed"
-}
-
-src_install() {
-	# -j1 because creates various dirs sequentially (hit should be small)
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" \
-			install-info install-pdf || die "emake install docs failed"
-	fi
-
-	emake -j1 \
-		-C src/nmath/standalone \
-		DESTDIR="${D}" install \
-		|| die "emake install math library failed"
-
-	# env file
-	cat > 99R <<-EOF
-		LDPATH=${R_HOME}/lib
-		R_HOME=${R_HOME}
-	EOF
-	doenvd 99R || die "doenvd failed"
-
-	dobashcompletion "${WORKDIR}"/R.bash_completion
-}
-
-pkg_config() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-2.7.1.ebuild b/dev-lang/R/R-2.7.1.ebuild
index 6beb75ad2bee..802af52e7a0f 100644
--- a/dev-lang/R/R-2.7.1.ebuild
+++ b/dev-lang/R/R-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.1.ebuild,v 1.2 2008/07/18 12:45:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.1.ebuild,v 1.3 2008/08/27 23:01:40 markusle Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -65,6 +65,15 @@ pkg_setup() {
 	filter-ldflags -Wl,-Bdirect -Bdirect
 }
 
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-javareconf.patch
+	epatch "${FILESDIR}"/${P}-test-fix.patch
+}
+
+
 src_compile() {
 	# fix packages.html for doc (bug #205103)
 	# check in later versions if fixed
@@ -116,6 +125,12 @@ src_compile() {
 	emake -j1 -C src/nmath/standalone || die "emake math library failed"
 }
 
+src_test() {
+	# we need to unset R_HOME otherwise some of the diff based
+	# tests fail due to warnings in the output
+	R_HOME="" make check || die "Some of the tests failed"
+}
+
 src_install() {
 	# -j1 because creates various dirs sequentially (hit should be small)
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
diff --git a/dev-lang/R/R-2.7.0.ebuild b/dev-lang/R/R-2.7.2.ebuild
index 93c357c76c6f..92d02a421a58 100644
--- a/dev-lang/R/R-2.7.0.ebuild
+++ b/dev-lang/R/R-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.0.ebuild,v 1.2 2008/05/10 15:01:59 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.2.ebuild,v 1.1 2008/08/27 23:01:40 markusle Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="doc java jpeg lapack minimal nls png readline tk X"
+IUSE="doc java jpeg lapack minimal nls png readline tk X cairo"
 
 # common depends
 CDEPEND="dev-lang/perl
@@ -21,6 +21,7 @@ CDEPEND="dev-lang/perl
 	app-arch/bzip2
 	virtual/blas
 	virtual/ghostscript
+	cairo? ( x11-libs/cairo x11-libs/pango )
 	readline? ( sys-libs/readline )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )
@@ -38,7 +39,7 @@ RDEPEND="${CDEPEND}
 	app-arch/zip
 	java? ( >=virtual/jre-1.5 )"
 
-R_HOME=/usr/$(get_libdir)/R
+R_HOME=/usr/$(get_libdir)/${PN}
 
 pkg_setup() {
 	FORTRAN="gfortran ifc g77"
@@ -47,11 +48,34 @@ pkg_setup() {
 	[[ ${FORTRANC} = gfortran || ${FORTRANC} = if* ]] && \
 		export FCFLAGS="${FCFLAGS:-${FFLAGS}}"
 
+	# make sure cairo and pango are both compiled with "X"
+	# use flag (see bug #231970)
+	if use cairo; then
+		if ( ! built_with_use x11-libs/cairo X ); then
+			eerror "x11-libs/cairo needs to be built with USE=\"X\""
+			die "Please rebuild x11-libs/cairo with USE=\"X\""
+		fi
+
+		if ( ! built_with_use x11-libs/pango X ); then
+			eerror "x11-libs/pango needs to be built with USE=\"X\""
+			die "Please rebuild x11-libs/pango with USE=\"X\""
+		fi
+	fi
+
 	filter-ldflags -Wl,-Bdirect -Bdirect
+}
 
-	# this is needed to properly compile additional R packages
-	# (see bug #152379)
-	append-flags -std=gnu99
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-javareconf.patch
+	epatch "${FILESDIR}"/${PN}-2.7.1-test-fix.patch
+}
+
+src_test() {
+	# we need to unset R_HOME otherwise some of the diff based
+	# tests fail due to warnings in the output
+	R_HOME="" make check || die "Some of the tests failed"
 }
 
 src_compile() {
@@ -62,9 +86,10 @@ src_compile() {
 		src/library/tools/R/packageshtml.R \
 		|| die "sed failed"
 
-	# fix Rscript patch
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"/usr/lib/${PN}/\"':" \
-		-i src/unix/Makefile.in || die "sed failed"
+	# fix Rscript
+	sed -i \
+		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_HOME}\"':" \
+		src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	use lapack && \
 		export LAPACK_LIBS="$(pkg-config --libs lapack)"
@@ -92,6 +117,7 @@ src_compile() {
 		$(use_with !minimal recommended-packages) \
 		$(use_with png libpng) \
 		$(use_with readline) \
+		$(use_with cairo) \
 		$(use_with X x) \
 		|| die "econf failed"
 	emake || die "emake failed"
diff --git a/dev-lang/R/files/R-2.7.1-test-fix.patch b/dev-lang/R/files/R-2.7.1-test-fix.patch
new file mode 100644
index 000000000000..3be9bc718b77
--- /dev/null
+++ b/dev-lang/R/files/R-2.7.1-test-fix.patch
@@ -0,0 +1,112 @@
+# this patch removed two non-essential tests that fail under portage
+# - test-internet fails due to ACCESS_VIOLATION 
+# - reg-plot-latin1.R fails probably due to locale mismatch
+
+diff -Naur R-2.7.1/tests/Makefile.in R-2.7.1.new/tests/Makefile.in
+--- R-2.7.1/tests/Makefile.in	2008-06-23 05:39:03.000000000 -0400
++++ R-2.7.1.new/tests/Makefile.in	2008-08-27 18:17:33.000000000 -0400
+@@ -40,7 +40,6 @@
+ 
+ test-src-demo = demos.R demos2.R
+ test-src-errmsgs = errormsgs.R
+-test-src-internet = internet.R
+ test-src-isas = isas-tests.R
+ test-src-primitive = primitives.R
+ test-src-random = p-r-random-tests.R
+@@ -51,21 +50,19 @@
+   reg-plot.R reg-S4.R
+ test-src-reg-auto =
+ test-src-reg = $(test-src-reg-1) $(test-src-reg-auto)
+-test-src-reg3 = reg-tests-3.R reg-plot-latin1.R 
++test-src-reg3 = reg-tests-3.R 
+ 
+ DISTFILES = Makefile.in Makefile.win README \
+ 	$(test-src-strict-1) $(test-src-strict-1:.R=.Rout.save) \
+ 	$(test-src-sloppy-1) $(test-src-sloppy-1:.R=.Rout.save) \
+ 	$(test-src-auto:.R=.Rin) isas-tests.Rout.save \
+ 	$(test-src-demo) demos.Rout.save \
+-	$(test-src-internet) internet.Rout.save \
+ 	$(test-src-primitive) \
+ 	$(test-src-random) p-r-random-tests.Rout.save \
+ 	$(test-src-reg) $(test-src-reg3) \
+ 	  reg-S4.Rout.save \
+ 	  reg-IO.Rout.save reg-IO2.Rout.save reg-plot.Rout.save \
+ 	  reg-plot.ps.save reg-tests-2.Rout.save reg-tests-3.Rout.save \
+-	  reg-plot-latin1.ps.save \
+ 	  reg-win.R encodings.R utf8-regex.R \
+ 	  errormsgs.R errormsgs.Rout.save \
+ 	gct-foot.R \
+@@ -89,7 +86,6 @@
+ 
+ test-out-demo = $(test-src-demo:.R=.Rout)
+ test-out-errmsgs = $(test-src-errmsgs:.R=.Rout)
+-test-out-internet = $(test-src-internet:.R=.Rout)
+ test-out-isas = $(test-src-isas:.R=.Rout)
+ test-out-primitive = $(test-src-primitive:.R=.Rout)
+ test-out-random = $(test-src-random:.R=.Rout)
+@@ -100,14 +96,13 @@
+ 
+ ## This macro is used only for dependencies
+ test-out = $(test-src:.R=.Rout) $(test-out-demo) $(test-out-gct) \
+-	$(test-out-internet) \
+ 	$(test-out-random) $(test-out-reg) $(test-out-reg3) \
+ 	$(test-out-segfault) $(test-out-isas)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .R .Rin .Rout .Rout-gct .Rout-valgct
+ 
+-all-basic-tests = Examples Specific Reg Internet
++all-basic-tests = Examples Specific Reg 
+ all-devel-tests = Docs IsAs Random Demo Rd Primitive Regexp Segfault \
+    Standalone Packages
+ 
+@@ -173,24 +168,6 @@
+ 	-@diff reg-plot.ps $(srcdir)/reg-plot.ps.save
+ 	@$(ECHO) "$(ECHO_T) OK"
+ 
+-reg-plot-latin1.Rout: reg-plot-latin1.R
+-	@rm -f $@ $@.fail
+-	@$(ECHO) $(ECHO_N) "running code in '$<' ...$(ECHO_C)"
+-	@$(R2) < $< > $@ 2>&1 || (mv $@ $@.fail && exit 1)
+-	@$(ECHO) "$(ECHO_T) OK"
+-	@if test -f $(srcdir)/$@.save ; then \
+-	  mv $@ $@.fail; \
+-	  $(ECHO) $(ECHO_N) \
+-	    "comparing '$@' to '$(srcdir)/$@.save' ...$(ECHO_C)"; \
+-	  $(RDIFF) $@.fail $(srcdir)/$@.save $(RVAL_IF_DIFF) || exit 1; \
+-	  mv $@.fail $@; \
+-	  $(ECHO) "$(ECHO_T) OK"; \
+-	fi
+-	@$(ECHO) $(ECHO_N) \
+-	  "comparing 'reg-plot-latin1.ps' to '$(srcdir)/reg-plot-latin1.ps.save' ...$(ECHO_C)"
+-	-@diff reg-plot-latin1.ps $(srcdir)/reg-plot-latin1.ps.save
+-	@$(ECHO) "$(ECHO_T) OK"
+-
+ .R.Rout-gct:
+ 	@$(ECHO) "running gctorture() + '$<'"
+ 	@($(ECHO) '.ptime <- proc.time(); gctorture()' ; \
+@@ -265,15 +242,6 @@
+ 	@$(ECHO) "running tests of error messages"
+ 	@$(MAKE) $(test-out-errmsgs) RVAL_IF_DIFF=0
+ 
+-## <NOTE>
+-## These depend on an internet connection, and the sites being up.
+-## So allow this to fail: it may be slow doing so.
+-test-Internet:
+-	@$(ECHO) "running tests of Internet and socket functions"
+-	@$(ECHO) "  expect some differences"
+-	-@$(MAKE) $(test-out-internet) RVAL_IF_DIFF=0
+-## </NOTE>
+-
+ test-IsAs:
+ 	@$(ECHO) "running tests of consistency of as/is.*"
+ 	@$(MAKE) $(test-out-isas) RVAL_IF_DIFF=1
+@@ -434,7 +402,7 @@
+ 	  (cd $${d} && $(MAKE) $@); \
+ 	done
+ 	-@rm -f stamp-R Makedeps Rplot* Rprof.out data dumpdata.R \
+-	  reg-plot-latin1.ps reg-plot.ps reg-tests-?.ps \
++	  reg-plot.ps reg-tests-?.ps \
+ 	  R-exts.* R-intro.R R-intro.Rout \
+ 	  FALSE.R FALSE.tex mirrors.html
+ 	-@rm -f testit.txt testit.html testit.tex testit-Ex.R
diff --git a/dev-lang/R/files/R-javareconf.patch b/dev-lang/R/files/R-javareconf.patch
new file mode 100644
index 000000000000..229dbb293ecb
--- /dev/null
+++ b/dev-lang/R/files/R-javareconf.patch
@@ -0,0 +1,32 @@
+# this patch fixes the insecure tempfile usage reported in bug #235822
+# it was extracted from Debian's r-base_2.7.2-1.diff patch
+
+diff -Naur R-2.7.2/src/scripts/javareconf R-2.7.2.new/src/scripts/javareconf
+--- R-2.7.2/src/scripts/javareconf	2008-03-25 08:26:44.000000000 -0400
++++ R-2.7.2.new/src/scripts/javareconf	2008-08-27 16:49:04.000000000 -0400
+@@ -125,16 +125,19 @@
+ javac_works='not present'
+ if test -n "$JAVAC"; then
+     javac_works='not functional'
+-    rm -rf /tmp/A.java /tmp/A.class
+-    echo "public class A { }" > /tmp/A.java
+-    if test -e /tmp/A.java; then
+-	if "${JAVAC}" /tmp/A.java >/dev/null; then
+-	    if test -e /tmp/A.class; then
++    # edd 25 Aug 2008  use mktemp -t -d
++    #rm -rf /tmp/A.java /tmp/A.class
++    jctmpdir=`mktemp -t -d`
++    echo "public class A { }" > ${jctmpdir}/A.java
++    if test -e ${jctmpdir}/A.java; then
++	if "${JAVAC}" ${jctmpdir}/A.java >/dev/null; then
++	    if test -e ${jctmpdir}/A.class; then
+ 		javac_works=yes
+ 	    fi
+ 	fi
+     fi
+-    rm -rf /tmp/A.java /tmp/A.class
++    # rm -rf /tmp/A.java /tmp/A.class
++    rm -rf ${jctmpdir}
+ fi
+ if test "${javac_works}" = yes; then
+     echo "Java compiler    : ${JAVAC}"