summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2015-02-28 04:39:54 +0000
committerMark Wright <gienah@gentoo.org>2015-02-28 04:39:54 +0000
commit1f489ca693a99dd24d35df87c150b1c5f6667aba (patch)
tree9cdf58b2b8bf60e7223841f7f6037fb1dfff8390 /sci-mathematics/rstudio
parentversion bump (diff)
downloadhistorical-1f489ca693a99dd24d35df87c150b1c5f6667aba.tar.gz
historical-1f489ca693a99dd24d35df87c150b1c5f6667aba.tar.bz2
historical-1f489ca693a99dd24d35df87c150b1c5f6667aba.zip
Patch rstudio-0.98.1091 to build with boost 1.57
Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'sci-mathematics/rstudio')
-rw-r--r--sci-mathematics/rstudio/ChangeLog11
-rw-r--r--sci-mathematics/rstudio/Manifest25
-rw-r--r--sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch60
-rw-r--r--sci-mathematics/rstudio/rstudio-0.97.336.ebuild10
-rw-r--r--sci-mathematics/rstudio/rstudio-0.97.551.ebuild10
-rw-r--r--sci-mathematics/rstudio/rstudio-0.98.1028.ebuild6
-rw-r--r--sci-mathematics/rstudio/rstudio-0.98.1091.ebuild9
-rw-r--r--sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild10
-rw-r--r--sci-mathematics/rstudio/rstudio-0.98.490.ebuild10
-rw-r--r--sci-mathematics/rstudio/rstudio-0.98.932.ebuild10
-rw-r--r--sci-mathematics/rstudio/rstudio-0.98.953.ebuild8
11 files changed, 119 insertions, 50 deletions
diff --git a/sci-mathematics/rstudio/ChangeLog b/sci-mathematics/rstudio/ChangeLog
index 9a7872ac23a3..ecc387f07d7c 100644
--- a/sci-mathematics/rstudio/ChangeLog
+++ b/sci-mathematics/rstudio/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-mathematics/rstudio
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.18 2014/12/06 12:32:01 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.19 2015/02/28 04:39:43 gienah Exp $
+
+ 28 Feb 2015; Mark Wright <gienah@gentoo.org>
+ +files/rstudio-0.98.1091-boost-1.57.patch, rstudio-0.97.336.ebuild,
+ rstudio-0.97.551.ebuild, rstudio-0.98.1028.ebuild, rstudio-0.98.1091.ebuild,
+ rstudio-0.98.490-r1.ebuild, rstudio-0.98.490.ebuild, rstudio-0.98.932.ebuild,
+ rstudio-0.98.953.ebuild:
+ Patch rstudio-0.98.1091 to build with boost 1.57
*rstudio-0.98.1091 (06 Dec 2014)
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index bffc3f4be071..fe370d45d337 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -13,6 +13,7 @@ AUX rstudio-0.97.551-boost-1.53.patch 3048 SHA256 86290a2a4ac39cae8de988739c702f
AUX rstudio-0.97.551-linker_flags.patch 806 SHA256 9fa104ef1fc659aeda8108d2a6418679685ae8d0a19e3f5f97a634ad1d1d05d8 SHA512 2049077768ef72faf502387b5eeef80948d0ec748bc52df7bff6e507dd92a8c52b3a7f7f82eda526ea1289f16720ae51fd40c059bd2d04f5eacd51911b995f06 WHIRLPOOL df36ec2fd3c3e9bced79b6f29ecfbeebde8df6a7873f5de8d46ac0ca7f26c7851426c8b869de12ad302d7c152fa2212af25ed4b52e123f324d92cc7085e6e772
AUX rstudio-0.97.551-paths.patch 5543 SHA256 376b0ba06c3744902b14ce644d481b1a61cd030981faaaadacbf20fa8dea7857 SHA512 42063474152f0c044f9afea3e93812ddae98de012a7f2d3d1b5f23b95353538b97c584bd6e61c8eb5d314b63b4af6161d7088037a8210687c31fd64d53788a4d WHIRLPOOL a028f30c1b5ce8e3773cee2099c683bb2fbe1f0b16ddf45a5bffba499c8460f078ffe25c9b64a8b774464ea72ea71b8cb11f1623789e82c21b897825c650e3ea
AUX rstudio-0.97.551-prefs.patch 1008 SHA256 ae5bcb603cdd112adb9f5929b9cf15b33db36a9f9efc76bd24fb67855e99150f SHA512 2edd5dee1d59ed2abc64c2f68f354bd0c2d23de649790e956112131988de68d649a09ce9cd893d2715f656e90cabfee8a67f9ef98464b5fc2a6eb17d29e4a50e WHIRLPOOL 83f7f85f2c40a21697db1a5af9f28de80a802005e910a78905b4b45d66accfec03e67fb1c35cc7091eedf9f7d98bcd89e427e200b999edf1b206e1115fe2aac7
+AUX rstudio-0.98.1091-boost-1.57.patch 1876 SHA256 cd570ec085eefdb5c6e195210ae33285f347e0c4c80d8309a9275886725e8618 SHA512 5edda18a495e6e95683e4822cda632fbf965cab040424e82368c2d45a2a632057de69c7d3211c40295dd17985fc5786714ef3076b6cb41894f9eeeee1ab5b9ae WHIRLPOOL 20aafb0e70d2e442c8a7f3358eb075ae8d5b5579a1a555c8cca0c380cf82c463a052c53f7a85c748cf0266f4d46ba1380f8c77998a58c56d7d08b89cf94d8f3f
AUX rstudio-0.98.1091-pandoc.patch 1372 SHA256 9373f509352e6e1b70e27c28c27b0c345750fd30f83b2a6ec4d3e1e495d0936d SHA512 15b51507c71849a0acb2f70b2bd2c85e693263a999975fa9db876bef30b436c4ade10f956ad4aee513a9ca170083ab06aeb42190db7454f13c5f4aaca2ae5b49 WHIRLPOOL e207c543c9cc6448ec8ebbac56f916db27bd3f50f8da9d6f21b3f7509322c06fa47558af545108b89d2c8d1b148348646f0a2a5418a72f286de047089f745765
AUX rstudio-0.98.490-linker_flags.patch 806 SHA256 9fa104ef1fc659aeda8108d2a6418679685ae8d0a19e3f5f97a634ad1d1d05d8 SHA512 2049077768ef72faf502387b5eeef80948d0ec748bc52df7bff6e507dd92a8c52b3a7f7f82eda526ea1289f16720ae51fd40c059bd2d04f5eacd51911b995f06 WHIRLPOOL df36ec2fd3c3e9bced79b6f29ecfbeebde8df6a7873f5de8d46ac0ca7f26c7851426c8b869de12ad302d7c152fa2212af25ed4b52e123f324d92cc7085e6e772
AUX rstudio-0.98.490-paths.patch 6156 SHA256 28b21281aa3b02fc2921e06b20a1778f7a85b2973da5d88c6b3eaff0d5957b8f SHA512 3e74bea76654ccf342dab95a61f8cd982faf0073c3fe70c0f13a31382a0349d2d0b79c400f89c760c73c45187e5c57a99e4ab8c546ef7e0cf7eb5a1b22e4dda5 WHIRLPOOL 097edbab026ce6daa4edf30c4d111f54bb711e2561e4b561c26d06a0093b52c7f149c59ff4d95fe616e692c4dabddd86a35c7af435e7de5fe86c694d90b11a20
@@ -41,20 +42,20 @@ DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea
DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
-EBUILD rstudio-0.97.336.ebuild 4019 SHA256 8c25df1b3e35cc0193acef27faecc2ea8a5aae24538d9d804e789670fc7c71e5 SHA512 4f8d406910d5e0835ba36414b06cace73572dd220107d610e87949a5818579c75ce7f9b99a07dc13f45f737d1e1e4733152906619a5cb2af45f7926f55e789fe WHIRLPOOL b00dd63459230b86fb502f7d2e96e466572177dd6b4a3989d7d19ca174bacb6eda69ea4c1353e7cc6d49d04d29658bc20c649e0602d73d5ca1a8d8b0f3ef15b0
-EBUILD rstudio-0.97.551.ebuild 4019 SHA256 e87b48c70bb8b0a4a4cdbf9f689e04eadfe2284050a90b863f84404a862b25c5 SHA512 f74d8a8e17d868bfb41ce3e0f75cf1456cca9e78fe6721e133a3cc177cc85c71a4732a99692cbcb6a13a6d3c8fab8977d779e3f49f2fd25c30bed1900d35ecdc WHIRLPOOL 74a0496f01149e5ea3e3f0c3bd0e488f42bb883ae32c2d6d181a0e23246104dd3828c253fb200fa76f6f80a35eea482cabeb76abb7fc90987fda47403d7690fb
-EBUILD rstudio-0.98.1028.ebuild 4801 SHA256 a28c92772823f76af26ced9a5d7b2796d09abec429970fe774bd2bf301cee8b2 SHA512 c4e19969001f33e95a004200c8fcd432b01fcbf9ced8ca7ceaf807f03563dc867d40d098569336fe1d66e58cd18c7582e4200cf4f6435911d5ab5e960889326b WHIRLPOOL 96c245715c696d491d84858102d0dc65aa7957fa7d209cf0dacc661ce6eb6c448a03efa808a0fc1ac30f59f1e207f5fe338da06aab80abf3f7cde1bddbb71126
-EBUILD rstudio-0.98.1091.ebuild 6128 SHA256 e6eb18344ba40dff9093a0184cd0077b82ceccd43e6d0a9cb37c65cb2a3628dd SHA512 1dc31d84a9e9839f5c039d4f981c6d7f0473da190384878d809c7d34b3b35a1021abd0c642660e73262958beff64ea2bbbbd3db8b2face6cd1e03f4c2503869b WHIRLPOOL 97dc14a62e264688d890ba56bc58219cfd0ec4747576823024e5ce460cc60ed4e1b91bc4cdb2b36d25bb37f32016f3823975e820cd28a0dacb62f1a82d8c15d1
-EBUILD rstudio-0.98.490-r1.ebuild 3431 SHA256 6cb4f794494456f917683863f92f5951d584d54776c92cc76ce4a63668bd976d SHA512 1e286f90923399d9bf3b887f73eeb64aea2d120d1c30bf5624040cffd4af89c0ecaef9537254567f624c9e916089906e04b849988130e1fd0dbbad565296aca2 WHIRLPOOL 24af6a384e7636f3d7e929e0c3b47ad4c940cc29aed3673b94bf4195fb3915a90d1ff230ef523393bc31aa1f7284b8d4814dcb08d4b542bd4264f83a7a451669
-EBUILD rstudio-0.98.490.ebuild 3946 SHA256 598caccd71a54fe7c7be48b0f19b1923aa367b01ba4d50252e3adc4a5872f5f1 SHA512 2fb5b8ceb1371ef3bcbd480a57a21df41f6154f808775a88305c499a1a835fc057cd8db64d1b9b267541075b5863f97651cd42d76d90b596287d5ad73cee7c8b WHIRLPOOL e1243242f3d74c4346eefa78691c1b3bea8c7b87a95e34f5aa7c64d5d0c1c6b96646c130d2712f90ae1117de64ac5f1913ef344f2de55677ddae99d9bb4480ac
-EBUILD rstudio-0.98.932.ebuild 5193 SHA256 15aa272beb8ab911aff3c4ada5cbe3f57e76881e07857206394a8337fc55015a SHA512 49cf0f4976a31e07f6e6e2000b180e6f8a2bd67116bc2254380811532939965a3044ce14bb13fc7f251c6c90c426177f6cd8a49118dde8169203d17b6ee09b66 WHIRLPOOL e7b027e812664e962f1a0a8271e080010ffce6be513993eb4f6807b300bc8a1902a77faa700b04313538e5019b909371bc512232e7f5ed23767b2bdcedf95ae9
-EBUILD rstudio-0.98.953.ebuild 5236 SHA256 d1aff2f94304fc8a5f9578caaf0155424a323bfccbac02f8b7ac9b5c85eb83ba SHA512 e3ba7a4166c7116b6ee988300958c3f6e66883e161861384716db393d6714f6a67239bb94ec36de9e8c08f85a23ad5d802d1054b61041732150433cbb0ad733c WHIRLPOOL 490ad76839da02699d0fbf74fd17fd940fd6930f5be69db9592f549e8e97988f70872cb9927204cb2a5c41e775c620e2aba6dc3eaf8472cb8f0c0c2f5e0fcdc3
-MISC ChangeLog 4839 SHA256 2f3365c14ff4e44d25502f1e228935260202a7c7ac285201fb0bdf468dfe95ab SHA512 72a52ad2cc03ff65577b0960f79371ecaa1c67b0e549b8e6c656ad68978e55d2dc7f205e8bf4944409f8ce2d5bc3b12453339b5a0e9b3d992bedd64267a46dca WHIRLPOOL 755623f5283fe8b67f0dce8529801e4528a573376f7a3263bf662a7e0e38df701d2c7067cb3dd8604491eaf5063b30198b41012177f748c29a5e3f823b80b93c
+EBUILD rstudio-0.97.336.ebuild 4025 SHA256 e628d162ca757a577ede64f343833bb8265120c613e74a53390e734482937d73 SHA512 77b3b4ce53015faeef6643de7ccc90f94b172d3938acb70b1164d28d0246fb29a3469e2c0e22d6e79410c0e7ad96cb35e0cd4d95eb810d2044f6e28750da7485 WHIRLPOOL cd7b2d643cf21b827f6e3b01d4c10ce5e5867843769ffb894975588f3fa9e40dd4d780615850b0361233e1f6cff88aee949f0d250fd124f822f0c9435f70dfa7
+EBUILD rstudio-0.97.551.ebuild 4025 SHA256 0adf3209340efd49aa84b03b0773b03f80e5137670fe2582e27ab9edb50702ab SHA512 8b6d43f882a75ec77f4f29f47d0ab1dea52bea8156b1ff6659967e92280f0f61864179e738185ee7f8616aa161526de87cd9fb435c0af491e3619189d06d398e WHIRLPOOL 771d4e21d7584a8d604ce122b09a101e9066f7ac35ddd0d69c23cffcf6063647d6321c40f581931f21f68875a290e30b3c32cd51eb01a137ba6298d0b591ecf0
+EBUILD rstudio-0.98.1028.ebuild 4803 SHA256 c1467a9cffb709d35af122ba1100ede2590ccc7987227344f4731e9ee633a7c2 SHA512 902ab19381659953a0d94aa37abf395fc5af7b6d98fa3d2e53e5faeecc285bbb4991e419815348ae845e2eb33a184a7e3af86acdcbf53f0eab99f0749051f04c WHIRLPOOL 802385a084f9f29d05746bb97132f4eb19c034957550c9743372e53e963983773dafba9d6630111516a1c77f6b5cef6accb920d4bce098a4fcc68604eb85cc9b
+EBUILD rstudio-0.98.1091.ebuild 6181 SHA256 a20f74c33f9d0ee39653f6a77e8e3d1c28df92558263528ec6d3334f74bcb395 SHA512 b96f44f86469538c8efad99cf640770094858ee4d730fe8142db31462807fee4cc4fd0b62d65fdec22b3d70157ebd2f624b2d48ac6f582b03161bf518a210dcf WHIRLPOOL 13973b869f4aff7eee56af06fcf5ad7310f77d3f09539d28c643934ea84111f21896f10f2c7e3077628788248516e3e4d1ba9bfa1dfd10ef6c61c9bb366e3824
+EBUILD rstudio-0.98.490-r1.ebuild 3437 SHA256 4aebac090b605ffc76c1be0445e1475b9d65edebeb2427d50b77726a78643f86 SHA512 a34cf6e9b176e112fa3a906f0f50c4b65fee020077847bdd1103bfb91b9970bec4b76270c3c46308ad97ffd6a82a74c6d8e48402fd9255ccaaff94d85cd3ac08 WHIRLPOOL 8bc672b3c45b21671cab4cc36576b9db9e30e3a123f7a0ac992d78dd225be23f7fb0466bcf59c3a177756a47c21090e8b9e9afdd940b2b7464ca7ccf70a10840
+EBUILD rstudio-0.98.490.ebuild 3952 SHA256 2b13202604a38332035cd0376c04f33d3cba7d100c762c584df9d602ca1c757d SHA512 afc321af993553c52f8257295955da62086662c4d75fe87f74154b11aae0d6e9ecddde361556830d1a1226af7f2364b3f272be76e2cee93140195fb302446a9d WHIRLPOOL 80625c7b5c49b57f988e16385abc5a8628d614af650fc688b7c861c171b8b8c872648e8935c5fc57a1a87aa4138d36a70ffe6fe83706a6717e5998341c150594
+EBUILD rstudio-0.98.932.ebuild 5199 SHA256 1164355b9e4a8d7348dfc13a65c251424e5d8fbb58cc6adc3d819cec6cd62a17 SHA512 5d2b6ef7b37ab61b90b406f2b00f3733d972c6b211ddc43991449c9746473ea4f3db66147e500c4888ede938814a9eb519430d725e2c4f9553f5d0ff024616aa WHIRLPOOL 304a0c1beebcde0d7d139d0471a34eb192fd4f434d0c1dea82f01bd6ee668c57760c3e749bb9ad56c876f8f93f77c6e0a3e5092857e964d26ef7379521e5cc9e
+EBUILD rstudio-0.98.953.ebuild 5240 SHA256 968ffddb222bb22ccac0398664364fb184e554f511195c635ca8d49a4053b890 SHA512 e3bdc05234359f969aca70dcb51cc409ac64bdbd201a84adcb6fb98f65090d2cd660c7336e05ecbfd668a4e1c8e4d59531229a7ceb65f319fe88b783ea54b363 WHIRLPOOL c3d452c925b041e893a9abd3c6e0e1b3b0782af87644e0afca15978237ebf8fdf372dda4a9204cca2980b9a15ee52038c660caac11db295aeae47f3b9aadd648
+MISC ChangeLog 5194 SHA256 1147217e46fb74a3df493b6e067a1ee76f462898be5f97ebe26b546d94d1116d SHA512 3e0384eaf92b4a804f5513a789c93f94d548b2afb9511341e5842ff878427c7c0bfb9d5d6bcc48a210505d9066d5fb9d79f22585d81041d08c127cd961919753 WHIRLPOOL a1e15e785b685888ba69b0811f395aa4ae23dbf80b19125f4d65a1b726955ca6a265e7a2bdcfa51e3d6d9b3896a9c99c9f6b302e48de17846d4dc485e5916d1f
MISC metadata.xml 492 SHA256 4eff29defb78a426cfcd8008074cd2d2390c51c1c848c86bf1bbfad893a78c3d SHA512 e4756aac3b119839704c7f9e585be170c55eeb7205b5408d6d3f384db1911c61aa194b8985cb074b6cfd928bd04e089938408eca2ae1f0de58c64f98d7699ace WHIRLPOOL 8d120667729b4bc7e72c77bd61e7cc6ed31f50b6fc2aaeb29e8cb98ff6e82d4de1c4b26205a0d6f4f4acbace1c4f17eecd4694ff6dc08150c61d416d40480038
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlSC90sACgkQoBEVQmGOlx8XjwD8DAhkCWi8M46T0N9Eed9w7mr7
-TCPsPeHgBt9PICPMmUEBAILKXHj/OeAwoaTJ8uwOiyzbxc9taKAMumDokh+ABpp9
-=5Vg2
+iF4EAREIAAYFAlTxRpcACgkQoBEVQmGOlx+tkAD+MCR7dOKVFEH0KAdF5FIcgwXF
+615oJN3WNJRA10oyYFoBAL+3zLRRI6GLTLQMXb0GoeJ1dBTK9hhTur5EvI31QkQ+
+=ybT8
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch b/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch
new file mode 100644
index 000000000000..3a157183c22c
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch
@@ -0,0 +1,60 @@
+--- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopApplicationLaunch.hpp 2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/desktop/DesktopApplicationLaunch.hpp 2015-02-28 14:01:51.970672316 +1100
+@@ -19,7 +19,10 @@
+ #include <QObject>
+ #include <QWidget>
+ #include <QApplication>
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/scoped_ptr.hpp>
++#endif
+
+ namespace desktop {
+
+--- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopSessionLauncher.hpp 2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-28 14:01:51.972672316 +1100
+@@ -18,7 +18,10 @@
+
+ #include <string>
+
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/utility.hpp>
++#endif
+
+ #include <core/Error.hpp>
+ #include <core/FilePath.hpp>
+--- rstudio-0.98.1091-orig/src/cpp/core/include/core/FilePath.hpp 2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/core/include/core/FilePath.hpp 2015-02-28 14:01:51.984672314 +1100
+@@ -23,11 +23,14 @@
+ #include <vector>
+ #include <iosfwd>
+
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/function.hpp>
+
+ #include <boost/utility.hpp>
++#endif
+
+ #include <core/Error.hpp>
+ #include <core/Log.hpp>
+--- rstudio-0.98.1091-orig/src/cpp/core/include/core/Error.hpp 2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/core/include/core/Error.hpp 2015-02-28 14:01:51.977672315 +1100
+@@ -20,11 +20,14 @@
+ #include <string>
+ #include <vector>
+
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+
+ #include <boost/system/error_code.hpp>
+
+ #include <boost/current_function.hpp>
++#endif
+
+ namespace core {
+
diff --git a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
index b49cb580cf9b..2ba127cb2f0c 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v 1.3 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v 1.4 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -30,10 +30,10 @@ IUSE="dedicated server"
QTVER=4.8
QTSLOT=4
RDEPEND=">=dev-lang/R-2.11.1
- >=dev-libs/boost-1.50
+ >=dev-libs/boost-1.50:=
dev-libs/mathjax
- dev-libs/openssl
- >=virtual/jre-1.5
+ dev-libs/openssl:0
+ >=virtual/jre-1.5:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
index 79d871e7889d..313adf9d44b6 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -30,10 +30,10 @@ IUSE="dedicated server"
QTVER=4.8
QTSLOT=4
RDEPEND=">=dev-lang/R-2.11.1
- >=dev-libs/boost-1.50
+ >=dev-libs/boost-1.50:=
dev-libs/mathjax
- dev-libs/openssl
- >=virtual/jre-1.5
+ dev-libs/openssl:0
+ >=virtual/jre-1.5:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
index f21ff18c4864..f1514d48d5a6 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -49,7 +49,7 @@ RDEPEND="
dev-libs/openssl:0
sys-apps/util-linux
sys-libs/zlib
- >=virtual/jre-1.5
+ >=virtual/jre-1.5:=
x11-libs/pango
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
>=dev-qt/qtdbus-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
index a59098b1adbc..c118ae30032a 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild,v 1.1 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild,v 1.2 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -51,7 +51,7 @@ RDEPEND="
dev-libs/openssl:0
sys-apps/util-linux
sys-libs/zlib
- >=virtual/jre-1.5
+ >=virtual/jre-1.5:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
@@ -107,7 +107,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
"${FILESDIR}"/${PN}-0.98.932-paths.patch \
"${FILESDIR}"/${PN}-0.98.1091-pandoc.patch \
- "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch
+ "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+ "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch
# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
# this sed hack for now. ~RMH
diff --git a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
index f2624bad47e1..fa793830beee 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild,v 1.3 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild,v 1.4 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -29,11 +29,11 @@ IUSE=""
QTVER=4.8
QTSLOT=4
RDEPEND=">=dev-lang/R-2.11.1
- >=dev-libs/boost-1.50
+ >=dev-libs/boost-1.50:=
dev-libs/mathjax
- dev-libs/openssl
+ dev-libs/openssl:0
sys-libs/zlib
- >=virtual/jre-1.5
+ >=virtual/jre-1.5:=
x11-libs/pango
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
>=dev-qt/qtdbus-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
index 43ef5c39a7e9..aea24d5ee353 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v 1.4 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v 1.5 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -29,11 +29,11 @@ IUSE="dedicated server"
QTVER=4.8
QTSLOT=4
RDEPEND=">=dev-lang/R-2.11.1
- >=dev-libs/boost-1.50
+ >=dev-libs/boost-1.50:=
dev-libs/mathjax
- dev-libs/openssl
+ dev-libs/openssl:0
sys-libs/zlib
- >=virtual/jre-1.5
+ >=virtual/jre-1.5:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
index 5ab66202c31f..d850375b7463 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -42,11 +42,11 @@ RDEPEND="
app-text/pandoc
dev-haskell/pandoc-citeproc
>=dev-lang/R-2.11.1
- >=dev-libs/boost-1.50
+ >=dev-libs/boost-1.50:=
dev-libs/mathjax
- dev-libs/openssl
+ dev-libs/openssl:0
sys-libs/zlib
- >=virtual/jre-1.5
+ >=virtual/jre-1.5:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
index 8e87354cb264..999f07b9864d 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
EAPI=5
@@ -42,12 +42,12 @@ RDEPEND="
app-text/pandoc
dev-haskell/pandoc-citeproc
>=dev-lang/R-2.11.1
- >=dev-libs/boost-1.50
+ >=dev-libs/boost-1.50:=
dev-libs/mathjax
dev-libs/openssl:0
sys-apps/util-linux
sys-libs/zlib
- >=virtual/jre-1.5
+ >=virtual/jre-1.5:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QTVER}:${QTSLOT}