Update to 2.21.0

1 files changed, 48 insertions, 69 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b38e9cec9a90..49b9e148d884 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,98 +1,77 @@
-# Maintainer: Jingbei Li <i@jingbei.li>
+# Contributor: Eric Fung <loseurmarbles[AT]gmail[DOT]com>
+# Contributor: Jingbei Li <i AT jingbei DOT li>
 # Contributor: Andrea Fagiani <andfagiani_at_gmail_dot_com>
 # Contributor: solarus <in01-archlinux at tunna.org>
+
 pkgname=eclim
-pkgver=2.8.0
-pkgrel=3
+pkgver=2.21.0
+pkgrel=1
 pkgdesc="Brings Eclipse functionality to Vim"
+arch=(i686 x86_64)
 url="http://eclim.org/"
 license=('GPL3')
-arch=(i686 x86_64)
-makedepends=('apache-ant' 'eclipse' 'groovy' 'java-environment=10' 'libnsl' 'python2-sphinx' 'python2-docutils' 'vim')
-optdepends=('eclipse-dltk-core')
-conflicts=('eclim-git')
-install=$pkgname.install
-source=("https://github.com/ervandew/eclim/releases/download/$pkgver/${pkgname}_$pkgver.tar.gz")
-md5sums=('aae873ee270d6c7b21a6ff3bec3f08ad')
+depends=('java-environment' 'eclipse>=4.21' 'vim>=7.1')
+makedepends=('java-environment<=11' 'ant' 'python-sphinx')
+optdepends=('eclipse-pydev')
+install=${pkgname}.install
+source=("https://github.com/ervandew/eclim/releases/download/${pkgver}/${pkgname}_${pkgver}.tar.gz")
+sha256sums=('0b943a47e01f4d1454637969ac84d148a607d5508d5452d54b797e52ff76c15a')
 
 prepare() {
-  cd $srcdir/${pkgname}_$pkgver
-
-  # fix build, thanks to mikezackles
-  sed -e "s/'sphinx-build'/'sphinx-build2'/g" \
-    -e 's|${user.home}/\.|${vim.files}/|g' \
-    -e "s|File(getVariable('eclipse')|File('/usr/lib/eclipse/'|g" \
-    -e '68,88d' \
-    -i ant/build.gant
 
-  export ANT_HOME=/usr/share/ant
-  export PATH=$PATH:$ANT_HOME/bin
-  export JAVA_HOME=/usr/lib/jvm/java-10-openjdk
-  export ANT_OPTS="--add-modules java.xml.bind"
+    cd "${srcdir}/${pkgname}_${pkgver}"
 
-  chmod +x org.eclim/nailgun/configure bin/sphinx
+    chmod +x org.eclim/nailgun/configure bin/sphinx
+    sed -e '33d' -i doc/content/conf.py
 
-  # Sphinx 1.6 => 1.7 compatibility issue
-  sed 's|sphinx.util.compat|docutils.parsers.rst|' -i doc/extension/plantuml.py
-
-  # ant/build.gant syntax error
-  sed '68,71d' -i ant/build.gant
-
-  # https://github.com/ervandew/eclim/issues/601
-  find -name "*.java" -exec sed -i -e 's/StubUtility2/StubUtility2Core/' \
-    -e 's/corext.codemanipulation.StubUtility;/core.manipulation.StubUtility;/' {} +
+    echo &>2 "INFO: Make sure to set your Java Environment to the correct version"
+    echo &>2 "INFO: using archlinux-java or else build may fail. Currently known"
+    echo &>2 "INFO: to be able to build with Java 11 or lower."
 }
 
 build() {
-  cd $srcdir/${pkgname}_$pkgver
 
-  # recompiling nailgun to make sure the executable is compliant with our architecture
-  cd org.eclim/nailgun
-  ./configure
-  make
+    cd "${srcdir}/${pkgname}_${pkgver}"
 
-  cd ../..
+    TMPDIR=$(mktemp -d eclipse.dummy.XXXXX)
+    # Make a temporary dummy directory to use so the build doesn't complain
+    # about an unwritable directory.
+    ant -Declipse.home=/usr/lib/eclipse -Declipse.dest=${TMPDIR} build
 
-  ant -lib /usr/share/groovy/lib \
-      -Declipse.home=/usr/lib/eclipse \
-      -Dvim.files=/usr/share/vim/vimfiles \
-      -Dfile.encoding=utf-8 \
-      build
+    rm -rf ${TMPDIR}
 }
 
 package() {
-  depends=('eclipse' 'java-environment' 'libnsl' 'vim')
-
-  cd $srcdir/${pkgname}_$pkgver
 
-  mkdir -p $pkgdir/usr/lib/eclipse
-  mkdir -p $pkgdir/usr/share/vim/vimfiles
+    cd ${srcdir}/${pkgname}_${pkgver}
 
-  ant -lib /usr/share/groovy/lib \
-      -Declipse.home=/usr/lib/eclipse \
-      -Dvim.files=$pkgdir/usr/share/vim/vimfiles \
-      docs vimdocs
+    install -d "${pkgdir}/usr/lib/eclipse"
+    install -d "${pkgdir}/usr/share/vim/vimfiles"
 
-  ant -lib /usr/share/groovy/lib \
-      -Declipse.home=$pkgdir/usr/lib/eclipse \
-      -Dvim.files=$pkgdir/usr/share/vim/vimfiles \
-      deploy
+    ant -Declipse.home=/usr/lib/eclipse              \
+        -Declipse.dest=${pkgdir}/usr/lib/eclipse     \
+        -Dvim.files=${pkgdir}/usr/share/vim/vimfiles \
+        vimdocs deploy.vim deploy.eclipse
 
-  # copy eclim docs
-  mkdir -p $pkgdir/usr/share/doc/
-  cp -r build/doc/site $pkgdir/usr/share/doc/eclim
+    install -d "${pkgdir}/usr/share/doc/eclim"
+    cp -r gh-pages/* "${pkgdir}/usr/share/doc/eclim/"
 
-  # fix eclim paths
-  sed -e "s|$pkgdir||g" \
-    -i $pkgdir/usr/share/vim/vimfiles/eclim/plugin/eclim.vim \
-    -i $pkgdir/usr/lib/eclipse/plugins/org.eclim_$pkgver/bin/eclimd \
-    -i $pkgdir/usr/lib/eclipse/plugins/org.eclim_$pkgver/plugin.properties
+    install -Dm644 "${srcdir}/${pkgname}_${pkgver}/copyright" \
+                   "${srcdir}/${pkgname}_${pkgver}/NOTICE"    \
+                   "${pkdir}/usr/share/licenses/eclim/"
 
-  # delete doctrees
-  rm -fr $pkgdir/usr/share/doc/eclim/.doctrees
+    # Remove unecessary/junk files from docs
+    rm -rf "${pkdir}/usr/share/doc/eclim/.buildinfo"  \
+           "${pkdir}/usr/share/doc/eclim/.doctrees/"  \
+           "${pkdir}/usr/share/doc/eclim/objects.inv" \
+           "${pkdir}/usr/share/doc/eclim/.nojekyll"   \
+           "${pkdir}/usr/share/doc/eclim/CNAME"
 
-  # delete Windows stuff
-  for i in $(find $pkgdir -regex ".*bat\|.*cmd\|.*exe"); do  rm -f $i ; done
+    rm -rf "${pkdir}/plugin/org_eclim_${pkver}/nailgun/config.status" \
+           "${pkdir}/plugin/org_eclim_${pkver}/nailgun/config.log"    \
+           "${pkdir}/plugin/org_eclim_${pkver}/nailgun/Makefile"
 
-  rm $pkgdir/usr/lib/eclipse/plugins/org.eclim_${pkgver}/nailgun/config.status
+    sed -e "s/${pkgdir}//g" \
+        -i $pkgdir/usr/lib/eclipse/plugins/org.eclim_$pkgver/plugin.properties \
+        -i $pkgdir/usr/lib/eclipse/plugins/org.eclim_$pkgver/bin/eclimd
 }