Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 7 insertions, 16 deletions

diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 42d4f1c32..99cb155ef 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179518 2013-03-05 19:33:11Z ioni $
+# $Id: PKGBUILD 191838 2013-07-31 09:34:14Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -6,24 +6,24 @@
 # Contributor: Marco Crosio <marco.crosio@gmail.com>
 
 pkgname=eclipse
-pkgver=4.2.2
+pkgver=4.3
 pkgrel=1
-_date=201302041200
+_date=201306052000
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eclipse.org"
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst')
+depends=('java-environment' 'gtk2' 'unzip' 'webkitgtk2' 'libxtst')
 install=${pkgname}.install
 makedepends=('zip')
 license=("EPL/1.1")
 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=('daa539af97a5cf4fb8ae1d7675b9625b'
+md5sums=('8046626198b529c2e292022c39c18262'
          '7ea99a30fbaf06ec29261541b8eb1e23'
          'ba2cf02c48e6e35bfe3685401c26bb5b'
          '77cff7543ccf7e177cb6667f5a20ce19')
 [ "$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]='902102ec85539f4c9342b2c1c4c67f64'
+[ "$CARCH" = "x86_64" ] && md5sums[0]='8dba840856c5ca38b3c08ebac9a47cb8'
 
 package() {
   # install eclipse
@@ -35,17 +35,8 @@ package() {
     $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.3.v201301120609/bin/runant.py
+  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.4.v201303080030/bin/runant.py
 }