Remove lingering files from previous package

9 files changed, 53 insertions, 231 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99799f3b917c..2cef65f2c927 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,19 @@
-# Generated by mksrcinfo v8
-# Sun Mar 20 20:53:34 UTC 2016
 pkgbase = eclipse-jee
-	pkgdesc = Eclipse IDE for Java EE Developers
-	pkgver = 4.5.2
+	pkgdesc = Highly extensible IDE (Enterprise Java and Web version)
+	pkgver = 4.20
 	pkgrel = 1
-	url = http://www.eclipse.org
-	install = eclipse-jee.install
-	arch = i686
+	epoch = 2
+	url = https://www.eclipse.org/
 	arch = x86_64
 	license = EPL
-	depends = java-environment
-	depends = gtk2
-	depends = webkitgtk2
-	source = eclipse-jee.sh
-	source = eclipse-jee.desktop
-	source = eclipse-jee.ini.patch
-	source = eclipse-jee.svg
-	sha256sums = d20cff0ecbcdd2d180b02d646293e5adbad926fd7183f49cc8f4f5789899db38
-	sha256sums = 462c1b703a35e99995dd8531d184dce7a723389bd89e4e721b5708b0e8e438bf
-	sha256sums = 854557110c6ea3b7c79fb92dc070ac39fc4c897385601c11779cd62ce6e00a03
-	sha256sums = da103fe3b9d8c6cc1316b2b45347697bf6561230e81286b78cf142b64b1d89a5
-	source_i686 = eclipse-jee-mars-2-linux-gtk.tar.gz::http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/mars/2/eclipse-jee-mars-2-linux-gtk.tar.gz&r=1
-	sha256sums_i686 = 1d3f5cf7da41f549e94777367417a3b1cfcd749ab054f9ae92cf252c7e5ebbef
-	source_x86_64 = eclipse-jee-mars-2-linux-gtk-.tar.gz::http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/mars/2/eclipse-jee-mars-2-linux-gtk-.tar.gz&r=1
-	sha256sums_x86_64 = 5155460d2b279ddcbf791b4286f289de7b3b938ebf46947e6e87258dc748e23a
+	depends = java-environment>=8
+	depends = webkit2gtk
+	depends = unzip
+	provides = eclipse=4.20-1
+	conflicts = eclipse
+	source = eclipse-jee-2021-06-R-linux-gtk-x86_64.tar.gz::https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2021-06/R/eclipse-jee-2021-06-R-linux-gtk-x86_64.tar.gz&r=1
+	source = eclipse.desktop
+	sha512sums = 89b8d359e7a0e5891b4adce63b464a84520c7aff7fde8f47689b2414dc7fdb1247d74f8651986d7fe8699561368c10133c9633b0d39fc7cc76b6206d574eb4cb
+	sha512sums = 9da29da1fe9e4ac4b8f1a4faef158155399574752a317addf90f6a068019ad62906f8ce1db11e543c7fee7dbf3dd8273aa34fc86ff2354420371cdf9b017cdf3
 
 pkgname = eclipse-jee
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..450dce35ce99
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.tar.gz
+*.part
+*.pkg.*
+config
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 62eac7b49191..a53d4b015e55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,35 @@
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Giuliano Schneider <gs93@gmx.net>
-# Contributor: [Vitaliy Berdinskikh](mailto:ur6lad@archlinux.org.ua) aka UR6LAD
+# Maintainer: Mattia Moffa <mattia [at] moffa [dot] xyz>
 
-_eclipse_name=mars
-_eclipse_release=2
 pkgname=eclipse-jee
-pkgver=4.5.2
+epoch=2
+pkgver=4.20
 pkgrel=1
-pkgdesc="Eclipse IDE for Java EE Developers"
-arch=('i686' 'x86_64')
-url="http://www.eclipse.org"
+_release=2021-06/R
+pkgdesc="Highly extensible IDE (Enterprise Java and Web version)"
+arch=(x86_64)
+url="https://www.eclipse.org/"
 license=('EPL')
