Fix bug 547478 upstream R bug https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 thanks to Kobboi for reporting. Revbump R-3.2.0 to R-3.2.0-r1 dropping the broken R-3.2.0 to force the upgrade of R.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 39 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 537e33f20b7a..20573db4fce4 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.244 2015/04/21 21:17:14 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.245 2015/05/01 13:35:41 gienah Exp $
+
+*R-3.2.0-r1 (01 May 2015)
+
+  01 May 2015; Mark Wright <gienah@gentoo.org> +R-3.2.0-r1.ebuild,
+  +files/R-3.2.0-omitted-extern-R_running_as_main_program.patch,
+  -R-3.2.0.ebuild:
+  Fix bug 547478 upstream R bug
+  https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 thanks to Kobboi
+  for reporting. Revbump R-3.2.0 to R-3.2.0-r1 dropping the broken R-3.2.0 to
+  force the upgrade of R.
 
 *R-3.2.0 (21 Apr 2015)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 085b392850ba..5774bd60095f 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX R-2.11.1-parallel.patch 685 SHA256 5e57374318a3f549fa64c939a45964b941fac1f9b021cdc94ff1d40ff23032c5 SHA512 30491365eee00389f6f09c2093b5b5a568f4567c110cc0cb3332a53d6a7fcd87fe8f46f9f8521cf21bf1f0cfa24f4282a6e22396902f454c43f26542ac22c2a9 WHIRLPOOL 266115362f92a57d7a22d7b8810d12641e44c61b8396a8fd1a7fde2f5655a4990950366fc801d1d621e045a5a0b44d34c982cddb11396e82c019bec386a65f2a
 AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed
 AUX R-2.13.1-zlib_header_fix.patch 591 SHA256 e185a2c324796c11cca171da63663a59e45b558e13f01af8c9527bd09ea1028b SHA512 1ada5a3ccb0ff902f7df35d6a42f4e99fee6a1f7b36ece000b9e2fed2b731abf5c3687d22239cd324ff6677bf8edff3415aca57c31beef33c73b98073206136a WHIRLPOOL 989418f4fdd120ca0b163b61e7e0bf56e7b52477b38b310ef281c4637c979b5b483d8b955a0167c719ca96e276798ea647d647080164b13e69d3789410d5d813
 AUX R-2.14.1-rmath-shared.patch 986 SHA256 c05463dbf9ec5bba34cc987df4f6878154a738e57aaeaac46cc4f728c0c837a7 SHA512 d839fab36da9f78eeed4aa60514b37b6737486ed38e1094bac304fb4dc540f44ebf7df906f7efc577509c62e6d8926fc4c2f66d49dde83a2372f53ee8293ba1d WHIRLPOOL 16964dacfc2867f7301b62c5997c6c7ac9562de9fd005f6ddc82fd2ffb43c782032a7c2ef2d0b95dbe72263e4d2b1fa92a6eecd5cc25c1739d43db50e85672b7
 AUX R-3.0.0-rmath-shared.patch 1137 SHA256 22d247f2b062074363d3fa6233106291d9b344cff40e56f02c217d97c6bc023f SHA512 92b950703f1bb6dc82b5cee5e4165fddbdf6a2aa2670980460268dae0918f884c8c0ced069b5d106853c7be814025153e8b3fe9689f1db7eeb387cf73b18a4d4 WHIRLPOOL 07c6c18e84c08060d2eef8b7e99ce1a2e49b6511339eac1e5163da056ef58d813dbf8f3a58e1b7b53d96db5b867799cdfcfb285550995cbd28915bafaf7345e7
+AUX R-3.2.0-omitted-extern-R_running_as_main_program.patch 434 SHA256 58e3730abf664dec618d18b0d8b6bd7280824a8f031c07a4d4b5747a2bf97c99 SHA512 ab5fa16b950b1752b7322d8173d00960d92493e47752aa238a20723d06bba2f7ef1ba77cb2c50ab274ecaeaf6fd4f921076a18a8e7f0a07bc91ed240524277ba WHIRLPOOL 5b2c01a6d8dfc6a287c67c89a6b0c21218f5f4fcf21e94fe975d7bad762fd5a72a8b7291312990552e0e5b16023dfb590a708e471081de33520694653b59ce1e
 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
 DIST R-3.0.1.tar.gz 25508280 SHA256 af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134 SHA512 470edbf4a4fccf9310add110d7fa7f338e410e412b3ec84f6ea5f1253e94a435e185a7a1b62b22aee443293147ff7bcca139015b490a9271a502b1bfbf1426a2 WHIRLPOOL f45c960280f51cba3a4f3730fa79671808b3c07fd49f97b2cdce4a1de45986e62ac9bb24c6f764386a3ef1034a266b86f041a1a1652ec7f687a4db08a074d22e
 DIST R-3.0.3.tar.gz 28075821 SHA256 b97cfd9540f294ab786e846153f3dd8605610d7e27616bfb4296795bc4fde6d6 SHA512 881c9c0a8d866eb87218a5cdca72153c9ef0fa0a0f091595fc065bdcbc1ea8b0bd1a2fb3008457b12e1b5025a7e70bd7764de4286a57ad3f73226367b2fc4e83 WHIRLPOOL 076d041c0581dc211a4ee53cf5cad731dc0ece33bbb34f8c066dc660ef0c1f7dcfc1b3359c6a0cebfa2ccec9b689776965a530edcf9f81758c4e003242347225
@@ -15,6 +19,13 @@ EBUILD R-3.0.3.ebuild 6185 SHA256 c966118221b99f8f35c9d6e30dce5e6ee1f60c22387ae2
 EBUILD R-3.1.0.ebuild 6245 SHA256 70715ced23d108bc76283268a0ad5a5ff3d26638ba4a2812053078e6c83b49d8 SHA512 11bfb21a9c766e1de3dc6cfdf5492f55e336dfa2fe1b947f491e5042d992b31c49037418dd9c294db8e417aff555a2e4108185e5cd52df2cbed2ba2481bb68ff WHIRLPOOL 6a7919073efff5bcbea3157d61d325d16fb7faa291dc59eedeca8e2dfb8fe7c26374333a394655695c647da73ca8bf78d7d59e6a883625c03d2e9d0154336d65
 EBUILD R-3.1.1.ebuild 6192 SHA256 b67e7a833ba05d1bdb13aef789311fd4e543c545adcde6663a0641f6fb78afda SHA512 5b20c1a3fb94b9146a6f743249d3a175fa0a93afbf56b2a83fd8e0fea42b61640f930f67abf2ad2ce97e02c6220dc2f0ad2ff4f901872b4e4e3c44d45fc23e61 WHIRLPOOL ee111bc06f9f7bba8552238378c00e96652a8a554f620fb69a1de18533bd827dabd7d85c1bee86392ea59d919f015c4466c5e6ebd63e89f667e5d094fee88927
 EBUILD R-3.1.2.ebuild 6193 SHA256 28fe94990662642a3df1c0f4f83906c9c86ba4eef63af91e8519db0333296185 SHA512 65912ae19b5d3e69c4feb6ffb3c3ac8938db14d0cec8591da57fadb27d8f52696e7be4da585131c4d4907649c43241806ec1207ff4c5b1cf4e0364bdf52bc43b WHIRLPOOL cac8ee2b994731f249a43ee76542619f8242510601da562e94b9535d86304c4bf34b785e0ca6ec84d3e5c174fd3967af125ae4e62fe1debf019916693b361c36
