| 1 |
commit: 01bdf0bb499aa42200b8544622fe706020d7949b |
| 2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 26 08:42:42 2017 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 26 08:43:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bdf0bb |
| 7 |
|
| 8 |
sci-mathematics/rstudio: Bump to 1.0.143, fix 609644 and 606166. |
| 9 |
|
| 10 |
Thanks to Matthias Schwartz for reporting 606166. Thanks to malices.gossips for |
| 11 |
reporting 609644, and kensington for the fix. |
| 12 |
|
| 13 |
Gentoo-Bug: 606166, 609644 |
| 14 |
|
| 15 |
Package-Manager: portage-2.3.5 |
| 16 |
|
| 17 |
sci-mathematics/rstudio/Manifest | 1 + |
| 18 |
sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 12 ++++++------ |
| 19 |
sci-mathematics/rstudio/rstudio-0.99.482.ebuild | 12 ++++++------ |
| 20 |
sci-mathematics/rstudio/rstudio-0.99.483.ebuild | 12 ++++++------ |
| 21 |
sci-mathematics/rstudio/rstudio-0.99.484.ebuild | 12 ++++++------ |
| 22 |
sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild | 12 ++++++------ |
| 23 |
sci-mathematics/rstudio/rstudio-0.99.491.ebuild | 12 ++++++------ |
| 24 |
sci-mathematics/rstudio/rstudio-0.99.879.ebuild | 12 ++++++------ |
| 25 |
sci-mathematics/rstudio/rstudio-0.99.893.ebuild | 12 ++++++------ |
| 26 |
sci-mathematics/rstudio/rstudio-0.99.896.ebuild | 12 ++++++------ |
| 27 |
sci-mathematics/rstudio/rstudio-0.99.902.ebuild | 12 ++++++------ |
| 28 |
sci-mathematics/rstudio/rstudio-0.99.903.ebuild | 12 ++++++------ |
| 29 |
sci-mathematics/rstudio/rstudio-1.0.136.ebuild | 10 +++++----- |
| 30 |
.../{rstudio-1.0.136.ebuild => rstudio-1.0.143.ebuild} | 10 +++++----- |
| 31 |
sci-mathematics/rstudio/rstudio-1.0.44.ebuild | 12 ++++++------ |
| 32 |
15 files changed, 83 insertions(+), 82 deletions(-) |
| 33 |
|
| 34 |
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest |
| 35 |
index 7366ec74612..c7992773634 100644 |
| 36 |
--- a/sci-mathematics/rstudio/Manifest |
| 37 |
+++ b/sci-mathematics/rstudio/Manifest |
| 38 |
@@ -29,6 +29,7 @@ DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b8 |
| 39 |
DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e WHIRLPOOL e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4 |
| 40 |
DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69 |
| 41 |
DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f |
| 42 |
+DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda |
| 43 |
DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef |
| 44 |
DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777 |
| 45 |
DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e |
| 46 |
|
| 47 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild |
| 48 |
index 7c3f04bff0c..cd4815f5d33 100644 |
| 49 |
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild |
| 50 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild |
| 51 |
@@ -1,9 +1,9 @@ |
| 52 |
-# Copyright 1999-2016 Gentoo Foundation |
| 53 |
+# Copyright 1999-2017 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=5 |
| 57 |
|
| 58 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 59 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 60 |
|
| 61 |
# TODO |
| 62 |
# * package gin and gwt |
| 63 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 64 |
>=dev-libs/mathjax-2.3 |
| 65 |
dev-libs/openssl:0 |
| 66 |
sys-apps/util-linux |
| 67 |
- >=sys-devel/clang-3.5.0 |
| 68 |
+ >=sys-devel/clang-3.5.0:* |
| 69 |
sys-libs/zlib |
| 70 |
>=virtual/jre-1.7:= |
| 71 |
x11-libs/pango |
| 72 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 73 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 74 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 75 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 76 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 77 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 78 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 79 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 80 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 81 |
@@ -166,7 +166,7 @@ src_prepare() { |
| 82 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 83 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 84 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 85 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 86 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 87 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 88 |
-e 's@LIBS \*= -l@@') |
| 89 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 90 |
@@ -189,7 +189,7 @@ src_configure() { |
| 91 |
-DDISTRO_SHARE=share/${PN} |
| 92 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 93 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 94 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 95 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 96 |
) |
| 97 |
|
| 98 |
cmake-utils_src_configure |
| 99 |
|
| 100 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild |
| 101 |
index 7c3f04bff0c..cd4815f5d33 100644 |
| 102 |
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild |
| 103 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild |
| 104 |
@@ -1,9 +1,9 @@ |
| 105 |
-# Copyright 1999-2016 Gentoo Foundation |
| 106 |
+# Copyright 1999-2017 Gentoo Foundation |
| 107 |
# Distributed under the terms of the GNU General Public License v2 |
| 108 |
|
| 109 |
EAPI=5 |
| 110 |
|
| 111 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 112 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 113 |
|
| 114 |
# TODO |
| 115 |
# * package gin and gwt |
| 116 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 117 |
>=dev-libs/mathjax-2.3 |
| 118 |
dev-libs/openssl:0 |
| 119 |
sys-apps/util-linux |
| 120 |
- >=sys-devel/clang-3.5.0 |
| 121 |
+ >=sys-devel/clang-3.5.0:* |
| 122 |
sys-libs/zlib |
| 123 |
>=virtual/jre-1.7:= |
| 124 |
x11-libs/pango |
| 125 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 126 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 127 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 128 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 129 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 130 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 131 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 132 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 133 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 134 |
@@ -166,7 +166,7 @@ src_prepare() { |
| 135 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 136 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 137 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 138 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 139 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 140 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 141 |
-e 's@LIBS \*= -l@@') |
| 142 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 143 |
@@ -189,7 +189,7 @@ src_configure() { |
| 144 |
-DDISTRO_SHARE=share/${PN} |
| 145 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 146 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 147 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 148 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 149 |
) |
| 150 |
|
| 151 |
cmake-utils_src_configure |
| 152 |
|
| 153 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild |
| 154 |
index 7c3f04bff0c..cd4815f5d33 100644 |
| 155 |
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild |
| 156 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild |
| 157 |
@@ -1,9 +1,9 @@ |
| 158 |
-# Copyright 1999-2016 Gentoo Foundation |
| 159 |
+# Copyright 1999-2017 Gentoo Foundation |
| 160 |
# Distributed under the terms of the GNU General Public License v2 |
| 161 |
|
| 162 |
EAPI=5 |
| 163 |
|
| 164 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 165 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 166 |
|
| 167 |
# TODO |
| 168 |
# * package gin and gwt |
| 169 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 170 |
>=dev-libs/mathjax-2.3 |
| 171 |
dev-libs/openssl:0 |
| 172 |
sys-apps/util-linux |
| 173 |
- >=sys-devel/clang-3.5.0 |
| 174 |
+ >=sys-devel/clang-3.5.0:* |
| 175 |
sys-libs/zlib |
| 176 |
>=virtual/jre-1.7:= |
| 177 |
x11-libs/pango |
| 178 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 179 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 180 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 181 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 182 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 183 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 184 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 185 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 186 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 187 |
@@ -166,7 +166,7 @@ src_prepare() { |
| 188 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 189 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 190 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 191 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 192 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 193 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 194 |
-e 's@LIBS \*= -l@@') |
| 195 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 196 |
@@ -189,7 +189,7 @@ src_configure() { |
| 197 |
-DDISTRO_SHARE=share/${PN} |
| 198 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 199 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 200 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 201 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 202 |
) |
| 203 |
|
| 204 |
cmake-utils_src_configure |
| 205 |
|
| 206 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild |
| 207 |
index 7c3f04bff0c..cd4815f5d33 100644 |
| 208 |
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild |
| 209 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild |
| 210 |
@@ -1,9 +1,9 @@ |
| 211 |
-# Copyright 1999-2016 Gentoo Foundation |
| 212 |
+# Copyright 1999-2017 Gentoo Foundation |
| 213 |
# Distributed under the terms of the GNU General Public License v2 |
| 214 |
|
| 215 |
EAPI=5 |
| 216 |
|
| 217 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 218 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 219 |
|
| 220 |
# TODO |
| 221 |
# * package gin and gwt |
| 222 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 223 |
>=dev-libs/mathjax-2.3 |
| 224 |
dev-libs/openssl:0 |
| 225 |
sys-apps/util-linux |
| 226 |
- >=sys-devel/clang-3.5.0 |
| 227 |
+ >=sys-devel/clang-3.5.0:* |
| 228 |
sys-libs/zlib |
| 229 |
>=virtual/jre-1.7:= |
| 230 |
x11-libs/pango |
| 231 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 232 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 233 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 234 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 235 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 236 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 237 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 238 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 239 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 240 |
@@ -166,7 +166,7 @@ src_prepare() { |
| 241 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 242 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 243 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 244 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 245 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 246 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 247 |
-e 's@LIBS \*= -l@@') |
| 248 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 249 |
@@ -189,7 +189,7 @@ src_configure() { |
| 250 |
-DDISTRO_SHARE=share/${PN} |
| 251 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 252 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 253 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 254 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 255 |
) |
| 256 |
|
| 257 |
cmake-utils_src_configure |
| 258 |
|
| 259 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild |
| 260 |
index f87c147094b..a0c4907f68f 100644 |
| 261 |
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild |
| 262 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild |
| 263 |
@@ -1,9 +1,9 @@ |
| 264 |
-# Copyright 1999-2016 Gentoo Foundation |
| 265 |
+# Copyright 1999-2017 Gentoo Foundation |
| 266 |
# Distributed under the terms of the GNU General Public License v2 |
| 267 |
|
| 268 |
EAPI=5 |
| 269 |
|
| 270 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 271 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 272 |
|
| 273 |
# TODO |
| 274 |
# * package gin and gwt |
| 275 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 276 |
>=dev-libs/mathjax-2.3 |
| 277 |
dev-libs/openssl:0 |
| 278 |
sys-apps/util-linux |
| 279 |
- >=sys-devel/clang-3.5.0 |
| 280 |
+ >=sys-devel/clang-3.5.0:* |
| 281 |
sys-libs/zlib |
| 282 |
>=virtual/jre-1.7:= |
| 283 |
x11-libs/pango |
| 284 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 285 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 286 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 287 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 288 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 289 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 290 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 291 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 292 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 293 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 294 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 295 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 296 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 297 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 298 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 299 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 300 |
-e 's@LIBS \*= -l@@') |
| 301 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 302 |
@@ -197,7 +197,7 @@ src_configure() { |
| 303 |
-DDISTRO_SHARE=share/${PN} |
| 304 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 305 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 306 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 307 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 308 |
) |
| 309 |
|
| 310 |
cmake-utils_src_configure |
| 311 |
|
| 312 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild |
| 313 |
index f87c147094b..a0c4907f68f 100644 |
| 314 |
--- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild |
| 315 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild |
| 316 |
@@ -1,9 +1,9 @@ |
| 317 |
-# Copyright 1999-2016 Gentoo Foundation |
| 318 |
+# Copyright 1999-2017 Gentoo Foundation |
| 319 |
# Distributed under the terms of the GNU General Public License v2 |
| 320 |
|
| 321 |
EAPI=5 |
| 322 |
|
| 323 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 324 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 325 |
|
| 326 |
# TODO |
| 327 |
# * package gin and gwt |
| 328 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 329 |
>=dev-libs/mathjax-2.3 |
| 330 |
dev-libs/openssl:0 |
| 331 |
sys-apps/util-linux |
| 332 |
- >=sys-devel/clang-3.5.0 |
| 333 |
+ >=sys-devel/clang-3.5.0:* |
| 334 |
sys-libs/zlib |
| 335 |
>=virtual/jre-1.7:= |
| 336 |
x11-libs/pango |
| 337 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 338 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 339 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 340 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 341 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 342 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 343 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 344 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 345 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 346 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 347 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 348 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 349 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 350 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 351 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 352 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 353 |
-e 's@LIBS \*= -l@@') |
| 354 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 355 |
@@ -197,7 +197,7 @@ src_configure() { |
| 356 |
-DDISTRO_SHARE=share/${PN} |
| 357 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 358 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 359 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 360 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 361 |
) |
| 362 |
|
| 363 |
cmake-utils_src_configure |
| 364 |
|
| 365 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild |
| 366 |
index 3ebf8d8443b..6adb372e5cd 100644 |
| 367 |
--- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild |
| 368 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild |
| 369 |
@@ -1,9 +1,9 @@ |
| 370 |
-# Copyright 1999-2016 Gentoo Foundation |
| 371 |
+# Copyright 1999-2017 Gentoo Foundation |
| 372 |
# Distributed under the terms of the GNU General Public License v2 |
| 373 |
|
| 374 |
EAPI=5 |
| 375 |
|
| 376 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 377 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 378 |
|
| 379 |
# TODO |
| 380 |
# * package gin and gwt |
| 381 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 382 |
>=dev-libs/mathjax-2.3 |
| 383 |
dev-libs/openssl:0 |
| 384 |
sys-apps/util-linux |
| 385 |
- >=sys-devel/clang-3.5.0 |
| 386 |
+ >=sys-devel/clang-3.5.0:* |
| 387 |
sys-libs/zlib |
| 388 |
>=virtual/jre-1.7:= |
| 389 |
x11-libs/pango |
| 390 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 391 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 392 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 393 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 394 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 395 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 396 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 397 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 398 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 399 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 400 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 401 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 402 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 403 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 404 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 405 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 406 |
-e 's@LIBS \*= -l@@') |
| 407 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 408 |
@@ -197,7 +197,7 @@ src_configure() { |
| 409 |
-DDISTRO_SHARE=share/${PN} |
| 410 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 411 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 412 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 413 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 414 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 415 |
) |
| 416 |
|
| 417 |
|
| 418 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild |
| 419 |
index 98f8def92c7..c3bc93830dd 100644 |
| 420 |
--- a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild |
| 421 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild |
| 422 |
@@ -1,9 +1,9 @@ |
| 423 |
-# Copyright 1999-2016 Gentoo Foundation |
| 424 |
+# Copyright 1999-2017 Gentoo Foundation |
| 425 |
# Distributed under the terms of the GNU General Public License v2 |
| 426 |
|
| 427 |
EAPI=5 |
| 428 |
|
| 429 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 430 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 431 |
|
| 432 |
# TODO |
| 433 |
# * package gin and gwt |
| 434 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 435 |
>=dev-libs/mathjax-2.3 |
| 436 |
dev-libs/openssl:0 |
| 437 |
sys-apps/util-linux |
| 438 |
- >=sys-devel/clang-3.5.0 |
| 439 |
+ >=sys-devel/clang-3.5.0:* |
| 440 |
sys-libs/zlib |
| 441 |
>=virtual/jre-1.7:= |
| 442 |
x11-libs/pango |
| 443 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 444 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 445 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 446 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 447 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 448 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 449 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 450 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 451 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 452 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 453 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 454 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 455 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 456 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 457 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 458 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 459 |
-e 's@LIBS \*= -l@@') |
| 460 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 461 |
@@ -197,7 +197,7 @@ src_configure() { |
| 462 |
-DDISTRO_SHARE=share/${PN} |
| 463 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 464 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 465 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 466 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 467 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 468 |
) |
| 469 |
|
| 470 |
|
| 471 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild |
| 472 |
index 559f9b85367..134838bcf65 100644 |
| 473 |
--- a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild |
| 474 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild |
| 475 |
@@ -1,9 +1,9 @@ |
| 476 |
-# Copyright 1999-2016 Gentoo Foundation |
| 477 |
+# Copyright 1999-2017 Gentoo Foundation |
| 478 |
# Distributed under the terms of the GNU General Public License v2 |
| 479 |
|
| 480 |
EAPI=5 |
| 481 |
|
| 482 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 483 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 484 |
|
| 485 |
# TODO |
| 486 |
# * package gin and gwt |
| 487 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 488 |
>=dev-libs/mathjax-2.3 |
| 489 |
dev-libs/openssl:0 |
| 490 |
sys-apps/util-linux |
| 491 |
- >=sys-devel/clang-3.5.0 |
| 492 |
+ >=sys-devel/clang-3.5.0:* |
| 493 |
sys-libs/zlib |
| 494 |
>=virtual/jre-1.7:= |
| 495 |
x11-libs/pango |
| 496 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 497 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 498 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 499 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 500 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 501 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 502 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 503 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 504 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 505 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 506 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 507 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 508 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 509 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 510 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 511 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 512 |
-e 's@LIBS \*= -l@@') |
| 513 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 514 |
@@ -197,7 +197,7 @@ src_configure() { |
| 515 |
-DDISTRO_SHARE=share/${PN} |
| 516 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 517 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 518 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 519 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 520 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 521 |
) |
| 522 |
|
| 523 |
|
| 524 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild |
| 525 |
index defc0ba72a2..bd0e219d50f 100644 |
| 526 |
--- a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild |
| 527 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild |
| 528 |
@@ -1,9 +1,9 @@ |
| 529 |
-# Copyright 1999-2016 Gentoo Foundation |
| 530 |
+# Copyright 1999-2017 Gentoo Foundation |
| 531 |
# Distributed under the terms of the GNU General Public License v2 |
| 532 |
|
| 533 |
EAPI=5 |
| 534 |
|
| 535 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 536 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 537 |
|
| 538 |
# TODO |
| 539 |
# * package gin and gwt |
| 540 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 541 |
>=dev-libs/mathjax-2.3 |
| 542 |
dev-libs/openssl:0 |
| 543 |
sys-apps/util-linux |
| 544 |
- >=sys-devel/clang-3.5.0 |
| 545 |
+ >=sys-devel/clang-3.5.0:* |
| 546 |
sys-libs/zlib |
| 547 |
>=virtual/jre-1.7:= |
| 548 |
x11-libs/pango |
| 549 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 550 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 551 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 552 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 553 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 554 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 555 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 556 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 557 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 558 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 559 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 560 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 561 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 562 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 563 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 564 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 565 |
-e 's@LIBS \*= -l@@') |
| 566 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 567 |
@@ -197,7 +197,7 @@ src_configure() { |
| 568 |
-DDISTRO_SHARE=share/${PN} |
| 569 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 570 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 571 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 572 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 573 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 574 |
) |
| 575 |
|
| 576 |
|
| 577 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild |
| 578 |
index 141716af12b..60d0858c53c 100644 |
| 579 |
--- a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild |
| 580 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild |
| 581 |
@@ -1,9 +1,9 @@ |
| 582 |
-# Copyright 1999-2016 Gentoo Foundation |
| 583 |
+# Copyright 1999-2017 Gentoo Foundation |
| 584 |
# Distributed under the terms of the GNU General Public License v2 |
| 585 |
|
| 586 |
EAPI=5 |
| 587 |
|
| 588 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 589 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 590 |
|
| 591 |
# TODO |
| 592 |
# * package gin and gwt |
| 593 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 594 |
>=dev-libs/mathjax-2.3 |
| 595 |
dev-libs/openssl:0 |
| 596 |
sys-apps/util-linux |
| 597 |
- >=sys-devel/clang-3.5.0 |
| 598 |
+ >=sys-devel/clang-3.5.0:* |
| 599 |
sys-libs/zlib |
| 600 |
>=virtual/jre-1.7:= |
| 601 |
x11-libs/pango |
| 602 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 603 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 604 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 605 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 606 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 607 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 608 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 609 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 610 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 611 |
@@ -174,7 +174,7 @@ src_prepare() { |
| 612 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 613 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 614 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 615 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 616 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 617 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 618 |
-e 's@LIBS \*= -l@@') |
| 619 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 620 |
@@ -197,7 +197,7 @@ src_configure() { |
| 621 |
-DDISTRO_SHARE=share/${PN} |
| 622 |
$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 623 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 624 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 625 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 626 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 627 |
) |
| 628 |
|
| 629 |
|
| 630 |
diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild |
| 631 |
index fd16cfb0c90..dcb101cac4e 100644 |
| 632 |
--- a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild |
| 633 |
+++ b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild |
| 634 |
@@ -3,7 +3,7 @@ |
| 635 |
|
| 636 |
EAPI=6 |
| 637 |
|
| 638 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 639 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 640 |
|
| 641 |
# TODO |
| 642 |
# * package gin and gwt |
| 643 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 644 |
>=dev-libs/mathjax-2.7.0 |
| 645 |
dev-libs/openssl:0 |
| 646 |
sys-apps/util-linux |
| 647 |
- >=sys-devel/clang-3.5.0 |
| 648 |
+ >=sys-devel/clang-3.5.0:* |
| 649 |
sys-libs/zlib |
| 650 |
>=virtual/jre-1.8:= |
| 651 |
x11-libs/pango |
| 652 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 653 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 654 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 655 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 656 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 657 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 658 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 659 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 660 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 661 |
@@ -172,7 +172,7 @@ src_prepare() { |
| 662 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 663 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 664 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 665 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 666 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 667 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 668 |
-e 's@LIBS \*= -l@@') |
| 669 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 670 |
@@ -195,7 +195,7 @@ src_configure() { |
| 671 |
-DDISTRO_SHARE=share/${PN} |
| 672 |
-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" |
| 673 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 674 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 675 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 676 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 677 |
) |
| 678 |
|
| 679 |
|
| 680 |
diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild |
| 681 |
similarity index 97% |
| 682 |
copy from sci-mathematics/rstudio/rstudio-1.0.136.ebuild |
| 683 |
copy to sci-mathematics/rstudio/rstudio-1.0.143.ebuild |
| 684 |
index fd16cfb0c90..dcb101cac4e 100644 |
| 685 |
--- a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild |
| 686 |
+++ b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild |
| 687 |
@@ -3,7 +3,7 @@ |
| 688 |
|
| 689 |
EAPI=6 |
| 690 |
|
| 691 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 692 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 693 |
|
| 694 |
# TODO |
| 695 |
# * package gin and gwt |
| 696 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 697 |
>=dev-libs/mathjax-2.7.0 |
| 698 |
dev-libs/openssl:0 |
| 699 |
sys-apps/util-linux |
| 700 |
- >=sys-devel/clang-3.5.0 |
| 701 |
+ >=sys-devel/clang-3.5.0:* |
| 702 |
sys-libs/zlib |
| 703 |
>=virtual/jre-1.8:= |
| 704 |
x11-libs/pango |
| 705 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 706 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 707 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 708 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 709 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 710 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 711 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 712 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 713 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 714 |
@@ -172,7 +172,7 @@ src_prepare() { |
| 715 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 716 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 717 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 718 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 719 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 720 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 721 |
-e 's@LIBS \*= -l@@') |
| 722 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 723 |
@@ -195,7 +195,7 @@ src_configure() { |
| 724 |
-DDISTRO_SHARE=share/${PN} |
| 725 |
-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" |
| 726 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 727 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 728 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 729 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 730 |
) |
| 731 |
|
| 732 |
|
| 733 |
diff --git a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild |
| 734 |
index 4d6d1203e85..dcb101cac4e 100644 |
| 735 |
--- a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild |
| 736 |
+++ b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild |
| 737 |
@@ -1,9 +1,9 @@ |
| 738 |
-# Copyright 1999-2016 Gentoo Foundation |
| 739 |
+# Copyright 1999-2017 Gentoo Foundation |
| 740 |
# Distributed under the terms of the GNU General Public License v2 |
| 741 |
|
| 742 |
EAPI=6 |
| 743 |
|
| 744 |
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 745 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils |
| 746 |
|
| 747 |
# TODO |
| 748 |
# * package gin and gwt |
| 749 |
@@ -57,7 +57,7 @@ RDEPEND=" |
| 750 |
>=dev-libs/mathjax-2.7.0 |
| 751 |
dev-libs/openssl:0 |
| 752 |
sys-apps/util-linux |
| 753 |
- >=sys-devel/clang-3.5.0 |
| 754 |
+ >=sys-devel/clang-3.5.0:* |
| 755 |
sys-libs/zlib |
| 756 |
>=virtual/jre-1.8:= |
| 757 |
x11-libs/pango |
| 758 |
@@ -70,7 +70,7 @@ RDEPEND=" |
| 759 |
>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 760 |
>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 761 |
>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 762 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 763 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
| 764 |
>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 765 |
>=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 766 |
>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 767 |
@@ -172,7 +172,7 @@ src_prepare() { |
| 768 |
# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 769 |
rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 770 |
local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 771 |
- "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 772 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
| 773 |
| sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 774 |
-e 's@LIBS \*= -l@@') |
| 775 |
sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 776 |
@@ -195,7 +195,7 @@ src_configure() { |
| 777 |
-DDISTRO_SHARE=share/${PN} |
| 778 |
-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" |
| 779 |
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 780 |
- -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 781 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
| 782 |
-DRSTUDIO_VERIFY_R_VERSION=FALSE |
| 783 |
) |
Archives