-depends=('java-environment' 'gtk2' 'webkitgtk2')
-install="${pkgname}.install"
-source=("${pkgname}.sh"
-        "${pkgname}.desktop"
-        "${pkgname}.ini.patch"
-        "${pkgname}.svg")
-source_i686=("${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk.tar.gz"::"http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${_eclipse_name}/${_eclipse_release}/${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk.tar.gz&r=1")
-source_x86_64=("${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk-${CARCH}.tar.gz"::"http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${_eclipse_name}/${_eclipse_release}/${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk-${CARCH}.tar.gz&r=1")
-sha256sums=('d20cff0ecbcdd2d180b02d646293e5adbad926fd7183f49cc8f4f5789899db38'
-            '462c1b703a35e99995dd8531d184dce7a723389bd89e4e721b5708b0e8e438bf'
-            '854557110c6ea3b7c79fb92dc070ac39fc4c897385601c11779cd62ce6e00a03'
-            'da103fe3b9d8c6cc1316b2b45347697bf6561230e81286b78cf142b64b1d89a5')
-sha256sums_i686=('1d3f5cf7da41f549e94777367417a3b1cfcd749ab054f9ae92cf252c7e5ebbef')
-sha256sums_x86_64=('5155460d2b279ddcbf791b4286f289de7b3b938ebf46947e6e87258dc748e23a')
-# prevent package compression
-PKGEXT=".pkg.tar"
+depends=('java-environment>=8' webkit2gtk unzip)
+makedepends=()
+provides=(eclipse=$pkgver-$pkgrel)
+conflicts=(eclipse)
 
-build() {
-  patch -p0 -i "${pkgname}.ini.patch"
-}
+_srcfilename="$pkgname-${_release//\//-}-linux-gtk-$CARCH.tar.gz"
+source=("$_srcfilename::https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/$_release/$_srcfilename&r=1"
+        "eclipse.desktop")
+sha512sums=('89b8d359e7a0e5891b4adce63b464a84520c7aff7fde8f47689b2414dc7fdb1247d74f8651986d7fe8699561368c10133c9633b0d39fc7cc76b6206d574eb4cb'
+            '9da29da1fe9e4ac4b8f1a4faef158155399574752a317addf90f6a068019ad62906f8ce1db11e543c7fee7dbf3dd8273aa34fc86ff2354420371cdf9b017cdf3')
 
 package() {
-  # Copy application files
-  install -m 755 -d "${pkgdir}/usr/lib"
-  cp -a "eclipse" "${pkgdir}/usr/lib/${pkgname}"
-
-  # Copy executable file
-  install -m 755 -d "${pkgdir}/usr/bin"
-  install -m 755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -d "${pkgdir}/usr/lib"
+    cp -r "eclipse" "${pkgdir}/usr/lib/eclipse"
+    install -d "${pkgdir}/usr/bin"
+    ln -s "/usr/lib/eclipse/eclipse" "${pkgdir}/usr/bin/eclipse"
 
-  # Copy icons
-  install -m 755 -d "${pkgdir}/usr/share/icons"
-  for _size in 16 32 48 256
-  do
-    install -m 755 -d "${pkgdir}/usr/share/icons/hicolor/${_size}x${_size}/apps"
-    install -m 644 eclipse/plugins/org.eclipse.platform_4.*.v*/eclipse${_size}.png \
-      "${pkgdir}/usr/share/icons/hicolor/${_size}x${_size}/apps/${pkgname}.png"
-  done
-  install -m 755 -d "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
-  install -m 644 "${pkgname}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+    install -Dm644 "eclipse.desktop" "${pkgdir}/usr/share/applications/eclipse.desktop"
 
-  # Copy desktop file
-  install -m 755 -d "${pkgdir}/usr/share/applications"
-  install -m 755 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    for i in 16 22 24 32 48 64 128 256 512 1024 ; do
+        install -Dm644 eclipse/plugins/org.eclipse.platform_*/eclipse$i.png \
+            "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/eclipse.png"
+    done
 }