-EBUILD R-3.2.0.ebuild 6193 SHA256 ea38c7730bb02e7425136dde6d201a8140d9b5d416d1191a10cb36bbd4707360 SHA512 2e33d81b4b297fc7735a09c207558a93711964075035103f97e6a1e5817ea22a3d4805ddd26273eeeb8752e3e11d62115606e4cf5c67bf9bb4320aabb4f7605b WHIRLPOOL f5c99e658b24414466bfdd3cc72fe4d3a147c46773a896766aa1b5bec36ffaa6f21e98dcd580283952d935dce25135c9a2eee3048dc0217914a4771fba7a7d70
-MISC ChangeLog 36997 SHA256 b61f6bfbfe17cbf86470a82334eae584ffbb361f68ce17efabe9a595e6b5ff63 SHA512 b8a7e75dbe9cd18526b2744ef3893b04a8c3ffa03e7819800bd1c5bfc5ac90f62a99e8c1d2ea0f9a0eb84207ce0908b17968d112d34c1c5fec72537a2a890aaf WHIRLPOOL b3972b48d4025dc89319479c56d09833349d1422f6e2d0dcbbb3f44e42b4dc25ab20342ccdb36534890525e528dc5cc5cd653933c1bd3ba0cc4169d74311fa69
+EBUILD R-3.2.0-r1.ebuild 6272 SHA256 6666bf42ebb3218d9cc1edfefa4ee4edc598f0e8724ddb1d8789a5774552b51c SHA512 67d58b30b2fffab15ef75a2cff6d5ab408de5e67b5cdedd307fb2d8dd019a07ebbb6d25f7b612a404e413e696ae51a38cd41b75f21d15d909c368646c238d302 WHIRLPOOL 25f6e1073ada4f04d6c4e81c45f107dfb3dffc503501cd3aecedf3acf7334b6963ef654096ef5bf36c77bb65695976373d9391e48b1909ac5c39872a80f6a4f0
+MISC ChangeLog 37389 SHA256 101a02192f9731c210a7bd41935776449e2d5f778f901b86a460694c7dfd9292 SHA512 2b84c031ac337650af82a766057425c66e11dcaae6aa5c27d7de6654068f231c0cec051463eb3f853f13afaf0e988b41bbc16280f332d9e9f0463797d03ee5e8 WHIRLPOOL a436c9e0a6dfe45cb95e2ec589134df6ab448dc4e64850ad0a050211bb8912b884c29d455dea4d9d8d3b587ea2f61015a57ad94539cd4e56e38977b1b4d168ac
 MISC metadata.xml 1136 SHA256 7d7c013a77ad6ffc785202e05711d4127a77f64fe09ef919deffa80cc74f992a SHA512 761c3afcbfc76c6026cc6a6f89dae2502f495008851dcb070ee04990653ed6785f089d31a0ea3ada11ccf3d027d372256d04a0baf9ee5d2528e63a9ea4dee313 WHIRLPOOL b7bd0d3843543ff07d15e2d18ae56358477667cec9e78be266f2d983304537afd6c1bac0842e403ce62729248debe2fddfe345c66e022bf2716a47d7819fe041
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlVDgTQACgkQoBEVQmGOlx9pRwD9GRIxIHicfqCiWCJFYkkAUyeN
+hha8RIB1jU5AlxVXB6EA/jSWh6eG5CU1Hd3Oyd/WBOY/6lPghTjc/s8oaQK00u2l
+=oBRi
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-3.2.0.ebuild b/dev-lang/R/R-3.2.0-r1.ebuild
index 020069de3986..e0cd32a2418b 100644
--- a/dev-lang/R/R-3.2.0.ebuild
+++ b/dev-lang/R/R-3.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.2.0.ebuild,v 1.1 2015/04/21 21:17:14 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.2.0-r1.ebuild,v 1.1 2015/05/01 13:35:41 gienah Exp $
 
 EAPI=5
 
@@ -74,7 +74,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
 		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
+		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch \
+		"${FILESDIR}"/${PN}-3.2.0-omitted-extern-R_running_as_main_program.patch
 
 	# fix packages.html for doc (gentoo bug #205103)
 	sed -i \
diff --git a/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch b/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch
new file mode 100644
index 000000000000..eebe5088ff98
--- /dev/null
+++ b/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch
@@ -0,0 +1,12 @@
+--- R-3.2.0-orig/src/include/Rinterface.h	2015-03-19 10:02:16.000000000 +1100
++++ R-3.2.0/src/include/Rinterface.h	2015-05-01 23:02:17.541946810 +1000
+@@ -90,7 +90,8 @@
+ void fpu_setup(Rboolean);
+ 
+ /* in unix/system.c */
+-int R_running_as_main_program; 
++/* Gentoo bug 547478 R bug https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 */
++extern int R_running_as_main_program; 
+ 
+ #ifdef CSTACK_DEFNS
+ /* duplicating Defn.h */