From c59b90f62abac35444734fbe0ce430c185b3a61b Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Wed, 28 Apr 2010 00:28:47 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-lang/R/ChangeLog | 8 +- dev-lang/R/Manifest | 20 ++- .../R/{R-2.10.0.ebuild => R-2.11.0.ebuild} | 33 ++-- dev-lang/R/R-2.7.2.ebuild | 159 ------------------ dev-lang/R/R-2.8.1.ebuild | 157 ----------------- 5 files changed, 35 insertions(+), 342 deletions(-) rename dev-lang/R/{R-2.10.0.ebuild => R-2.11.0.ebuild} (84%) delete mode 100644 dev-lang/R/R-2.7.2.ebuild delete mode 100644 dev-lang/R/R-2.8.1.ebuild diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 449b6312a82b..9a2f1a4e70b3 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,12 @@ # 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.172 2010/04/16 20:24:43 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.173 2010/04/28 00:28:47 bicatali Exp $ + +*R-2.11.0 (28 Apr 2010) + + 28 Apr 2010; Sébastien Fabbro -R-2.7.2.ebuild, + -R-2.8.1.ebuild, -R-2.10.0.ebuild, +R-2.11.0.ebuild: + Version bump 16 Apr 2010; Raúl Porcel R-2.10.1.ebuild: alpha/ia64/sparc stable wrt #306747 diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 3272f71a8666..7ec333bf31b9 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,15 +1,21 @@ +-----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.0.tar.gz 19089286 RMD160 a0d335f99d744eba4f03b2082f6e71f1e9269399 SHA1 72249c2fd4dc88d76f775c06b0336c8f934fb358 SHA256 6aaaf5e0d245b62b5fb43d10ebc2e7dffe69838ca45fbc4952a01d500a14b18f DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d -DIST R-2.7.2.tar.gz 16466658 RMD160 948e379f07cbfeda13c46947791f755e1faabbf7 SHA1 0de9f00ae58e67840fc2daab8973d37d97d78535 SHA256 7184c1f85fafce518e6dbccb5a64ba47a62d8694c7019da0e1c1e83ff98c3ff4 -DIST R-2.8.1.tar.gz 16585380 RMD160 1d12f8833a7b368d3cc06488172394ce4cb165ff SHA1 71e577dc061ff8720ce399471a75dea5b8fb1dab SHA256 ab488af73ce7a4f2057afcf0e725be96c9ae37f8721143004397b91928ecfa60 +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.0.ebuild 4182 RMD160 c0ad03b80bb065070b26bd504386ddd222f260a8 SHA1 53be2a68454b063902a424eb005bf7257565fb3c SHA256 4a214173bdfcfd4cf93471e6cde3d775da97a4da1a3875adb5eac1d61bb9c23e EBUILD R-2.10.1.ebuild 4082 RMD160 aeaf48d1ae29fc78b579f1840b4a188d999b56b6 SHA1 c6d13dabfbd809b2c28feaab8f43f4605e2d43cd SHA256 eb0f767993c6119ff0d76c1575d5e4a0915b37584705b53f49a5cbff91fbf579 -EBUILD R-2.7.2.ebuild 4161 RMD160 8f7d81c7c0ef8e1ae420c4f4a2ede0a67374fa71 SHA1 085e496bf1860d0512b6ae2318d1b1c5241a1fa1 SHA256 86dd31392cb0d553ee4dc814046537bfc9b7d0c6dcd01901e395babb298f964e -EBUILD R-2.8.1.ebuild 4091 RMD160 96bd9d8e773c3c624d60f99fa1a1b3c050f34dd4 SHA1 f1777c57a45174c8c05037cf721ff095afa9aad8 SHA256 ec5ff75f36216ca0121dbec9bcaa5421a637cf61cbdb46a21ae0d2e0cc59e7b5 +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 24912 RMD160 7c8a8c8d6809be04a7410ec10e368743500abe34 SHA1 3da27dfca3aee606173c78475395e112f8bddda3 SHA256 900b503f97738b394d04a5e40b5cf8d85fd20d0ebd68b28970d04b1e35f97d5a +MISC ChangeLog 25081 RMD160 6e103389e1191d7a524f09197273e402b018eb9e SHA1 caf233fd50bdb05a93d631c1d116fca9c590000c SHA256 536f8bfad647031e3238c1bfc9bd62ff35318017bd04eb6fa26c31e1235ae217 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvXi+kACgkQ1ycZbhPLE2BPNQCfY1R3kp/L/Gx+VN5GNdi+apgf +EKsAoI9yZQYI3YAU3BCbPnqlFwaHQ8Ts +=mKUb +-----END PGP SIGNATURE----- diff --git a/dev-lang/R/R-2.10.0.ebuild b/dev-lang/R/R-2.11.0.ebuild similarity index 84% rename from dev-lang/R/R-2.10.0.ebuild rename to dev-lang/R/R-2.11.0.ebuild index 99fa80cc7437..59ccb16f4e65 100644 --- a/dev-lang/R/R-2.10.0.ebuild +++ b/dev-lang/R/R-2.11.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.0.ebuild,v 1.2 2009/12/26 17:32:26 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.11.0.ebuild,v 1.1 2010/04/28 00:28:47 bicatali Exp $ EAPI=2 inherit eutils flag-o-matic bash-completion versionator @@ -42,10 +42,14 @@ RDEPEND="${CDEPEND} app-arch/zip java? ( >=virtual/jre-1.5 )" -R_HOME=/usr/$(get_libdir)/${PN} +RESTRICT="minimal? ( test )" + +R_DIR=/usr/$(get_libdir)/${PN} pkg_setup() { filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME } src_prepare() { @@ -58,7 +62,7 @@ src_prepare() { # fix Rscript sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_HOME}\"':" \ + -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ src/unix/Makefile.in || die "sed unix Makefile failed" # fix HTML links to manual (bug #273957) @@ -72,16 +76,15 @@ src_prepare() { export R_BROWSER="$(type -p xdg-open)" export R_PDFVIEWER="$(type -p xdg-open)" fi - use perl && export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" + use perl && \ + 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 \ @@ -103,7 +106,7 @@ src_configure() { src_compile(){ emake || die "emake failed" RMATH_V=0.0.0 - emake -j1 -C src/nmath/standalone \ + emake -C src/nmath/standalone \ libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \ || die "emake math library failed" if use doc; then @@ -112,12 +115,6 @@ src_compile(){ 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" @@ -128,7 +125,7 @@ src_install() { fi # standalone math lib install (-j1 basically harmless) - emake -j1 \ + emake \ -C src/nmath/standalone \ DESTDIR="${D}" install \ || die "emake install math library failed" @@ -141,14 +138,14 @@ src_install() { # env file cat > 99R <<-EOF - LDPATH=${R_HOME}/lib - R_HOME=${R_HOME} + LDPATH=${R_DIR}/lib + R_HOME=${R_DIR} EOF doenvd 99R || die "doenvd failed" dobashcompletion "${WORKDIR}"/R.bash_completion } -pkg_config() { +pkg_postinst() { if use java; then einfo "Re-initializing java paths for ${P}" R CMD javareconf diff --git a/dev-lang/R/R-2.7.2.ebuild b/dev-lang/R/R-2.7.2.ebuild deleted file mode 100644 index dc37efb32a6b..000000000000 --- a/dev-lang/R/R-2.7.2.ebuild +++ /dev/null @@ -1,159 +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.7.2.ebuild,v 1.13 2009/12/26 17:32:26 pva Exp $ - -EAPI=2 -inherit fortran 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 tk X cairo" - -# common depends -CDEPEND="dev-lang/perl - >=dev-libs/libpcre-7.3 - app-arch/bzip2 - virtual/blas - app-text/ghostscript-gpl - cairo? ( x11-libs/cairo[X] - || ( >=x11-libs/pango-1.20[X] 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.8.1.ebuild b/dev-lang/R/R-2.8.1.ebuild deleted file mode 100644 index 92bbbc789874..000000000000 --- a/dev-lang/R/R-2.8.1.ebuild +++ /dev/null @@ -1,157 +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.8.1.ebuild,v 1.12 2009/12/26 17:32:26 pva Exp $ - -EAPI=2 -inherit eutils fortran 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 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] 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 -} -- 2.26.2