[arch-commits] Commit in eclipse/trunk (PKGBUILD eclipse.ini.patch eclipse.install)

[Ionut Biru]

    Date: Sunday, February 26, 2012 @ 12:36:30
  Author: ibiru
Revision: 151491

update to 3.7.2

Modified:
  eclipse/trunk/PKGBUILD
  eclipse/trunk/eclipse.install
Deleted:
  eclipse/trunk/eclipse.ini.patch

-------------------+
 PKGBUILD          |   58 ++++++++++++++++++++++++----------------------------
 eclipse.ini.patch |   14 ------------
 eclipse.install   |    8 +------
 3 files changed, 29 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-26 17:28:19 UTC (rev 151490)
+++ PKGBUILD	2012-02-26 17:36:30 UTC (rev 151491)
@@ -1,14 +1,14 @@
 # $Id$
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
 # Contributor: Andrew Wright <andreww at photism.org>
 # Contributor: Andreas W. Hauser <andy-aur at splashground.de>
 # Contributor: Marco Crosio <marco.crosio at gmail.com>
 
 pkgname=eclipse
-pkgver=3.7.1
-_internal_pkgver=3.7.1
-pkgrel=2
-_date=201109091335
+pkgver=3.7.2
+pkgrel=1
+_date=201202080800
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
@@ -16,40 +16,36 @@
 install=${pkgname}.install
 makedepends=('zip')
 license=("EPL/1.1")
-source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk.tar.gz"
-	'eclipse.svg' 'eclipse.sh' 'eclipse.desktop'
-	'eclipse.ini.patch')
-md5sums=('c7f3e186e7996d3a8afc16eec9e9e71f'
-         '77cff7543ccf7e177cb6667f5a20ce19'
+source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
+	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
+md5sums=('79b90faa1ee6e7af1910c3a5077b594f'
          '7ea99a30fbaf06ec29261541b8eb1e23'
          'ba8a37e30a7ebd69774cec87c69e8c44'
-         '017b2a68edc48a752a7e27c7aceef797')
-[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk-${CARCH}.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='b8b37135600d92c373514ce5bb094143'
+         '77cff7543ccf7e177cb6667f5a20ce19')
+[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
+[ "$CARCH" = "x86_64" ] && md5sums[0]='6a0fd32cb6a986032a67defab3753476'
 
 package() {
-  cd "${srcdir}/eclipse"
+  cd "$srcdir/eclipse"
 
-  # patch to increase default memory limits
-  patch -Np1 -i "${srcdir}/eclipse.ini.patch"
-
   # install eclipse
-  install -m755 -d "${pkgdir}/usr/share"
-  mv "${srcdir}/eclipse" "${pkgdir}/usr/share/"
+  install -m755 -d "$pkgdir/usr/share"
+  mv "$srcdir/eclipse" "$pkgdir/usr/share/"
 
   # install misc
-  install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/applications \
-    ${pkgdir}/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
-  install -m755 "${srcdir}/eclipse.sh" "${pkgdir}/usr/bin/eclipse"
-  install -m644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse.png \
-    "${pkgdir}/usr/share/icons/hicolor/16x16/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse32.png \
-    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse48.png \
-    "${pkgdir}/usr/share/icons/hicolor/48x48/apps/eclipse.png"
+  install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \
+    $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
+  install -m755 "$srcdir/eclipse.sh" "$pkgdir/usr/bin/eclipse"
+  install -m644 "$srcdir/eclipse.desktop" "$pkgdir/usr/share/applications/"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \
+    "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \
+    "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \
+    "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png"
 
   # install icon
-  install -Dm644 ${srcdir}/eclipse.svg \
-    ${pkgdir}/usr/share/icons/hicolor/scalable/apps/eclipse.svg
+  install -Dm644 "$srcdir"/eclipse.svg \
+    "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
+  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.2.v20120109-1030/bin/runant.py
 }

Deleted: eclipse.ini.patch
===================================================================
--- eclipse.ini.patch	2012-02-26 17:28:19 UTC (rev 151490)
+++ eclipse.ini.patch	2012-02-26 17:36:30 UTC (rev 151491)
@@ -1,14 +0,0 @@
---- eclipse/eclipse.ini	2010-06-24 09:22:59.474998451 +0200
-+++ eclipse/eclipse.ini~	2010-06-24 09:24:26.325011998 +0200
-@@ -5,9 +5,9 @@
- -showsplash
- org.eclipse.platform
- --launcher.XXMaxPermSize
--256m
-+512m
- --launcher.defaultAction
- openFile
- -vmargs
- -Xms40m
---Xmx384m
-+-Xmx768m

Modified: eclipse.install
===================================================================
--- eclipse.install	2012-02-26 17:28:19 UTC (rev 151490)
+++ eclipse.install	2012-02-26 17:36:30 UTC (rev 151491)
@@ -1,9 +1,5 @@
 post_install() {
-  # Prevent a bug, where eclipse hangs without this.
-  # See http://aur.archlinux.org/packages.php?ID=12173
-  xulrunner --register-global >/dev/null 2>&1
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
@@ -11,5 +7,5 @@
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post-install $1
 }