Bump rstudio to 0.98.1091. Fix Bug 519290 sci-mathematics/rstudio-0.98.490 - rstudio-server start: /usr/bin/rstudio-server: 1: eval: /etc/init.d/rstudio-server: not found, thanks to Franz Fellner for reporting, Adam Tygart and Franz Fellner for suggesting the fix, Silvio for testing. Fix Bug 522196 - sci-mathematics/rstudio lack of server part and two more conf files, thanks to Silvio for reporting and providing the conf files. Fix Bug 523296 - sci-mathematics/rstudio-0.98-1028 with dev-libs/boost-1.56.0 - .../work/rstudio-0.98.1028/src/cpp/core/Assert.cpp:40:10: error: boost::core::log has not been declared. paxmark m rstudio for Gentoo Hardened. Add missing dependencies app-text/pandoc and dev-haskell/pandoc-citeproc to rstudio-0.98.1028.ebuild. Remove obsolete rstudio-0.97.318.ebuild, as the this failed to build in my tests.

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

15 files changed, 391 insertions, 171 deletions

diff --git a/sci-mathematics/rstudio/ChangeLog b/sci-mathematics/rstudio/ChangeLog
index e1d519c340dc..9a7872ac23a3 100644
--- a/sci-mathematics/rstudio/ChangeLog
+++ b/sci-mathematics/rstudio/ChangeLog
@@ -1,6 +1,28 @@
 # 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.17 2014/11/29 11:31:36 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.18 2014/12/06 12:32:01 gienah Exp $
+
+*rstudio-0.98.1091 (06 Dec 2014)
+
+  06 Dec 2014; Mark Wright <gienah@gentoo.org> +files/rsession.conf,
+  +files/rstudio-0.98.1091-pandoc.patch, +files/rstudio-server.conf,
+  +files/rstudio-server.initd, +rstudio-0.98.1091.ebuild,
+  -files/rstudio-rserver.initd, -rstudio-0.97.318.ebuild,
+  rstudio-0.97.336.ebuild, rstudio-0.97.551.ebuild, rstudio-0.98.1028.ebuild,
+  rstudio-0.98.490-r1.ebuild, rstudio-0.98.490.ebuild, rstudio-0.98.932.ebuild,
+  rstudio-0.98.953.ebuild:
+  Bump rstudio to 0.98.1091. Fix Bug 519290 sci-mathematics/rstudio-0.98.490 -
+  rstudio-server start: /usr/bin/rstudio-server: 1: eval: /etc/init.d/rstudio-
+  server: not found, thanks to Franz Fellner for reporting, Adam Tygart and
+  Franz Fellner for suggesting the fix, Silvio for testing. Fix Bug 522196 -
+  sci-mathematics/rstudio lack of server part and two more conf files, thanks to
+  Silvio for reporting and providing the conf files. Fix Bug 523296 - sci-
+  mathematics/rstudio-0.98-1028 with dev-libs/boost-1.56.0 -
+  .../work/rstudio-0.98.1028/src/cpp/core/Assert.cpp:40:10: error:
+  boost::core::log has not been declared. paxmark m rstudio for Gentoo Hardened.
+  Add missing dependencies app-text/pandoc and dev-haskell/pandoc-citeproc to
+  rstudio-0.98.1028.ebuild. Remove obsolete rstudio-0.97.318.ebuild, as the this
+  failed to build in my tests.
 
   29 Nov 2014; Mark Wright <gienah@gentoo.org> metadata.xml:
   Set the maintainer.
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 77149bbe6f29..bffc3f4be071 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX rsession.conf 1145 SHA256 23dea938def95eaf559666faba1701f686000d1af510a579d13e415d99b8226e SHA512 90395faac5aa80ce52ae56da3565512b8a880a14ab2acf9a24c7a56c9d03f1e3d5f63ebaca66efa68f5c5c9c831235846df22ca37f20ba071437a2a963b808cf WHIRLPOOL c57d10c1fdccb49004825f4f99e8fb966e4270167be36116a5b73c289bb4af89fb36a99275d1b35d0f2f4b6f3dfc2fa45a9e66892ea9d59a8223afa888990db6
 AUX rstudio-0.97.318-linker_flags.patch 806 SHA256 9fa104ef1fc659aeda8108d2a6418679685ae8d0a19e3f5f97a634ad1d1d05d8 SHA512 2049077768ef72faf502387b5eeef80948d0ec748bc52df7bff6e507dd92a8c52b3a7f7f82eda526ea1289f16720ae51fd40c059bd2d04f5eacd51911b995f06 WHIRLPOOL df36ec2fd3c3e9bced79b6f29ecfbeebde8df6a7873f5de8d46ac0ca7f26c7851426c8b869de12ad302d7c152fa2212af25ed4b52e123f324d92cc7085e6e772
 AUX rstudio-0.97.318-paths.patch 5418 SHA256 6973516ee72f19df412e6b7739fa0d18f337328ca74d009564b5f3e93d3f5470 SHA512 bfe3a0c2903e804773e4325f655de18097ce30534fd6d8cf6ff5a54f976de170b4e37d86eae2d812411131fa96e1eef7f3a3fbd951c35082fab478fd72a4d0fc WHIRLPOOL 50ae21a068b63b644a033fc25dff8599c95bf869b64f1bfd0a200484f61d15f7deba3ac565efd02b09e9fc92e10fb4f429ab28eabb2c3b95dfb3cac8c5b97fb8
 AUX rstudio-0.97.318-prefs.patch 1008 SHA256 ae5bcb603cdd112adb9f5929b9cf15b33db36a9f9efc76bd24fb67855e99150f SHA512 2edd5dee1d59ed2abc64c2f68f354bd0c2d23de649790e956112131988de68d649a09ce9cd893d2715f656e90cabfee8a67f9ef98464b5fc2a6eb17d29e4a50e WHIRLPOOL 83f7f85f2c40a21697db1a5af9f28de80a802005e910a78905b4b45d66accfec03e67fb1c35cc7091eedf9f7d98bcd89e427e200b999edf1b206e1115fe2aac7
@@ -12,43 +13,48 @@ 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-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
 AUX rstudio-0.98.490-prefs.patch 1008 SHA256 ae5bcb603cdd112adb9f5929b9cf15b33db36a9f9efc76bd24fb67855e99150f SHA512 2edd5dee1d59ed2abc64c2f68f354bd0c2d23de649790e956112131988de68d649a09ce9cd893d2715f656e90cabfee8a67f9ef98464b5fc2a6eb17d29e4a50e WHIRLPOOL 83f7f85f2c40a21697db1a5af9f28de80a802005e910a78905b4b45d66accfec03e67fb1c35cc7091eedf9f7d98bcd89e427e200b999edf1b206e1115fe2aac7
 AUX rstudio-0.98.932-pandoc.patch 1143 SHA256 0706e41fc00ad7fa5abe3abb4f42c0a93fd1999609063b2cf48d508bb988b6e4 SHA512 3295e41d69e49a8da6fc7605f7f2b53c7697c8cf051861147a544a3be2c97c4afd589f2ba0fe9e2137f93064b660e61060115cd2ec425012fb4416d19fcba3df WHIRLPOOL cc3540f1f557330b62a747ccfd4b57c475e377bf13e0b6c95a284391848c9c4151567dc469fb7319c89e9d8960813b8a4bc529444ad3a002c270515f8fd43beb
 AUX rstudio-0.98.932-paths.patch 6829 SHA256 57d01278b28ad380c731cb33f11374b4353a335059eb3d56a984d7a4f2c1e00f SHA512 1887f2af4a648f1d2975672b91007f5fd29e136c31aed7bf419d969d53010261e59d1a378a66cb18ea8c4ded70deb41aee6c854161daacfb673344dff19bc7fd WHIRLPOOL 3d02919ca2ab1ea745e7b8b5fc85e48826be85695891cfad37ee1c73c93821bc329b831c739e418b88290bb522508eca8b436b0f361ad54ef9236159bf3a42c5
-AUX rstudio-rserver.initd 376 SHA256 b35b3807e7748a372b9968ce35d0adf5a72641c7f1c3551af3c8d14f84cfefec SHA512 1ff6fa9078841a885e080cae62d12478cc536333059ab850516cd8de405378188b6d503ce1edf6afaead85cf96466d71befb239cf4691d6f103fc4fcc88d47de WHIRLPOOL 464346a10ac2843c1b75145793fafc4fe5432d9dc254c94964d0c2486edfbf462f9a5901af4a48a04075262037d182faa9d6aba18f0099e618fa983c4ea5255b
+AUX rstudio-server.conf 1336 SHA256 ef1ca46dcca299057ba402d77028d95de636eac386e2a835ea464a85ab347658 SHA512 7d621e774a205f2c5df3d955dfdb2d7de2e5a11653111f893d235383c74782af3abf31108b102d05d546a62cd74d36b0f7392a6b060cb8cf820d26c314973b32 WHIRLPOOL e81fb2fd589f061e9e2279a5965642c68f6e4cfb376ef23cc7daca6eca45f8ea1f8c2cf9b3a273012ce910927c0ae9d23ecb1e3b6c5368a3eef58746fd49ac0a
+AUX rstudio-server.initd 376 SHA256 c12c1e846825b361a50b307c4d3cb4e620586df98969b65cf9dffb6cb5afb5d2 SHA512 697a0e7f1de553b2ce29b87543c40c4f666b62baf4c43019f261f10218e8e4121408375eb94804c739593f1791eca41ea8c286079b8e2ef7f1282c9ca604a655 WHIRLPOOL dd03d0b3d433bb4d27d1de7a1ca6aca56ca090175d92c530acd4a057b9d172d8888af3ef10f5f5911a7921952448512462223c0b938657931c298ad4ceb88118
 DIST chromedriver-linux 19303552 SHA256 1ff3e9fc17e456571c440ab160f25ee451b2a4d36e61c8e297737cff7433f48c SHA512 18774ede961dec222058dd0e3f128d63732cd444ee310136b44d5bf508a4f2f2c164a2c8d195d80bce8b5fb6303559e167f82f384e4a58e30f48b151a4206ee8 WHIRLPOOL 06534c131d3a8ade4fb12ad94955f430f23d86654342357d223e78e210cc401416361a847934bccb3957702bbe8fc8a6dd7f18416461edf486145bde96c7091e
 DIST core-dictionaries.zip 876339 SHA256 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9 WHIRLPOOL 316dced8ac46e4216613b0b850c33d4c1e10ef0ecd954d786eb131ea80b34e66ba3d39a0ef25b45230b64ded415737ddabef8f7d68f4d42caea98679cff44ee0
 DIST gin-1.5.zip 1055663 SHA256 f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897 WHIRLPOOL e66d348ed275eb20518369c39592a5a03ee4257422e2947520385377939de65a54d131332818362a47597392026db48ed1332f11ae218e336798498ae5d5b196
 DIST gwt-2.5.0.rc1.zip 104156555 SHA256 83a6dec583d1b7f3bf3fd2e321d89c1d95881eed1f81c7ea4056201fc105258b SHA512 c0c4f502b4ca191537eada53eb0458c0d33282661423f6d2648e6107ed8e38465b189377fcd0d9babcbf2c688e16080d33cbd7165ed20dafda7fedc39a74e163 WHIRLPOOL b37f12d1937b6479b97e274a59a1856dcf0c5cc3b767b6a19f65d7807e1f32cc2483358f1414c4c9e427d890eb1e0617fe8af84c6f0dca4a9ded64ae5ffde129
 DIST gwt-2.5.1.zip 111070580 SHA256 c457df45a3eed582452c5784ed11746685df494c0ffe4a8ae4de52945916593a SHA512 845c6bc6ce5ade57eeddd8b40cc3458f5e7d40d881cb4017615897eebd5349bfecfef8cd3e3b05a09b33ecf9ee0262d4a84700b0965a27b40cb60d701457a7ea WHIRLPOOL 9d820026e97f96402fc6b69a06f24d2f79df830a0afdba808ab98f14a32312bc999692ad5822005acf6fdcd1b4261918a318f9f20980c640cf32292d5df83a05
 DIST gwt-2.6.0.zip 108819959 SHA256 bd4c13a5d1078446d519a742ee233971e55c447d1b87ffd5b1f90e54dd876b9a SHA512 40690f83f6271ab58abf0ccbf2da1045ea142867ed88accdce91f65a70e39ecf48070696caffcab3f797523ee69b0431b67155b7f04c2856cd95856a7e20d2fb WHIRLPOOL d59ce0f9b13a9956b07905479b394397020fcbc85ac3aabff9ebd74d39b7e660c862e7fe1adb32160e82186d83db10d1254121846e1a9bdafacc38efc55a38fd
+DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c42851545d61817c181bf6109e2df6b SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 WHIRLPOOL a2d0c3c3e04cbc496f59abbf1065fcd0b7ae25433ce0b7ca8e75ab59362f320508537b2a62ed1028dd5baad6cbab5ef2e91dd9d3af327bbd04c08a96c57d80f4
 DIST packrat_0.3.0.tar.gz 79974 SHA256 5ea35b6cb964188f4ffe58a3c9cf2c1f5a436569117c218d097e0fa66d032ebb SHA512 7f964e94e62193466e9bc880fea2c2fef8a0996061d9b971789e4e33a2d1e6327033f03236327545aa73e1112e2bea730c3fc0984729ecdec6f1582855c1b249 WHIRLPOOL 7ff4c3f3681300d402e8738b1aceac7ee2dbd55edb36966e3b7453b1b90182093979436d2c1193d460418251bc370ab222f61142311d8fe1a5a42527c5869aa3
+DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790
 DIST rmarkdown_0.2.49.tar.gz 3846795 SHA256 56b9a032b07d62c6af2a4a2d04007cccf379a9c8e91426c59f265c8b7fd992ee SHA512 46d15c354c9a90ae75a7dc3660b1ea82d097aaceb3dd220a4a8c6f4b22751ad2d63fd5ef3d56821160716ab6552529cef6513b5cd7043368d13513f537511fef WHIRLPOOL d658a091d1b4508ea38fbf2f3691517dc2b814aa3ffaec25483263266106756a89712d7c8a2ec3de8d6d45234d5f8b11340c287509bd836be5875527077f7fcd
-DIST rstudio-0.97.318.tar.gz 12597967 SHA256 170782aeee1c92e877abbac141b1516d52875f699b4dbfed44fe8f97f831beae SHA512 510e44c569809193cc0bf9b2cbdc80315671e245aa0871941dd93e7c9c435be03a4bf5aa29d2ce14b7cd1da2e67c0ddc8621fb025d3958d2c5ab00713d7c0c2f WHIRLPOOL 33e298ec68ce7600cd622e74801fe1d0a08e97f776aa3f22f4303258b1380b822236f41d99a4cd6956bd6cef07ab5a03b8a16ed7d09e9342745ebfc38c510eee
 DIST rstudio-0.97.336.tar.gz 12598580 SHA256 e6c24d6a865827d3a39e64508976a825bba705efe0921eb06f9a95ba58aefcd1 SHA512 bfaf6218cb400e83a97a320cf633e4656f1552e27bb9843fda1837945a3823fb0df20a2c86e0b6d76608d98806b0acf163aaba10783c923ef900b3eaf03b7569 WHIRLPOOL eca7b837ccff6cc6595298c3137f8663c0754256763a1d049e44a11e10daf53914234c426e004cc1f0158d7b4a38319f61653f78785c7189a64413fc196848c2
 DIST rstudio-0.97.551.tar.gz 12602738 SHA256 caed5f6b6ec57139ddf550dc2f51c1f9a74b39b81b878863b97e1a12edecf498 SHA512 f855a5ba3a86e44c870a4843e94678a1f6eeedc49934d8ad42f202815f93d282913a0be739435be63e510a6ec81b7a1436e4c911acbff955f5fb28b78b00fd10 WHIRLPOOL d8cd3d2978b690fc8c83696cb2017748e74b38309174ac85d6d35d5a1dd91d8e0d8ea06177b349754b3be9eb5e78e04b1d23b82f9e7940d062b262c1eb7eb58e
 DIST rstudio-0.98.1028.tar.gz 15555649 SHA256 19827c3d05b4817530fb07f235fe38ec5e391324acd1d5d8ab6711d0db4757ef SHA512 db1be9f91263386ad0fb8addc80421434695d2c8dd53101af268e878fd59c59b9349cc9456d7096d2c660ee2681cd0172d8f4d8432ccf7322a1a2b473ce291fd WHIRLPOOL ab2974d2e529fea03fe641569d4b74a6eb1d86179be47de46531a970d5f70624824e08573835d531a5033d20f800117174926b83aee290f784ac31f7a9627d7d
