From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BB88138330 for ; Mon, 12 Sep 2016 19:47:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4781CE0852; Mon, 12 Sep 2016 19:47:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1430EE0852 for ; Mon, 12 Sep 2016 19:47:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CB8C340A9D for ; Mon, 12 Sep 2016 19:47:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB86A2471 for ; Mon, 12 Sep 2016 19:47:51 +0000 (UTC) From: "Denis Dupeyron" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Denis Dupeyron" Message-ID: <1473709609.8b1e2a2a81492a97874b0b86f301aeda2af1df66.calchan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/R/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/R/R-3.2.5.ebuild dev-lang/R/R-3.3.0.ebuild X-VCS-Directories: dev-lang/R/ X-VCS-Committer: calchan X-VCS-Committer-Name: Denis Dupeyron X-VCS-Revision: 8b1e2a2a81492a97874b0b86f301aeda2af1df66 X-VCS-Branch: master Date: Mon, 12 Sep 2016 19:47:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d3057f28-326a-4312-8681-d30a3221af36 X-Archives-Hash: 965180f27ef2a854766a662f36bdc76a commit: 8b1e2a2a81492a97874b0b86f301aeda2af1df66 Author: Denis Dupeyron gentoo org> AuthorDate: Mon Sep 12 19:46:49 2016 +0000 Commit: Denis Dupeyron gentoo org> CommitDate: Mon Sep 12 19:46:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1e2a2a dev-lang/R: remove 3.2.5 and 3.3.0 dev-lang/R/R-3.2.5.ebuild | 206 ---------------------------------------------- dev-lang/R/R-3.3.0.ebuild | 203 --------------------------------------------- 2 files changed, 409 deletions(-) diff --git a/dev-lang/R/R-3.2.5.ebuild b/dev-lang/R/R-3.2.5.ebuild deleted file mode 100644 index c8227c9..00000000 --- a/dev-lang/R/R-3.2.5.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - >=dev-libs/libpcre-8.35:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - >=sys-libs/zlib-1.2.5.1-r2:0[minizip] - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone \ - shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/NEWS.rds -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-3.3.0.ebuild b/dev-lang/R/R-3.3.0.ebuild deleted file mode 100644 index c7a578a..00000000 --- a/dev-lang/R/R-3.3.0.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs - -BCP=${PN}-20130129.bash_completion -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="http://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-3/${P}.tar.gz - https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" -REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" - -CDEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - >=dev-libs/libpcre-8.35:3= - virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) - cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) - icu? ( dev-libs/icu:= ) - jpeg? ( virtual/jpeg:0 ) - lapack? ( virtual/lapack:0 ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - readline? ( sys-libs/readline:0= ) - tiff? ( media-libs/tiff:0= ) - tk? ( dev-lang/tk:0= ) - X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - )" - -RDEPEND="${CDEPEND} - >=sys-libs/zlib-1.2.5.1-r2:0[minizip] - java? ( >=virtual/jre-1.5 )" - -RESTRICT="minimal? ( test )" - -R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME - # Temporary fix for bug #419761 - if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then - append-flags -fno-ipa-cp-clone - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ - "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ - "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch - - # fix packages.html for doc (gentoo bug #205103) - sed -i \ - -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -i \ - -e 's:\.\./manual/:manual/:g' \ - $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" - - use lapack && \ - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - - if use X; then - export R_BROWSER="$(type -p xdg-open)" - export R_PDFVIEWER="$(type -p xdg-open)" - fi - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" - - # don't search /usr/local - sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die - # Fix for Darwin (OS X) - if use prefix; then - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ - -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ - -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ - -e "/SHLIB_EXT/s/\.so/.dylib/" \ - configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ - src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 eaclocal - eautoconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable java) \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(use_with cairo) \ - $(use_with icu ICU) \ - $(use_with jpeg jpeglib) \ - $(use_with lapack) \ - $(use_with !minimal recommended-packages) \ - $(use_with png libpng) \ - $(use_with readline) \ - $(use_with tiff libtiff) \ - $(use_with tk tcltk) \ - $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ - $(use_with X x) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - emake AR="$(tc-getAR)" - emake -C src/nmath/standalone \ - shared $(use static-libs && echo static) AR="$(tc-getAR)" - use doc && emake info pdf -} - -src_install() { - default - emake -j1 -C src/nmath/standalone DESTDIR="${D}" install - - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - cat > 99R <<-EOF - LDPATH=${R_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - newbashcomp "${WORKDIR}"/${BCP} ${PN} - # The buildsystem has a different understanding of install_names than - # we require. Since it builds modules like shared objects (wrong), many - # objects (all modules) get an incorrect install_name. Fixing the build - # system here is not really trivial. - if [[ ${CHOST} == *-darwin* ]] ; then - local mod - pushd "${ED}"/usr/lib/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - docompress -x /usr/share/doc/${PF}/{BioC_mirrors.csv,CRAN_mirrors.csv,KEYWORDS.db,NEWS.rds} -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -}