diff options
| author |   Mark Wright <gienah@gentoo.org> | 2017-04-26 18:42:42 +1000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2017-04-26 18:43:22 +1000 |
| commit | 01bdf0bb499aa42200b8544622fe706020d7949b (patch) | |
| tree | 6015c4fba58abd76a6bd53f57b489c10928a1c27 /sci-mathematics/rstudio/rstudio-0.99.484.ebuild | |
| parent | media-sound/qmidiroute: Bump to 0.4.0, switch to qt5 (diff) | |
| download | gentoo-01bdf0bb499aa42200b8544622fe706020d7949b.tar.gz gentoo-01bdf0bb499aa42200b8544622fe706020d7949b.tar.bz2 gentoo-01bdf0bb499aa42200b8544622fe706020d7949b.zip | |
sci-mathematics/rstudio: Bump to 1.0.143, fix 609644 and 606166.
Thanks to Matthias Schwartz for reporting 606166. Thanks to malices.gossips for
reporting 609644, and kensington for the fix.
Gentoo-Bug: 606166, 609644
Package-Manager: portage-2.3.5
Diffstat (limited to 'sci-mathematics/rstudio/rstudio-0.99.484.ebuild')
| -rw-r--r-- | sci-mathematics/rstudio/rstudio-0.99.484.ebuild | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild index 7c3f04bff0c6..cd4815f5d332 100644 --- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild +++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils +inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils # TODO # * package gin and gwt @@ -57,7 +57,7 @@ RDEPEND=" >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux - >=sys-devel/clang-3.5.0 + >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.7:= x11-libs/pango @@ -70,7 +70,7 @@ RDEPEND=" >=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[qt5] + >=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} @@ -166,7 +166,7 @@ src_prepare() { # 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' \ - "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ + $(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" \ @@ -189,7 +189,7 @@ src_configure() { -DDISTRO_SHARE=share/${PN} $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake + -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake ) cmake-utils_src_configure |