De-conflict Eclipse variants

2 files changed, 43 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ce2ea1b9d0c..1a23801a41b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,31 @@
 pkgbase = eclipse
 	pkgdesc = Highly extensible IDE
-	pkgver = 4.15
+	pkgver = 4.14
 	pkgrel = 2
 	url = https://eclipse.org
 	arch = x86_64
 	license = EPL
 	makedepends = python3
-	noextract = eclipse-java-2020-03-R-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-jee-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-cpp-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-php-2020-03-R-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-javascript-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	noextract = eclipse-rust-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-java-2019-12-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-jee-2019-12-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-cpp-2019-12-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-php-2019-12-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-javascript-2019-12-R-linux-gtk-x86_64.tar.gz
+	noextract = eclipse-rust-2019-12-R-incubation-linux-gtk-x86_64.tar.gz
 	source = commonify
 	sha256sums = a68cccdf182449dfb4aef595ab26fe6542902421aef42a79672483865cbbd0ea
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2020-03/R/eclipse-java-2020-03-R-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2020-03/R/eclipse-jee-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2020-03/R/eclipse-cpp-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2020-03/R/eclipse-php-2020-03-R-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2020-03/R/eclipse-javascript-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2020-03/R/eclipse-rust-2020-03-R-incubation-linux-gtk-x86_64.tar.gz
-	sha256sums_x86_64 = 72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
-	sha256sums_x86_64 = 1f6b44cc8a8665f452170f395523486e3555570174768d96d8ca7e2bacc3f31d
-	sha256sums_x86_64 = 3cc546c7bd9214ca834cf5d8bcd16e300ae0fa95f1bf49e15c52ea47235b7f01
-	sha256sums_x86_64 = 0d6662d7a57585320f441029358261c23e570bf7779cbe34ee2f91208b2aff54
-	sha256sums_x86_64 = 25a2e502e33c0a4b6629b35dfb140d5bd772d932ca472e554f672524d189caec
-	sha256sums_x86_64 = c52860b6134e083aa263d1c1eb80f4a904cdf284d25f7aaee472950386347109
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2019-12/R/eclipse-java-2019-12-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2019-12/R/eclipse-jee-2019-12-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2019-12/R/eclipse-cpp-2019-12-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2019-12/R/eclipse-php-2019-12-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2019-12/R/eclipse-javascript-2019-12-R-linux-gtk-x86_64.tar.gz
+	source_x86_64 = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/2019-12/R/eclipse-rust-2019-12-R-incubation-linux-gtk-x86_64.tar.gz
+	sha256sums_x86_64 = eea78b2daab7c5d3e11cd86d0782023a05f7e173265f470536357ef97cd31a29
+	sha256sums_x86_64 = a012ad5dd54c344aff66b82f0ed37b54002e727566c7d786d0d60f96b1117c38
+	sha256sums_x86_64 = 56c3f4757d31ac002f996de0e81edb18cdf660d6193aa0b076e25dae32079789
+	sha256sums_x86_64 = 427b1d74485ccde8b3c6d2b23390be74123281e90ad8e93db701d9835130039a
+	sha256sums_x86_64 = 2a17772438a1966f182e2aa2433e1119c9988b2d50f54dc89f476fcca8fe2755
+	sha256sums_x86_64 = 88ff37f326648a8bfc061ec9e14823a776e182b715ca5d7dc06b6942c903460c
 
 pkgname = eclipse-common
 	pkgdesc = Highly extensible IDE (common files)
diff --git a/PKGBUILD b/PKGBUILD
index 632ba80b4465..bd88cdbeb088 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Carson Black <uhhadd@gmail.com>
+# Maintainer:  Carson Black <uhhadd@gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -8,9 +8,9 @@
 
 pkgbase=eclipse
 pkgname=(eclipse-{common,java,jee,cpp,php,javascript,rust})
-pkgver=4.15
+pkgver=4.14
 pkgrel=2
-_release=2020-03/R
+_release=2019-12/R
 pkgdesc="Highly extensible IDE"
 license=(EPL)
 arch=(x86_64)
@@ -18,17 +18,17 @@ url="https://eclipse.org"
 makedepends=(python3)
 source=(commonify)
 sha256sums=('a68cccdf182449dfb4aef595ab26fe6542902421aef42a79672483865cbbd0ea')
