summaryrefslogtreecommitdiff
path: root/sci-mathematics/rstudio
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
commitabaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
treeeca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-mathematics/rstudio
parent24fd814c326e282c4321965c31f341dad77e270d (diff)
gentoo resync : 22.01.2021
Diffstat (limited to 'sci-mathematics/rstudio')
-rw-r--r--sci-mathematics/rstudio/Manifest17
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch46
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch17
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch160
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch60
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch32
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch118
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch83
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch106
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch106
-rw-r--r--sci-mathematics/rstudio/rstudio-1.2.5033.ebuild236
-rw-r--r--sci-mathematics/rstudio/rstudio-1.2.5042.ebuild236
-rw-r--r--sci-mathematics/rstudio/rstudio-1.3.1056.ebuild232
-rw-r--r--sci-mathematics/rstudio/rstudio-1.3.959.ebuild231
14 files changed, 0 insertions, 1680 deletions
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 82251821778a..ced070bee23d 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -1,18 +1,9 @@
AUX rsession.conf 1145 BLAKE2B 81e0ba1c273cbebe1fcd95917cbfd9269525e4994f594734207972948ffbda5f500483ea21678dd15f28aed25ca060698f710fc3586522043347e55d3f4890a1 SHA512 90395faac5aa80ce52ae56da3565512b8a880a14ab2acf9a24c7a56c9d03f1e3d5f63ebaca66efa68f5c5c9c831235846df22ca37f20ba071437a2a963b808cf
AUX rstudio-1.0.44-systemd.patch 1060 BLAKE2B c5417748653b60c85cacfaab08f2baf6936c3c2d76fe0c23702fe006c4f13de9d17a3556c05c0f47be41c6f4629d92da265861b1c689415bbdd59a515d1848af SHA512 3559fc0cb229b50fbfd4361e5be982396d563e41475878f15f870609caa9f85bd50b32f90b8f8d9c432287cb7286920dca21279bc5bfb33f1fd95a0ce68a2c4e
-AUX rstudio-1.2.1335-boost-1.70.0_p1.patch 1771 BLAKE2B eaa29ff256b8ee79c0384075745c53999d2d4ace494c0403cfa805868638921b6b0aa48631c8399bd8f21a4ee5734c6e0f46d2abf5f5111466613fbf7eca73bc SHA512 01a105c269147e256a3a0d2f803809d215c492c22626bf8b7bd5d9b6465db584b8aaa48299a6cc4f7081dd537ffcdedae1e2c328fe9bae0e1dca844f13402586
-AUX rstudio-1.2.1335-boost-1.70.0_p2.patch 1081 BLAKE2B 19e78cfa2620335cdc2f058b84eba48f693d2cd3268813fb226641727c0f622bbe452d29bdd2be85518aaf4268306cd5e985ec5778e08f21bd802bfd5ef2eb2e SHA512 20c57a4eec8e8b333c718578caad1aca525df94090c7528f996077aab4a1a59d77a03e01d8ed2d3a77d444bebcd9744815fc168d2c3263b2f0b7646c5ebc37c0
-AUX rstudio-1.2.1335-core.patch 6336 BLAKE2B 00abd96a9d653fc6c557e9e3bd82227ead2edef5a49ae67ee0ee4ec97b5a80665c999f478516710c437a0148b9e3b372164aa5e4c50813db41de0eb667bdbd41 SHA512 7cda17801efd5afe91d9064c7c24bd285ee1c2bc2df3f2631fe68261194394adb217345be529b5a6880a93a99dd6f4f32a92d449ace30c31f6d85cbf79f039fa
AUX rstudio-1.2.1335-linker_flags.patch 505 BLAKE2B ac0ebca22f6dfcb799dd151e3c915c387dade30f86a9d335513d75c7c726c362255c745e91949ef3c1f58695d7a76a53550837c9d550113ba81d3d2d36507459 SHA512 221471a6ad720517a0b62563779ee11190f14b2f2f6d39e9e1c0acb32a03e41b9db5bd639c5336a26936d8f71ab5d88274471b00d224c6e31f2662680d6fd71c
-AUX rstudio-1.2.1335-qtsingleapplication.patch 2080 BLAKE2B 3e2c1b5df1c030a0d3f9adb01ad469a7e4032248eca156644aa74fdbf1a4584fd92185c9f3e38cb8ee8afdfd556f40642995702719b4d69fe9342f9e4de85dda SHA512 6b03194d47c7f7a39b13ccf93d02bb154e85b5d46777fbf5306e94da13f22fc83bf91bd923a58dfc9bceda517cda81673deb0f0a7b087d501b82a961174bc9cc
-AUX rstudio-1.2.5033-pandoc.patch 1442 BLAKE2B 28a1070057624fb70a2df6de0312dfa827a075ae481f6433733cdc6136a429fe67c72262d3106c6b00f7411f93d3e33ca69f232cc87aa9d8e50e11cad89d2dd6 SHA512 cdbb97f0705f6b56ce8e285d066c57a9f73ce87ef58d8101362a508cb1cc52a32418a742e84a9a9d6476b253984abe0759b45e824d360d8b550e53a98d2d05ca
-AUX rstudio-1.2.5033-paths.patch 6055 BLAKE2B 1c389cbd2980031080955c104e614d2bbcd0d747fd7d925a9650685bf30ddb84c34b66a4a6bcb58a1b18167e51804df9c22734460255eda866365231cda3e9f9 SHA512 ba213cf13ae15df043215e6b87bf554c9daba4124a1a83ecb2e5ccc8f26fd6f1467798901cc24451f04f4d25482da401cc9cdd5071a4c6ac28d9af37c45f51e5
-AUX rstudio-1.2.5033-prefs.patch 3684 BLAKE2B dfa5f7289a7e752704b6481dd6e02f8e88a91aaa36b25c91e8154f17bf3fbfcb2b674fcc790a82ae14deb0718b1d001f4931de6d6ccb99d1ed4dc9c8e71d6149 SHA512 86436aec19da35d99ec64ad1d4c243efad85a277ee72c2eaf94627c49389ba8d4bc626177a9d599bb95d00bc3e66210472e11a5ff38ed74a7a353a719f64fe4d
-AUX rstudio-1.2.5042-R-4.0.0.patch 3516 BLAKE2B ee54ab84f373c2d89c9bac238cbb500e10e542953522dede105885675e7cae319a5cd99ebd9cbceab903532925b950e827ab218cae8ce91ca58b0221ec223659 SHA512 872335efd1fbd8ec01c812ce652285220dda0ab9b53a0a044758ea7d7798a37ab3969e5c82e909139591f18716b0fd50538ec3ae264946ecd037b6bb1f84af38
AUX rstudio-1.2.5042-boost-1.73.0.patch 728 BLAKE2B 675e5ff75ce5c3242bff5d92b32ca6391e8ceb68c504c2f161f2f30c083ae842e5e9a9c519e848595704bb6d639c5a8dc13a296dcfa445db19295f8ee78168e0 SHA512 214751fff5b027f407b093f397e70e701ed9016451a3972b240dcd4999d9b27a1309b47fb22a9f4f3944c47dc6de6bd8f1165a70a7046b5133bd88923d1b46a6
AUX rstudio-1.3.1056-R-4.0.0.patch 1900 BLAKE2B 6429fd40c65a67a8159fda98b517f37133ff070b0b4885e14cbe9acf20516263407e4b5c96833dd6bacaf5f58cf74d65da701e52cf91c38de94c55bfa765647e SHA512 1c7ce8791b6c2f04dbad875433620efacef309b5b84d0c461617b5c52661634ca80e40d9a0fa94e606f992289972f3ce4ae015333de7f4c52b3d498e97746920
AUX rstudio-1.3.1056-boost-1.74.0.patch 1126 BLAKE2B 289631a75eed12417f0091e20d393ce4687a849bfef47f3665c5cfc4d17da8ed9894e4bbded43c39255d58db021fc765e9f66ea0cdbcfe7cec463e271ee71c8e SHA512 c2ad2c189b845002f2b65dcdf3f7f093381759e294fec70148312a5cc5096ed9a1d47fb57d7e9f6c9b7efe174751c4d94dffd4060fc352a986c5c835d23ac5fa
-AUX rstudio-1.3.959-R-4.0.0.patch 3514 BLAKE2B 9cdadbf402f4f90f9b6e43155ec22d0bf22bcd33c817b7ce67646895b3d5672e5fe412e2ea891d6997ad4eb76dc4c514cb5f8ab06467e4c79c52875476bac7d1 SHA512 59b80b284bac4f1435a160c07a7959a4db4c7c3474d13c1c0e90f5bee34b017fd507618914fd249c14fef41535c06e78dfed22860c104c679e95a4782b1bfac3
AUX rstudio-1.3.959-core.patch 7302 BLAKE2B eceff2aa67fc1a1cb36433bfa0956a4a45da3a017f80987e14893018737b3fc40cf1bbf9641e900311db3f5182828b11452c960b40c4e20ed83e5c3692e458bd SHA512 cf4e0682e3961c1208f14055bc604c2b8b8cc6db955216858ef4d95ca91154ab4d1eef58fcb5cdea84b2b755c98cd837b9028dad1520dd9dba222a45074a68f8
AUX rstudio-1.3.959-pandoc-mathjax.patch 1997 BLAKE2B 71d40c2299b0598f9687175fe464d334e821762972dc0c4027f71c124eef2fd6795030c4426cec56c6b4fe81b8b72598f97214bab1d2b2b2a4c0c551cc1421a7 SHA512 6a5a76898500d3a8a20636a3854d459e5b8d806f68b0a4a08fcf3dae98feeebe751c14a7e4f8275c02ad47de9795168d90505d4dada19ccbdfbef0e07229cb66
AUX rstudio-1.3.959-paths.patch 6142 BLAKE2B ed7ea6025e919e24228ea55679b198496446bc711e0efd355e1bc4ed4822078b8a486fb8390aaf6cf5852447fc9405ca68099e4a566b24521d341744c7e719a7 SHA512 9ee6c13619d6dac9f7af85557be1c4430d801424c3b29cbc73b657686d2cba49476083ae2bf87f7cef0039672116d3385fb51a03e803d9ae02e4a721403e614a
@@ -22,14 +13,6 @@ AUX rstudio-server.conf 1337 BLAKE2B a9a85c76a1c7c5f32f55606c6e3c9b72662dbd25e4b
AUX rstudio-server.initd 377 BLAKE2B 4f49b9ae2a81cd60565f79f121d60f5531746febd1f6f68cc93863985bd9af28d4ef04f647bd1b492ca69273724c282bcaedcfb5d08b8f2ac237ddb6f5baa438 SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8
AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848adde282fc586acccfa4110f902e4de9962211ca0c871f66f3563319fe195c9f230daa4d4e429357ff74701e4d2d7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173
DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
-DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
-DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
-DIST rstudio-1.3.1056.tar.gz 89584544 BLAKE2B 0e758ad97f9faa2d3932a49dafd92bc21199a5c0a20e2d8480267ebbb7cd11dc38596b4bb697e04add7bfe6b126f7b2ae6675040a0ac8caca5a5cf737f5ad6eb SHA512 8a9077c2ae021e0cf4cca41b374a50534087b35fd2c1e4b18bdd5ba3672e1ab275046e483ec8a3aba729a8e39f961149fb03a053ea005d8a32873b51201baca2
DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e
-DIST rstudio-1.3.959.tar.gz 89639419 BLAKE2B d45b2c1b0e426ddb5a945e59a8127ddfd47f6230ef0929639c4b525382ae57437a273df6ade85cfbf3a29911cf0158ee2e0808bfa94e783d70d4615f6c228f31 SHA512 e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac
-EBUILD rstudio-1.2.5033.ebuild 7256 BLAKE2B 5b6481bbe0d02d6751ab19df0ac2a12e8d71399cb13999d65f1c6b0ce2fab49eb0ad7e55b458933d6c3fc2490f2ecc2a5e4e0c5b41c7e36a978bf825bc27f8c5 SHA512 14a307c42c979fb18c19ccf0bb68322d9382dba785421120c21c77aac666b0517e069cb60f408baa53c349c1f3b6f8ab2a59db442ec377a244ce462b395ddb1c
-EBUILD rstudio-1.2.5042.ebuild 7256 BLAKE2B 24303ced907ff45ff66fbab6638f7bda958849ae977e0b3f37e00eb396b7ff6169ae7e10b2285c804e9cec2131cce8d45bfa8197096774fef06fc859460c5aad SHA512 f5c36843edbd62a80891b1a148081e163254fcdbdc94aafd4c9051992d63704dc360c0ee129ba92b9cc0a63e39c8cf6be258606db3b1a8831f1ee8a7110ad08c
-EBUILD rstudio-1.3.1056.ebuild 7067 BLAKE2B 3e9c18d653602ad25aaa3dfd9bfbdeb34260bfe4464559c9a8ade653e5487f89d0cf043549ae212c68542f6e1fa53fab14a733f1175189af81c9daf0e019906c SHA512 e5450ef5bb210f02f7250bfb21492f94c9a694f5e59e23fe3437da91f18d34d7036de6b64cb7ef14d61f771ee18fe311b421b8dc8204b44c87356fb35f5d5263
EBUILD rstudio-1.3.1093.ebuild 6980 BLAKE2B 51467f99af427ab86437818788918cdeec384de97b450ea7028ad046edbe259984d3e8158ae86b51e238e4d47bcd9ddef5e110532f3544bc28e6c06a3e64ca83 SHA512 9dd2ac83e838def156fb9fac7c94ccb61fae52f7144acfd924f328077dd0630a455a914dd0c59ff186878ee4ed8f4502296d07f867be2e6003a5f5a6953a4498
-EBUILD rstudio-1.3.959.ebuild 7047 BLAKE2B 78861c03e1b7aff68ba63cc00503e09eca8d67b77df12161f8bed33d226440fc70e76b584cfb4a6236836250791d6d50f127c57c9ffc36add95866db7b19ca5e SHA512 0ae6d91439d4fb22eb27d9e58d9d5bf05f6cb063e947f4431593f9cb5c60b85e9e817cd668cb1a5d8313d74ed6cb6f0136ef370a45ef4da7f1f17a9e7c8ba0ca
MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
deleted file mode 100644
index 1ec458bb8698..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000
-@@ -296,7 +296,11 @@
- */
- timer_ptr set_timer(long duration, timer_handler callback) {
- timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
-+ *m_io_service,
-+#else
- lib::ref(*m_io_service),
-+#endif
- boost::posix_time::milliseconds(duration)
- );
-
---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000
-@@ -184,7 +184,12 @@
- m_io_service = ptr;
- m_external_io_service = true;
- m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
-- lib::ref(*m_io_service));
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
-+ *m_io_service
-+#else
-+ lib::ref(*m_io_service)
-+#endif
-+ );
-
- m_state = READY;
- ec = lib::error_code();
---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000
-@@ -167,7 +167,12 @@
- }
-
- m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
-- lib::ref(*service));
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
-+ *service
-+#else
-+ lib::ref(*service)
-+#endif
-+ );
-
- m_state = READY;
-
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
deleted file mode 100644
index eed2c5c955cb..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000
-@@ -77,7 +77,13 @@
- {
- // start a timer that will cancel any outstanding asynchronous operations
- // when it elapses if the connection operation has not succeeded
-- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
-+ pConnectionTimer_.reset(new boost::asio::deadline_timer(
-+#if BOOST_VERSION >= 107000
-+ resolver_.get_executor(),
-+#else
-+ resolver_.get_io_service(),
-+#endif
-+ timeout));
- pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
- TcpIpAsyncConnector::shared_from_this(),
- boost::asio::placeholders::error));
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
deleted file mode 100644
index 2c4374bb8045..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp 2019-04-09 18:15:37.746363789 +1000
-@@ -87,13 +87,13 @@
- boost::shared_ptr<http::Cookie>* pCookie)
- {
- // extract the base URL
-- json::JsonRpcRequest request;
-+ core::json::JsonRpcRequest request;
- Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request);
- if (error)
- return error;
- std::string baseURL;
-
-- error = json::readParams(request.params, &baseURL);
-+ error = core::json::readParams(request.params, &baseURL);
- if (error)
- return error;
-
-@@ -161,7 +161,7 @@
- }
-
- // prepare session info
-- json::Object sessionInfo ;
-+ core::json::Object sessionInfo ;
- sessionInfo["clientId"] = clientId;
- sessionInfo["mode"] = options.programMode();
-
-@@ -175,8 +175,8 @@
- }
-
- // temp dir
-- FilePath tempDir = rstudio::r::session::utils::tempDir();
-- Error error = tempDir.ensureDirectory();
-+ core::FilePath tempDir = rstudio::r::session::utils::tempDir();
-+ core::Error error = tempDir.ensureDirectory();
- if (error)
- LOG_ERROR(error);
- sessionInfo["temp_dir"] = tempDir.absolutePath();
-@@ -194,12 +194,12 @@
- sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt");
-
- // client state
-- json::Object clientStateObject;
-+ core::json::Object clientStateObject;
- rstudio::r::session::clientState().currentState(&clientStateObject);
- sessionInfo["client_state"] = clientStateObject;
-
- // source documents
-- json::Array jsonDocs;
-+ core::json::Array jsonDocs;
- error = modules::source::clientInitDocuments(&jsonDocs);
- if (error)
- LOG_ERROR(error);
-@@ -224,7 +224,7 @@
- if (resumed)
- {
- // console actions
-- json::Object actionsObject;
-+ core::json::Object actionsObject;
- consoleActions.asJson(&actionsObject);
- sessionInfo["console_actions"] = actionsObject;
- }
-@@ -290,12 +290,12 @@
- }
- else
- {
-- sessionInfo["active_project_file"] = json::Value();
-- sessionInfo["project_ui_prefs"] = json::Value();
-- sessionInfo["project_open_docs"] = json::Value();
-+ sessionInfo["active_project_file"] = core::json::Value();
-+ sessionInfo["project_ui_prefs"] = core::json::Value();
-+ sessionInfo["project_open_docs"] = core::json::Value();
- sessionInfo["project_supports_sharing"] = false;
- sessionInfo["project_owned_by_user"] = false;
-- sessionInfo["project_user_data_directory"] = json::Value();
-+ sessionInfo["project_user_data_directory"] = core::json::Value();
- }
-
- sessionInfo["system_encoding"] = std::string(::locale2charset(NULL));
-@@ -332,20 +332,20 @@
- sessionInfo["build_tools_bookdown_website"] =
- module_context::isBookdownWebsite();
-
-- FilePath buildTargetDir = projects::projectContext().buildTargetPath();
-+ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath();
- if (!buildTargetDir.empty())
- {
- sessionInfo["build_target_dir"] = module_context::createAliasedPath(
- buildTargetDir);
-- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) &&
-+ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) &&
- buildTargetDir.childPath("src").exists();
- sessionInfo["has_pkg_vig"] =
-- (type == r_util::kBuildTypePackage) &&
-+ (type == core::r_util::kBuildTypePackage) &&
- buildTargetDir.childPath("vignettes").exists();
- }
- else
- {
-- sessionInfo["build_target_dir"] = json::Value();
-+ sessionInfo["build_target_dir"] = core::json::Value();
- sessionInfo["has_pkg_src"] = false;
- sessionInfo["has_pkg_vig"] = false;
- }
-@@ -353,9 +353,9 @@
- }
- else
- {
-- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone;
-+ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone;
- sessionInfo["build_tools_bookdown_website"] = false;
-- sessionInfo["build_target_dir"] = json::Value();
-+ sessionInfo["build_target_dir"] = core::json::Value();
- sessionInfo["has_pkg_src"] = false;
- sessionInfo["has_pkg_vig"] = false;
- }
-@@ -364,7 +364,7 @@
- sessionInfo["presentation_commands"] = options.allowPresentationCommands();
-
- sessionInfo["tutorial_api_available"] = false;
-- sessionInfo["tutorial_api_client_origin"] = json::Value();
-+ sessionInfo["tutorial_api_client_origin"] = core::json::Value();
-
- sessionInfo["build_state"] = modules::build::buildStateAsJson();
- sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled();
-@@ -375,7 +375,7 @@
-
- // console history -- we do this at the end because
- // restoreBuildRestartContext may have reset it
-- json::Array historyArray;
-+ core::json::Array historyArray;
- rstudio::r::session::consoleHistory().asJson(&historyArray);
- sessionInfo["console_history"] = historyArray;
- sessionInfo["console_history_capacity"] =
-@@ -447,14 +447,14 @@
-
- sessionInfo["multi_session"] = options.multiSession();
-
-- json::Object rVersionsJson;
-+ core::json::Object rVersionsJson;
- rVersionsJson["r_version"] = module_context::rVersion();
- rVersionsJson["r_version_label"] = module_context::rVersionLabel();
- rVersionsJson["r_home_dir"] = module_context::rHomeDir();
- sessionInfo["r_versions_info"] = rVersionsJson;
-
- sessionInfo["show_user_home_page"] = options.showUserHomePage();
-- sessionInfo["user_home_page_url"] = json::Value();
-+ sessionInfo["user_home_page_url"] = core::json::Value();
-
- sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson();
- sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload();
-@@ -491,7 +491,7 @@
-
- // create response (we always set kEventsPending to false so that the client
- // won't poll for events until it is ready)
-- json::JsonRpcResponse jsonRpcResponse;
-+ core::json::JsonRpcResponse jsonRpcResponse;
- jsonRpcResponse.setField(kEventsPending, "false");
- jsonRpcResponse.setResult(sessionInfo);
-
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
deleted file mode 100644
index a59fa02f1d2c..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt 2019-04-09 18:04:57.783616412 +1000
-@@ -140,6 +140,13 @@
- get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE)
- get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE)
-
-+find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication
-+ PATH_SUFFIXES QtSolutions
-+ PATHS
-+ /usr/include/qt5)
-+find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6
-+ libQt5Solutions_SingleApplication-2.6)
-+
- # disable clang warnings for qt sources
- if(APPLE)
- add_definitions(-Wno-unused-private-field
-@@ -158,7 +165,6 @@
-
- set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
- list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
-- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
- ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
- ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
- ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
-@@ -224,8 +230,6 @@
- DesktopSlotBinders.cpp
- DesktopSubMenu.cpp
- DesktopSynctex.cpp
-- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
-- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
- )
-
- if(WIN32)
-@@ -280,6 +284,7 @@
- ${CORE_SOURCE_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
-+ ${QTSINGLEAPPLIB_INCLUDE_DIR}
- ${TESTS_INCLUDE_DIR}
- )
-
-@@ -384,6 +389,7 @@
- # set link dependencies
- target_link_libraries(rstudio
- ${RSTUDIO_QTMODULES}
-+ ${QTSINGLEAPPLIB}
- ${QT_LIBRARIES}
- ${Boost_LIBRARIES}
- rstudio-core
---- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp 2019-04-09 18:01:39.333920927 +1000
-@@ -16,7 +16,7 @@
- #ifndef DESKTOP_POSIX_APPLICATION_HPP
- #define DESKTOP_POSIX_APPLICATION_HPP
-
--#include "3rdparty/qtsingleapplication/QtSingleApplication"
-+#include <QtSingleApplication>
-
- #include "DesktopApplicationLaunch.hpp"
-
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
deleted file mode 100644
index b4f611063e17..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- rstudio-1.2.5033-orig/src/cpp/session/CMakeLists.txt 2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/session/CMakeLists.txt 2020-01-07 12:29:20.174304185 +1100
-@@ -25,9 +25,6 @@
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
- message(FATAL_ERROR "Mathjax 2.6 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()
-
- # we often install embedded versions of these packages but don't do so currently
-
-@@ -490,19 +487,6 @@
- install(DIRECTORY "resources/connections"
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
-
-- # install pandoc
-- if(WIN32)
-- set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version")
-- else()
-- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
-- endif()
--
-- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
-- 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-1.2.5033-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch
deleted file mode 100644
index aa6a9b23fdec..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- rstudio-1.2.5033-orig/CMakeGlobals.txt 2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/CMakeGlobals.txt 2020-01-07 12:20:19.115307754 +1100
-@@ -175,7 +175,7 @@
- else()
- set(RSTUDIO_INSTALL_BIN bin)
- endif()
-- set(RSTUDIO_INSTALL_SUPPORTING .)
-+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
- endif()
-
- # if the install prefix is /usr/local then tweak as appropriate
---- rstudio-1.2.5033-orig/src/cpp/server/CMakeLists.txt 2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/server/CMakeLists.txt 2020-01-07 12:17:32.736309024 +1100
-@@ -194,7 +194,7 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
-- DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
-
- # install configured redhat init.d script
- set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
-@@ -202,7 +202,7 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
-- DESTINATION ${RSERVER_INITD_REDHAT_DIR})
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
-
- # install configured suse init.d script
- set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
-@@ -210,13 +210,13 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
-- DESTINATION ${RSERVER_INITD_SUSE_DIR})
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
-
- # install pam profile
- set(RSERVER_PAM_DIR "extras/pam")
- set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
-- DESTINATION ${RSERVER_PAM_DIR})
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
-
- # install configured upstart profile
- set(RSERVER_UPSTART_DIR "extras/upstart")
-@@ -224,12 +224,12 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
-- DESTINATION ${RSERVER_UPSTART_DIR})
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
- set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
-- DESTINATION ${RSERVER_UPSTART_DIR})
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
-
- # install configured systemd profile
- set(RSERVER_SYSTEMD_DIR "extras/systemd")
---- rstudio-1.2.5033-orig/src/cpp/server/ServerOptions.cpp 2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/server/ServerOptions.cpp 2020-01-07 12:17:32.773309023 +1100
-@@ -389,8 +389,8 @@
-
- // convert relative paths by completing from the system installation
- // path (this allows us to be relocatable)
-- resolvePath(resourcePath, &wwwLocalPath_);
-- resolvePath(resourcePath, &wwwSymbolMapsPath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
- resolvePath(binaryPath, &authPamHelperPath_);
- resolvePath(binaryPath, &rsessionPath_);
- resolvePath(binaryPath, &rldpathPath_);
---- rstudio-1.2.5033-orig/src/cpp/session/SessionOptions.cpp 2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/session/SessionOptions.cpp 2020-01-07 12:17:32.774309023 +1100
-@@ -53,7 +53,7 @@
- namespace session {
-
- namespace {
--const char* const kDefaultPandocPath = "bin/pandoc";
-+const char* const kDefaultPandocPath = "bin";
- const char* const kDefaultPostbackPath = "bin/postback/rpostback";
- const char* const kDefaultRsclangPath = "bin/rsclang";
-
-@@ -571,14 +571,14 @@
- }
-
- // convert relative paths by completing from the app resource path
-- resolvePath(resourcePath_, &rResourcesPath_);
-- resolvePath(resourcePath_, &agreementFilePath_);
-- resolvePath(resourcePath_, &wwwLocalPath_);
-- resolvePath(resourcePath_, &wwwSymbolMapsPath_);
-- resolvePath(resourcePath_, &coreRSourcePath_);
-- resolvePath(resourcePath_, &modulesRSourcePath_);
-- resolvePath(resourcePath_, &sessionLibraryPath_);
-- resolvePath(resourcePath_, &sessionPackageArchivesPath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
- resolvePostbackPath(resourcePath_, &rpostbackPath_);
- #ifdef _WIN32
- resolvePath(resourcePath_, &consoleIoPath_);
-@@ -611,7 +611,7 @@
- }
- winptyPath_ = pty.complete(completion).absolutePath();
- #endif // _WIN32
-- resolvePath(resourcePath_, &hunspellDictionariesPath_);
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
- resolvePath(resourcePath_, &mathjaxPath_);
- resolvePath(resourcePath_, &libclangHeadersPath_);
- resolvePandocPath(resourcePath_, &pandocPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch
deleted file mode 100644
index 034eba37a8b9..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- rstudio-1.2.5033-orig/src/gwt/build.xml 2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/gwt/build.xml 2020-01-10 18:35:29.913030923 +1100
-@@ -28,17 +28,35 @@
- classname="com.google.javascript.jscomp.ant.CompileTask"
- classpath="${tools.dir}/compiler/compiler.jar"/>
-
-+ <!-- Configure path to aopalliance -->
-+ <property name="aopalliance.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/aopalliance-1/lib"/>
-+
-+ <!-- Configure path to javax-inject -->
-+ <property name="javax.inject" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/javax-inject/lib"/>
-+
-+ <!-- Configure path to validation-api -->
-+ <property name="validation.api" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/lib"/>
-+ <property name="validation.api.sources" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/sources"/>
-+
- <!-- Configure path to GWT SDK -->
-- <property name="gwt.sdk" value="${lib.dir}/gwt/2.8.1"/>
-+ <property name="gwt.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gwt-2.8/lib"/>
-+
-+ <!-- Configure path to Google Gin -->
-+ <property name="gin.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gin-2.1/lib"/>
-
- <property name="gwt.extra.args" value=""/>
- <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
- <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
-+ <property environment="env"/>
-
- <path id="project.class.path">
- <pathelement location="${build.dir}"/>
-+ <fileset dir="${aopalliance.sdk}" includes="*.jar"/>
-+ <fileset dir="${javax.inject}" includes="*.jar"/>
-+ <fileset dir="${validation.api}" includes="*.jar"/>
-+ <fileset dir="${validation.api.sources}" includes="*.zip"/>
- <fileset dir="${gwt.sdk}" includes="*.jar"/>
-- <fileset dir="${lib.dir}/gin/2.1.2" includes="*.jar"/>
-+ <fileset dir="${gin.sdk}" includes="*.jar"/>
- </path>
-
- <path id="test.class.path">
-@@ -112,8 +130,10 @@
- <pathelement location="${src.dir}"/>
- <path refid="project.class.path"/>
- </classpath>
-+ <jvmarg value="-Duser.home=${env.T}"/>
- <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
- <jvmarg value="-Xmx1536M"/>
-+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
- <arg value="-war"/>
- <arg value="${www.dir}"/>
- <arg value="-localWorkers"/>
-@@ -154,6 +174,7 @@
- <pathelement location="${src.dir}"/>
- <path refid="project.class.path"/>
- </classpath>
-+ <jvmarg value="-Duser.home=${env.T}"/>
- <jvmarg value="-Xmx2048M"/>
- <arg value="-style"/>
- <arg value="PRETTY"/>
-@@ -176,6 +197,7 @@
- <pathelement location="src"/>
- <path refid="project.class.path"/>
- </classpath>
-+ <jvmarg value="-Duser.home=${env.T}"/>
- <jvmarg value="-Xmx2048M"/>
- <arg value="-style"/>
- <arg value="PRETTY"/>
-@@ -202,6 +224,7 @@
- <pathelement location="src"/>
- <path refid="project.class.path"/>
- </classpath>
-+ <jvmarg value="-Duser.home=${env.T}"/>
- <jvmarg value="-Xmx2048M"/>
- <arg value="-src"/>
- <arg value = "src"/>
-@@ -237,6 +260,7 @@
- <pathelement location="${test.dir}"/>
- <pathelement location="${src.dir}"/>
- </classpath>
-+ <jvmarg value="-Duser.home=${env.T}"/>
- <classpath refid="project.class.path"/>
- <classpath refid="unittest.class.path"/>
- <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
deleted file mode 100644
index 87ec83a7d4af..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001
-From: Jonathan McPherson <jonathan@rstudio.com>
-Date: Tue, 14 Jan 2020 12:53:20 -0800
-Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+
-
----
- src/cpp/r/CMakeLists.txt | 12 ++++++++++++
- src/cpp/r/config.h.in | 8 +++++++-
- src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------
- 3 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt
-index 6984ae309c..29784b8b67 100644
---- a/src/cpp/r/CMakeLists.txt
-+++ b/src/cpp/r/CMakeLists.txt
-@@ -15,6 +15,18 @@
-
- project (R)
-
-+# find the version of R in play
-+find_package(LibR REQUIRED)
-+execute_process(
-+ COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))"
-+ OUTPUT_VARIABLE LIBR_VERSION)
-+
-+# parse and save the R version to a variable
-+string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}")
-+list(GET R_VERSION_LIST 0 R_VERSION_MAJOR)
-+list(GET R_VERSION_LIST 1 R_VERSION_MINOR)
-+list(GET R_VERSION_LIST 2 R_VERSION_PATCH)
-+
- # include files
- file(GLOB_RECURSE R_HEADER_FILES "*.h*")
-
-diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in
-index 6ba67c8e09..00bc8b6191 100644
---- a/src/cpp/r/config.h.in
-+++ b/src/cpp/r/config.h.in
-@@ -1,7 +1,7 @@
- /*
- * config.h.in
- *
-- * Copyright (C) 2009-12 by RStudio, Inc.
-+ * Copyright (C) 2009-20 by RStudio, Inc.
- *
- * Unless you have received this program directly from RStudio pursuant
- * to the terms of a commercial license agreement with RStudio, then
-@@ -16,4 +16,10 @@
-
- #cmakedefine PANGO_CAIRO_FOUND
-
-+// Important: These variables represent the version of R found during
-+// compile/link time, NOT the version of R present at runtime.
-+#define R_VERSION_MAJOR ${R_VERSION_MAJOR}
-+#define R_VERSION_MINOR ${R_VERSION_MINOR}
-+#define R_VERSION_PATCH ${R_VERSION_PATCH}
-+
-
-diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp
-index ac71b94522..73e2e2ce7f 100644
---- a/src/cpp/r/session/REmbeddedPosix.cpp
-+++ b/src/cpp/r/session/REmbeddedPosix.cpp
-@@ -1,7 +1,7 @@
- /*
- * REmbeddedPosix.cpp
- *
-- * Copyright (C) 2009-12 by RStudio, Inc.
-+ * Copyright (C) 2009-20 by RStudio, Inc.
- *
- * Unless you have received this program directly from RStudio pursuant
- * to the terms of a commercial license agreement with RStudio, then
-@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void);
- extern "C" typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned long);
- #endif
-
-+#include "config.h"
-+
- extern int R_running_as_main_program; // from unix/system.c
-
- using namespace rstudio::core;
-@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/, // ignored on posix
- //
- structRstart rp;
- Rstart Rp = &rp;
-- R_DefParams(Rp) ;
-- Rp->R_Slave = FALSE ;
-+ R_DefParams(Rp);
-+#if R_VERSION_MAJOR > 3
-+ // R 4.0 and above use --no-echo to suppress output
-+ Rp->R_NoEcho = FALSE;
-+#else
-+ // R 3.x and below use --slave
-+ Rp->R_Slave = FALSE;
-+#endif
- Rp->R_Quiet = quiet ? TRUE : FALSE;
-- Rp->R_Interactive = TRUE ;
-- Rp->SaveAction = defaultSaveAction ;
-+ Rp->R_Interactive = TRUE;
-+ Rp->SaveAction = defaultSaveAction;
- Rp->RestoreAction = SA_NORESTORE; // handled within initialize()
- Rp->LoadInitFile = loadInitFile ? TRUE : FALSE;
-- R_SetParams(Rp) ;
-+ R_SetParams(Rp);
-
- // redirect console
- R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R
diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch
deleted file mode 100644
index dc35d0ce0083..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001
-From: Jonathan McPherson <jonathan@rstudio.com>
-Date: Tue, 14 Jan 2020 12:53:20 -0800
-Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+
-
----
- src/cpp/r/CMakeLists.txt | 12 ++++++++++++
- src/cpp/r/config.h.in | 8 +++++++-
- src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------
- 3 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt
-index 6984ae309c..29784b8b67 100644
---- a/src/cpp/r/CMakeLists.txt
-+++ b/src/cpp/r/CMakeLists.txt
-@@ -15,6 +15,18 @@
-
- project (R)
-
-+# find the version of R in play
-+find_package(LibR REQUIRED)
-+execute_process(
-+ COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))"
-+ OUTPUT_VARIABLE LIBR_VERSION)
-+
-+# parse and save the R version to a variable
-+string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}")
-+list(GET R_VERSION_LIST 0 R_VERSION_MAJOR)
-+list(GET R_VERSION_LIST 1 R_VERSION_MINOR)
-+list(GET R_VERSION_LIST 2 R_VERSION_PATCH)
-+
- # include files
- file(GLOB_RECURSE R_HEADER_FILES "*.h*")
-
-diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in
-index 6ba67c8e09..00bc8b6191 100644
---- a/src/cpp/r/config.h.in
-+++ b/src/cpp/r/config.h.in
-@@ -1,7 +1,7 @@
- /*
- * config.h.in
- *
-- * Copyright (C) 2009-12 by RStudio, PBC
-+ * Copyright (C) 2009-20 by RStudio, Inc.
- *
- * Unless you have received this program directly from RStudio pursuant
- * to the terms of a commercial license agreement with RStudio, then
-@@ -16,4 +16,10 @@
-
- #cmakedefine PANGO_CAIRO_FOUND
-
-+// Important: These variables represent the version of R found during
-+// compile/link time, NOT the version of R present at runtime.
-+#define R_VERSION_MAJOR ${R_VERSION_MAJOR}
-+#define R_VERSION_MINOR ${R_VERSION_MINOR}
-+#define R_VERSION_PATCH ${R_VERSION_PATCH}
-+
-
-diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp
-index ac71b94522..73e2e2ce7f 100644
---- a/src/cpp/r/session/REmbeddedPosix.cpp
-+++ b/src/cpp/r/session/REmbeddedPosix.cpp
-@@ -1,7 +1,7 @@
- /*
- * REmbeddedPosix.cpp
- *
-- * Copyright (C) 2009-19 by RStudio, PBC
-+ * Copyright (C) 2009-20 by RStudio, Inc.
- *
- * Unless you have received this program directly from RStudio pursuant
- * to the terms of a commercial license agreement with RStudio, then
-@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void);
- extern "C" typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned long);
- #endif
-
-+#include "config.h"
-+
- extern int R_running_as_main_program; // from unix/system.c
-
- using namespace rstudio::core;
-@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/, // ignored on posix
- //
- structRstart rp;
- Rstart Rp = &rp;
-- R_DefParams(Rp) ;
-- Rp->R_Slave = FALSE ;
-+ R_DefParams(Rp);
-+#if R_VERSION_MAJOR > 3
-+ // R 4.0 and above use --no-echo to suppress output
-+ Rp->R_NoEcho = FALSE;
-+#else
-+ // R 3.x and below use --slave
-+ Rp->R_Slave = FALSE;
-+#endif
- Rp->R_Quiet = quiet ? TRUE : FALSE;
-- Rp->R_Interactive = TRUE ;
-- Rp->SaveAction = defaultSaveAction ;
-+ Rp->R_Interactive = TRUE;
-+ Rp->SaveAction = defaultSaveAction;
- Rp->RestoreAction = SA_NORESTORE; // handled within initialize()
- Rp->LoadInitFile = loadInitFile ? TRUE : FALSE;
-- R_SetParams(Rp) ;
-+ R_SetParams(Rp);
-
- // redirect console
- R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
deleted file mode 100644
index 09ff6e9c5162..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt
-GWT_VER=2.8.1
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.10
-QT_SLOT=5
-
-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-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
- >=app-text/pandoc-${PANDOC_VER}
- dev-java/aopalliance:1
- dev-java/gin:2.1
- dev-java/gwt:2.8
- dev-java/javax-inject
- =dev-java/validation-api-1.0*:1.0[source]
- dev-haskell/pandoc-citeproc
- dev-lang/R
- dev-libs/boost:=
- >=dev-libs/mathjax-2.7.4
- sys-apps/util-linux
- sys-devel/clang:*
- sys-libs/zlib
- >=virtual/jre-1.8:=
- x11-libs/pango
- !dedicated? (
- >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
- >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
- >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
- server? ( sys-libs/pam )
- )
- dedicated? ( sys-libs/pam )
- dedicated? (
- sys-libs/pam
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- server? (
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-java/ant-core
- >=virtual/jdk-1.8:=
- virtual/pkgconfig"
-# test? ( dev-java/junit:4 )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.5033-prefs.patch
- "${FILESDIR}"/${PN}-1.2.5033-paths.patch
- "${FILESDIR}"/${PN}-1.2.5033-pandoc.patch
- "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
- "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
- "${FILESDIR}"/${PN}-1.0.44-systemd.patch
- "${FILESDIR}"/${PN}-1.2.1335-core.patch
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
- "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
- "${FILESDIR}"/${PN}-1.2.5042-R-4.0.0.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}" || die
- mkdir -p dependencies/common/dictionaries
- unzip -qd dependencies/common/dictionaries \
- "${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- java-pkg-2_src_prepare
- egit_clean
-
- # Enable CMake to install our .service file for systemd usage
- mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
- cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
- # 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-26 || 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
-
- # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
- sed -i \
- -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
- src/cpp/server/CMakeLists.txt || die
-
- # 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
-
- # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
- # It provides a library that has its version number appended to the end,
- # which is difficult to handle in cmake, as find_library does not support
- # searching for wildcard library names. So I find the library name from the
- # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
- rm -rf "${S}"/src/cpp/desktop/3rdparty || die
- local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
- $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
- | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
- -e 's@LIBS \*= -l@@')
- sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
- -i "${S}"/src/cpp/desktop/CMakeLists.txt \
- || die
-
- # The git commit for tag: git rev-list -n 1 v${PV}
- sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
- -i "${S}"/CMakeLists.txt \
- "${S}"/CMakeGlobals.txt \
- || die
-
- eprefixify src/gwt/build.xml
-}
-
-src_configure() {
- export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
- export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
- export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
- local mycmakeargs=(
- -DDISTRO_SHARE=share/${PN}
- -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
- -DRSTUDIO_VERIFY_R_VERSION=FALSE
- )
-
- if use !dedicated; then
- mycmakeargs+=(
- -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
- -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- local JAVA_ANT_REWRITE_CLASSPATH="yes"
- local EANT_BUILD_XML="src/gwt/build.xml"
- local EANT_BUILD_TARGET="clean"
- java-pkg-2_src_compile
-
- # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
- # P: /root/.oracle_jre_usage.
- export ANT_OPTS="-Duser.home=${T}"
- cmake-utils_src_compile
-}
-
-src_install() {
- export ANT_OPTS="-Duser.home=${T}"
- cmake-utils_src_install
- use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
- doconfd "${FILESDIR}"/rstudio-server.conf
- insinto /etc/rstudio
- doins "${FILESDIR}"/rsession.conf
- dosym ../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() {
- java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
deleted file mode 100644
index 6c4943d4513b..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt
-GWT_VER=2.8.1
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.10
-QT_SLOT=5
-
-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-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
- >=app-text/pandoc-${PANDOC_VER}
- dev-java/aopalliance:1
- dev-java/gin:2.1
- dev-java/gwt:2.8
- dev-java/javax-inject
- =dev-java/validation-api-1.0*:1.0[source]
- dev-haskell/pandoc-citeproc
- dev-lang/R
- dev-libs/boost:=
- >=dev-libs/mathjax-2.7.4
- sys-apps/util-linux
- sys-devel/clang:*
- sys-libs/zlib
- >=virtual/jre-1.8:=
- x11-libs/pango
- !dedicated? (
- >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
- >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
- >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
- server? ( sys-libs/pam )
- )
- dedicated? ( sys-libs/pam )
- dedicated? (
- sys-libs/pam
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- server? (
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-java/ant-core
- >=virtual/jdk-1.8:=
- virtual/pkgconfig"
-# test? ( dev-java/junit:4 )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.5033-prefs.patch
- "${FILESDIR}"/${PN}-1.2.5033-paths.patch
- "${FILESDIR}"/${PN}-1.2.5033-pandoc.patch
- "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
- "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
- "${FILESDIR}"/${PN}-1.0.44-systemd.patch
- "${FILESDIR}"/${PN}-1.2.1335-core.patch
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
- "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
- "${FILESDIR}"/${PN}-1.2.5042-R-4.0.0.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}" || die
- mkdir -p dependencies/common/dictionaries
- unzip -qd dependencies/common/dictionaries \
- "${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- java-pkg-2_src_prepare
- egit_clean
-
- # Enable CMake to install our .service file for systemd usage
- mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
- cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
- # 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-26 || 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
-
- # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
- sed -i \
- -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
- src/cpp/server/CMakeLists.txt || die
-
- # 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
-
- # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
- # It provides a library that has its version number appended to the end,
- # which is difficult to handle in cmake, as find_library does not support
- # searching for wildcard library names. So I find the library name from the
- # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
- rm -rf "${S}"/src/cpp/desktop/3rdparty || die
- local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
- $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
- | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
- -e 's@LIBS \*= -l@@')
- sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
- -i "${S}"/src/cpp/desktop/CMakeLists.txt \
- || die
-
- # The git commit for tag: git rev-list -n 1 v${PV}
- sed -e 's@git ARGS rev-parse HEAD@echo ARGS e4a1c219cbf6c10d9aec41461d80171ab3009bef@'\
- -i "${S}"/CMakeLists.txt \
- "${S}"/CMakeGlobals.txt \
- || die
-
- eprefixify src/gwt/build.xml
-}
-
-src_configure() {
- export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
- export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
- export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
- local mycmakeargs=(
- -DDISTRO_SHARE=share/${PN}
- -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
- -DRSTUDIO_VERIFY_R_VERSION=FALSE
- )
-
- if use !dedicated; then
- mycmakeargs+=(
- -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
- -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- local JAVA_ANT_REWRITE_CLASSPATH="yes"
- local EANT_BUILD_XML="src/gwt/build.xml"
- local EANT_BUILD_TARGET="clean"
- java-pkg-2_src_compile
-
- # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
- # P: /root/.oracle_jre_usage.
- export ANT_OPTS="-Duser.home=${T}"
- cmake-utils_src_compile
-}
-
-src_install() {
- export ANT_OPTS="-Duser.home=${T}"
- cmake-utils_src_install
- use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
- doconfd "${FILESDIR}"/rstudio-server.conf
- insinto /etc/rstudio
- doins "${FILESDIR}"/rsession.conf
- dosym ../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() {
- java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild
deleted file mode 100644
index 49d75885be5f..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.12.6
-QT_SLOT=5
-
-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-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
- >=app-text/pandoc-${PANDOC_VER}
- dev-java/aopalliance:1
- dev-java/gin:2.1
- dev-java/javax-inject
- =dev-java/validation-api-1.0*:1.0[source]
- dev-haskell/pandoc-citeproc
- dev-lang/R
- dev-libs/boost:=
- >=dev-libs/mathjax-2.7.4
- sys-apps/util-linux
- sys-devel/clang:*
- sys-libs/zlib
- >=virtual/jre-1.8:=
- x11-libs/pango
- !dedicated? (
- >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
- >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
- >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
- server? ( sys-libs/pam )
- )
- dedicated? ( sys-libs/pam )
- dedicated? (
- sys-libs/pam
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- server? (
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-java/ant-core
- >=virtual/jdk-1.8:=
- virtual/pkgconfig"
-# test? ( dev-java/junit:4 )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.959-prefs.patch
- "${FILESDIR}"/${PN}-1.3.959-paths.patch
- "${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
- "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
- "${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
- "${FILESDIR}"/${PN}-1.0.44-systemd.patch
- "${FILESDIR}"/${PN}-1.3.959-core.patch
- "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
- "${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
- "${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}" || die
- mkdir -p dependencies/common/dictionaries
- unzip -qd dependencies/common/dictionaries \
- "${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
- cmake_src_prepare
- java-pkg-2_src_prepare
- egit_clean
-
- # Enable CMake to install our .service file for systemd usage
- mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
- cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
- # 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-26 || 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
-
- # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
- sed -i \
- -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
- src/cpp/server/CMakeLists.txt || die
-
- # 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
-
- # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
- # It provides a library that has its version number appended to the end,
- # which is difficult to handle in cmake, as find_library does not support
- # searching for wildcard library names. So I find the library name from the
- # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
- rm -rf "${S}"/src/cpp/desktop/3rdparty || die
- local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
- $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
- | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
- -e 's@LIBS \*= -l@@')
- sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
- -i "${S}"/src/cpp/desktop/CMakeLists.txt \
- || die
-
- # The git commit for tag: git rev-list -n 1 v${PV}
- sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5a4dee980c998d9a270a83b582b367126f3914cf@'\
- -i "${S}"/CMakeLists.txt \
- "${S}"/CMakeGlobals.txt \
- || die
-
- eprefixify src/gwt/build.xml
-}
-
-src_configure() {
- export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
- export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
- export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
- local mycmakeargs=(
- -DDISTRO_SHARE=share/${PN}
- -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
- -DRSTUDIO_VERIFY_R_VERSION=FALSE
- -DRSTUDIO_USE_SYSTEM_BOOST=TRUE
- )
-
- if use !dedicated; then
- mycmakeargs+=(
- -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
- -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
- )
- fi
- cmake_src_configure
-}
-
-src_compile() {
- local JAVA_ANT_REWRITE_CLASSPATH="yes"
- local EANT_BUILD_XML="src/gwt/build.xml"
- local EANT_BUILD_TARGET="clean"
- java-pkg-2_src_compile
-
- # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
- # P: /root/.oracle_jre_usage.
- export ANT_OPTS="-Duser.home=${T}"
- cmake_src_compile
-}
-
-src_install() {
- export ANT_OPTS="-Duser.home=${T}"
- cmake_src_install
- use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
- doconfd "${FILESDIR}"/rstudio-server.conf
- insinto /etc/rstudio
- doins "${FILESDIR}"/rsession.conf
- dosym ../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() {
- java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.3.959.ebuild b/sci-mathematics/rstudio/rstudio-1.3.959.ebuild
deleted file mode 100644
index d708ec5bd513..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.3.959.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.12.6
-QT_SLOT=5
-
-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-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
- >=app-text/pandoc-${PANDOC_VER}
- dev-java/aopalliance:1
- dev-java/gin:2.1
- dev-java/javax-inject
- =dev-java/validation-api-1.0*:1.0[source]
- dev-haskell/pandoc-citeproc
- dev-lang/R
- dev-libs/boost:=
- >=dev-libs/mathjax-2.7.4
- sys-apps/util-linux
- sys-devel/clang:*
- sys-libs/zlib
- >=virtual/jre-1.8:=
- x11-libs/pango
- !dedicated? (
- >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
- >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
- >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
- >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
- server? ( sys-libs/pam )
- )
- dedicated? ( sys-libs/pam )
- dedicated? (
- sys-libs/pam
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- server? (
- acct-user/rstudio-server
- acct-group/rstudio-server
- )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-java/ant-core
- >=virtual/jdk-1.8:=
- virtual/pkgconfig"
-# test? ( dev-java/junit:4 )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.959-prefs.patch
- "${FILESDIR}"/${PN}-1.3.959-paths.patch
- "${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
- "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
- "${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
- "${FILESDIR}"/${PN}-1.0.44-systemd.patch
- "${FILESDIR}"/${PN}-1.3.959-core.patch
- "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
- "${FILESDIR}"/${PN}-1.3.959-R-4.0.0.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}" || die
- mkdir -p dependencies/common/dictionaries
- unzip -qd dependencies/common/dictionaries \
- "${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- java-pkg-2_src_prepare
- egit_clean
-
- # Enable CMake to install our .service file for systemd usage
- mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
- cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
- # 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-26 || 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
-
- # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
- sed -i \
- -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
- src/cpp/server/CMakeLists.txt || die
-
- # 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
-
- # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
- # It provides a library that has its version number appended to the end,
- # which is difficult to handle in cmake, as find_library does not support
- # searching for wildcard library names. So I find the library name from the
- # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
- rm -rf "${S}"/src/cpp/desktop/3rdparty || die
- local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
- $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
- | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
- -e 's@LIBS \*= -l@@')
- sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
- -i "${S}"/src/cpp/desktop/CMakeLists.txt \
- || die
-
- # The git commit for tag: git rev-list -n 1 v${PV}
- sed -e 's@git ARGS rev-parse HEAD@echo ARGS 3a09be39fd51a8fafa8ae330007937d31924b395@'\
- -i "${S}"/CMakeLists.txt \
- "${S}"/CMakeGlobals.txt \
- || die
-
- eprefixify src/gwt/build.xml
-}
-
-src_configure() {
- export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
- export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
- export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
- local mycmakeargs=(
- -DDISTRO_SHARE=share/${PN}
- -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
- -DRSTUDIO_VERIFY_R_VERSION=FALSE
- -DRSTUDIO_USE_SYSTEM_BOOST=TRUE
- )
-
- if use !dedicated; then
- mycmakeargs+=(
- -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
- -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- local JAVA_ANT_REWRITE_CLASSPATH="yes"
- local EANT_BUILD_XML="src/gwt/build.xml"
- local EANT_BUILD_TARGET="clean"
- java-pkg-2_src_compile
-
- # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
- # P: /root/.oracle_jre_usage.
- export ANT_OPTS="-Duser.home=${T}"
- cmake-utils_src_compile
-}
-
-src_install() {
- export ANT_OPTS="-Duser.home=${T}"
- cmake-utils_src_install
- use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
- doconfd "${FILESDIR}"/rstudio-server.conf
- insinto /etc/rstudio
- doins "${FILESDIR}"/rsession.conf
- dosym ../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() {
- java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
- use dedicated || { xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update ;}
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 09:53:32 +0000