diff --git a/eclipse-jee.desktop b/eclipse-jee.desktop
deleted file mode 100644
index db6fb0def791..000000000000
--- a/eclipse-jee.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse for Java EE
-Comment=A Java EE Development Environment
-Exec=eclipse-jee
-Icon=eclipse-jee
-Terminal=false
-Type=Application
-Categories=Java;Development;IDE;
-StartupNotify=true
diff --git a/eclipse-jee.ini.patch b/eclipse-jee.ini.patch
deleted file mode 100644
index 88217222950d..000000000000
--- a/eclipse-jee.ini.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur eclipse.orig/eclipse.ini eclipse/eclipse.ini
---- eclipse.orig/eclipse.ini	2015-06-21 19:05:47.000000000 +0200
-+++ eclipse/eclipse.ini	2015-07-05 20:32:53.117591065 +0200
-@@ -9,7 +9,7 @@
- -showsplash
- org.eclipse.platform
- --launcher.XXMaxPermSize
--256m
-+512m
- --launcher.defaultAction
- openFile
- --launcher.appendVmargs
-@@ -18,3 +18,4 @@
- -XX:MaxPermSize=256m
- -Xms256m
- -Xmx1024m
-+-Dosgi.configuration.area=@user.home/.config/eclipse-jee
diff --git a/eclipse-jee.install b/eclipse-jee.install
deleted file mode 100644
index d59dca6e808e..000000000000
--- a/eclipse-jee.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/eclipse-jee.sh b/eclipse-jee.sh
deleted file mode 100644
index c37ab7394d6e..000000000000
--- a/eclipse-jee.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export ECLIPSE_HOME=/usr/lib/eclipse-jee
-export GDK_NATIVE_WINDOWS=true
-${ECLIPSE_HOME}/eclipse "$@"
diff --git a/eclipse-jee.svg b/eclipse-jee.svg
deleted file mode 100644
index 9a3e8c49f9af..000000000000
--- a/eclipse-jee.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Nuovo documento 1">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3892">
-      <stop
-         style="stop-color:#463788;stop-opacity:1;"
-         offset="0"
-         id="stop3894" />
-      <stop
-         style="stop-color:#463788;stop-opacity:0;"
-         offset="1"
-         id="stop3896" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3892"
-       id="linearGradient3898"
-       x1="142.24303"
-       y1="228.04634"
-       x2="143.72633"
-       y2="19.627708"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3892"
-       id="linearGradient4039"
-       gradientUnits="userSpaceOnUse"
-       x1="142.24303"
-       y1="228.04634"
-       x2="143.72633"
-       y2="19.627708" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4756825"
-     inkscape:cx="28.356784"
-     inkscape:cy="116.33584"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="702"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Livello">
-    <path
-       style="fill:#f7941e;fill-opacity:1;stroke:none;opacity:1"
-       d="M 115.875 11.375 C 51.877022 11.375 0 63.252022 0 127.25 C 0 191.24798 51.877022 243.125 115.875 243.125 C 119.24725 243.125 122.57585 242.96978 125.875 242.6875 C 66.563577 237.61269 20 187.87572 20 127.25 C 20 66.624275 66.563577 16.887315 125.875 11.8125 C 122.57585 11.530218 119.24725 11.375 115.875 11.375 z "
-       id="path3070" />
-    <g
-       id="g4032"
-       transform="translate(100,0)">
-      <path
-         transform="matrix(1.0167013,0,0,0.99870512,-104.3727,0.2419774)"
-         d="m 254.1197,127.92367 c 0,61.37817 -49.75684,111.13502 -111.13502,111.13502 -61.378175,0 -111.135017,-49.75685 -111.135017,-111.13502 0,-61.378177 49.756842,-111.135019 111.135017,-111.135019 61.37818,0 111.13502,49.756842 111.13502,111.135019 z"
-         sodipodi:ry="111.13502"
-         sodipodi:rx="111.13502"
-         sodipodi:cy="127.92367"
-         sodipodi:cx="142.98468"
-         id="path3872"
-         style="fill:#2c2255;fill-opacity:1;stroke:#000000;stroke-width:3.96958089;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.67523787,0,0,0.66328578,-55.54866,43.150051)"
-         d="m 254.1197,127.92367 c 0,61.37817 -49.75684,111.13502 -111.13502,111.13502 -61.378175,0 -111.135017,-49.75685 -111.135017,-111.13502 0,-61.378177 49.756842,-111.135019 111.135017,-111.135019 61.37818,0 111.13502,49.756842 111.13502,111.135019 z"
-         sodipodi:ry="111.13502"
-         sodipodi:rx="111.13502"
-         sodipodi:cy="127.92367"
-         sodipodi:cx="142.98468"
-         id="path3872-1"
-         style="fill:url(#linearGradient4039);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect3900"
-         d="m -65.79729,95.625 c -1.2006,3.918982 -2.201169,7.91034 -2.964018,12 l 219.522618,0 c -0.76285,-4.08966 -1.76342,-8.081018 -2.96402,-12 l -213.59458,0 z m -4.662154,26 c -0.120066,2.10891 -0.185251,4.23621 -0.185251,6.375 0,1.88407 0.06106,3.76397 0.154376,5.625 l 222.980639,0 c 0.0933,-1.86103 0.15437,-3.74093 0.15437,-5.625 0,-2.13879 -0.0652,-4.26609 -0.18525,-6.375 l -222.918884,0 z m 1.574635,26 c 0.733123,4.0871 1.670574,8.08093 2.840518,12 l 214.088581,0 c 1.16995,-3.91907 2.1074,-7.9129 2.84052,-12 l -219.769619,0 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-</svg>
diff --git a/eclipse.desktop b/eclipse.desktop
new file mode 100644
index 000000000000..bc5d0464b5df
--- /dev/null
+++ b/eclipse.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Eclipse
+Comment=Java and Web Development Environment
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Type=Application
+Categories=Development;IDE;Java;
+StartupNotify=true