diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-07-04 13:53:27 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-07-04 13:53:27 +0000 |
commit | 4e71e1b4f6583b857a1cd7b25751ff0c937bdd0c (patch) | |
tree | c6eaf8e7731b8114262f3a1d5e57b1e2492a316b /sci-mathematics | |
parent | Version bump. (diff) | |
download | historical-4e71e1b4f6583b857a1cd7b25751ff0c937bdd0c.tar.gz historical-4e71e1b4f6583b857a1cd7b25751ff0c937bdd0c.tar.bz2 historical-4e71e1b4f6583b857a1cd7b25751ff0c937bdd0c.zip |
version bump wrt #513862
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/rstudio/ChangeLog | 10 | ||||
-rw-r--r-- | sci-mathematics/rstudio/Manifest | 34 | ||||
-rw-r--r-- | sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch | 25 | ||||
-rw-r--r-- | sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch | 140 | ||||
-rw-r--r-- | sci-mathematics/rstudio/rstudio-0.98.932.ebuild | 166 |
5 files changed, 365 insertions, 10 deletions
diff --git a/sci-mathematics/rstudio/ChangeLog b/sci-mathematics/rstudio/ChangeLog index de81e0ded54b..18ab52bebe10 100644 --- a/sci-mathematics/rstudio/ChangeLog +++ b/sci-mathematics/rstudio/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-mathematics/rstudio -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.9 2013/12/23 21:33:01 hasufell Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.10 2014/07/04 13:53:22 hasufell Exp $ + +*rstudio-0.98.932 (04 Jul 2014) + + 04 Jul 2014; Julian Ospald <hasufell@gentoo.org> +rstudio-0.98.932.ebuild, + +files/rstudio-0.98.932-pandoc.patch, +files/rstudio-0.98.932-paths.patch: + version bump wrt #513862 23 Dec 2013; Julian Ospald <hasufell@gentoo.org> rstudio-0.98.490.ebuild: fix build with +server wrt #494362 diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 4edd211f5be4..ceb80ce82f84 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -15,29 +15,47 @@ AUX rstudio-0.97.551-prefs.patch 1008 SHA256 ae5bcb603cdd112adb9f5929b9cf15b33db 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 +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.3.0.tar.gz 79974 SHA256 5ea35b6cb964188f4ffe58a3c9cf2c1f5a436569117c218d097e0fa66d032ebb SHA512 7f964e94e62193466e9bc880fea2c2fef8a0996061d9b971789e4e33a2d1e6327033f03236327545aa73e1112e2bea730c3fc0984729ecdec6f1582855c1b249 WHIRLPOOL 7ff4c3f3681300d402e8738b1aceac7ee2dbd55edb36966e3b7453b1b90182093979436d2c1193d460418251bc370ab222f61142311d8fe1a5a42527c5869aa3 +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.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 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.490.ebuild 3635 SHA256 19b22ab34c630ecdaac31c53015b8ba900cd9c969f19b564890e6b3d765bb85e SHA512 2251a8bf74543573cb6dce731f002d4b4c384d7acd960da4280608b4a86408429f670980dda671053a235a2abddf2051101ff7f90397f3794f72b09f5d80a208 WHIRLPOOL 3960577332006fec5e632e3dff69c920cd3048733d34274bbf89b38c29c11e5faa47443556d7fcadda9eaa9b6d9445b4eb531e9e26b93bea734a68e3cef3d8ef -MISC ChangeLog 2480 SHA256 d7af1c664ad269ffde29d3a379b1834e1a845e91655006e1fd49a3ee5b9755fb SHA512 7371d8de41581f5f71c0b771369ee65cf76313a6313bf8549ae73b7a9e8ee9bd7fd638b608cae1ef036f7072e4eee9cf919debd84146224cdd918a0ab962f21e WHIRLPOOL 0f222f942228ac6aea0e73c60086dcfef5585c80635c8e66e3aceddd54c615750851a191ff68de3db85f4349147b0878aa152c86033c8541d5f49b4adf243b52 +EBUILD rstudio-0.98.932.ebuild 4881 SHA256 c75c67325435a00a13f087af12f2b87fd7049a4ce3723ad9c5458e23e56f945b SHA512 2350748ec8f9c0837027e17cecc4ad7bbac291b4bff0623c34846b2905f4eee10dbfd55e7abb9be2aafe59ffa94b77d119cbd1208ab930fab9a305a51301baca WHIRLPOOL f6ec0a40f061cfebfd1725ccdb04a5a5d9284d9346f7bba0d3f5ef0d2a502c68cd11f4ea9d5757caede8ab993d0286053964f1b4b59496bbee12c5a33dfb1848 +MISC ChangeLog 2696 SHA256 4e67da7aaea1df68355adb7956b0b3d7a1a5c80fe1741d71da44f9ec24569355 SHA512 98426ddc1399dc9a75202db2419dbf94197b3059ee91c51d2a554026028d35c3a75fa84268ee22b31a1ec4f6ed95fcb7ab1428853351fccfe52f9a17cc0c7ee0 WHIRLPOOL 6c6ad99d6d68965523fef74c73686a057acaa26d874509b0dfb12e3d0328313d59cc56287a3b474bae3877d1d8140c67275baadc30d7971a0fc70d70c0e0ff55 MISC metadata.xml 492 SHA256 983c0c34455413d16d33a977101ea093b0ce90b0c4ea0b8e67fd5719c48b29cf SHA512 0ef17192ca14c533c46e2749406dde7b2c76d282c63fd270f7e52aee9a19de423c4855341145453ccabf8a1b680171c9d6c35174cd1c67fbc8c604bdd3216f4c WHIRLPOOL 7a0c5d8409f6aeae7eec87097303f95ad47c525fa7b4ae52d752119df1d23a647b546e2fc96084a15cbf7c36967fb0e08618a042360d8a4149d2563d67b4d5e7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSuKwRAAoJEFpvPKfnPDWzy5oH/jw+i9RcjwvjB6BZoTKpqbfi -eLblXM2HePbAiAk5qBWZkir14NqLCWR5b3di8P+7gPE9QeK7RslIF7yzRBo00rfU -H526JdyszgnKqpepEDN8xM2LM4ZJJHdn5B53IhxeGy4jAmqYEtRgW7vU17GsJWc3 -t7rUHPqQao8yGy3OAkSxqG9H6ivLH+38LChptBWv4LcTxdpOM11SDEzTICMbPPlt -9jDJwTgfLTfnV++cD/9HfinBTCa4fyDwEP+3qMDUvsBmNGIDL5pXKtaSzLUcHwm/ -FhSoemaazB0+bNpT+ZJRncgJ3Xf5jSRIE3hxGkoeHMIDgTeXFaTwGvV1j6y92M8= -=h4Ha +iQJ8BAEBCABmBQJTtrHVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgDg0QAM1AS9Q7ySnioefqouUGEOmq +FfN+hcr8+eHqsdIuqM06fun4S9E1+D8fN8OHcB6L/ZOu7osSf9aZPsvqz/i1eOWa +9ap5qtkj6o9+41PSH1hp2lmNfDEohAPNXFmQc/iXtlFNM+QJxzw8S+PdrZXkQZOr +r3jI1PWFH13jEd/8XxNAbZYXyxThnunHjahSg4bLc8qFdIqzijVPwauEleXlWoHc +n51Bd77cj+k8eUgMxdJfQGzTGgyLifasWWgniHXZCWMV4yOFbWb8hL5j5Y/vCmv9 +ZiXWevx7yLfFlx+K9OGwcOtewLNnlgpHLXlgPtsuyOV+4padC1z06CdzZbMctrHC +yrAabP65E/0yY7ErOZq8DLXgJFtmFSMhFRz8DoIbqUwR51jvgYpub4pzWrgJqfaU +AXAVmWOnjzyJRzQgey70G3Daoq+FXrPNC7nIKJyAKAGVNXqmoWYIm/R67u4TGDVx +8fP4f+JBXSp2kO0+okF8zvbEhgQJYLDNZgzAb89dHhmoyIc5coP0VOgXZiX7lJav +jN37dEcNiGiS/acBSr+/t599yHZ4SgTaHBcwwOfW0WMkui4rGkv6Mmsw6V1jX+0c +dbEM14H2eblSRun8iz5cHU/pZYjcZ6+4XEC2mZDB0MutkivFss6GuYQ234SQkbbj +OYRwBDNcNuoO4C2aP9FF +=oBLa -----END PGP SIGNATURE----- diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch new file mode 100644 index 000000000000..d2b6911eabb8 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch @@ -0,0 +1,25 @@ +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -25,9 +25,6 @@ + if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax") + message(FATAL_ERROR "Mathjax 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() +@@ -337,12 +334,6 @@ + install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax" + DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") + +- # install pandoc +- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.3") +- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") +- install(PROGRAMS ${PANDOC_FILES} +- 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-0.98.932-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch new file mode 100644 index 000000000000..d4bb4249f1a6 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch @@ -0,0 +1,140 @@ +diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt +index cc10191..f75b85a 100644 +--- a/CMakeGlobals.txt ++++ b/CMakeGlobals.txt +@@ -105,7 +105,7 @@ else() + 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 +diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt +index 184e514..d09aac5 100644 +--- a/src/cpp/server/CMakeLists.txt ++++ b/src/cpp/server/CMakeLists.txt +@@ -145,7 +145,7 @@ if (UNIX AND NOT APPLE) + 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") +@@ -153,7 +153,7 @@ if (UNIX AND NOT APPLE) + 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") +@@ -161,13 +161,13 @@ if (UNIX AND NOT APPLE) + 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 apparmor profile + set(RSERVER_APPARMOR_DIR "extras/apparmor") +@@ -175,9 +175,9 @@ if (UNIX AND NOT APPLE) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} +- DESTINATION ${RSERVER_APPARMOR_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) + install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load +- DESTINATION ${RSERVER_APPARMOR_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) + + # install configured upstart profile + set(RSERVER_UPSTART_DIR "extras/upstart") +@@ -185,12 +185,12 @@ if (UNIX AND NOT APPLE) + 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}) + + endif() + +diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp +index 1eaf7c0..4b25fa1 100644 +--- a/src/cpp/server/ServerOptions.cpp ++++ b/src/cpp/server/ServerOptions.cpp +@@ -307,8 +307,8 @@ ProgramStatus Options::read(int argc, + + // 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_); +diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp +index 44b3d55..a48cdb6 100644 +--- a/src/cpp/session/SessionOptions.cpp ++++ b/src/cpp/session/SessionOptions.cpp +@@ -40,7 +40,7 @@ + namespace session { + + namespace { +-const char* const kDefaultPandocPath = "bin/pandoc"; ++const char* const kDefaultPandocPath = "bin"; + const char* const kDefaultPostbackPath = "bin/postback/rpostback"; + } // anonymous namespace + +@@ -392,15 +392,15 @@ + } + + // 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, &sessionPackagesPath_); +- 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), &coreRSourcePath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); + resolvePostbackPath(resourcePath, &rpostbackPath_); + #ifdef _WIN32 + resolvePath(resourcePath, &consoleIoPath_); +@@ -409,7 +409,7 @@ + resolvePath(resourcePath, &msysSshPath_); + resolvePath(resourcePath, &sumatraPath_); + #endif +- resolvePath(resourcePath, &hunspellDictionariesPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); + resolvePath(resourcePath, &mathjaxPath_); + resolvePandocPath(resourcePath, &pandocPath_); + diff --git a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild new file mode 100644 index 000000000000..54c8065a81a0 --- /dev/null +++ b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild @@ -0,0 +1,166 @@ +# 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 $ + +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?) + +GWTVER=2.6.0 +GINVER=1.5 +SELENIUMVER=2.37.0 +CHROMEDRIVER_VER=2.7 +PANDOC_VER=1.12.3 +PACKRAT_VER=0.3.0 +RMARKDOWN_VER=0.2.49 + +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-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/~hasufell/distfiles/packrat_${PACKRAT_VER}.tar.gz + http://dev.gentoo.org/~hasufell/distfiles/rmarkdown_${RMARKDOWN_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 + dev-libs/openssl + 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 + cp "${DISTDIR}"/rmarkdown_${RMARKDOWN_VER}.tar.gz \ + . || die + cp "${DISTDIR}"/packrat_${PACKRAT_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}"/${P}-paths.patch \ + "${FILESDIR}"/${P}-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 || 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 "Development" "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 ;} +} |