From f0c8bc83a729f331a841830a1640e813a145255f Mon Sep 17 00:00:00 2001
From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Mon, 14 Dec 2009 22:13:38 +0000
Subject: Version bump (Portage version: 2.2_rc58/cvs/Linux x86_64)

---
 dev-lang/R/ChangeLog       |   8 ++-
 dev-lang/R/R-2.10.1.ebuild | 156 +++++++++++++++++++++++++++++++++++++++++++++
 dev-lang/R/R-2.9.1.ebuild  | 156 ---------------------------------------------
 3 files changed, 163 insertions(+), 157 deletions(-)
 create mode 100644 dev-lang/R/R-2.10.1.ebuild
 delete mode 100644 dev-lang/R/R-2.9.1.ebuild

(limited to 'dev-lang')

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index e267cd026b83..4c208c34ee51 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.165 2009/11/18 20:35:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.166 2009/12/14 22:13:38 bicatali Exp $
+
+*R-2.10.1 (14 Dec 2009)
+
+  14 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> -R-2.9.1.ebuild,
+  +R-2.10.1.ebuild:
+  Version bump
 
   18 Nov 2009; Brent Baude <ranger@gentoo.org> R-2.9.2.ebuild:
   Marking R-2.9.2 ppc64 for bug 289381
diff --git a/dev-lang/R/R-2.10.1.ebuild b/dev-lang/R/R-2.10.1.ebuild
new file mode 100644
index 000000000000..bfb5f143df88
--- /dev/null
+++ b/dev-lang/R/R-2.10.1.ebuild
@@ -0,0 +1,156 @@
+# 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.10.1.ebuild,v 1.1 2009/12/14 22:13:38 bicatali 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 perl png readline threads tk X cairo"
+
+# common depends
+CDEPEND="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 ) )
+	jpeg? ( media-libs/jpeg )
+	lapack? ( virtual/lapack )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	readline? ( sys-libs/readline )
+	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
+	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 \
+		--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/R-2.9.1.ebuild b/dev-lang/R/R-2.9.1.ebuild
deleted file mode 100644
index 585db11d034a..000000000000
--- a/dev-lang/R/R-2.9.1.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.1.ebuild,v 1.3 2009/08/07 17:18:52 bicatali 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
-	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() {
-	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
-}
-- 
cgit v1.2.3-65-gdbad