Version Bump, #391045, cleaned old, moved to bashcompletion-r1.eclass, sorted minor things in ebuild (adopt changes in between versions)

Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64

8 files changed, 114 insertions, 259 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index bdb3e34b3029..b9377126b3bd 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.190 2011/10/17 15:34:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.191 2011/11/21 16:22:52 jlec Exp $
+
+*R-2.14.0 (21 Nov 2011)
+
+  21 Nov 2011; Justin Lecher <jlec@gentoo.org> R-2.10.1.ebuild,
+  -R-2.12.1.ebuild, -R-2.12.2.ebuild, R-2.13.0.ebuild, R-2.13.1-r1.ebuild,
+  +R-2.14.0.ebuild, metadata.xml:
+  Version Bump, #391045, cleaned old, moved to bashcompletion-r1.eclass, sorted
+  minor things in ebuild (adopt changes in between versions)
 
   17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> R-2.10.1.ebuild:
   Fix building with libpng15 wrt #366223. Fix building with sys-libs/zlib >=
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index fcef862668e6..d28ea1d536ab 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,30 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX R-2.11.1-parallel.patch 488 RMD160 d693776b4650bc151f977f7c75234e582ad379c1 SHA1 02ea92a7ef3c2b87a9b1f3c929cb8eb828cd06db SHA256 d17c52fcda732908954aa4bbf690085402a4027ef905bc456e5101602e2bcf4f
 AUX R-2.12.1-ldflags.patch 526 RMD160 d54e94d5c1d621821d5b0ff5d8ea789a153259eb SHA1 5cfbec92afaa164aa28fc28def531b26b2e8e428 SHA256 1af5dcdba86a915b7f6dc67d81afb71959adeca1a305890c3b7e0666b7537546
 AUX R-2.13.1-zlib_header_fix.patch 383 RMD160 a90c76bd42a86d972ba59e38b98e60222aa5e807 SHA1 1a10ce2ff0d357b9b2eb7c6512a0a12a954aec4c SHA256 e9ebeebcffbef51219537dd18a57d2764099a01999336c5a9e76030d17d1c72e
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
-DIST R-2.12.1.tar.gz 20806432 RMD160 a083689dc6785cd8072461f30ce4a7969fc7ec91 SHA1 41f443cd646f7773bd824c41ea53cac3102b428d SHA256 74475d73f145d25c1e121dac9e4f18eaa077510b9e58d514cc6ae523382dee3f
-DIST R-2.12.2.tar.gz 21120720 RMD160 0f835e1f3433f2e2916b784089843a7fe8f47f23 SHA1 dbdc46edbab2dbbdc115b7247f80da5fee3dd912 SHA256 869ac219844671e4139aa4ddf5a272c27e26b1250bc427af3877fb237a5a9dbb
 DIST R-2.13.0.tar.gz 21832899 RMD160 5fc0bbdbdc0f6520e0da68ef7a17a4f3780bf9cb SHA1 878510e8a5fa1ccd1e0c4af5866f5416f3c27469 SHA256 559213ff05a205b9d2ad7ac7abebf477fb87c1bb3f0b03febbff5aa6bd8ab811
 DIST R-2.13.1.tar.gz 22063747 RMD160 3d83b907f6c81980a7e65bdf942936d6ce02a850 SHA1 8b9d48c7a654186064f369652ea34a085eff239b SHA256 ded5f39bc5130ff58a53d361435e0fee818ebec6c2aacc976ab625a3adf9bc51
