Use R blas internals to pass tests for stable candidate (it does work with other blas than blas-reference), remove old

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

10 files changed, 28 insertions, 534 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 22ddef4dd743..a9af427d139a 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.217 2013/08/27 15:03:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.218 2013/09/24 16:13:24 bicatali Exp $
+
+*R-3.0.1-r1 (24 Sep 2013)
+
+  24 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> +R-3.0.1-r1.ebuild,
+  -R-2.15.2-r2.ebuild, -R-2.15.2.ebuild, -R-3.0.0.ebuild,
+  -files/R-2.14.1-tiff.patch, -files/R-2.14.1-warnings-buffer-overflow.patch,
+  -files/R-2.15.2-cairo.patch, R-3.0.1.ebuild, metadata.xml:
+  Use R blas internals to pass tests for stable candidate (it does work with
+  other blas than blas-reference), remove old
 
   27 Aug 2013; Michael Palimaka <kensington@gentoo.org> R-2.10.1.ebuild,
   R-2.15.2-r2.ebuild, R-2.15.2.ebuild, R-2.15.3.ebuild, R-3.0.0.ebuild,
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 9d8b56dc992d..fa6540593edb 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -5,35 +5,22 @@ AUX R-2.11.1-parallel.patch 633 SHA256 4ad6f007ffb390584de0c8a5935e98f98106f3239
 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-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.15.2-cairo.patch 1141 SHA256 da114707c8319a3e553e38bce17bf3e172dda8a4f4791452a1d82da500b5439f SHA512 f37b8909f4fafef7ebc4dc0d82abaa62213bd7d5fcdd273c3effdcfc760ba6e66237ab043c8441bc010bde567b5303a59354ab8c0cc3658dfecdab821ea21ecc WHIRLPOOL 30ac3db661ea7e44252d443f766559c9d67023a5cc5f315aeb5718c498a94f4807d3d9b96aadedfbec7cac8884a012d1f76585ce3bad560a79c59ed0e8da63dd
 AUX R-3.0.0-rmath-shared.patch 1069 SHA256 fc5278e204bbd71ec5ac634e108295744d509ee50a61bb36e5fd268a854f9219 SHA512 63640d890346651f5f92664afffadc9614c1c4c6207d230df873d81fb9361827f0b9b96a46acd7d9bd3ee5d9f100bc0484c2dfa17c947c5707d6895fd46a6b74 WHIRLPOOL d68a3093b6a3a25b5e10a35e77a486ee78c5b19772764f7a3256e9020ff7ed1695dcb73e9819effbd0bc7a419fdca7d64f10e06064221b70701e8ae0a1b8cb26
 DIST R-2.10.1.tar.gz 19705604 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d SHA512 aeedc0190c90b09fc2969f680ec0b8b8174ca224288d0d0c5536e19c63e28d92604ec2936015298b839cdbce349e5d4e9f759ef30d31fc3dccd2a67448e3b7d4 WHIRLPOOL 2252ad97059b6e7fbe4473280f681af1b57ff1a3c1c3151c499f71cc6b7f4d4fce0c5312389e79e61272f7b635cf31dcd1dd320525e627c08b97367c17ec3d58
-DIST R-2.15.2.tar.bz2 22374116 SHA256 57f929f0e3925d1ae9ae32010fb9a7cb02eed47ee998c0fdc8284cb8f167ffbc SHA512 2506654259fa72599c150ea6e43f5d57f57a5d2ed2771067a96bb2a232df9aa05213f327001c78a82beec88048cc102263b41e897392181d044db675818bfbff WHIRLPOOL 07e86aaac4362088bdf869a9bc25dadb3aaa3cab39b0ebc45d67c2deda0bbd46280cf70525e51ae2f433fa558a4098e5feff4fc34ca298f79f40dd9d4eb79674
-DIST R-2.15.2.tar.gz 24338934 SHA256 292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d SHA512 86b07630cf9b69e9889a753297fd672a8fe89000c8b084908d6f1c90118cdb8b478681db37deefd5a5ddb3128169f60671201550bcd34689658b1f189398adac WHIRLPOOL 88fe31ce28115b0ca6961ad372c054618b199836131ca067f06139a0f6e4f23ff849f52d8653828e4245156d5377f4fbd08b866de44ea33b18b39c5694d08694
 DIST R-2.15.3.tar.gz 25409925 SHA256 c583a38f8dad3bc012c08116f4ba1eb2182cadfad4b0f8d7bd3cdba24bc255d6 SHA512 83389e792aecb52fcd129321c896558dd3bfaf0f6ac775b662d67bbea8a4ec86f22fab625cc20587a17f991ea39764a89fbea34c9f638e3134a095a4e3b2fa12 WHIRLPOOL 3c240f24c82db09fe2c9b4b33cb9ddbc57688940d6f6e3b76f67e0a440910f1aef23617f25219fd62ba83f730a4a8bae3ff32b9c27faad08fd8b95fce847ed6d
-DIST R-20120306.bash_completion.bz2 4325 SHA256 63003bcad2c35edc5e3329b72f85aaa0b8843b9ec424dc015b50212976372c3f SHA512 1bf874c58efb648aa96ac22b7c6c66444cb8f72b33cefa9eb28461043659476548873ec6dbd5a15bf893d6f87a7a7d18e4deb045759a1e74774d03cbb8f1f082 WHIRLPOOL 231742e9a886174b3f6bd62102d5b7cea1b050e786420f4e0cd4d9cec31ccb93fcc5a3115364776fbd00020d4e26398400e80cec126a41c5bd70677fd675c966
 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
-DIST R-3.0.0.tar.gz 25482059 SHA256 dd65c24f1497610f3ff16008da99b4f52286d6424fbd61f08037c4f10f57ff16 SHA512 a192031becacd1660d81cea708f2ebde534fde4a656c24e80e5165b7645dd03e8762569bbda478ac0a5c6bc34651d735c213bff42cefe0a5140e20efb0a410d4 WHIRLPOOL e543ae87394e238a2859a5c3f1fa49dc8fffba7decc170ba85307e32d96f9c6608e294d1d7037641d4c0e7d8cc853efc8b270e9d68d87e41135fcad9a1991271
 DIST R-3.0.1.tar.gz 25508280 SHA256 af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134 SHA512 470edbf4a4fccf9310add110d7fa7f338e410e412b3ec84f6ea5f1253e94a435e185a7a1b62b22aee443293147ff7bcca139015b490a9271a502b1bfbf1426a2 WHIRLPOOL f45c960280f51cba3a4f3730fa79671808b3c07fd49f97b2cdce4a1de45986e62ac9bb24c6f764386a3ef1034a266b86f041a1a1652ec7f687a4db08a074d22e
 DIST R.bash_completion.bz2 4019 SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 SHA512 b11efb99a5dae1f434d2f8c70154a09dd3826126a034a102f905144650c3d77851ddeb206c247dd9365baca13cf95897708a62bd6f8bddc079e3b679a8470fe2 WHIRLPOOL eb8fb8bff43873b75b61bf92af817be7d2bc4eddb2bf51c13e51dc1bdcc0cb5b0bd3623cf73fe20867c8b734732c6c89523916bc8ed4fba2931e55c5a0f837b8
 EBUILD R-2.10.1.ebuild 4531 SHA256 2530cbef6549da567b379378ad63868c226b9368d29248c63737e866e28dc776 SHA512 22cbaa8e378efb6c3894ee38f26306fe7dd62bedc22a333899e22360c64beb72de86a5af1b2a652c4bc62f15b5d1a7b4b818e2724ea5eb8003effd37aecceb0b WHIRLPOOL 68fafe4a9d0ce1741ac7e8d7c8d08dbc080a616831c9adaac8a54685c6de8cd776200ab0bfcc1bd3226a689e9606e9f43e9ce463db6e07a59d469566be3f7380
-EBUILD R-2.15.2-r2.ebuild 6370 SHA256 22edb2c9de54bda348cfa37adcef9ed6196aa903f1b4ec616ec4ec3587a321e5 SHA512 d3d1e66c863188342b0faf2fecd65673d1e8c9c17a9d7d65d8820fdcb50b8ceb6d55c084a205a59460d8f9ac67762d70137e09dd33f446c7e208193496f98d74 WHIRLPOOL 34071c1bacfbab44cdb82377c05cd0eb5c1692ca78d69396ee19bd44c8a46e2ed4c1f193bd797ffa3cb8b4d5fe830815c424c6a2e151bfc063eddd73493303ac
-EBUILD R-2.15.2.ebuild 6067 SHA256 34aa42269a86c6089e782833a54df4fe78eb61aee5483106843a1aabcf8d9736 SHA512 b9288dec330cfa75170b06ae3f3e3a6dd7528be3c7a9bd7c9b9ee6bf7f985685093fb1303d2e8249e63cc5c599164c274e8dab88a4f0b3162988b07f72615750 WHIRLPOOL 76daed01c5104696e9fe30ecf129c0024875b99a33334974a5549bef8f39d078daf260a8ae69237b510d2c48ee65be6b56e2f895b906913fe704760ae105117f
 EBUILD R-2.15.3.ebuild 6214 SHA256 31a7461a5810daab486f385dbb744c0204ad3080fff6c4a2a1a421e0aa5c161e SHA512 3fdb804b9109ad52a32ab9bdd485041e66bccbe525d4f6f5c2f8efb8fdcc5a77ea4e3214ab6ef8109886db21c6eca4996af331058b7e357bf6f6d3d32eefb5f2 WHIRLPOOL f184c1869250a4961f91fc1bb33b98bb8ebc87361810849a02591a24a699d14f923d07afda5671c19f5b0fa8f1cdf27ae44b1a6bda5b3715d955197e6eb5ba79
