another version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 190 insertions, 16 deletions

diff --git a/sci-mathematics/rstudio/ChangeLog b/sci-mathematics/rstudio/ChangeLog
index 18ab52bebe10..878a8b7e2c9d 100644
--- a/sci-mathematics/rstudio/ChangeLog
+++ b/sci-mathematics/rstudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/rstudio
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.11 2014/07/04 14:08:16 hasufell Exp $
+
+*rstudio-0.98.953 (04 Jul 2014)
+
+  04 Jul 2014; Julian Ospald <hasufell@gentoo.org> +rstudio-0.98.953.ebuild:
+  another version bump
 
 *rstudio-0.98.932 (04 Jul 2014)
 
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index ceb80ce82f84..068ca0b6bbc1 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -31,6 +31,7 @@ DIST rstudio-0.97.336.tar.gz 12598580 SHA256 e6c24d6a865827d3a39e64508976a825bba
 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 rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
 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
@@ -38,24 +39,25 @@ EBUILD rstudio-0.97.336.ebuild 3707 SHA256 e709f04ac75823cb9029466ac2a08fb8408bc
 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
 EBUILD rstudio-0.98.932.ebuild 4881 SHA256 c75c67325435a00a13f087af12f2b87fd7049a4ce3723ad9c5458e23e56f945b SHA512 2350748ec8f9c0837027e17cecc4ad7bbac291b4bff0623c34846b2905f4eee10dbfd55e7abb9be2aafe59ffa94b77d119cbd1208ab930fab9a305a51301baca WHIRLPOOL f6ec0a40f061cfebfd1725ccdb04a5a5d9284d9346f7bba0d3f5ef0d2a502c68cd11f4ea9d5757caede8ab993d0286053964f1b4b59496bbee12c5a33dfb1848
-MISC ChangeLog 2696 SHA256 4e67da7aaea1df68355adb7956b0b3d7a1a5c80fe1741d71da44f9ec24569355 SHA512 98426ddc1399dc9a75202db2419dbf94197b3059ee91c51d2a554026028d35c3a75fa84268ee22b31a1ec4f6ed95fcb7ab1428853351fccfe52f9a17cc0c7ee0 WHIRLPOOL 6c6ad99d6d68965523fef74c73686a057acaa26d874509b0dfb12e3d0328313d59cc56287a3b474bae3877d1d8140c67275baadc30d7971a0fc70d70c0e0ff55
+EBUILD rstudio-0.98.953.ebuild 4924 SHA256 e6d08c8dce9f6813bb1eef87c0f2eb0bca40298b65dff616bafec902039c5ce9 SHA512 bc3ff67400706b0debd1fd8e0fd09a2278a6f86c41a87be10b8bd967a7caaa1ed96c84c00fc6733459bf34e5395a92bc815b357752cb474c59733cc561a99492 WHIRLPOOL 4df6d3585e8c927e7be01714fb7c74a44ddbcbf42962340078f0a785ecfdb5aae359c1b817ef2b6050401cbe39275ea59aefb81cf89979be98e606c194fbefb7
+MISC ChangeLog 2830 SHA256 4937077e6c56e51eff9a5bae7d740d2da1e3c56f8498d8c2f12c0c3e87c8b202 SHA512 c159266526bbbf6d66b4ac838126d8260cdd1d43158d0e3fd2859ce532f804d7e289cff9eb079952f0f5e83dc3b501268fdb133e25ff8c765b0b76d828924b57 WHIRLPOOL f7e5f3befef1020906a835ba7f8a023429b8a11f75ad8731f112c970fd44f6819040281f742064f466ec6bdcd083e427619762a56d73e799ca2030cc98887ad6
 MISC metadata.xml 492 SHA256 983c0c34455413d16d33a977101ea093b0ce90b0c4ea0b8e67fd5719c48b29cf SHA512 0ef17192ca14c533c46e2749406dde7b2c76d282c63fd270f7e52aee9a19de423c4855341145453ccabf8a1b680171c9d6c35174cd1c67fbc8c604bdd3216f4c WHIRLPOOL 7a0c5d8409f6aeae7eec87097303f95ad47c525fa7b4ae52d752119df1d23a647b546e2fc96084a15cbf7c36967fb0e08618a042360d8a4149d2563d67b4d5e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTtrHVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTtrVTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg3yIP+wSEMW1C1IPjcyX1X7WvNVIV
+LPijrPEbBRsR2Fx5pPY4Vvh6LO2E6e1lWuU45eeKJYw6/u79f2K7xI9RKI+t6k9a
+czKjh8OBU3O8+IP9mZ/MOXLQmRT8wre+EHmgVKJ0XElnDPyJoVfueF/U6PaYgtRz
+BV1Ls1yWpVX0SPYzvm4IGI9QBGwGj9zyh/1hN43P/CjyB4NHeZm7NRiy79KUUa13
+i0Cyj1p4mD/0kX2LxHazqJ+byOZbbiOWoejte4UDQLl/bopkZZ3GvMy1sr4OoI34
+AJ2YGP/4XZwcmTSKYAs8bs6KzdEWnhGRZJA5yVYWTJnMX1i1YIWUbdAUfgqjDPT6
+0KQdyHpIc8p95pjqHagpgHJwZoDN0Bp4YRQ4a4X8Gj79sLO+VzX4u4jiJ4Altlgj
+eiU9/IWAbYnqks/QnvlZrB32/kY5VwCxN0z2b/QlkHwe+g0Tph610qKguBgSAJMg
+xw9LYtjodA0niNINwVLNDfts3KdzwhuR9hBBzurFjBUYcjKKCdKCZhr2c1TZDHfb
+velgEAGmioLWSdyc5KyukqR49zVa/DbihY67g3Ywpr//XjZj8vtUP82eN4Q0JN0W
+4QJmbIUr0iSQBadZpm0klBCBpaaH5J7XDyAsIBeIJRKE9Viv3E3sumbTUWaYqfKq
+TwlCmznQtvr+vfc+I5ye
+=gmn4
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
new file mode 100644
index 000000000000..9a3b3d5a7d51
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
@@ -0,0 +1,167 @@
+# 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.953.ebuild,v 1.1 2014/07/04 14:08:16 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:0
+	sys-apps/util-linux
+	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}"/${PN}-0.98.932-paths.patch \
+		"${FILESDIR}"/${PN}-0.98.932-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 ;}
+}