+DIST R-2.14.0.tar.gz 22675106 RMD160 f2f2805c8660d58050be1d11abf376843dbb40ea SHA1 0f46bf75a7c150350b1142c29a98e7994d2b4bef SHA256 036204f56f8128e633a5d2fe56ebe0ba5a5e8501abe2056736d12a99bf69b910
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
-EBUILD R-2.10.1.ebuild 4498 RMD160 72d270e846311fa090ffddfa9b042bc1b5f6cf32 SHA1 68767a818c647dffb55dab4e8e0499549cb22ade SHA256 5d13b703ba12a24e8140b951f7778e372f6b4eeeb64c306d8afa5d3df1ffc14f
-EBUILD R-2.12.1.ebuild 4385 RMD160 81af44c3035c7899473ac738e42a5b97422b8f33 SHA1 94d0659a9699fb0ab8a7bc32953a4bddb2d009a9 SHA256 81800f7f7e830b538658c24786ca2399b91c8bcc5aac162ee695476d50b8778e
-EBUILD R-2.12.2.ebuild 4583 RMD160 e3c0375b59748c342890ba9596d26ea699d69131 SHA1 87ed3a582f3c28af2b6f2dc9d8ce916b85128531 SHA256 393404dacad782b923d2b0d571701db926dbad782fb6b84e7fc2811ce52d659b
-EBUILD R-2.13.0.ebuild 4593 RMD160 966aad7953bf32940bb6431c82918c3572e8c01e SHA1 ddff14f5a6080e58af0c1f38e04f331d84688dcf SHA256 8d6b1676a7eb5e86460bd330c3c4c76977a9ccd7e8d4cae97c1aaa1661ef588d
-EBUILD R-2.13.1-r1.ebuild 5161 RMD160 1879836a7ccca78b7b6b54ef5b205d2ea7da948c SHA1 e06caf3d2fb5caba19972b04936392cf367bb87f SHA256 6d9b955768e0f2ff6a4510010de199acd600f03de6749dca2d3a879f013935b3
-MISC ChangeLog 27734 RMD160 1a9d1670bd200fa786d52c7492cd6cfa4c7e16ee SHA1 120279414bddc1ee8e6724932867937a87c6c95c SHA256 ba0ffece46770115ffda0a2dfa3e249e146a9991246d37e6c0251b7fdf2551f1
-MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
+EBUILD R-2.10.1.ebuild 4514 RMD160 7f170bfc025de21298d01f6b44ac3714605146fd SHA1 2a4d80e1e2ab22e2b3bfa2e910770185b81ee584 SHA256 86e6ab59bf58155d0dc313ecc3a07281b471074b3a178058c96fa8e4e3e3dea8
+EBUILD R-2.13.0.ebuild 4626 RMD160 2ef50a8dbc79e5a9d08a022680ce46baa3b72d73 SHA1 db9b97944db6b9ecac54d6ed981afd09b8df21a8 SHA256 6f8a2bfb4727b61a25ca88ea2015a7df64f174d43621ca73c991a45b701f85b5
+EBUILD R-2.13.1-r1.ebuild 5212 RMD160 008478c437ba1ba9114395f74f956eab6ac27e9c SHA1 c9e4e60135ca20de1bf74629bd9e36c5ed7e5a36 SHA256 a12df8ea7069b04dd449cd22eaa612d2943029c4897c084039827b675c54d9a1
+EBUILD R-2.14.0.ebuild 5208 RMD160 bd8c96266667590b821191384cb020ebd34230a6 SHA1 cadcbf97d5b1c3321b8438fe6892fa6d892d664c SHA256 46f8c40e1a085168254d0a87a93f4575198844c08a03fe012e217f27d0ff6ddd
+MISC ChangeLog 28069 RMD160 927123887d133656bd27be7394de3e8ff629ee47 SHA1 b5ff47422f38b34742f0d78f874035ffd59bb62f SHA256 6f105f47bb4320aadad130ace496d9e9ca7866ac5b97810a9fdcebf9bc4173b3
+MISC metadata.xml 1033 RMD160 d200586401de4f212758a5632040059b86cebe79 SHA1 7e6e9da0f5fe1f39a440ecdb298775685f14bb31 SHA256 c0e2a21f7e4e5eeadfd2502b7d035633b81a8f0228e4986758fb0f45990ec016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOnEraAAoJEEdUh39IaPFNtrYH/AmzzT4fk7jv40W5ypGw6Pcp
-wNRqriOF62ay4vdfUzwgyyQrsNLY2LMCPhkCD6E5JtBtjuHMMQiH95eRduxovqGL
-NbRtO80ID0QXA0eFesHiXYGS+7Mmgt3Bz/cVk3f7p2hPBw5a1dyge4GCCJ6IWx4I
-VuEa3DgRYEjRZ/cyeAyriyXdrO6VlvdSQVNgHbM5wGWG082qxNUDfjbhEOIBFzj7
-JYVkimDmAPUZIrOQtP/8K3KO5s/Lv0BeulUE5QPIBn0iSGUsRmPy7jYKQTS2c1Uq
-I+N0VfCl48ZVJ1r8t8FdFUUHhxxHg2ltFTRhJDt+La7EKJaQ1YivRliTg9Cpafg=
-=vd3U
+iEYEAREKAAYFAk7KeuMACgkQgAnW8HDreRYRbQCgptWgYOE7qSzZ6SCxJq2uUAcr
+nxoAoMLAWTEajmBCP4Dw1GBq917tSOcd
+=tlg2
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.10.1.ebuild b/dev-lang/R/R-2.10.1.ebuild
index 03f3516b739f..faea2ca51f45 100644
--- a/dev-lang/R/R-2.10.1.ebuild
+++ b/dev-lang/R/R-2.10.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.14 2011/10/17 15:34:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.15 2011/11/21 16:22:52 jlec Exp $
 
 EAPI=2
 
