Install to /opt and don't conflict with the standard eclipse packages.

4 files changed, 41 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2e3d2d0ffb6..db0eb569c5d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Apr  5 15:46:29 UTC 2017
+# Fri Apr 14 02:21:49 UTC 2017
 pkgbase = eclipse-devel
 	pkgdesc = Highly extensible IDE
 	pkgver = 4.7.0.M6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://eclipse.org
 	arch = i686
 	arch = x86_64
@@ -22,24 +22,24 @@ pkgbase = eclipse-devel
 	source = eclipse.sh
 	source = eclipse.desktop
 	sha256sums = 9f8980078c97fb3020ba2e9c6c07eac077b932406aba3e2d6a4763a5d299290d
-	sha256sums = 04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed
-	sha256sums = 57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3
+	sha256sums = 7f0c352f8593774838d96c213293de6d00fb6d71becce8d4ff6209bb8c58e8f6
+	sha256sums = be491b305ee6d5fd4a94db4d2b31a5fbc69539e3f97094ffc35246e104deea17
 	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-java-oxygen-M6-linux-gtk.tar.gz
 	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-cpp-oxygen-M6-linux-gtk.tar.gz
 	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-jee-oxygen-M6-linux-gtk.tar.gz
 	source_i686 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-php-oxygen-M6-linux-gtk.tar.gz
-	sha512sums_i686 = ac555fc4c6f623728c768f0b644a8bf59ff7d7a2da5bf2578ec027645ddd8d8ca21f0ff7254328cc5c2418833c7af23af5ea841602ce91856f1ce867a7b08499
-	sha512sums_i686 = ef79bd85a156777b7bcf894042a69cbcd1f46a8dd7b2241519a578c3219a59d127d905632823fa0a7d85547147b31d668c40fbf4f9d967ee255f9da3a0ef951b
-	sha512sums_i686 = 0cd0e98d038cc5e3a77c29ccb0e8221e5427d979e554dd8b10ab7a8db29eabb4a5d0d2dcad737194f6029b5ebb476de5759f92f53ce9126dcad967edffbd786f
-	sha512sums_i686 = 9ec4bb1c9c6738ccd7ce0ff1b7b5b95649cded90b18fda8820a596bf3b29ea4bb42f164a1a51143f40b865d86f6112054d41c3d5524c13c3f9c10a8ff87edce2
+	sha1sums_i686 = 9d71fd57d2e0ba855ef635fca8e361ffc96f2aba
+	sha1sums_i686 = 00510a0a6a840707e8156776d1291d9289cc126c
+	sha1sums_i686 = 40a9a98becb770ffdae4433be163d6c69014c0af
+	sha1sums_i686 = 11f1f305985d66b8b22fbf94ae13f687798ed3dc
 	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-java-oxygen-M6-linux-gtk-x86_64.tar.gz
 	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-cpp-oxygen-M6-linux-gtk-x86_64.tar.gz
 	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-jee-oxygen-M6-linux-gtk-x86_64.tar.gz
 	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/oxygen/M6/eclipse-php-oxygen-M6-linux-gtk-x86_64.tar.gz
-	sha512sums_x86_64 = b68eab5977eb2990b491858595d5de333bf6a79a0af1ecb37d85c90346d02bead1830ea9b6ff12883e8539c54c0f628b0f3e059073dcf6e5b7636f61e82c1719
-	sha512sums_x86_64 = 790c0a712ffc34274b65dde32f9040351a74bb39109c6d60d1de1155f783b11b1a23b0a3da698105e697aebea17cc36e25412fd68d6220ffd6d28f4d15059997
-	sha512sums_x86_64 = 37536b9f2ccaa25e0babee170e7d93067ecbd50db474f5821f7e2d48f94a7cc1a1b30e9c850e843c9a9818527d39f91db09112945d8ed2fb088cf02fd16d2238
-	sha512sums_x86_64 = a0797de72eb5fcbd200a87f43cf975d45b18a423470c142d06930366da27d3179255a93be6329ebf98b372c3f8fb920b153813be92893b62183c2ba0c73b72e2
+	sha1sums_x86_64 = 4326ff209c5415bd20ce108dff155ced786b7997
+	sha1sums_x86_64 = f1ddb78d971abd058877fe7a298e6816a98e2662
+	sha1sums_x86_64 = 515360e9e0ba2453131daca15e7787a802386b2b
+	sha1sums_x86_64 = 7620ca59e897bacacc7d7a23ac87181f02dc9253
 
 pkgname = eclipse-common-devel
 	pkgdesc = Highly extensible IDE (common files) Development Version
@@ -47,8 +47,7 @@ pkgname = eclipse-common-devel
 	depends = java-environment>=8
 	depends = webkit2gtk
 	depends = unzip
-	provides = eclipse-common=4.7.0.M6-1
-	conflicts = eclipse-common
+	provides = eclipse-common=4.7.0.M6-2
 
 pkgname = eclipse-java-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index 05317661e1c9..c0de673bc261 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,10 @@
 
 pkgbase=eclipse-devel
 pkgname=(eclipse-{common,java,cpp,jee,php}-devel)
-pkgver=4.7.0.M6
-pkgrel=1
-_release=oxygen-M6
+_milestone=M6
+pkgver=4.7.0.${_milestone}
+pkgrel=2
+_release=oxygen-${_milestone}
 pkgdesc="Highly extensible IDE"
 license=(EPL)
 arch=(i686 x86_64)