+DIST rstudio-0.98.1091.tar.gz 15551758 SHA256 61745708096b5feb3d88befab65adf67dd386262cde1ef2b351f56695f5b9ac2 SHA512 6b2fcd7418118b8845266dc12ff4680623a68a8fdfda2bdc523e8cd30139e99fa29063438fbb441f23d04e57715eec1ee21763baf0ab77d313b763d8b3d9e3a0 WHIRLPOOL 356297217bdc70954b79695755fb873127e9b7c5a8ff2be18e237b559638aa1ec3c0349d8606598bd81e4057914e518748c236dc4a701d9a1f27805c2a4c7327
 DIST rstudio-0.98.490.tar.gz 14989329 SHA256 e38296a10b12c9e769a8be0545c36745999b9ba90942f7ffb6d27f05192a7f93 SHA512 b167083eb4adf1203da63299e61c9e3f40b8aeb4728d25c9d840f8a22659aad8de442dbba3a68e7d11f6157680d3a3636f6d5fecbabab82fd8d1a8278e3f1cb1 WHIRLPOOL d7c07aea3aef424aa9fa05f74b8222cae69b9ce287ba67d80591dc2a433471e7127d975119667560bf6667190d128b0ffcf82f641792075dacf826f4d76df568
 DIST rstudio-0.98.932.tar.gz 15515025 SHA256 e4a69a2f746cb7cfcacd3811f15e41a9d156175607da334f412614cc4cb70728 SHA512 beeb8c035d4f8524bd3e497162e3a218e92fbd1c1704ff3bc99a70a1248244155e3998272a6aa985b59cfa67c640adec877465f5d50acb9e47abca2657f2a06f WHIRLPOOL e422a2cef857aa9d094dd11e62b6c762a2a7477e7d84fd66456152c6521aebd94d4c365980ed6c06fc1c90d5a62426376d978de0ed23186d4732c0b148cc62bc
 DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
 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