-inherit bash-completion eutils flag-o-matic fortran-2 versionator
+inherit bash-completion-r1 eutils flag-o-matic fortran-2 versionator
 
 DESCRIPTION="Language and environment for statistical computing and graphics"
 HOMEPAGE="http://www.r-project.org/"
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
-IUSE="cairo doc java jpeg lapack minimal nls perl png readline threads tk X"
+IUSE="bash-completion cairo doc java jpeg lapack minimal nls perl png readline threads tk X"
 
 # common depends
 CDEPEND="
@@ -27,7 +27,7 @@ CDEPEND="
 	virtual/fortran
 	cairo? (
 		x11-libs/cairo[X]
-		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+		>=x11-libs/pango-1.20[X] )
 	jpeg? ( virtual/jpeg )
 	lapack? ( virtual/lapack )
 	perl? ( dev-lang/perl )
@@ -39,9 +39,9 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-		)"
+			virtual/latex-base
+			dev-texlive/texlive-fontsrecommended
+		   )"
 
 RDEPEND="${CDEPEND}
 	app-arch/unzip
@@ -68,12 +68,14 @@ src_prepare() {
 		|| die "sed failed"
 
 	# fix Rscript
-	sed -i \
+	sed \
 		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
+		-i 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) \
+	sed \
+		-e 's:\.\./manual/:manual/:g' \
+		-i $(grep -Flr ../manual/ doc) \
 		|| die "sed for HTML links to manual failed"
 
 	# Fix compability with zlib-1.2.5.1-r1 OF change