-EBUILD R-3.0.0.ebuild 6216 SHA256 13e891833b2b33fcc480ff1ca53c2405e46faf61ef04a498a9a1084828da1eca SHA512 695ebe65625dfc7b0a4ece263f101e98d2314cd7c5ae9a839773d73ccb1387f137713e13d904f7ccb4e64c938ceffbc784165598807c69ca10e65d900f6638c6 WHIRLPOOL 1c26a20de3dd1559e48853854f0b01e8c417b4520a09972e90373c07c4ccb47ad9eae872adbb458b0506eac1a7fa042af5abd6e39957f2a7edfd6bb340fe313b
-EBUILD R-3.0.1.ebuild 6218 SHA256 353537c30a3ff0edda2374ec36672e40b213fe52e4a00bcb79719c24164516f9 SHA512 d47b5955d9cba7500539009c41a0d361061db04978e678e5d6d655868e657bb3498766fa7236bb8ab96f13775143625c6758bb1b3f8681fa173714d16e2c652c WHIRLPOOL eddbbc3f870e2d3686ce8f96fdb95c992340753474b67e7d0e38ae8ba901ebedc7657daa2ee7342dd6b70042b885ebe3f3323345cb0045b16aaca35f60321f70
-MISC ChangeLog 33033 SHA256 a283862573caa1333fc6c7a13c02ea19fb499e892ea9530655774beb8b9a3ba1 SHA512 5e2f89fb7d07e7db76c49ba73661163f84c98ad58c2f28fd83b2f36104f2d1cbca078a29044852e27f413dfd11050f664088820992490074cb22110c3f906eee WHIRLPOOL ae82215f954fd4954229dea884d0525a6987265d18278a4606e146629c62d1c6e5267fdbdd21828a145d3587c74a976c9234ec4ad8779bbc382d88f2157ebee7
-MISC metadata.xml 1136 SHA256 7d7c013a77ad6ffc785202e05711d4127a77f64fe09ef919deffa80cc74f992a SHA512 761c3afcbfc76c6026cc6a6f89dae2502f495008851dcb070ee04990653ed6785f089d31a0ea3ada11ccf3d027d372256d04a0baf9ee5d2528e63a9ea4dee313 WHIRLPOOL b7bd0d3843543ff07d15e2d18ae56358477667cec9e78be266f2d983304537afd6c1bac0842e403ce62729248debe2fddfe345c66e022bf2716a47d7819fe041
+EBUILD R-3.0.1-r1.ebuild 6219 SHA256 300af60cb00a4ec31e8c51870fb70056ebf3aa05d711e5a768c89dcb3a3caf4d SHA512 1106ea5d096e6f4004f9a9a189cf21354e6af53cdd3e956578b5546f5378aed606ff61491f89a185a24707207910b289ce112b47f3a2ff5a5aa00bff3a9d17e6 WHIRLPOOL c1bcfe20d0719f443c60d8966771ee68984e26092f846a79c5f9d79ac0f2c5da2f5c50a5e31fbacdb2e62216faa9a737ef3e21c636faf339a741bcae2e35344b
+EBUILD R-3.0.1.ebuild 6182 SHA256 e44095de27f83987f378c3549742ba0845d4eac9556e61549d6a257c46e2744e SHA512 8917f6ee62bdab69e54d89b244c4c081ebe2fb0d1fe69c1a0bd009153d1546ebc99205879a77cebf97454a7377c847653da90fae7bde24732ff40ac77fbe2195 WHIRLPOOL 881582634210444780ca026f985e50fa787e1a8e5ecb86de2e97b3fe9d1b7f629dfe5b3f0186b370f7fdfcf2e362c173fb8b5b230fbbf865161c1dc32c93707f
+MISC ChangeLog 33454 SHA256 298583b0b8f1dfa6d24aefabd8968565efd0776a0f1678a27c82139090ae0031 SHA512 a0d66aa053d621e4e3f71fa194fb1eff73d1aa451f4e6d314e92051d6599d60bc9a6dfbf45d480a8867e32817f5b15e6a205748f3f3747851d9e3a03d276bf63 WHIRLPOOL 8377ad2b432a61725237555a478caed8574de069452687951e8662fddb7a3a7cf081d904e439158def992238f2d03878d7327514705b22b358d1a8bf587f91c0
+MISC metadata.xml 1124 SHA256 8f06d05ef29fdd4960269413a7e3e6ed5cfbdf32fa7cac5ed4c2750d58a4785b SHA512 4cf9bdeb2352cbe899d33c701332cbb99f3b12f2b7289eec339e0138a6764f2080e5a1d86785a0be6eca5e9ea3efeafa3224ebc0f85a04dce550476913ace4d4 WHIRLPOOL 68707e00e5a3bda1baea92d81e4760290e575662ad82f896e90dc08a436869150fd4578ecead1b5752c6b1e198d89b73f5dda10d4616b5ca05eec0ee096f2726
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHL8gAAoJEMbwO6tnXQ0sPt8IAK9viCArNB/f+DBcWuEVDK6a
-EmQXvUDmp634vWxUeLb6uXY+1JH2TjEN60WU2v0iyIkh4a7CCgV0kNidiNmdLvAQ
-n92PJfa6o9V+XtHGQpg/XrSIkbmRFOAiH4RkTZba6u5xhAxgJoY0KiubDpUGgPG+
-izIqXHgZf3l+NRf/Gcj8+Wv3o8e5Kr9RF1oOWrUiynwD1pjaZKoSX1BElXbU5gxL
-mVGdNW9oD54vol/DAH+3Lt3xw+Zca7hjg8FpVj4gS39ZjXd1q+Kqyv7XBw/Cedmg
-XUxcBfgErMOls5fKRnoCr0o1elI3y8VwNGLo5s3Bit4mEujQTF4XSlbqXfLvIGY=
-=6fR9
+iEYEAREIAAYFAlJBuikACgkQ1ycZbhPLE2AaDwCdE9txfOnU6W6YZFxp383NkaGZ
+F2AAnR8j5TfqCNhIQF4v52OjsMEqRexa
+=FVfj
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.15.2-r2.ebuild b/dev-lang/R/R-2.15.2-r2.ebuild
deleted file mode 100644
index 651ecd3b46c3..000000000000
--- a/dev-lang/R/R-2.15.2-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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.2-r2.ebuild,v 1.3 2013/08/27 15:03:04 kensington Exp $
-
-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-2/${P}.tar.gz
-SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2
-	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 ~amd64-linux ~x86-fbsd ~x86-linux ~x64-macos"
-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
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu )
-	jpeg? ( virtual/jpeg:0 )
-	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="${EROOT%/}/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
-
-	# 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" \
-		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() {
-	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 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 -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}
-	# The buildsystem has a different understanding of install_names than what
-	# 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
-}
-
-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.2.ebuild b/dev-lang/R/R-2.15.2.ebuild
deleted file mode 100644
index aaddb73d3bd5..000000000000
--- a/dev-lang/R/R-2.15.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# 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.2.ebuild,v 1.3 2013/08/27 15:03:04 kensington 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 ~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"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	virtual/fortran
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu )
-	jpeg? ( virtual/jpeg:0 )
-	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
-
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
-	epatch "${FILESDIR}"/${PN}-2.14.1-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 [[ ${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
-	fi
-
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	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 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}
-	# The buildsystem has a different understanding of install_names than what
-	# 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
-}
-
-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.0.0.ebuild b/dev-lang/R/R-3.0.1-r1.ebuild
index 15f92b2f6326..7a7d3604a000 100644
--- a/dev-lang/R/R-3.0.0.ebuild
+++ b/dev-lang/R/R-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.0.ebuild,v 1.3 2013/08/27 15:03:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.1-r1.ebuild,v 1.1 2013/09/24 16:13:24 bicatali Exp $
 
 EAPI=5
 
@@ -9,7 +9,8 @@ inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib vers
 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
+SRC_URI="
+	mirror://cran/src/base/R-3/${P}.tar.gz
 	bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
diff --git a/dev-lang/R/R-3.0.1.ebuild b/dev-lang/R/R-3.0.1.ebuild
index e2af154b62e1..cb0803a0cc52 100644
--- a/dev-lang/R/R-3.0.1.ebuild
+++ b/dev-lang/R/R-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.1.ebuild,v 1.2 2013/08/27 15:03:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.1.ebuild,v 1.3 2013/09/24 16:13:24 bicatali Exp $
 
 EAPI=5
 
@@ -138,7 +138,7 @@ src_configure() {
 		--with-system-bzlib \
 		--with-system-pcre \
 		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--without-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-tiff.patch b/dev-lang/R/files/R-2.14.1-tiff.patch
deleted file mode 100644
index f815285557f3..000000000000
--- a/dev-lang/R/files/R-2.14.1-tiff.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Add a --with-libtiff to avoid broken implicit dependencies
-Patch by Sebastien Fabbro
-
---- configure.ac.orig	2012-01-02 17:01:24.000000000 +0000
-+++ configure.ac	2012-01-02 17:04:21.000000000 +0000
-@@ -396,6 +396,10 @@
- [AS_HELP_STRING([--with-jpeglib],[use jpeglib library (if available) @<:@yes@:>@])],
- [R_ARG_USE(jpeglib)],
- [use_jpeglib=yes])
-+AC_ARG_WITH([libtiff],
-+[AS_HELP_STRING([--with-libtiff],[use libtiff library (if available) @<:@yes@:>@])],
-+[R_ARG_USE(libtiff)],
-+[use_libtiff=yes])
- AC_ARG_WITH([system-zlib],
- [AS_HELP_STRING([--with-system-zlib],[use system zlib library (if available) @<:@no@:>@])],
- [R_ARG_USE_SYSTEM(zlib)],
---- m4/R.m4.orig	2012-01-02 17:05:22.000000000 +0000
-+++ m4/R.m4	2012-01-02 17:08:08.000000000 +0000
-@@ -2005,16 +2005,18 @@
- 	      [Define if you have the PNG headers and libraries.])
-   fi
- fi
--AC_CHECK_HEADERS(tiffio.h)
--# may need to resolve jpeg routines
--AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no], [${BITMAP_LIBS}])
--if test "x${ac_cv_header_tiffio_h}" = xyes ; then
--  if test "x${have_tiff}" = xyes; then
--    AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.])
--    BITMAP_LIBS="-ltiff ${BITMAP_LIBS}"
--  else
--    have_tiff=no
--  fi
-+if test "${use_libtiff}" = yes; then
-+   AC_CHECK_HEADERS(tiffio.h)
-+   # may need to resolve jpeg routines
-+   AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no], [${BITMAP_LIBS}])
-+   if test "x${ac_cv_header_tiffio_h}" = xyes ; then
-+     if test "x${have_tiff}" = xyes; then
-+      AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.])
-+      BITMAP_LIBS="-ltiff ${BITMAP_LIBS}"
-+     else
-+	have_tiff=no
-+     fi
-+   fi
- fi
- AC_SUBST(BITMAP_LIBS)
- ])# R_BITMAPS
diff --git a/dev-lang/R/files/R-2.14.1-warnings-buffer-overflow.patch b/dev-lang/R/files/R-2.14.1-warnings-buffer-overflow.patch
deleted file mode 100644
index 9a5caf244f36..000000000000
--- a/dev-lang/R/files/R-2.14.1-warnings-buffer-overflow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/main/main.c.orig	2012-02-23 21:57:10.478788427 +0100
-+++ src/main/main.c	2012-02-23 21:56:12.186789729 +0100
-@@ -674,7 +674,7 @@
- #ifdef ENABLE_NLS
-     char localedir[PATH_MAX+20];
- #endif
--    char deferred_warnings[6][250];
-+    char deferred_warnings[11][250];
-     volatile int ndeferred_warnings = 0;
- 
-     InitConnections(); /* needed to get any output at all */
-
diff --git a/dev-lang/R/files/R-2.15.2-cairo.patch b/dev-lang/R/files/R-2.15.2-cairo.patch
deleted file mode 100644
index 3a02b28ead9d..000000000000
--- a/dev-lang/R/files/R-2.15.2-cairo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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 1deadcbddd09..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