-EBUILD rstudio-0.97.318.ebuild 3667 SHA256 52127d40e3e5b3650b1c4d9bb96bef1f7803baae9b65ff3741331a27e103e7a5 SHA512 abb66dc495f05134ee73f1060b64bfa9064afce5648c854a56915dad1a2db1c1dba7cc56b225fb8854ad88093610e3c04717f3cccbf22ae380adeac3e393d20b WHIRLPOOL b968731766f6c9f3a633742f6e34962f06bba166e14a3b38477fa0234b5765b04237c1db0eb6353a63a1aa24ffaead6914302d213e422a7fee796c40ab3efa12
-EBUILD rstudio-0.97.336.ebuild 3707 SHA256 e709f04ac75823cb9029466ac2a08fb8408bc6ba5672ad6dc9e28ed58a7ede10 SHA512 ae560ef23734634f2b81283322cb0d45393f55a508f0cfca9b8c94ff8c0e6534eeed027fd10369dc78390b38165725dbdc55a95f01bc2bbd8d66ee309e9998ae WHIRLPOOL eecc5cb0000682d08ed2109ac14846e8ddd36eca4d5f32faffa0a4822d4dee714fa921e46feb4f92889af29535dc75c5c3009f3fc23da3161e5f635ea01e6f7b
-EBUILD rstudio-0.97.551.ebuild 3707 SHA256 6aea8df78879ff50ed6b2a96b595c3a981ead48aeaab2b4177d7ad8422c09f95 SHA512 6f9866bc65f46d0a703f0d049086986fc2ba4d63c3f018390f04b220172d4fa127e6143a0d5965975b7baafc517e9ec9fddd9a92e8b7a878d8f87e09d799e970 WHIRLPOOL 08e77287bf7cd69b3d07af4b048af1fefb857aac6096d562d9d9c0aca5b2b5f7c5f021af047818cfaecd08beaf1d7d17a9b117506cc4f6e3834250d150789170
-EBUILD rstudio-0.98.1028.ebuild 4441 SHA256 9ca89a6b44346020cfc5bd46a2325b0d4ebc3ec9bc03183a5bb2ad4c7e3990e5 SHA512 492d69f29f7fbde17010c33ec3bf0d8b58e80b46c4b47a8f221c122a21cefb4f671272a766615dbc28bec7fcbeaeba11dad68b0726c34b27139a71f9b0859045 WHIRLPOOL 1a87fa53bcd77cdab92d643a84e7d75f5479a09e19bd478f70ffc4e6c3cb3e391c4f493fa2b448e3b53dc34701d76918ba0f87cc544a72857a280616a88d42fb
-EBUILD rstudio-0.98.490-r1.ebuild 3115 SHA256 9771dd346a10ed085971f85cae238deaee590dadaf5f3f83e6614caf6d540e43 SHA512 6184b3003624f2fca554a5ea401cd366d6d8e6b29720fd27e69fca1e23452fc75210d839d25345080cb074b65c5b03017c330523869c5dd4280ceb0f980d944a WHIRLPOOL e5b21c74c455272b86c045f60baeefc4e1dec7759d1831e256f464de1a75308d88ef9730d8ea7bd0e3d73f92211bfeb50e3fe71ba4d0a6eb32c3348551162f7e
-EBUILD rstudio-0.98.490.ebuild 3636 SHA256 5808d66efa59329759298db09af1514382903d5eab7bf3dc02a6ddb11cb2c42e SHA512 001aaee1ecce148e75f5fb09dca8911d7f114af931883ea455d00da91ae4d6aa360442905ef35bb7c101f4d168647b197f90fdd90430a25009511c879b0815db WHIRLPOOL 57a82a05908ec868356c324d266812bb14b0bfc5f3d8d05abec06e265056cb04aef0d3d026519bbcf927c2cb34185a5be817757dc233e5129022bb41855f35e7
-EBUILD rstudio-0.98.932.ebuild 4881 SHA256 c75c67325435a00a13f087af12f2b87fd7049a4ce3723ad9c5458e23e56f945b SHA512 2350748ec8f9c0837027e17cecc4ad7bbac291b4bff0623c34846b2905f4eee10dbfd55e7abb9be2aafe59ffa94b77d119cbd1208ab930fab9a305a51301baca WHIRLPOOL f6ec0a40f061cfebfd1725ccdb04a5a5d9284d9346f7bba0d3f5ef0d2a502c68cd11f4ea9d5757caede8ab993d0286053964f1b4b59496bbee12c5a33dfb1848
-EBUILD rstudio-0.98.953.ebuild 4924 SHA256 e6d08c8dce9f6813bb1eef87c0f2eb0bca40298b65dff616bafec902039c5ce9 SHA512 bc3ff67400706b0debd1fd8e0fd09a2278a6f86c41a87be10b8bd967a7caaa1ed96c84c00fc6733459bf34e5395a92bc815b357752cb474c59733cc561a99492 WHIRLPOOL 4df6d3585e8c927e7be01714fb7c74a44ddbcbf42962340078f0a785ecfdb5aae359c1b817ef2b6050401cbe39275ea59aefb81cf89979be98e606c194fbefb7
-MISC ChangeLog 3499 SHA256 5e215285d490458df072d13c64b9a97c205f5f839b9e5d6c3a47ddbff6fe7a0c SHA512 6ed1a73f67f71748fbd38a22988eb40d4438ebdce6ac7fee28713fd6dbbbab09ca7db2647b6068410d1fe8076be6c3ce57c1944bde733c39100fe7edc0a9f634 WHIRLPOOL 3b8402ff9e1bb494be2724201cc52926d616a5c17e5137f564346c2f45b6e89af6c8b630e2ffee8aa4f35c8502ce0c1a8f8d26b643aa10b0030481209ad945f0
+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
 MISC metadata.xml 492 SHA256 4eff29defb78a426cfcd8008074cd2d2390c51c1c848c86bf1bbfad893a78c3d SHA512 e4756aac3b119839704c7f9e585be170c55eeb7205b5408d6d3f384db1911c61aa194b8985cb074b6cfd928bd04e089938408eca2ae1f0de58c64f98d7699ace WHIRLPOOL 8d120667729b4bc7e72c77bd61e7cc6ed31f50b6fc2aaeb29e8cb98ff6e82d4de1c4b26205a0d6f4f4acbace1c4f17eecd4694ff6dc08150c61d416d40480038
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlR5rp8ACgkQoBEVQmGOlx9EDwD/S82tUU+eHRIGrv1jzKrA2tPF
-DanOmoGFrv09PtM2NO0BAKseTotfoHXqNC2Yk5+q5BlBiqJkyrIwnrXYyqgeh1Sv
-=PyRt
+iF4EAREIAAYFAlSC90sACgkQoBEVQmGOlx8XjwD8DAhkCWi8M46T0N9Eed9w7mr7
+TCPsPeHgBt9PICPMmUEBAILKXHj/OeAwoaTJ8uwOiyzbxc9taKAMumDokh+ABpp9
+=5Vg2
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/rstudio/files/rsession.conf b/sci-mathematics/rstudio/files/rsession.conf
new file mode 100644
index 000000000000..645bfa46b208
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rsession.conf
@@ -0,0 +1,26 @@
+######rsession.conf############
+# Session Timeouts
+# By default if a user hasn't issued a command for 2 hours 
+# RStudio will suspend that user's R session to disk so 
+# they are no longer consuming server resources (the next 
+# time the user attempts to access the server their session 
+# will be restored). You can change the timeout (including 
+# disabling it by specifying a value of 0) using the 
+# session-timeout-minutes setting
+#session-timeout-minutes=30
+
+# By default RStudio sets the R_LIBS_USER environment 
+# variable to ~/R/library. This ensures that packages 
+# installed by end users do not have R version numbers 
+# encoded in the path (which is the default behavior). 
+# This in turn enables administrators to upgrade the version 
+# of R on the server without reseting users installed packages
+# (which would occur if the installed packages were in an 
+# R-version derived directory).
+# If you wish to override this behavior you can do so using 
+# the r-libs-user settings
+#r-libs-user=~/R/packages
+
+# You can set the default CRAN repository for the server 
+# using the r-cran-repos setting
+#r-cran-repos=http://cran.case.edu/
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch
new file mode 100644
index 000000000000..3df8d1a986a3
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch
@@ -0,0 +1,26 @@
+--- rstudio-0.98.1091-orig/src/cpp/session/CMakeLists.txt	2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/session/CMakeLists.txt	2014-11-26 17:12:42.699712510 +1100
+@@ -25,9 +25,6 @@
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23")
+   message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies script to install)")
+ endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
+-  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
+   message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)")
+ endif()
+@@ -343,13 +340,6 @@
+    install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23"
+            DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+ 
+-   # install pandoc
+-   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.4.2")
+-   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+-   install(FILES ${PANDOC_FILES}
+-           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-           DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+    # install rmarkdown package
+    file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+    install(FILES ${RMARKDOWN_PACKAGE}
diff --git a/sci-mathematics/rstudio/files/rstudio-server.conf b/sci-mathematics/rstudio/files/rstudio-server.conf
new file mode 100644
index 000000000000..ebf1a1649169
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-server.conf
@@ -0,0 +1,35 @@
+###########rstudio-server.conf#############
+
+# www-port entry corresponding to the port you want RStudio to listen on
+#www-port=80
+
+
+# By default RStudio binds to address 0.0.0.0 (accepting connections 
+# from any remote IP). You can modify this behavior using the 
+# www-address entry.
+#www-address=127.0.0.1
+
+
+# You can add elements to the default LD_LIBRARY_PATH for R 
+# sessions (as determined by the R ldpaths script) by adding 
+# an rsession-ld-library-path entry to the server config file. 
+# This might be useful for ensuring that packages can 
+# locate external library dependencies that aren't installed 
+# in the system standard library paths
+#rsession-ld-library-path=/opt/local/lib:/opt/local/someapp/lib
+
+
+#By default RStudio Server runs against the version of R which 
+# is found on the system PATH (using which R). You can override 
+# which version of R is used via the rsession-which-r setting 
+# in the server config file. For example, if you have two 
+# versions of R installed on the server and want to make sure 
+# the one at /usr/local/bin/R is used by RStudio then you would use:
+rsession-which-r=/usr/bin/R
+
+########ADDITIONALAL#########
+
+# To limit the users who can login to RStudio to the members 
+# of a specific group, you use the auth-required-user-group 
+# setting
+auth-required-user-group=rstudio_users
diff --git a/sci-mathematics/rstudio/files/rstudio-rserver.initd b/sci-mathematics/rstudio/files/rstudio-server.initd
index 37a684cdd76f..e6ca6b942bb9 100644
--- a/sci-mathematics/rstudio/files/rstudio-rserver.initd
+++ b/sci-mathematics/rstudio/files/rstudio-server.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 start() {
diff --git a/sci-mathematics/rstudio/rstudio-0.97.318.ebuild b/sci-mathematics/rstudio/rstudio-0.97.318.ebuild
deleted file mode 100644
index 6030fb1a8dc0..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.97.318.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.318.ebuild,v 1.2 2013/03/02 23:25:58 hwoarang Exp $
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-# * fix the about/help/menu and get rid of license
-
-GWTVER=2.5.0.rc1
-GINVER=1.5
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-buildtools/gin-${GINVER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated server"
-
-QTVER=4.8
-QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
-	dev-libs/mathjax
-	dev-libs/openssl
-	>=virtual/jre-1.5
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
-		>=dev-qt/qtdbus-${QTVER}:${QTSLOT}
-		>=dev-qt/qtgui-${QTVER}:${QTSLOT}
-		>=dev-qt/qtwebkit-${QTVER}:${QTSLOT}
-		>=dev-qt/qtxmlpatterns-${QTVER}:${QTSLOT}
-		server? ( virtual/pam )
-	)
-	dedicated? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.5
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWTVER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} dependencies/common/dictionaries || die
-	mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER} || die
-	unzip -qd src/gwt/lib/gin/${GINVER} "${DISTDIR}"/gin-${GINVER}.zip || die
-	unzip -qd dependencies/common/dictionaries "${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	find . -name .gitignore -delete || die
-
-	epatch "${FILESDIR}"/${P}-prefs.patch \
-		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-linker_flags.patch
-
-	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
-	# this sed hack for now. ~RMH
-	sed -i \
-		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
-		src/cpp/server/ServerOptions.cpp \
-		src/cpp/session/SessionOptions.cpp || die
-
-	# use mathjax from system
-	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax || die
-
-	# make sure icons and mime stuff are with prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
-	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
-	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "All" "Desktop")")
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
-	fi
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		gnome2_icon_cache_update ;}
-
-	if use dedicated || use server; then
-		enewgroup rstudio-server
-		enewuser rstudio-server -1 -1 -1 rstudio-server
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || { fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		gnome2_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
index 1e9f90a5153a..b49cb580cf9b 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.2 2013/07/15 15:21:58 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v 1.3 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -84,6 +84,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -106,9 +111,10 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
 	fi
 }
 