@@ -161,7 +163,7 @@ src_install() {
 		R_HOME=${R_DIR}
 	EOF
 	doenvd 99R || die "doenvd failed"
-	dobashcompletion "${WORKDIR}"/R.bash_completion
+	use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion
 }
 
 pkg_config() {
diff --git a/dev-lang/R/R-2.12.1.ebuild b/dev-lang/R/R-2.12.1.ebuild
deleted file mode 100644
index bd7afcc0a362..000000000000
--- a/dev-lang/R/R-2.12.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.12.1.ebuild,v 1.5 2011/10/05 19:20:04 aballier Exp $
-
-EAPI=2
-
-inherit bash-completion eutils flag-o-matic fortran-2 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="cairo doc java jpeg lapack minimal nls perl png profile readline static-libs threads tk X"
-
-# common depends
-CDEPEND="
-	app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	virtual/fortran
-	cairo? (
-		x11-libs/cairo[X]
-		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
-	jpeg? ( virtual/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
-		)"
-
-RDEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR=/usr/$(get_libdir)/${PN}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-}
-
-src_prepare() {
-	# fix ocasional failure with parallel install (bug #322965)
-	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
-	# respect ldflags on rscript
-	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.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_DIR}\"':" \
-		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 \
-		--enable-R-shlib \
-		--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 profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(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(){
-	export VARTEXFONTS="${T}/fonts"
-	emake || die "emake failed"
-	RMATH_V=0.0.0
-	emake -C src/nmath/standalone \
-		libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \
-		|| die "emake math library failed"
-	if use doc; then
-		emake info pdf || die "emake docs failed"
-	fi
-}
-
-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 \
-		-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_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R || die "doenvd failed"
-	dobashcompletion "${WORKDIR}"/R.bash_completion
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-2.13.0.ebuild b/dev-lang/R/R-2.13.0.ebuild
index daa0941b73cf..5a5833333c14 100644
--- a/dev-lang/R/R-2.13.0.ebuild
+++ b/dev-lang/R/R-2.13.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.0.ebuild,v 1.2 2011/10/05 19:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.0.ebuild,v 1.3 2011/11/21 16:22:52 jlec Exp $
 
 EAPI=4
 
-inherit bash-completion eutils flag-o-matic fortran-2 versionator
+inherit bash-completion-r1 eutils flag-o-matic fortran-2 versionator
 
 DESCRIPTION="Language and environment for statistical computing and graphics"
 HOMEPAGE="http://www.r-project.org/"
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X"
+IUSE="bash-completion cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X"
 
 # common depends
 CDEPEND="
@@ -24,10 +24,10 @@ CDEPEND="
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
 	virtual/blas
-	virtual/fortran[openmp?]
+	virtual/fortran
 	cairo? (
 		x11-libs/cairo[X]
-		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+		>=x11-libs/pango-1.20[X] )
 	jpeg? ( virtual/jpeg )
 	lapack? ( virtual/lapack )
 	perl? ( dev-lang/perl )
@@ -39,9 +39,9 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-		)"
+			virtual/latex-base
+			dev-texlive/texlive-fontsrecommended
+		   )"
 
 RDEPEND="${CDEPEND}
 	app-arch/unzip
@@ -51,7 +51,7 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="minimal? ( test )"
 
-R_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+R_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}"
 
 pkg_setup() {
 	if use openmp; then
@@ -161,7 +161,7 @@ src_install() {
 		R_HOME=${R_DIR}
 	EOF
 	doenvd 99R || die "doenvd failed"
-	dobashcompletion "${WORKDIR}"/R.bash_completion
+	use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion
 }
 
 pkg_postinst() {
@@ -169,4 +169,5 @@ pkg_postinst() {
 		einfo "Re-initializing java paths for ${P}"
 		R CMD javareconf
 	fi
+	bash-completion-r1_pkg_postinst
 }
diff --git a/dev-lang/R/R-2.13.1-r1.ebuild b/dev-lang/R/R-2.13.1-r1.ebuild
index 4e15f1050fdd..f861b046663d 100644
--- a/dev-lang/R/R-2.13.1-r1.ebuild
+++ b/dev-lang/R/R-2.13.1-r1.ebuild
@@ -1,30 +1,31 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1-r1.ebuild,v 1.2 2011/10/05 19:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1-r1.ebuild,v 1.3 2011/11/21 16:22:52 jlec Exp $
 
 EAPI=4
 
-inherit bash-completion eutils flag-o-matic fortran-2 versionator
+inherit bash-completion-r1 eutils flag-o-matic fortran-2 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
+SRC_URI="
+	mirror://cran/src/base/R-2/${P}.tar.gz
 	bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )"
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X"
+IUSE="bash-completion cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X"
 
 # common depends
-CDEPEND="app-arch/bzip2
+CDEPEND="
+	app-arch/bzip2
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
 	|| ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 sys-freebsd/freebsd-lib )
 	virtual/blas
