Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gnash/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD

1 files changed, 15 insertions, 15 deletions

diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index b6c7ed050..1caa906dd 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159243 2012-05-18 17:00:08Z ibiru $
+# $Id: PKGBUILD 163219 2012-07-11 01:43:03Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -6,9 +6,9 @@
 # Contributor: Marco Crosio <marco.crosio@gmail.com>
 
 pkgname=eclipse
-pkgver=3.7.2
-pkgrel=3
-_date=201202080800
+pkgver=4.2
+pkgrel=1
+_date=201206081400
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eclipse.org"
@@ -17,36 +17,36 @@ install=${pkgname}.install
 makedepends=('zip')
 conflicts=('xulrunner')
 license=("EPL/1.1")
-source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
+source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
 	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
-md5sums=('79b90faa1ee6e7af1910c3a5077b594f'
+md5sums=('506b9f4e3919ebe3d6a717cd9bef5e07'
          '7ea99a30fbaf06ec29261541b8eb1e23'
          'ba8a37e30a7ebd69774cec87c69e8c44'
          '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'
+[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
+[ "$CARCH" = "x86_64" ] && md5sums[0]='804938dd087c310d8bfd54c8024afbbd'
 
 package() {
-  cd "$srcdir/eclipse"
-
   # install eclipse
   install -m755 -d "$pkgdir/usr/share"
-  mv "$srcdir/eclipse" "$pkgdir/usr/share/"
+  mv 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/"
+    $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
+  install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse"
+  install -m644 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"
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \
+    "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png"
 
   # install icon
   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
+  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py
 }