Fixed for cairo graphics (bug #453048), use generic pkg-config, make sure Rexec links to libR.so on prefix. Removed old.

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

11 files changed, 95 insertions, 638 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 64ec3c2578aa..043ba5ba476b 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/R
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.207 2012/10/26 21:44:05 calchan Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.208 2013/01/28 22:49:47 bicatali Exp $
+
+*R-2.15.2-r1 (28 Jan 2013)
+
+  28 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +R-2.15.2-r1.ebuild,
+  +files/R-2.15.2-cairo.patch, -R-2.14.1.ebuild, -R-2.14.2.ebuild,
+  -R-2.15.0.ebuild, -R-2.15.1.ebuild, -files/R-2.14.1-pcre830.patch,
+  -files/R-2.14.2-library-writability.patch,
+  -files/R-2.14.2-prune-package-update.patch, metadata.xml:
+  Fixed for cairo graphics (bug #453048), use generic pkg-config, make sure
+  Rexec links to libR.so on prefix. Removed old.
 
 *R-2.15.2 (26 Oct 2012)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index bb441b0ba1cd..7bfee682eb69 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,25 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX R-2.11.1-parallel.patch 633 SHA256 4ad6f007ffb390584de0c8a5935e98f98106f32394aac45c30c3fdfe77c00c70 SHA512 788eca6236dccaf3fd6a13387c167bf3b11625b32c5b658fb19b17521d8e2747170cfaa54eaca3a4703a89e1f9453399e013792f7f92e7e9d0adeafeefb7e6da WHIRLPOOL a8ebf8ea01406fe576d2f95d57efc1f3c42d9ba61f75bd1034f485c85e68576cdd1c46c5d0e3139b5de8da312c20e89c78d97395082b4ff821fde4248a1b2b58
 AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed
 AUX R-2.13.1-zlib_header_fix.patch 464 SHA256 161f0fff63db5cb2cb4894321759997e75463d784d5a7ba5105f74fe2ed73c40 SHA512 7d573f33f16a9cfe080976e32fae1cb0af50e02bef026814aa5d30ce5a37d79f0ddeb69cee817602de40968fc3d5aee2ee4681b15d4011afc61ad69a01705f17 WHIRLPOOL 30d34d6e3c3a39f395409f238f6469b0c096db5039df377c8668678aaf4968f704205202f5c4f63cf8c5e3607b15df83172af09178df7707e12e746151bf02aa
-AUX R-2.14.1-pcre830.patch 949 SHA256 720ed76bdbb47169fd354d861b86b8443c3e6f923a5b220b47d46634b9c45bb2 SHA512 2f3dc52795117d7e9ce3a4acf945bd85efec0d7bab0ccf57befa2a843768b31e11aacf050c0d42bfbdaea81f3e553f15b40f9dcfc1b904fef172732709a74357 WHIRLPOOL 6484ec4088f25c36504bb23e85bbd4f414d9f46c7a41f8efeb5eae224f30e9b8199f049912caf44bff40f99490fe8386102cd18e7776bc53b13dcbdbcbb911af
 AUX R-2.14.1-rmath-shared.patch 986 SHA256 c05463dbf9ec5bba34cc987df4f6878154a738e57aaeaac46cc4f728c0c837a7 SHA512 d839fab36da9f78eeed4aa60514b37b6737486ed38e1094bac304fb4dc540f44ebf7df906f7efc577509c62e6d8926fc4c2f66d49dde83a2372f53ee8293ba1d WHIRLPOOL 16964dacfc2867f7301b62c5997c6c7ac9562de9fd005f6ddc82fd2ffb43c782032a7c2ef2d0b95dbe72263e4d2b1fa92a6eecd5cc25c1739d43db50e85672b7
 AUX R-2.14.1-tiff.patch 1711 SHA256 ff77e062a80eeb403dc98ffb0b6fedce28859f18082981891ae6e2a95cf61142 SHA512 cefa162324966999cc824b2167d39219c2dc7f72fedc1b61e4beda8d6016cb8dd0e732fb567f71aab18e03506e1fd16dc6743bd0142d4d0e4fcf87ba55f5f957 WHIRLPOOL 620d9db1533c22f95813da0690d0f4697c246d63d0a5ce5561e092dca8d467a9d40cad46fddc6eae8a1951a16b4889c341773ce31957fb0e8e734d6a0a2aed8f
 AUX R-2.14.1-warnings-buffer-overflow.patch 380 SHA256 e6b3e825ef837342c0a4bbfc05d7441d1ec5a98e31cf3bdb3d25000337a8538f SHA512 69fe4fa593a50ae9650ff868e729e3eeaba0f994cd31da853b0c1b7a50297d833a36c6f6078b093eb25e30dc5b1194de20d84ce59fab4aa65c4a32492532211f WHIRLPOOL 2046a434ba2cb6181ca4b4e09ddd69ba24fd457e0a4de876e52b8b2a84ac7a9a0f175def76ea663cfaa279ad6d6d7ab1096fd28819310a94cc451c856497f28f
-AUX R-2.14.2-library-writability.patch 2042 SHA256 7bb20306c7cec885c219b7eedbf27b38b14bd30e752139a4eba14fdac5515d9d SHA512 b7d51fa22d215d3a1346982d1be7b74d659d7b23675f9c7d8edb7b34e221e013c30bf0855ce373fd8ffa8f5e52250b5b93d94aad0cb21c74ae0d5a068cbbac76 WHIRLPOOL 46bf954d6007031468de13e07af9843e5b1f9771119eb4bef084ae816ebb23a9b84c80aa30a33e0847e3969bfe8419a7d04a596f262bb1ee5c111e2f2c9cbac8
-AUX R-2.14.2-prune-package-update.patch 1173 SHA256 386c382daf23199a620e6c6d73a4be1a17e611d1ff08c82aeb7c51a9ebe02314 SHA512 039b0ffa421477e7952c2da7ab306a5bc8d53155fab93b3cdf8642bd12490f6bc4cc21ad82eea69983142289c6c3def29fe1882b30b499caa1a47aabb03e6e07 WHIRLPOOL d6a66c5c221e3e550d4bd7a7aa6f826ad2f9c787ec445b6a4665db44fda6a113016587ebd2837d9a8ce37268b869a5e58724132f84659167cbe50fb1914c9c3b
+AUX R-2.15.2-cairo.patch 1141 SHA256 da114707c8319a3e553e38bce17bf3e172dda8a4f4791452a1d82da500b5439f SHA512 f37b8909f4fafef7ebc4dc0d82abaa62213bd7d5fcdd273c3effdcfc760ba6e66237ab043c8441bc010bde567b5303a59354ab8c0cc3658dfecdab821ea21ecc WHIRLPOOL 30ac3db661ea7e44252d443f766559c9d67023a5cc5f315aeb5718c498a94f4807d3d9b96aadedfbec7cac8884a012d1f76585ce3bad560a79c59ed0e8da63dd
 DIST R-2.10.1.tar.gz 19705604 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d SHA512 aeedc0190c90b09fc2969f680ec0b8b8174ca224288d0d0c5536e19c63e28d92604ec2936015298b839cdbce349e5d4e9f759ef30d31fc3dccd2a67448e3b7d4 WHIRLPOOL 2252ad97059b6e7fbe4473280f681af1b57ff1a3c1c3151c499f71cc6b7f4d4fce0c5312389e79e61272f7b635cf31dcd1dd320525e627c08b97367c17ec3d58
-DIST R-2.14.1.tar.gz 23697861 SHA256 d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c SHA512 bb394a3f4ad0aea3596daf0954d016d241a45cdc9e1eb6e7069b578d035e0f493249e5c8bd6a44b8288379f55c52bad182e9238050131522412ede498af04e47 WHIRLPOOL 362554d0f136bf0cece4d0234308479f076695790012f203b0d46223b47e38bd4fa97b1c971fd74be860ed974742a701a44b251b236d3de70eab764c37507f85
-DIST R-2.14.2.tar.gz 23893986 SHA256 ccd8b43a746dc7105a1c77423ea1bb72dc333b41d9e9801a96d6f71c2266736e SHA512 366765f92d790c276ba9e3d2b29df7f1c518597bc31581a9d04a22aced6799a45a9b5162034d284333e0d7e4a24c8ee4a7447f7065b0c1c47169dbc065465df7 WHIRLPOOL 045ab86944227519c76fb2f99e2580b137addbde7cbafdb1374ece3b33567d3ec41a632f3d4f4299c7068ed8abddf780e70b5e9edceecffd90e2577d103a8765
-DIST R-2.15.0.tar.gz 24195517 SHA256 6f26304773e92d8b61f150e1ccd21c153a32b89e8032b1ece45e5f4c34d9e397 SHA512 50be07c69a5c2ab967009254ec30973eb31584ddd3ca0cade76a83c3feaf22fb29759d8e705930ef8a3e4ec4cd502f6c08d7a701c6f840f6031b124cc0e4f1b6 WHIRLPOOL 775ff40b1418b869d4ccf507e761f4a328fa9481036d93fac52e7e5aacf11279868c0ab22550954e3a1d3348a8a54a60a81e0f7730e001a323b4177bec6ac3aa
-DIST R-2.15.1.tar.gz 24592493 SHA256 96e4baea9dc7653b9160d7f2e1d321d0f252fee37ceb4273d4c94f0d4d815485 SHA512 22e15e5535c15ece208a21692d397cd993a1cf1b226d75d87c83557cc2a75e2f38a5a4743b20d92d44bee3629e98a1e5dfafac00ea2bffa77f984426cd2d70ca WHIRLPOOL 7bb9092fa7578790d8acb600de4a2f13f4bc6969aa82594a827e2d74df56b733babf85a0789fd0550e2583fb6a7a6eec80e7c77a2bc3e64cc7c77beb9210b521
 DIST R-2.15.2.tar.gz 24338934 SHA256 292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d SHA512 86b07630cf9b69e9889a753297fd672a8fe89000c8b084908d6f1c90118cdb8b478681db37deefd5a5ddb3128169f60671201550bcd34689658b1f189398adac WHIRLPOOL 88fe31ce28115b0ca6961ad372c054618b199836131ca067f06139a0f6e4f23ff849f52d8653828e4245156d5377f4fbd08b866de44ea33b18b39c5694d08694
 DIST R-20120306.bash_completion.bz2 4325 SHA256 63003bcad2c35edc5e3329b72f85aaa0b8843b9ec424dc015b50212976372c3f SHA512 1bf874c58efb648aa96ac22b7c6c66444cb8f72b33cefa9eb28461043659476548873ec6dbd5a15bf893d6f87a7a7d18e4deb045759a1e74774d03cbb8f1f082 WHIRLPOOL 231742e9a886174b3f6bd62102d5b7cea1b050e786420f4e0cd4d9cec31ccb93fcc5a3115364776fbd00020d4e26398400e80cec126a41c5bd70677fd675c966
 DIST R.bash_completion.bz2 4019 SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 SHA512 b11efb99a5dae1f434d2f8c70154a09dd3826126a034a102f905144650c3d77851ddeb206c247dd9365baca13cf95897708a62bd6f8bddc079e3b679a8470fe2 WHIRLPOOL eb8fb8bff43873b75b61bf92af817be7d2bc4eddb2bf51c13e51dc1bdcc0cb5b0bd3623cf73fe20867c8b734732c6c89523916bc8ed4fba2931e55c5a0f837b8
 EBUILD R-2.10.1.ebuild 4505 SHA256 260a2a335dd5bd19e84b6a9d898a6b5062db8922797cf142e666a9c5d16eaa0c SHA512 98c3312e1d22857c3edb48a96e221cdfe23d24eac3a7303462a5c6c193e5adfa1b58076b8bece363853c546355c7b5be417701bbe5778fac6df0bde9e665eb0f WHIRLPOOL c90295b9be219fe6753bc855c32a97297f1a4a02ca3e12fc8f7259a54c80be2c32b1372d52212316ee60bbd424f43ad6f98b286164dd7a096a10a944e41342a6
-EBUILD R-2.14.1.ebuild 4334 SHA256 4caa551320de5ea8b8e0acf252eb54cb502862dcc993dab5e2d63899e11461f8 SHA512 066e6c00f463e42b3d1ec8676a546881889a8eb82947b5161c8d1a090e35a5792bf941cff198513364a600e8b564b810ff2b349b5d8a0df4f51d0beb68b30365 WHIRLPOOL c8cebbfee76a715f8657dcf173868e0cfb58468cb56650f2d76ce9a63854f1ae06b1ad1d586d67bd8c2de28635a07c0234240602759eead750e56d2e21e9d515
-EBUILD R-2.14.2.ebuild 4401 SHA256 72f77e19c48afb86e686c4dd8a44a8dff1b29c37d83a59d8b7678b2ffe81ff42 SHA512 d5517692f2f3427b9d2341f9550771ca419b9b4055691ed759e01a188ee324a77f07e160f373727a822030e06f8269a0617c0ee3b6d08cc0fd1c3e53f0dca87d WHIRLPOOL 3ead56e44342d0d1275cd0188948f2645f11e975394298e096ac2dd5f4be87a9152f12a807889b9d13ce02242aa1c157240a986026f33a6b593a8630f7a11267
-EBUILD R-2.15.0.ebuild 5218 SHA256 922f4b89be9f49c46fbff64f4af026b8c862bbb3421c84bf87f3051522533a41 SHA512 c4fb77e788be0b9d8d258c0d3c9ca1f17ae54049390564270f8f422c81a18c1a88712f5302c98d0bd1ab5a9177c4b9d08eb3a853630c57dad35b141bfb181b5e WHIRLPOOL 02c991e3a2372a32a47c302ba86a17cc579b4d46080c75ff6e7bc8eeeb0b23ce07b54f42455a4c98fbfcf973de4f36c41e2e6a38a9e82a5dd87840ebb3a73d07
-EBUILD R-2.15.1.ebuild 6151 SHA256 5cd42d166f1f525ca1a1b3c289206da38c2b4921d7a24cc918c276efe8dc573c SHA512 56c840fdc836dc33e255ff73f8e70b865d054f65e1858db1908ee5b812268703c8a83c8cb36f295d673007e96df02ca435cb1ad9ac81eb6aabd5497d43aae80f WHIRLPOOL 511116d219bfdf43b30d61c2a4467d1037736b8c676cdf0e44eec7bed966ee70d705b23cc9f701f1074562873b4b48768d33b4bde28387232dbd5e75a984ef7a
+EBUILD R-2.15.2-r1.ebuild 6261 SHA256 52ea7a931a6fb131cfb0123fe48c1db8765303aca6ad4b3563202482fca7c9b1 SHA512 7ecade6ae09345d98c93955e2faadc4c472d0d8a44ddfa1006c48067e335fe94afe2f7ae350a28d0ef236091298749e8e84b4b05cb885ea813ebf515b2e7ed46 WHIRLPOOL 8596aae74d51502f6d5e342543b37f3741ab5fc0a0dcf5b3ac300265647e5b8949275f506e608d3fd296439a6173ae830dc3341fade18b8eff1e1a869bb13983
 EBUILD R-2.15.2.ebuild 6044 SHA256 39c7c327f19e8747d1a4c1f54375c707d1d22ce900bfa86c8562c2591f621c6e SHA512 e01cd46d763bb494e40f3426b638e0e5e16e6c1fc8f7f57661938152f52ba63cef80bce0392efa1afb929459d050daf7afd95bd1a80cdee39b19e77bcb35c4f4 WHIRLPOOL de0986d9620b88ccc08fbd144accba3e8e7f3f1084236144b9e02513fae53ebdf95ad26d701f6a08a590a61ca334f5f6b392224295867e9f9824b1f37c4edbbe
-MISC ChangeLog 31221 SHA256 aad08e6bd4c903dddc2e97c93129b85f592ce5264432babdf842fe51596a6fb1 SHA512 71d36c5bf01418046f69eada87f62bf3f8889d260f56fc222fa3a969607bc9794b9b4770034b0c824049b1efa1e51cf66deb213d065232c443837def3cd5939c WHIRLPOOL c6969ae13ad5a97591405cfb329a8d67658c2027163e1815b8b79f0d3a196e0de9cf712090fea63aebc850fe366ddea4865a988e4a427784c1f0877cf59f273a
-MISC metadata.xml 1128 SHA256 2d7e3ff1039fd54c49878cda840c5bf9e9e920acbe40b23842205eb952438f30 SHA512 5be608da862dad635021511537d92f1fc30553cf6de847dee82e756254273dd18f74d3237a58327ba12f5709542fc6472b099c8536f0e78836aeb00a93292fb9 WHIRLPOOL 624711ad18e98f4ba99213c31a2da979eeb27fd1c81ac27e0dc0b62f2add78ea55c20d32caec0652f412ecfe213bd06822fa0e87d4dae0aa9c052f774010d4a3
+MISC ChangeLog 31693 SHA256 6aa470298d150920aeb25b5a35ca082453de8ccc6b2071d424e15499627a9516 SHA512 7e9cad33ee6ded180b51cee33bd8837f5d7b8cdb517ac5c632053d7f80a2ab9d3a92d4f9e067104602c9e4d7bee0020dce43cdba7c2c38b662798dc481b0b012 WHIRLPOOL fbce53be713cfcf91eca0c62c73dcb1ed03b4cd8b34070bbae9d3d2b5694d4ec61dbebb2adedb5e7c5cf8b1f13c02965deacb635b96f1ca4881ae4378bf3ee9a
+MISC metadata.xml 1124 SHA256 8f06d05ef29fdd4960269413a7e3e6ed5cfbdf32fa7cac5ed4c2750d58a4785b SHA512 4cf9bdeb2352cbe899d33c701332cbb99f3b12f2b7289eec339e0138a6764f2080e5a1d86785a0be6eca5e9ea3efeafa3224ebc0f85a04dce550476913ace4d4 WHIRLPOOL 68707e00e5a3bda1baea92d81e4760290e575662ad82f896e90dc08a436869150fd4578ecead1b5752c6b1e198d89b73f5dda10d4616b5ca05eec0ee096f2726
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEHAJAACgkQ1ycZbhPLE2BeRQCgg0/r5ROWwKYHWcfR+EVvaec8
+hJYAmgLnFSxqLgzocbL/zaB9eG7PlWsP
+=JlUG
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.14.1.ebuild b/dev-lang/R/R-2.14.1.ebuild
deleted file mode 100644
index adc0b41563c8..000000000000
--- a/dev-lang/R/R-2.14.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.6 2012/06/06 02:50:20 zmedico Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib 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 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu )
-	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}
-	virtual/pkgconfig
-	doc? (
-			virtual/latex-base
-			dev-texlive/texlive-fontsrecommended
-		 )"
-
-RDEPEND="${CDEPEND}
-	( || ( <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}"
-
-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
-	unset R_HOME
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.12.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-2.14.1-tiff.patch \
-		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \
-		"${FILESDIR}"/${PN}-2.14.1-pcre830.patch \
-		"${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch
-
-	# fix packages.html for doc (bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (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 (bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links 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}"
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-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}" \
-		$(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 X x)
-}
-
-src_compile(){
-	export VARTEXFONTS="${T}/fonts"
-	emake
-	emake -C src/nmath/standalone shared $(use static-libs && echo static)
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -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
-	use bash-completion && dobashcomp "${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.14.2.ebuild b/dev-lang/R/R-2.14.2.ebuild
deleted file mode 100644
index ba374f12afb4..000000000000
--- a/dev-lang/R/R-2.14.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.2.ebuild,v 1.4 2012/10/07 13:35:21 jlec Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib 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 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu )
-	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}
-	virtual/pkgconfig
-	doc? (
-			virtual/latex-base
-			dev-texlive/texlive-fontsrecommended
-		 )"
-
-RDEPEND="${CDEPEND}
-	( || ( <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}"
-
-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
-	unset R_HOME
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.12.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-2.14.1-tiff.patch \
-		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \
-		"${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch \
-		"${FILESDIR}"/${PN}-2.14.2-library-writability.patch \
-		"${FILESDIR}"/${PN}-2.14.2-prune-package-update.patch
-
-	# fix packages.html for doc (bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (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 (bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links 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}"
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-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}" \
-		$(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 X x)
-}
-
-src_compile(){
-	export VARTEXFONTS="${T}/fonts"
-	emake
-	emake -C src/nmath/standalone shared $(use static-libs && echo static)
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -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
-	use bash-completion && dobashcomp "${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.15.0.ebuild b/dev-lang/R/R-2.15.0.ebuild
deleted file mode 100644
index 30b89ec2ad4c..000000000000
--- a/dev-lang/R/R-2.15.0.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.0.ebuild,v 1.8 2012/10/07 13:35:21 jlec Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20120306.bash_completion
-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? ( http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu )
-	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}
-	virtual/pkgconfig
-	doc? (
-			virtual/latex-base
-			dev-texlive/texlive-fontsrecommended
-		 )"
-
-RDEPEND="${CDEPEND}
-	( || ( <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}"
-
-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
-	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() {
-	# gentoo bug #322965 (not applied upstream)
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
-	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
-
-	# respect ldflags (not applied upstream)
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
-	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
-
-	# gentoo bug #383431
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
-	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
-
-	# tiff automagic
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14952
-	epatch "${FILESDIR}"/${PN}-2.14.1-tiff.patch
-
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
-	epatch "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch
-
-	# too many warning crash, bug #405463
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14954
-	epatch "${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch
-
-	# applied upstream for next R
-	epatch \
-		"${FILESDIR}"/${PN}-2.14.2-library-writability.patch \
-		"${FILESDIR}"/${PN}-2.14.2-prune-package-update.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="$(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}"
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-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}" \
-		$(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 X x)
-}
-
-src_compile(){
-	export VARTEXFONTS="${T}/fonts"
-	emake
-	emake -C src/nmath/standalone shared $(use static-libs && echo static)
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -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
-	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-}
-
-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.15.1.ebuild b/dev-lang/R/R-2.15.2-r1.ebuild
index ab930a8a0b6f..548e37a201a8 100644
--- a/dev-lang/R/R-2.15.1.ebuild
+++ b/dev-lang/R/R-2.15.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.1.ebuild,v 1.3 2012/10/07 13:35:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.2-r1.ebuild,v 1.1 2013/01/28 22:49:47 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
 
