Merge branch 'master' of git+ssh://parabola-git/srv/git/abslibre

5 files changed, 57 insertions, 4 deletions

diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index db408e0ac..f48fd9f32 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.8
+pkgver=4.2.10
 pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 276007582..570a95b13 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.8
+pkgver=4.2.10
 _extramodules=extramodules-3.8-LIBRE
 pkgrel=2
 arch=('i686' 'x86_64')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index be25bf3b4..ce73da564 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
-pkgver=4.2.8
+pkgver=4.2.10
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
@@ -73,7 +73,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('54e35ece40457b1a9e27dd9d0429c3a1'
+md5sums=('99349df34caacdecbb7cf3908631c3f3'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD
new file mode 100644
index 000000000..569df2b33
--- /dev/null
+++ b/pcr/rstudio-desktop/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer:  TDY <tdy@archlinux.info>
+# Contributor: Ben Ward <benjamin.ward@bathspa.org>
+
+pkgname=rstudio-desktop
+pkgver=0.97.332
+_commit=e65a459
+pkgrel=1
+pkgdesc="A powerful and productive user interface for R"
+arch=('i686' 'x86_64')
+url="http://www.rstudio.org/"
+license=('AGPL')
+depends=('r>=2.11.1' 'qtwebkit' 'boost-libs>=1.50' 'shared-mime-info')
+makedepends=('git' 'cmake>=2.8' 'boost>=1.50' 'java-environment' 'apache-ant' 'unzip' 'openssl' 'pam' 'wget')
+install=rstudio.install
+source=($pkgname-$pkgver.tgz::https://github.com/rstudio/rstudio/tarball/v$pkgver)
+md5sums=('0197506486c76ed1bff71a534072e0e9')
+
+build() {
+  cd "$srcdir/rstudio-rstudio-$_commit/dependencies/common"
+  sh install-gwt
+  sh install-dictionaries
+  sh install-mathjax
+
+  rm -rf "$srcdir/rstudio-rstudio-$_commit/build"
+  install -dm755 "$srcdir/rstudio-rstudio-$_commit/build"
+  cd "$srcdir/rstudio-rstudio-$_commit/build"
+  cmake -DRSTUDIO_TARGET=Desktop \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio ..
+}
+
+package() {
+  cd "$srcdir/rstudio-rstudio-$_commit/build"
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/rstudio-desktop/rstudio.install b/pcr/rstudio-desktop/rstudio.install
new file mode 100644
index 000000000..d0192c8c0
--- /dev/null
+++ b/pcr/rstudio-desktop/rstudio.install
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et: