From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0F403138010 for ; Fri, 2 Nov 2012 19:44:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31E9921C06C; Fri, 2 Nov 2012 19:44:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8323D21C06C for ; Fri, 2 Nov 2012 19:44:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94AA433D814 for ; Fri, 2 Nov 2012 19:44:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C52A9E5449 for ; Fri, 2 Nov 2012 19:44:23 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1349965797.57877ae53a172f4acb0e9b7757cc24b987cb6a90.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/rstudio/, sci-mathematics/rstudio/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch sci-mathematics/rstudio/files/rstudio-linker_flags.patch sci-mathematics/rstudio/files/rstudio-paths.patch sci-mathematics/rstudio/files/rstudio-prefs.patch sci-mathematics/rstudio/files/rstudio.desktop.patch sci-mathematics/rstudio/rstudio-0.96.316.ebuild sci-mathematics/rstudio/rstudio-0.96.331.ebuild X-VCS-Directories: sci-mathematics/rstudio/ sci-mathematics/rstudio/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 57877ae53a172f4acb0e9b7757cc24b987cb6a90 X-VCS-Branch: master Date: Fri, 2 Nov 2012 19:44:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 66fe9291-69bd-4519-80a6-b1c39d1f2270 X-Archives-Hash: a135636d0c347df442d15ae89ea864ad commit: 57877ae53a172f4acb0e9b7757cc24b987cb6a90 Author: Fredric Johansson gmail com> AuthorDate: Thu Oct 11 14:29:57 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Oct 11 14:29:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=57877ae5 Added rstudio-0.96.331 and desktop file fix --- ...nker_flags.patch => rstudio-linker_flags.patch} | 0 ...io-0.96.316-paths.patch => rstudio-paths.patch} | 0 ...io-0.96.316-prefs.patch => rstudio-prefs.patch} | 0 .../rstudio/files/rstudio.desktop.patch | 16 ++++++++++++++++ sci-mathematics/rstudio/rstudio-0.96.316.ebuild | 10 ++++++---- ...dio-0.96.316.ebuild => rstudio-0.96.331.ebuild} | 10 ++++++---- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-linker_flags.patch similarity index 100% rename from sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch rename to 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 similarity index 100% rename from sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch rename to 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 similarity index 100% rename from sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch rename to 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 0000000..5437eb7 --- /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 caf160c..eaf2181 100644 --- a/sci-mathematics/rstudio/rstudio-0.96.316.ebuild +++ b/sci-mathematics/rstudio/rstudio-0.96.316.ebuild @@ -33,7 +33,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 +66,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.316.ebuild b/sci-mathematics/rstudio/rstudio-0.96.331.ebuild similarity index 94% copy from sci-mathematics/rstudio/rstudio-0.96.316.ebuild copy to sci-mathematics/rstudio/rstudio-0.96.331.ebuild index caf160c..0d35e57 100644 --- a/sci-mathematics/rstudio/rstudio-0.96.316.ebuild +++ b/sci-mathematics/rstudio/rstudio-0.96.331.ebuild @@ -33,7 +33,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 +66,21 @@ src_unpack() { 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}"/${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 \