diff --git a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
index 6de5d19c5753..79d871e7889d 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.1 2013/07/16 11:39:28 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -84,6 +84,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -106,9 +111,10 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
 	fi
 }
 
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
index 086d714b60b5..f21ff18c4864 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.1 2014/08/27 15:51:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2
+inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -41,6 +41,8 @@ IUSE=""
 QTVER=4.8
 QTSLOT=4
 RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.50
 	dev-libs/mathjax
@@ -112,6 +114,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -134,6 +141,7 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 }
 
 pkg_preinst() {
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
new file mode 100644
index 000000000000..a59098b1adbc
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+GWTVER=2.6.0
+GINVER=1.5
+SELENIUMVER=2.37.0
+CHROMEDRIVER_VER=2.7
+PANDOC_VER=1.12.4.2
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GINVER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUMVER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUMVER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	http://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	http://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	http://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QTVER=4.8
+QTSLOT=4
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	sys-libs/zlib
+	>=virtual/jre-1.5
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
+		>=dev-qt/qtdbus-${QTVER}:${QTSLOT}
+		>=dev-qt/qtgui-${QTVER}:${QTSLOT}
+		>=dev-qt/qtwebkit-${QTVER}:${QTSLOT}
+		>=dev-qt/qtxmlpatterns-${QTVER}:${QTSLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.5
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWTVER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUMVER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER} || die
+	unzip -qd src/gwt/lib/gin/${GINVER} \
+		"${DISTDIR}"/gin-${GINVER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUMVER} \
+		"${DISTDIR}"/selenium-java-${SELENIUMVER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUMVER}.jar \
+		src/gwt/lib/selenium/${SELENIUMVER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${RMARKDOWN_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	find . -name .gitignore -delete || die
+
+	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
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		 -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
index 4de7ad2e3e68..f2624bad47e1 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.2 2014/08/30 15:46:38 nimiux Exp $
+# $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 $
 
 EAPI=5
 
-inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2
+inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -79,6 +79,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -101,6 +106,7 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 }
 
 pkg_preinst() {
diff --git a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
index 8247d4c7d32f..43ef5c39a7e9 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.3 2014/07/27 11:33:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v 1.4 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -83,6 +83,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -105,9 +110,10 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
 	fi
 }
 
diff --git a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
index 54c8065a81a0..5ab66202c31f 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.1 2014/07/04 13:53:22 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -115,6 +115,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -137,9 +142,10 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
 	fi
 }
 
diff --git a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
index 9a3b3d5a7d51..8e87354cb264 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.1 2014/07/04 14:08:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v 1.2 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -116,6 +116,11 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# specify that namespace core the is in the global namespace and not
+	# relative to some other namespace (like its ::core not ::boost::core)
+	find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+		-e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' -i {} \;
 }
 
 src_configure() {
@@ -138,9 +143,10 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
 	fi
 }