-sha256sums_x86_64=('72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e'
-                   '1f6b44cc8a8665f452170f395523486e3555570174768d96d8ca7e2bacc3f31d'
-                   '3cc546c7bd9214ca834cf5d8bcd16e300ae0fa95f1bf49e15c52ea47235b7f01'
-                   '0d6662d7a57585320f441029358261c23e570bf7779cbe34ee2f91208b2aff54'
-                   '25a2e502e33c0a4b6629b35dfb140d5bd772d932ca472e554f672524d189caec'
-                   'c52860b6134e083aa263d1c1eb80f4a904cdf284d25f7aaee472950386347109')
+sha256sums_x86_64=('eea78b2daab7c5d3e11cd86d0782023a05f7e173265f470536357ef97cd31a29'
+                   'a012ad5dd54c344aff66b82f0ed37b54002e727566c7d786d0d60f96b1117c38'
+                   '56c3f4757d31ac002f996de0e81edb18cdf660d6193aa0b076e25dae32079789'
+                   '427b1d74485ccde8b3c6d2b23390be74123281e90ad8e93db701d9835130039a'
+                   '2a17772438a1966f182e2aa2433e1119c9988b2d50f54dc89f476fcca8fe2755'
+                   '88ff37f326648a8bfc061ec9e14823a776e182b715ca5d7dc06b6942c903460c')
 
 _sourcename() {
   case $1 in
     eclipse-common) return 1 ;;
-    eclipse-rust | eclipse-jee | eclipse-cpp | eclipse-javascript) echo $1-${_release//\//-}-incubation-linux-gtk-x86_64.tar.gz ;;
+    eclipse-rust  ) echo $1-${_release//\//-}-incubation-linux-gtk-x86_64.tar.gz ;;
     *             ) echo $1-${_release//\//-}-linux-gtk-x86_64.tar.gz ;;
   esac
 }
@@ -83,16 +83,24 @@ _package() {
   _lower=${variant,,}
 
   pkgdesc+=" for $variant"
-  depends=("eclipse-common=$pkgver-$pkgrel" bash)
-  provides=("eclipse=$pkgver-$pkgrel")
+  depends=("eclipse-common=$pkgver-$pkgrel" bash fuse-overlayfs)
 
   install -d "$pkgdir/usr/lib"
   cp -a $1 "$pkgdir/usr/lib/eclipse-${_lower}"
 
+  install -D /dev/stdin "$pkgdir/usr/lib/eclipse-${_lower}-helper" <<END
+#!/bin/bash
+mkdir -p /tmp/eclipse-${_lower}-workdir
+mkdir -p /tmp/eclipse-${_lower}-upper
+mkdir -p /run/user/\$1/eclipse-${_lower}
+fuse-overlayfs -o lowerdir=/usr/lib/eclipse:/usr/lib/eclipse-${_lower},upperdir=/tmp/eclipse-${_lower}-upper,workdir=/tmp/eclipse-${_lower}-workdir /run/user/\$1/eclipse-${_lower}
+export ECLIPSE_HOME=/run/user/\$1/eclipse-${_lower}
+unshare -U /run/user/\$1/eclipse-${_lower}/eclipse "\${@:1}" -configuration \$HOME/.eclipse-${_lower}-config -data \$HOME/eclipse-${_lower}-workspace
+END
+
   install -D /dev/stdin "$pkgdir/usr/bin/eclipse-${_lower}" <<END
 #!/bin/bash
-export ECLIPSE_HOME=/usr/lib/eclipse-"${_lower}"
-exec /usr/lib/eclipse/eclipse "\$@"
+exec unshare -rm /usr/lib/eclipse-${_lower}-helper \$(id -u) "\$@"
 END
 
   install -Dm644 /dev/stdin "$pkgdir/usr/share/applications/eclipse-${_lower}.desktop" <<END
@@ -107,7 +115,7 @@ Categories=Development;IDE;Java;
 StartupNotify=true
 END
 
-  sed -i "$ a -classpath \"/usr/lib/eclipse:/usr/lib/eclipse-${_lower}:.\"" "$pkgdir/usr/lib/eclipse-${_lower}/eclipse.ini"
+  sed -i "1 i -configuration=@user.home/.eclipse-${_lower}" "$pkgdir/usr/lib/eclipse-${_lower}/eclipse.ini"
   sed -i "s%-Dosgi.instance.area.default=@user.home/eclipse-workspace%-Dosgi.instance.area.default=@user.home/eclipse-${_lower}-workspace%g" "$pkgdir/usr/lib/eclipse-${_lower}/eclipse.ini"
 
   for i in 16 22 24 32 48 64 128 256 512 1024; do