@@ -15,10 +15,11 @@ SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png profile readline static-libs tiff tk X"
+IUSE="bash-completion 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
+CDEPEND="
+	app-arch/bzip2
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
 	virtual/blas
@@ -46,7 +47,7 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="minimal? ( test )"
 
-R_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}"
+R_DIR="${EROOT}/usr/$(get_libdir)/${PN}"
 
 pkg_setup() {
 	if use openmp; then
@@ -76,13 +77,12 @@ src_prepare() {
 	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
 	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
 
-	# tiff automagic
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14952
-	epatch "${FILESDIR}"/${PN}-2.14.1-tiff.patch
-
 	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
 	epatch "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch
 
+	# fix cairo plots (gentoo bug #453048)
+	epatch "${FILESDIR}"/${PN}-2.15.2-cairo.patch
+
 	# fix packages.html for doc (gentoo bug #205103)
 	sed -i \
 		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
@@ -99,7 +99,7 @@ src_prepare() {
 		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
 
 	use lapack && \
-		export LAPACK_LIBS="$(pkg-config --libs lapack)"
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 
 	if use X; then
 		export R_BROWSER="$(type -p xdg-open)"
@@ -111,18 +111,22 @@ src_prepare() {
 	# don't search /usr/local
 	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
 	# Fix for Darwin (OS X)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -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/" \
-			-i configure.ac || die
-
-		# sort of "undo" 2.14.1-rmath-shared.patch
-		sed "s:-Wl,-soname=libRmath.so:-install_name ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \
-			-i src/nmath/standalone/Makefile.in || die
+	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
 }
@@ -136,7 +140,7 @@ src_configure() {
 		--with-system-bzlib \
 		--with-system-pcre \
 		--with-system-xz \
-		--with-blas="$(pkg-config --libs blas)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable nls) \
diff --git a/dev-lang/R/files/R-2.14.1-pcre830.patch b/dev-lang/R/files/R-2.14.1-pcre830.patch
deleted file mode 100644
index 54036d6e01c7..000000000000
--- a/dev-lang/R/files/R-2.14.1-pcre830.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix for pcre-8.30 and above
-
---- src/main/util.c.orig	2012-02-09 17:15:08.000000000 +0000
-+++ src/main/util.c	2012-02-09 17:20:31.000000000 +0000
-@@ -1257,8 +1257,18 @@
- }
- 
- #include "pcre.h"
-+
-+/* This changed at 8.30 */
-+#if  PCRE_MAJOR > 8 || PCRE_MINOR >= 30
-+extern int _pcre_valid_utf(const char *string, int length, int *erroroffset);
-+
-+Rboolean utf8Valid(const char *str)
-+{
-+    int errp;
-+    return  (_pcre_valid_utf(str, (int) strlen(str), &errp) == 0);
-+}
- /* This changed at 8.13: we don't allow < 8.0 */
--#if  PCRE_MAJOR > 8 || PCRE_MINOR >= 13
-+#elif  PCRE_MAJOR > 8 || PCRE_MINOR >= 13
- extern int _pcre_valid_utf8(const char *string, int length, int *erroroffset);
- 
- Rboolean utf8Valid(const char *str)
-@@ -1266,7 +1276,7 @@
-     int errp;
-     return  (_pcre_valid_utf8(str, (int) strlen(str), &errp) == 0);
- }
--#else
-+#else 
- extern int _pcre_valid_utf8(const char *string, int length);
- 
- Rboolean utf8Valid(const char *str)
diff --git a/dev-lang/R/files/R-2.14.2-library-writability.patch b/dev-lang/R/files/R-2.14.2-library-writability.patch
deleted file mode 100644
index 3e6cabf654cc..000000000000
--- a/dev-lang/R/files/R-2.14.2-library-writability.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: src/library/utils/R/packages2.R
-===================================================================
---- src/library/utils/R/packages2.R	(revision 58532)
-+++ src/library/utils/R/packages2.R	(working copy)
-@@ -229,8 +229,8 @@
-                 domain = NA, immediate. = TRUE)
-         userdir <- unlist(strsplit(Sys.getenv("R_LIBS_USER"),
-                                    .Platform$path.sep))[1L]
--        if(interactive() && !file.exists(userdir)) {
--            msg <- gettext("Would you like to create a personal library\n%s\nto install packages into?")
-+        if(interactive()) {
-+            msg <- gettext("Would you like to use a personal library instead?")
-             if(.Platform$OS.type == "windows") {
-                 ans <- winDialog("yesno", sprintf(msg, sQuote(userdir)))
-                 if(ans != "YES") stop("unable to install packages")
-@@ -239,10 +239,21 @@
-                 if(substr(ans, 1L, 1L) == "n")
-                     stop("unable to install packages")
-             }
--            if(!dir.create(userdir, recursive = TRUE))
--                stop("unable to create ", sQuote(userdir))
-             lib <- userdir
--            .libPaths(c(userdir, .libPaths()))
-+            if(!file.exists(userdir)) {
-+                msg <- gettext("Would you like to create a personal library\n%s\nto install packages into?")
-+                if(.Platform$OS.type == "windows") {
-+                    ans <- winDialog("yesno", sprintf(msg, sQuote(userdir)))
-+                    if(ans != "YES") stop("unable to install packages")
-+                } else {
-+                    ans <- readline(paste(sprintf(msg, userdir), " (y/n) "))
-+                    if(substr(ans, 1L, 1L) == "n")
-+                        stop("unable to install packages")
-+                }
-+                if(!dir.create(userdir, recursive = TRUE))
-+                    stop("unable to create ", sQuote(userdir))
-+                .libPaths(c(userdir, .libPaths()))
-+            }
-         } else stop("unable to install packages")
-     }
- 
diff --git a/dev-lang/R/files/R-2.14.2-prune-package-update.patch b/dev-lang/R/files/R-2.14.2-prune-package-update.patch
deleted file mode 100644
index 8b4b76916e1d..000000000000
--- a/dev-lang/R/files/R-2.14.2-prune-package-update.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: src/library/utils/R/packages.R
-===================================================================
---- src/library/utils/R/packages.R	(revision 58579)
-+++ src/library/utils/R/packages.R	(working copy)
-@@ -323,6 +323,20 @@
- 	oldPkgs <- old.packages(lib.loc = lib.loc,
- 				contriburl = contriburl, method = method,
- 				available = available, checkBuilt = checkBuilt)
-+        ## prune package versions which are invisible to require()
-+        if(!is.null(oldPkgs)) {
-+            pkg <- 0
-+            while(pkg < nrow(oldPkgs)) {
-+                pkg <- pkg + 1
-+                if(find.package(oldPkgs[pkg], lib.loc = lib.loc) != find.package(oldPkgs[pkg], lib.loc = oldPkgs[pkg,2])) {
-+                    warning(sprintf("package '%s' in library '%s' will not be updated",
-+                                    oldPkgs[pkg], oldPkgs[pkg, 2]),
-+                            call. = FALSE, immediate. = TRUE)
-+                    oldPkgs <- oldPkgs[-pkg, , drop = FALSE]
-+                    pkg <- pkg - 1
-+                }
-+            }
-+        }
- 	if(is.null(oldPkgs))
- 	    return(invisible())
-     } else if (!(is.matrix(oldPkgs) && is.character(oldPkgs)))
diff --git a/dev-lang/R/files/R-2.15.2-cairo.patch b/dev-lang/R/files/R-2.15.2-cairo.patch
new file mode 100644
index 000000000000..3a02b28ead9d
--- /dev/null
+++ b/dev-lang/R/files/R-2.15.2-cairo.patch
@@ -0,0 +1,36 @@
+--- src/modules/X11/devX11.c	(révision 61681)
++++ src/modules/X11/devX11.c	(révision 61682)
+@@ -244,6 +244,7 @@ 
+ {
+     if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
+     cairo_paint(xd->xcc);
++    cairo_surface_flush(xd->xcs);
+     if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
+     XSync(display, 0);
+     xd->last = currentTime();
+@@ -753,8 +754,10 @@ 
+ #ifdef HAVE_WORKING_CAIRO
+ 	    pX11Desc xd = (pX11Desc) dd->deviceSpecific;
+ 	    /* We can use the buffered copy where we have it */ 
+-	    if(xd->buffered == 1) cairo_paint(xd->xcc);
+-	    else if (xd->buffered > 1)
++	    if(xd->buffered == 1) {
++		cairo_paint(xd->xcc);
++		cairo_surface_flush(xd->xcs);
++	    } else if (xd->buffered > 1)
+ 		/* rely on timer to repaint eventually */
+ 		xd->last_activity = currentTime();
+ 	    else
+@@ -2691,7 +2694,11 @@ 
+ 		Cairo_update(xd);
+ 	    return;
+ 	}
+-	if(xd->buffered) cairo_paint(xd->xcc);
++	if(xd->buffered) {
++	    cairo_paint(xd->xcc);
++	    cairo_surface_flush(xd->xcs);
++	}
++	
+ #endif
+ 	if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
+ 	XSync(display, 0);
diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml
index 148f2798d1a1..5d205a8da7fb 100644
--- a/dev-lang/R/metadata.xml
+++ b/dev-lang/R/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
-	<maintainer>
-		<email>calchan@gentoo.org</email>
-		<name>Denis Dupeyron</name>
-	</maintainer>
-	<longdescription lang="en">
+<herd>sci-mathematics</herd>
+<maintainer>
+  <email>calchan@gentoo.org</email>
+  <name>Denis Dupeyron</name>
+</maintainer>
+<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