@@ -31,16 +32,18 @@ for _pkg in ${pkgname[@]/-devel/}; do
 done
 
 sha256sums=('9f8980078c97fb3020ba2e9c6c07eac077b932406aba3e2d6a4763a5d299290d'
-            '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
-            '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
-sha512sums_i686=('ac555fc4c6f623728c768f0b644a8bf59ff7d7a2da5bf2578ec027645ddd8d8ca21f0ff7254328cc5c2418833c7af23af5ea841602ce91856f1ce867a7b08499'
-                 'ef79bd85a156777b7bcf894042a69cbcd1f46a8dd7b2241519a578c3219a59d127d905632823fa0a7d85547147b31d668c40fbf4f9d967ee255f9da3a0ef951b'
-                 '0cd0e98d038cc5e3a77c29ccb0e8221e5427d979e554dd8b10ab7a8db29eabb4a5d0d2dcad737194f6029b5ebb476de5759f92f53ce9126dcad967edffbd786f'
-                 '9ec4bb1c9c6738ccd7ce0ff1b7b5b95649cded90b18fda8820a596bf3b29ea4bb42f164a1a51143f40b865d86f6112054d41c3d5524c13c3f9c10a8ff87edce2')
-sha512sums_x86_64=('b68eab5977eb2990b491858595d5de333bf6a79a0af1ecb37d85c90346d02bead1830ea9b6ff12883e8539c54c0f628b0f3e059073dcf6e5b7636f61e82c1719'
-                   '790c0a712ffc34274b65dde32f9040351a74bb39109c6d60d1de1155f783b11b1a23b0a3da698105e697aebea17cc36e25412fd68d6220ffd6d28f4d15059997'
-                   '37536b9f2ccaa25e0babee170e7d93067ecbd50db474f5821f7e2d48f94a7cc1a1b30e9c850e843c9a9818527d39f91db09112945d8ed2fb088cf02fd16d2238'
-                   'a0797de72eb5fcbd200a87f43cf975d45b18a423470c142d06930366da27d3179255a93be6329ebf98b372c3f8fb920b153813be92893b62183c2ba0c73b72e2')
+            '7f0c352f8593774838d96c213293de6d00fb6d71becce8d4ff6209bb8c58e8f6'
+            'be491b305ee6d5fd4a94db4d2b31a5fbc69539e3f97094ffc35246e104deea17')
+sha1sums_i686=()
+sha1sums_x86_64=()
+
+for _file in "${source_i686[@]}" ; do
+	sha1sums_i686+=( $( curl -s "${_file}".sha1 | cut -f1 -d' ' ) )
+done
+
+for _file in "${source_x86_64[@]}" ; do
+	sha1sums_x86_64+=( $( curl -s "${_file}".sha1 | cut -f1 -d' ' ) )
+done
 
 prepare() {
   mkdir eclipse-common
@@ -69,18 +72,17 @@ package_eclipse-common-devel() {
   pkgdesc+=" (common files) Development Version"
   depends=("java-environment>=8" webkit2gtk unzip)
   provides=("eclipse-common=$pkgver-$pkgrel")
-  conflicts=('eclipse-common')
   install=eclipse.install
 
-  install -d "$pkgdir/usr/lib"
-  cp -a eclipse-common "$pkgdir/usr/lib/eclipse"
+  install -d "$pkgdir/opt"
+  cp -a eclipse-common "$pkgdir/opt/eclipse-devel"
 
-  install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
-  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
+  install -Dm755 eclipse.sh "$pkgdir/usr/bin/eclipse-devel"
+  install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse-devel.desktop"
 
   for _i in 16 32 48 256; do
     install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse${_i}.png \
-      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
+      "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse-devel.png"
   done
 }
 
@@ -88,14 +90,8 @@ _package() {
   _variant=${1#eclipse-}
   pkgdesc+=" (${_variant^^} variant) Development Version"
   depends=(eclipse-common-devel=$pkgver)
-  provides=("eclipse=$pkgver-$pkgrel" "eclipse-$_variant=$pkgver-$pkgrel")
-  conflicts=(eclipse "eclipse-$_variant")
-
-  case $_variant in
-    java) replaces=(eclipse) ;;
-    cpp)  replaces=(eclipse-cdt) ;;
-  esac
+  provides=("eclipse-$_variant=$pkgver-$pkgrel")
 
-  install -d "$pkgdir/usr/lib"
-  cp -a $1 "$pkgdir/usr/lib/eclipse"
+  install -d "$pkgdir/opt"
+  cp -a $1 "$pkgdir/opt/eclipse-devel"
 }
diff --git a/eclipse.desktop b/eclipse.desktop
index 597b1aca8773..c249c515448a 100644
--- a/eclipse.desktop
+++ b/eclipse.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Eclipse
+Name=Eclipse (Development Version)
 Comment=A Java Development Environment
-Icon=eclipse
-Exec=eclipse
+Icon=eclipse-devel
+Exec=eclipse-devel
 Terminal=false
 Type=Application
 Categories=Development;IDE;Java;
diff --git a/eclipse.sh b/eclipse.sh
index 985d142e89d9..1fcf28deccb7 100644
--- a/eclipse.sh
+++ b/eclipse.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-export ECLIPSE_HOME=/usr/lib/eclipse
+export ECLIPSE_HOME=/opt/eclipse-devel
 exec ${ECLIPSE_HOME}/eclipse "$@"