Removed old, does not access docs, fixing bug #305641

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 10 insertions, 313 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index ebeeea2bc335..d19d8be1bdba 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.175 2010/05/23 17:52:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.176 2010/05/25 16:24:07 bicatali Exp $
+
+  25 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/R-2.7.1-test-fix.patch, -R-2.9.2.ebuild, -files/R-javareconf.patch:
+  Removed old, does not access docs, fixing bug #305641
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> R-2.10.1.ebuild:
   stable amd64, bug 306747
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a6e0cf0b4ae9..61083a9bc05b 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91
-AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1 0af91b826b969afb54462569cc210b8d16b0d482 SHA256 1667dc70b39197e1b77fbaab74a5fce078067f43da248d650a84d4cf494b15bd
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 DIST R-2.11.0.tar.gz 19779908 RMD160 358d5ba19bd534e9f5be56f517bd217c235599dc SHA1 86af359879afaf18bf0cd9ca36f2957d7b146ba3 SHA256 9b2a1769cdf21ad00500cbc0a1f7e09c872681d2ca0ea592e7692f15ff980a43
-DIST R-2.9.2.tar.gz 18591679 RMD160 71313889c2886b285dcf588d60089a5ce7260648 SHA1 3934743b67a57691db724606c575e38a35ecb590 SHA256 2b2bfa9edab38d2c0c9a6262767336f2f19780cb30483aedcb7c69524ec1dbb8
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4078 RMD160 135e9344cf5de1ca710f216822075ffc35dc3b0e SHA1 e58976ba3ffb4473f120d293c036e97114e02908 SHA256 2296760ff1357e60475cff72c7715e92fcfc50ec2c3271b9d5a9b094123b2e6e
 EBUILD R-2.11.0.ebuild 4040 RMD160 e07c5cf6ebe8efb12d172feae7898948c2a54929 SHA1 20b8739961d325080fdeb70b406f131261bceb4f SHA256 1dea2cbd708ca4c53d231462df79691ae9ec5bb28027530b07816ca9e17578d7
-EBUILD R-2.9.2.ebuild 4146 RMD160 8d461b178848e27d5cb633371fe7a257c1fe6c6f SHA1 c76616c28afba0b5f455cf3dbf89e0710057d9c7 SHA256 6ad6730891a6970992414736949157429aa81b9bdec784ed3ed7736cd97858b8
-MISC ChangeLog 25272 RMD160 7aa535949b4062313a3457e595dcfb93da749dfa SHA1 4767527c472b56000c6ec913896174edf2a38a7a SHA256 2368133994d2b4d75fdcb41b9bcbd4ea4ea8f274c36289bda7bb561b010b93e5
+MISC ChangeLog 25464 RMD160 2b0912473140198892b4aea4651ab519406ae0f9 SHA1 bb6f2fa4e4b6c6f5dd97606ae8826025d7242a28 SHA256 5ed9d9242682de36a1c943b9beecc50e0ecac56a155a0461d5c1d903721aca88
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv5a1cACgkQCaWpQKGI+9QzzACggRwW2BJtTH6Cs+DMwn3m+uik
-DlgAnRZeCoDOttAAfZGPLLX6dat3dnuh
-=RmDz
+iEYEARECAAYFAkv8Ar0ACgkQ1ycZbhPLE2AI/gCeKSeWZ9YUeLKwMtnTQyLu5YCt
+8z8AnRoswWFzYT2OCiWrONRF9Kr8krMg
+=v8r4
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.9.2.ebuild b/dev-lang/R/R-2.9.2.ebuild
deleted file mode 100644
index 6fbe732f1373..000000000000
--- a/dev-lang/R/R-2.9.2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.2.ebuild,v 1.9 2009/12/26 17:32:26 pva Exp $
-
-EAPI=2
-inherit eutils flag-o-matic bash-completion versionator
-
-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 threads tk X cairo"
-
-# common depends
-CDEPEND="dev-lang/perl
-	dev-libs/libpcre
-	app-arch/bzip2
-	virtual/blas
-	app-text/ghostscript-gpl
-	cairo? ( x11-libs/cairo[X]
-		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
-	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
-		   app-text/ptex ) )"
-
-RDEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	java? ( >=virtual/jre-1.5 )"
-
-R_HOME=/usr/$(get_libdir)/${PN}
-
-pkg_setup() {
-	filter-ldflags -Wl,-Bdirect -Bdirect
-}
-
-src_prepare() {
-	# 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"
-
-	# fix Rscript
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_HOME}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (bug #273957)
-	sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \
-		|| die "sed for HTML links to manual 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
-	export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--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_enable threads) \
-		$(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 cairo) \
-		$(use_with X x)
-}
-
-src_compile(){
-	emake || die "emake failed"
-	RMATH_V=0.0.0
-	emake -j1 -C src/nmath/standalone \
-		libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \
-		|| die "emake math library failed"
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake info pdf || die "emake docs failed"
-	fi
-}
-
-src_test() {
-	# we need to unset R_HOME otherwise some of the diff based
-	# tests fail due to warnings in the output
-	R_HOME="" emake -j1 check || die "Some of the tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" \
-			install-info install-pdf || die "emake install docs failed"
-		dosym /usr/share/doc/${PF}/manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	# standalone math lib install (-j1 basically harmless)
-	emake -j1 \
-		-C src/nmath/standalone \
-		DESTDIR="${D}" install \
-		|| die "emake install math library failed"
-
-	local mv=$(get_major_version ${RMATH_V})
-	mv  "${D}"/usr/$(get_libdir)/libRmath.so \
-		"${D}"/usr/$(get_libdir)/libRmath.so.${RMATH_V}
-	dosym libRmath.so.${RMATH_V} /usr/$(get_libdir)/libRmath.so.${mv}
-	dosym libRmath.so.${mv} /usr/$(get_libdir)/libRmath.so
-
-	# 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/files/R-2.7.1-test-fix.patch b/dev-lang/R/files/R-2.7.1-test-fix.patch
deleted file mode 100644
index 3be9bc718b77..000000000000
--- a/dev-lang/R/files/R-2.7.1-test-fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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
deleted file mode 100644
index faea18a929c6..000000000000
--- a/dev-lang/R/files/R-javareconf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# this patch fixes the insecure tempfile usage reported in bug #235822
-# it was adapted from the fix in 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-31 10:28:48.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
--		javac_works=yes
--	    fi
--	fi
-+    # edd 25 Aug 2008  use mktemp -t -d
-+    #rm -rf /tmp/A.java /tmp/A.class
-+    if jctmpdir=`mktemp -t -d`; then
-+      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 ${jctmpdir}
-     fi
--    rm -rf /tmp/A.java /tmp/A.class
- fi
- if test "${javac_works}" = yes; then
-     echo "Java compiler    : ${JAVAC}"