diff options
| -rw-r--r-- | sci-mathematics/rstudio/Manifest | 9 | ||||
| -rw-r--r-- | sci-mathematics/rstudio/files/rstudio-linker_flags.patch (renamed from sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch) | 0 | ||||
| -rw-r--r-- | sci-mathematics/rstudio/files/rstudio-paths.patch (renamed from sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch) | 0 | ||||
| -rw-r--r-- | sci-mathematics/rstudio/files/rstudio-prefs.patch (renamed from sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch) | 0 | ||||
| -rw-r--r-- | sci-mathematics/rstudio/files/rstudio.desktop.patch | 16 | ||||
| -rw-r--r-- | sci-mathematics/rstudio/rstudio-0.96.316.ebuild | 11 | ||||
| -rw-r--r-- | sci-mathematics/rstudio/rstudio-0.96.331.ebuild | 141 |
7 files changed, 168 insertions, 9 deletions
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 8d21bc68f..4b9711023 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -1,4 +1,5 @@ -DIST core-dictionaries.zip 876339 RMD160 1f9e86729e4d7646ebd221cb0b1480d51a899009 SHA1 c09eba9fe08fc72934058a0add7b8e4ccca38da5 SHA256 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9 WHIRLPOOL 316dced8ac46e4216613b0b850c33d4c1e10ef0ecd954d786eb131ea80b34e66ba3d39a0ef25b45230b64ded415737ddabef8f7d68f4d42caea98679cff44ee0 -DIST gin-1.5.zip 1055663 RMD160 cde394d111b3af798935ab5391da79ef3173c8cb SHA1 211a257b78f4ea462d1d5e64641b6776d905b3c7 SHA256 f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897 WHIRLPOOL e66d348ed275eb20518369c39592a5a03ee4257422e2947520385377939de65a54d131332818362a47597392026db48ed1332f11ae218e336798498ae5d5b196 -DIST gwt-2.4.0.zip 89734508 RMD160 79d159ba2176a4b96d7cefdfcc557301ebb1d31d SHA1 a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88 SHA256 27d48a4b6df9de01eaf1bd3ba3971a8f32742886f67041ddc3cd9dbe01787ebf SHA512 7c64e4fdcf2114700112ea8258f91eed3c5c64ce1067100f86a4201eb4a2f9ba2b8d89663a3bd9c45b1a0555bd3d8b1dcabeb2b59b38ffc0ebb429bcad255ec2 WHIRLPOOL 94fa83ab291434e4975f7c526712dc6b0068ea96213d039b5483c8cc6b6bcd7ee7ebab3d00dc3b8202b25db34732d8b9af1a3fe1d02bc6189699baa2c24a6b82 -DIST rstudio-0.96.316.tar.gz 12424635 RMD160 4fa175d59a1ffa6a6847afc597836560b43f20ce SHA1 5a5b21d34a3e1c2f8abd53c95d298db9ed0410ba SHA256 301504831d08ce2efe90a15b0fecd305f0f83d52e6d2b9ea67eb70c99ed280e6 SHA512 51ac9ce01510b3385949d69ebf5b13dacbed2be751c870131def5531cb767e248e03342c69cc6e9e0986024e8f04fba3b0225104145fd05449e00bc795703272 WHIRLPOOL 4a778e7cfaa6acc6a8e972ee8403414055e780006b66576e97071e98e642169ca27a7f656ae406f8a698237fdff9e97f71d402dd88bf3278c6e6269dc1b2ed4e +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.4.0.zip 89734508 SHA256 27d48a4b6df9de01eaf1bd3ba3971a8f32742886f67041ddc3cd9dbe01787ebf SHA512 7c64e4fdcf2114700112ea8258f91eed3c5c64ce1067100f86a4201eb4a2f9ba2b8d89663a3bd9c45b1a0555bd3d8b1dcabeb2b59b38ffc0ebb429bcad255ec2 WHIRLPOOL 94fa83ab291434e4975f7c526712dc6b0068ea96213d039b5483c8cc6b6bcd7ee7ebab3d00dc3b8202b25db34732d8b9af1a3fe1d02bc6189699baa2c24a6b82 +DIST rstudio-0.96.316.tar.gz 12424635 SHA256 301504831d08ce2efe90a15b0fecd305f0f83d52e6d2b9ea67eb70c99ed280e6 SHA512 51ac9ce01510b3385949d69ebf5b13dacbed2be751c870131def5531cb767e248e03342c69cc6e9e0986024e8f04fba3b0225104145fd05449e00bc795703272 WHIRLPOOL 4a778e7cfaa6acc6a8e972ee8403414055e780006b66576e97071e98e642169ca27a7f656ae406f8a698237fdff9e97f71d402dd88bf3278c6e6269dc1b2ed4e +DIST rstudio-0.96.331.tar.gz 12424579 SHA256 c72ed5b34831cfc094eac0a8f35ecdb0c20a44619b84302ba004c3ca52ebdc5e SHA512 71c15a787f24bc03c8f5c00c40f36ac436dad5255b6dbcc88863932bf2ea9fbd20222ab5771602cb45677a3258576247cbb7edad733760aec08d7a8242faffdc WHIRLPOOL 1e19c82957ffb8dfdc1d0bb392f8794951fa55acbea9a5cf6f3c941852e21b75b4108656ae27ef0503a795b67a1c55e2ca92806bf191221273f0aab30139adf7 diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-linker_flags.patch index e68399d13..e68399d13 100644 --- a/sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch +++ b/sci-mathematics/rstudio/files/rstudio-linker_flags.patch diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch b/sci-mathematics/rstudio/files/rstudio-paths.patch index 917e2209d..917e2209d 100644 --- a/sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch +++ b/sci-mathematics/rstudio/files/rstudio-paths.patch diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch b/sci-mathematics/rstudio/files/rstudio-prefs.patch index 0d5401cf0..0d5401cf0 100644 --- a/sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch +++ b/sci-mathematics/rstudio/files/rstudio-prefs.patch diff --git a/sci-mathematics/rstudio/files/rstudio.desktop.patch b/sci-mathematics/rstudio/files/rstudio.desktop.patch new file mode 100644 index 000000000..5437eb755 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio.desktop.patch @@ -0,0 +1,16 @@ +--- rstudio-0.96.331/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in.old 2012-10-11 16:11:09.247971451 +0200 ++++ rstudio-0.96.331/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in 2012-10-11 16:12:30.967971366 +0200 +@@ -1,10 +1,10 @@ + [Desktop Entry] + Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F +-Icon=rstudio.png ++Icon=rstudio + Type=Application + Terminal=false + Name=RStudio +-Categories=Development +-MimeType=text/x-r-source;text/x-r;text-x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-html;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript; ++Categories=Development; ++MimeType=text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript; + + diff --git a/sci-mathematics/rstudio/rstudio-0.96.316.ebuild b/sci-mathematics/rstudio/rstudio-0.96.316.ebuild index caf160c98..2ac35de82 100644 --- a/sci-mathematics/rstudio/rstudio-0.96.316.ebuild +++ b/sci-mathematics/rstudio/rstudio-0.96.316.ebuild @@ -7,7 +7,6 @@ EAPI=4 inherit eutils cmake-utils pam versionator fdo-mime java-pkg-2 # TODO -# * make sure icon/menu and mime type work # * work out server (see package/linux/debian-control/*) # * package gin and gwt # * use dict from tree, linguas @@ -33,7 +32,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+desktop server test" QTVER=4.8 -RDEPEND="dev-lang/R +RDEPEND=">=dev-lang/R-2.11.1 >=dev-libs/boost-1.42 dev-libs/mathjax dev-libs/openssl @@ -66,19 +65,21 @@ src_unpack() { src_prepare() { find . -name .gitignore -delete + # Fix the QA warnings on the desktop file + epatch "${FILESDIR}"/${PN}.desktop.patch # And now we fix src/gwt/build.xml since java's user preference class is # braindead and insists on writing where it is not allowed. # much thanks to http://www.allaboutbalance.com/articles/disableprefs/ - epatch "${FILESDIR}"/${P}-prefs.patch + epatch "${FILESDIR}"/${PN}-prefs.patch # change the install path, as by default everything is dumped right under # the prefix. After fixing install paths, now fix the source so the # program can find the moved resources. - epatch "${FILESDIR}"/${P}-paths.patch + epatch "${FILESDIR}"/${PN}-paths.patch # Some gcc hardening options were added, however since we add # "-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which # leads to linker errors about unknown options, if we make it so the # as-needed option is the last option on the line, everything is fine. - epatch "${FILESDIR}"/${P}-linker_flags.patch + epatch "${FILESDIR}"/${PN}-linker_flags.patch # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using # this sed hack for now. ~RMH sed -i \ diff --git a/sci-mathematics/rstudio/rstudio-0.96.331.ebuild b/sci-mathematics/rstudio/rstudio-0.96.331.ebuild new file mode 100644 index 000000000..35fd37c89 --- /dev/null +++ b/sci-mathematics/rstudio/rstudio-0.96.331.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit eutils cmake-utils pam versionator fdo-mime java-pkg-2 + +# TODO +# * work out server (see package/linux/debian-control/*) +# * package gin and gwt +# * use dict from tree, linguas +# * use java-pkg-2 eclass and/or java-ant-2.eclass +# * do src_test (use junit from tree?) +# * fix the about/help/menu and get rid of license +# * desktop flag -> qt4 flag? +# * more prefix love + +GWTVER=2.4.0 +GINVER=1.5 + +DESCRIPTION="IDE for the R language" +HOMEPAGE="http://www.rstudio.org" +SRC_URI="https://github.com/${PN}/${PN}/tarball/v${PV} -> ${P}.tar.gz + https://s3.amazonaws.com/${PN}-buildtools/gin-${GINVER}.zip + https://s3.amazonaws.com/${PN}-buildtools/gwt-${GWTVER}.zip + https://s3.amazonaws.com/${PN}-dictionaries/core-dictionaries.zip" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+desktop server test" + +QTVER=4.8 +RDEPEND=">=dev-lang/R-2.11.1 + >=dev-libs/boost-1.42 + dev-libs/mathjax + dev-libs/openssl + >=virtual/jre-1.5 + x11-libs/pango + desktop? ( >=x11-libs/qt-core-${QTVER} + >=x11-libs/qt-dbus-${QTVER} + >=x11-libs/qt-gui-${QTVER} + >=x11-libs/qt-webkit-${QTVER} + >=x11-libs/qt-xmlpatterns-${QTVER} ) + server? ( virtual/pam )" +DEPEND="${RDEPEND} + app-arch/unzip + dev-java/ant-core + >=virtual/jdk-1.5 + virtual/pkgconfig" +# test? ( dev-java/junit:4 ) + +REQUIRED_USE="!server? ( desktop ) !desktop? ( server )" + +src_unpack() { + unpack ${P}.tar.gz gwt-${GWTVER}.zip + mv rstudio-rstudio-* ${P} + cd "${S}" + mkdir -p src/gwt/lib/{gin,gwt} dependencies/common/dictionaries || die + mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER} + unzip -qd src/gwt/lib/gin/${GINVER} "${DISTDIR}"/gin-${GINVER}.zip || die + unzip -qd dependencies/common/dictionaries "${DISTDIR}"/core-dictionaries.zip || die +} + +src_prepare() { + find . -name .gitignore -delete + # Fix the QA warning on the desktop file + epatch "${FILESDIR}"/${PN}.desktop.patch + # And now we fix src/gwt/build.xml since java's user preference class is + # braindead and insists on writing where it is not allowed. + # much thanks to http://www.allaboutbalance.com/articles/disableprefs/ + epatch "${FILESDIR}"/${PN}-prefs.patch + # change the install path, as by default everything is dumped right under + # the prefix. After fixing install paths, now fix the source so the + # program can find the moved resources. + epatch "${FILESDIR}"/${PN}-paths.patch + # Some gcc hardening options were added, however since we add + # "-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which + # leads to linker errors about unknown options, if we make it so the + # as-needed option is the last option on the line, everything is fine. + epatch "${FILESDIR}"/${PN}-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 -s "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax + # 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} ) + if use server; then + if use desktop; then + mycmakeargs+=( + -DRSTUDIO_INSTALL_FREEDESKTOP=ON + -DRSTUDIO_TARGET=All ) + else + mycmakeargs+=( -DRSTUDIO_TARGET=Server ) + fi + else + mycmakeargs+=( + -DRSTUDIO_INSTALL_FREEDESKTOP=ON + -DRSTUDIO_TARGET=Desktop + ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + if use server; then + dopamd src/cpp/server/extras/pam/rstudio + newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver + fi +} + +pkg_postinst() { + use desktop && fdo-mime_mime_database_update + if use server; then + enewgroup rstudio-server + enewuser rstudio-server -1 -1 -1 rstudio-server + fi +} + +pkg_postrm() { + use desktop && fdo-mime_mime_database_update +} |