diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2009-08-07 17:18:52 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-08-07 17:18:52 +0000 |
commit | 415b8aec1e73522c4867884787b70fda76380f8c (patch) | |
tree | fd9a41c3f14dfb9140aa1c5c889119eeae18374f /dev-lang | |
parent | Fix dependencies. Remove old version. (diff) | |
download | historical-415b8aec1e73522c4867884787b70fda76380f8c.tar.gz historical-415b8aec1e73522c4867884787b70fda76380f8c.tar.bz2 historical-415b8aec1e73522c4867884787b70fda76380f8c.zip |
Fixed perl 5 path, thanks to Guenther Brunthaler, closing bug #278258
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/R/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lang/R/Manifest | 17 | ||||
-rw-r--r-- | dev-lang/R/R-2.7.2.ebuild | 3 | ||||
-rw-r--r-- | dev-lang/R/R-2.8.1.ebuild | 3 | ||||
-rw-r--r-- | dev-lang/R/R-2.9.0.ebuild | 160 | ||||
-rw-r--r-- | dev-lang/R/R-2.9.1.ebuild | 3 | ||||
-rw-r--r-- | dev-lang/R/files/R-2.9.0-without-x.patch | 11 |
7 files changed, 19 insertions, 185 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 6f6d257731e2..021e140bc39e 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/R # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.155 2009/07/16 06:14:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.156 2009/08/07 17:18:52 bicatali Exp $ + + 07 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.7.2.ebuild, + R-2.8.1.ebuild, -R-2.9.0.ebuild, -files/R-2.9.0-without-x.patch, + R-2.9.1.ebuild: + Fixed perl 5 path, thanks to Guenther Brunthaler, closing bug #278258 16 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.9.1.ebuild: Added symlinking for docs, thanks to Martin von Gagern, closing bug diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 80e6cca9144f..6a07f5f229dd 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -2,23 +2,20 @@ Hash: SHA1 AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91 -AUX R-2.9.0-without-x.patch 398 RMD160 6b4afb6104ebb7af04eafed4eaee7b33857b751d SHA1 acd4dd9a690b310be523bb48ba18d009366ea1a4 SHA256 8922b64fb8d96df30942fa9f58ed44d1be97bb3542bbb3f7a0a32483a3f6b886 AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1 0af91b826b969afb54462569cc210b8d16b0d482 SHA256 1667dc70b39197e1b77fbaab74a5fce078067f43da248d650a84d4cf494b15bd 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.9.0.tar.gz 18423754 RMD160 90c9b42d7e8f3c78fa3442690dedb23c10d9a294 SHA1 97c610b31113db27999cf615d4182d68c8602a4f SHA256 f2de4b710feabf0395ee3503befc69332b78ed6b159e959e93bc086a1a8ad818 DIST R-2.9.1.tar.gz 18620921 RMD160 cdce66673d301555c3a4c128283b456b85d9dcaa SHA1 59bcc4e775db5c681aefbfafe9fc357bc99e1fad SHA256 ef981c88b1632bef3359bc3755eed7f7eb38b2fca37e0443e64eb95162d3985a DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 -EBUILD R-2.7.2.ebuild 4095 RMD160 a3d0682264de76235fc075cc831dc94ea8bb6e35 SHA1 f57dbf820ce4fd90df764e53bd794424a34f8990 SHA256 7e3527174e4ebd6d76dce92a1402ab5010b1a8201f08520e198c7fc246caf330 -EBUILD R-2.8.1.ebuild 4025 RMD160 c7dcca9bef2ca9bb058100d993990172a4027acc SHA1 752ef4f4e16ed3632f82666ba29289d7d6c265c7 SHA256 0f6d7cd1edc38b314cf4db9f0efb10409fe710360c5c7203075c2752882aacc9 -EBUILD R-2.9.0.ebuild 4157 RMD160 51f0d7e43d39275ee684701352913005de5e142f SHA1 82772538ac5342c43a9465767620be4df04f977c SHA256 9f06728f16aa72f9d6c41340f40ee756deda4b7e1687b4b80cb11b53c6ece83e -EBUILD R-2.9.1.ebuild 4093 RMD160 c366185cdd43ccdff8f5c8260d2c3a0a34a5554d SHA1 dbe9c7161f3b8a61ff6e88ecfeef85f55e3116e3 SHA256 a311e57a5ccddbb2f1642be824c2fa641f0fcce27dbd83023ae366660b34321b -MISC ChangeLog 22851 RMD160 5a8e7c9f29a24192ca3e7155b5e6d958f13ca658 SHA1 a5c5f01f570d5307fa4f62e5f673dbdb4327f514 SHA256 64748bdd15ac9f92afbfea429ce4b28a113c0e612372c3f26f7171fc62f3cd79 +EBUILD R-2.7.2.ebuild 4161 RMD160 da607b0384b0e21a94f6aa70cd82d1958d7bd521 SHA1 dea7d9b9bf835ba32c983187f4666b1839867be5 SHA256 6c7b080500c7a6eebc121428fa0b77c811d2b74deb7de50813398f0cadeca721 +EBUILD R-2.8.1.ebuild 4091 RMD160 a08f808836139f5a4a8dfdadd3c097370fdb59d1 SHA1 2129de504986407e167e721a3492d3e916e33c40 SHA256 a4591dd44623cc94725c7a6eec3d38e505d1eb8f3478fefdc7698bd83df2b3fa +EBUILD R-2.9.1.ebuild 4154 RMD160 e9f8d43330e405b5245cd68d4cd6a1e7bb196215 SHA1 d3b5634fca66ebe9ffd45868f9b091cf799bc7f9 SHA256 4e16cc754911cff3c61df9d7e0e40d0fd82b3db0b494cdb6b92fb40a061efd4e +MISC ChangeLog 23080 RMD160 0636753fc6334a5267f57db98a6ebdc5fe52ba8e SHA1 efcde4c880e8a7a9edfcce10175e5860f32f1295 SHA256 a08b2cdf310f07fca411edad875a86e12ecb06bd333d39e05b046afc92500dc9 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkpexT0ACgkQ1ycZbhPLE2BePQCgsCn5VZpnrAsZkOxMtEviIGl6 -BN4An2wJt6muh4F60MZMkAzOb6HZ2f5D -=Oyq0 +iEYEARECAAYFAkp8YgYACgkQ1ycZbhPLE2AHoQCfWg6jZohLlSJa5ZVHE/0kiwPx +zBkAoJGKf0PoM2csvXx2oXrNqVr6D8ct +=GHtx -----END PGP SIGNATURE----- diff --git a/dev-lang/R/R-2.7.2.ebuild b/dev-lang/R/R-2.7.2.ebuild index 2536b8e2ab7e..77f0be26bfc6 100644 --- a/dev-lang/R/R-2.7.2.ebuild +++ b/dev-lang/R/R-2.7.2.ebuild @@ -1,6 +1,6 @@ # 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.11 2009/05/30 08:30:27 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.2.ebuild,v 1.12 2009/08/07 17:18:52 bicatali Exp $ EAPI=2 inherit fortran flag-o-matic bash-completion versionator @@ -56,6 +56,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-javareconf.patch epatch "${FILESDIR}"/${PN}-2.7.1-test-fix.patch + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" } src_test() { diff --git a/dev-lang/R/R-2.8.1.ebuild b/dev-lang/R/R-2.8.1.ebuild index 9e1b1c661996..bd2c05ae0a4a 100644 --- a/dev-lang/R/R-2.8.1.ebuild +++ b/dev-lang/R/R-2.8.1.ebuild @@ -1,6 +1,6 @@ # 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.10 2009/05/30 08:30:27 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.8.1.ebuild,v 1.11 2009/08/07 17:18:52 bicatali Exp $ EAPI=2 inherit eutils fortran flag-o-matic bash-completion versionator @@ -74,6 +74,7 @@ src_prepare() { export R_BROWSER="$(type -p xdg-open)" export R_PDFVIEWER="$(type -p xdg-open)" fi + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" } src_configure() { diff --git a/dev-lang/R/R-2.9.0.ebuild b/dev-lang/R/R-2.9.0.ebuild deleted file mode 100644 index d21ccd67828b..000000000000 --- a/dev-lang/R/R-2.9.0.ebuild +++ /dev/null @@ -1,160 +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.0.ebuild,v 1.3 2009/07/07 19:47:58 bicatali 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 threads tk X cairo" - -# common depends -CDEPEND="dev-lang/perl - dev-libs/libpcre - app-arch/bzip2 - virtual/blas - virtual/ghostscript - 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() { - FORTRAN="gfortran ifc g77" - fortran_pkg_setup - export FFLAGS="${FFLAGS:--O2}" - [[ ${FORTRANC} = gfortran || ${FORTRANC} = if* ]] && \ - export FCFLAGS="${FCFLAGS:-${FFLAGS}}" - filter-ldflags -Wl,-Bdirect -Bdirect -} - -src_prepare() { - - # fix empty loop for option -without-x (bug #268362) - epatch "${FILESDIR}"/${PN}-2.9.0-without-x.patch - - # 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" - - 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 -} - -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" - 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/R-2.9.1.ebuild b/dev-lang/R/R-2.9.1.ebuild index 3eaa960eb823..585db11d034a 100644 --- a/dev-lang/R/R-2.9.1.ebuild +++ b/dev-lang/R/R-2.9.1.ebuild @@ -1,6 +1,6 @@ # 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.1.ebuild,v 1.2 2009/07/16 06:14:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.1.ebuild,v 1.3 2009/08/07 17:18:52 bicatali Exp $ EAPI=2 inherit eutils flag-o-matic bash-completion versionator @@ -72,6 +72,7 @@ src_prepare() { export R_BROWSER="$(type -p xdg-open)" export R_PDFVIEWER="$(type -p xdg-open)" fi + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" } src_configure() { diff --git a/dev-lang/R/files/R-2.9.0-without-x.patch b/dev-lang/R/files/R-2.9.0-without-x.patch deleted file mode 100644 index 1d92ad0b7c31..000000000000 --- a/dev-lang/R/files/R-2.9.0-without-x.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- R-2.9.0/src/modules/Makefile.in.orig 2009-03-20 02:05:31.000000000 +0300 -+++ R-2.9.0/src/modules/Makefile.in 2009-05-03 00:25:38.000000000 +0400 -@@ -24,7 +24,7 @@ - @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - R: Makefile make.internet make.lapack make.vfonts -- @for d in "$(R_MODULES)"; do \ -+ @for d in $(R_MODULES); do \ - (cd $${d} && $(MAKE) $@) || exit 1; \ - done - |