Changed install directory to match other packages, updated libwebkit dependency to webkitgtk2

4 files changed, 33 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c870a7292a7..33987ddf3471 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = eclipse-platform
 	pkgdesc = A minimal installation suitable for complete per-user customization with the built-in Eclipse package manager
 	pkgver = 4.6.2
-	pkgrel = 1
-	url = http://www.eclipse.org
+	pkgrel = 2
+	url = https://www.eclipse.org
 	install = eclipse-platform.install
 	arch = i686
 	arch = x86_64
 	license = EPL
-	depends = java-environment
-	depends = gtk2
+	depends = java-environment>=8
 	depends = unzip
-	depends = libwebkit
+	depends = webkitgtk2
 	depends = libxtst
 	depends = hicolor-icon-theme
 	provides = eclipse=4.6.2
@@ -19,9 +18,9 @@ pkgbase = eclipse-platform
 	source = http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk-x86_64.tar.gz&r=1
 	source = eclipse.sh
 	source = eclipse.desktop
-	md5sums = d919f449465a80e2ee0eb93539270604
-	md5sums = 66757230837fdebabb8ce91eb4fccc80
-	md5sums = 6978e306347d49393e7ac833ba47c4ac
+	sha512sums = 1e0a7c817127efbb2a7b216ab6854efce91228b606a5aa39b9176441e4341a4172657839133698ba33a3e029ac310ea7e9381a2de396b17cdd9e2496457a4c78
+	sha512sums = 71393b01c2774654e1b3348ceedd6b110c7f1b26da93da40dac653ce2103a34997ec0e9e7fd4e977d869c149d19ef39f59738717cc6762e39b0bc0e7d53df4ac
+	sha512sums = 34bae62e7428dec7ceb4fee73f4b5b846be1fe16e4bbd5958ef6684ae7340bda0d5bc3c6ea55c0d3fd87cadcc80f2570c2b0b85e0c60863ea139cadf5744c0c8
 
 pkgname = eclipse-platform
 
diff --git a/PKGBUILD b/PKGBUILD
index 886ce41a8c97..80e734a4b357 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,42 +5,44 @@
 pkgname=eclipse-platform
 pkgver=4.6.2
 _pkgbuild=201611241400
-pkgrel=1
+pkgrel=2
 pkgdesc="A minimal installation suitable for complete per-user customization with the built-in Eclipse package manager"
-url="http://www.eclipse.org"
-arch=('i686' 'x86_64')
-license=('EPL')
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst' 'hicolor-icon-theme')
+url="https://www.eclipse.org"
+arch=("i686" "x86_64")
+license=("EPL")
+depends=("java-environment>=8" "unzip" "webkitgtk2" "libxtst" "hicolor-icon-theme")
 optdepends=()
-conflicts=('eclipse')
+conflicts=("eclipse")
 provides=("eclipse=$pkgver")
 install=${pkgname}.install
 options=(!strip)
 
 source=(
-	"http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-${pkgver}-${_pkgbuild}/eclipse-platform-${pkgver}-linux-gtk.tar.gz&r=1"
-	"eclipse.sh"
-	"eclipse.desktop"
+    "http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-${pkgver}-${_pkgbuild}/eclipse-platform-${pkgver}-linux-gtk.tar.gz&r=1"
+    "eclipse.sh"
+    "eclipse.desktop"
 )
 
-md5sums=('0ad1c0185450e1f719a5a2802bf40703'
-         '66757230837fdebabb8ce91eb4fccc80'
-         '6978e306347d49393e7ac833ba47c4ac')
+sha512sums=(
+    "ffa301055d17d24437d190deda0f1851458f7522c2a496ef7896d9bb06aaaefa2fd5457b725795a1e341cff53d5186ccba48796206ce1a0f9352950b150ea6a9"
+    "71393b01c2774654e1b3348ceedd6b110c7f1b26da93da40dac653ce2103a34997ec0e9e7fd4e977d869c149d19ef39f59738717cc6762e39b0bc0e7d53df4ac"
+    "34bae62e7428dec7ceb4fee73f4b5b846be1fe16e4bbd5958ef6684ae7340bda0d5bc3c6ea55c0d3fd87cadcc80f2570c2b0b85e0c60863ea139cadf5744c0c8"
+)
 
 if [ "$CARCH" = "x86_64" ]; then
-	source[0]=${source/linux-gtk/linux-gtk-x86_64}
-	md5sums[0]='d919f449465a80e2ee0eb93539270604'
+    source[0]=${source/linux-gtk/linux-gtk-x86_64}
+    sha512sums[0]="1e0a7c817127efbb2a7b216ab6854efce91228b606a5aa39b9176441e4341a4172657839133698ba33a3e029ac310ea7e9381a2de396b17cdd9e2496457a4c78"
 fi
 
 package() {
-	install -d ${pkgdir}/usr/bin ${pkgdir}/usr/lib ${pkgdir}/usr/share/applications
-	
-	install -m755 "${srcdir}/eclipse.sh" "${pkgdir}/usr/bin/eclipse"
-	install -Dm644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/"
-	
-	for _i in 16 32 48 256; do
-      install -Dm644 ${srcdir}/eclipse/plugins/org.eclipse.platform_${pkgver}*/eclipse${_i}.png "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
+    install -d ${pkgdir}/usr/bin ${pkgdir}/usr/lib ${pkgdir}/usr/share/applications
+    
+    install -m755 "${srcdir}/eclipse.sh" "${pkgdir}/usr/bin/eclipse"
+    install -Dm644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/"
+    
+    for _i in 16 32 48 256; do
+        install -Dm644 "${srcdir}"/eclipse/plugins/org.eclipse.platform_${pkgver}*/eclipse${_i}.png "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
     done
     
-    mv "${srcdir}/eclipse" "${pkgdir}/usr/share/"
+    mv "${srcdir}/eclipse" "${pkgdir}/usr/lib/"
 }
diff --git a/eclipse.desktop b/eclipse.desktop
index 6d16e9548d42..73f3990542fe 100644
--- a/eclipse.desktop
+++ b/eclipse.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=4.6
+Version=4.6.2
 Name=Eclipse
 Comment=Open Development Platform
 Exec=eclipse
diff --git a/eclipse.sh b/eclipse.sh
index a6d6d70ae4d8..985d142e89d9 100644
--- a/eclipse.sh
+++ b/eclipse.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-export ECLIPSE_HOME=/usr/share/eclipse
+export ECLIPSE_HOME=/usr/lib/eclipse
 exec ${ECLIPSE_HOME}/eclipse "$@"