-	cairo? ( x11-libs/cairo[X]
-		>=x11-libs/pango-1.20[X] )
+	cairo? ( x11-libs/cairo[X] )
 	jpeg? ( virtual/jpeg )
 	lapack? ( virtual/lapack )
 	perl? ( dev-lang/perl )
@@ -35,8 +36,9 @@ CDEPEND="app-arch/bzip2
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
-	doc? ( virtual/latex-base
-		   dev-texlive/texlive-fontsrecommended
+	doc? (
+			virtual/latex-base
+			dev-texlive/texlive-fontsrecommended
 		   )"
 
 RDEPEND="${CDEPEND}
@@ -46,7 +48,7 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="minimal? ( test )"
 
-R_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+R_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}"
 
 pkg_setup() {
 	if use openmp; then
@@ -88,12 +90,14 @@ src_prepare() {
 		|| die "sed failed"
 
 	# fix Rscript
-	sed -i \
+	sed \
 		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
+		-i 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) \
+	sed \
+		-e 's:\.\./manual/:manual/:g' \
+		-i $(grep -Flr ../manual/ doc) \
 		|| die "sed for HTML links to manual failed"
 
 	use lapack && \
@@ -116,8 +120,8 @@ src_configure() {
 		--with-system-pcre \
 		--with-system-xz \
 		--with-blas="$(pkg-config --libs blas)" \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		rdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable openmp) \
 		$(use_enable nls) \
 		$(use_enable profile R-profiling) \
@@ -169,7 +173,7 @@ src_install() {
 		R_HOME=${R_DIR}
 	EOF
 	doenvd 99R
-	dobashcompletion "${WORKDIR}"/R.bash_completion
+	use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion
 }
 
 pkg_postinst() {
@@ -177,4 +181,5 @@ pkg_postinst() {
 		einfo "Re-initializing java paths for ${P}"
 		R CMD javareconf
 	fi
+	bash-completion-r1_pkg_postinst
 }
diff --git a/dev-lang/R/R-2.12.2.ebuild b/dev-lang/R/R-2.14.0.ebuild
index fcd5667ffcef..30f7289d0d95 100644
--- a/dev-lang/R/R-2.12.2.ebuild
+++ b/dev-lang/R/R-2.14.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.12.2.ebuild,v 1.4 2011/10/05 19:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.0.ebuild,v 1.1 2011/11/21 16:22:52 jlec Exp $
 
-EAPI=3
+EAPI=4
 
-inherit bash-completion eutils flag-o-matic fortran-2 versionator
+inherit bash-completion-r1 eutils flag-o-matic fortran-2 versionator
 
 DESCRIPTION="Language and environment for statistical computing and graphics"
 HOMEPAGE="http://www.r-project.org/"
@@ -12,22 +12,19 @@ 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"
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="cairo doc java jpeg lapack minimal nls perl png profile readline static-libs tk X"
+IUSE="bash-completion cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X"
 
 # common depends
 CDEPEND="
 	app-arch/bzip2
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
+	|| ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 sys-freebsd/freebsd-lib )
 	virtual/blas
-	virtual/fortran
-	cairo? (
-		x11-libs/cairo[X]
-		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+	cairo? ( x11-libs/cairo[X] )
 	jpeg? ( virtual/jpeg )
 	lapack? ( virtual/lapack )
 	perl? ( dev-lang/perl )
@@ -39,20 +36,24 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-		)"
+			virtual/latex-base
+			dev-texlive/texlive-fontsrecommended
+		   )"
 
 RDEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/zip
+	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	app-arch/xz-utils
 	java? ( >=virtual/jre-1.5 )"
 
 RESTRICT="minimal? ( test )"
 
-R_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+R_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}"
 
 pkg_setup() {
+	if use openmp; then
+		FORTRAN_NEED_OPENMP=1
+		tc-has-openmp || die "Please enable openmp support in your compiler"
+	fi
 	fortran-2_pkg_setup
 	filter-ldflags -Wl,-Bdirect -Bdirect
 	# avoid using existing R installation
@@ -61,19 +62,30 @@ pkg_setup() {
 
 src_prepare() {
 	# fix ocasional failure with parallel install (bug #322965)
-	# upstream in R-12.3?
+	# upstream in R-2.13?
 	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
 	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
 	# respect ldflags on rscript
 	# upstream does not want it, no reasons given
 	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
 	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
+	# update for zlib header changes (see bug #383431)
+	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
+
+	# glibc 2.14 removed rpc
+	if has_version '>=net-libs/libtirpc-0.2.2-r1'; then
+		append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags)
+		export LIBS+=" $($(tc-getPKG_CONFIG) libtirpc --libs)"
+		# patching configure.ac would cause way too much work
+		# ugly hack on configure and let upstream do the job
+		sed -i -e "s/'' nsl;/'' tirpc;/" configure || die
+	fi
 
 	# 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 \
+		src/library/tools/R/Rd.R \
 		|| die "sed failed"
 
 	# fix Rscript
@@ -98,13 +110,16 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--enable-byte-compiled-packages \
 		--enable-R-shlib \
 		--with-system-zlib \
 		--with-system-bzlib \
 		--with-system-pcre \
+		--with-system-xz \
 		--with-blas="$(pkg-config --libs blas)" \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		rdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable openmp) \
 		$(use_enable nls) \
 		$(use_enable profile R-profiling) \
 		$(use_enable profile memory-profiling) \
@@ -122,30 +137,26 @@ src_configure() {
 
 src_compile(){
 	export VARTEXFONTS="${T}/fonts"
-	emake || die "emake failed"
+	emake
 	RMATH_V=0.0.0
 	emake -C src/nmath/standalone \
-		libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \
-		|| die "emake math library failed"
-	if use doc; then
-		emake info pdf || die "emake docs failed"
-	fi
+		libRmath_la_LDFLAGS="-Wl,-soname,libRmath.so.${RMATH_V}" \
+		libRmath_la_LIBADD="\$(LIBM)" \
+		shared $(use static-libs && echo static)
+	use doc && emake info pdf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
+	default
 	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
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
 	fi
 
 	# standalone math lib install (-j1 basically harmless)
 	emake \
 		-C src/nmath/standalone \
-		DESTDIR="${D}" install \
-		|| die "emake install math library failed"
+		DESTDIR="${D}" install
 
 	local mv=$(get_major_version ${RMATH_V})
 	mv  "${ED}"/usr/$(get_libdir)/libRmath.so \
@@ -158,8 +169,8 @@ src_install() {
 		LDPATH=${R_DIR}/lib
 		R_HOME=${R_DIR}
 	EOF
-	doenvd 99R || die "doenvd failed"
-	dobashcompletion "${WORKDIR}"/R.bash_completion
+	doenvd 99R
+	use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion
 }
 
 pkg_postinst() {
@@ -167,4 +178,5 @@ pkg_postinst() {
 		einfo "Re-initializing java paths for ${P}"
 		R CMD javareconf
 	fi
+	bash-completion-r1_pkg_postinst
 }
diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml
index ec8fee50f867..915e03f5b95e 100644
--- a/dev-lang/R/metadata.xml
+++ b/dev-lang/R/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
   R is GNU S, a system for statistical computation and graphics. It
   consists of a language plus a run-time environment with graphics, a
   debugger, access to certain system functions, and the ability to run