pcr/eclim: updated to 2.8.0

1 files changed, 24 insertions, 17 deletions

diff --git a/pcr/eclim/PKGBUILD b/pcr/eclim/PKGBUILD
index f04d5ee77..158704ad1 100644
--- a/pcr/eclim/PKGBUILD
+++ b/pcr/eclim/PKGBUILD
@@ -1,28 +1,21 @@
 # Maintainer (AUR): Jingbei Li <i@jingbei.li>
 # Contributor (AUR): Andrea Fagiani <andfagiani_at_gmail_dot_com>
+# Contributor (AUR): solarus <in01-archlinux at tunna.org>
 # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
-# parabora changes and rationale:
-#  no changes.
-
 pkgname=eclim
-pkgver=2.7.1
-pkgrel=1
+pkgver=2.8.0
+pkgrel=3
 pkgdesc="Brings Eclipse functionality to Vim"
 url="http://eclim.org/"
 license=('GPL3')
-arch=(i686 x86_64 armv7h)
-depends=('vim' 'eclipse' 'java-environment')
-makedepends=('apache-ant' 'python2-sphinx' 'groovy')
-optdepends=('eclipse-pdt: Eclipse PHP Development Tools support'
-            'eclipse-cdt: Eclipse C/C++ Plugin support'
-            'eclipse-dltk-core: Eclipse Dynamic Languagues Toolkit support'
-            'eclipse-dltk-ruby: Eclipse Ruby support'
-            'eclipse-wtp: Eclipse Web Developer Tools support')
+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=('b7c283fff4813617eaf2c67c96072b9a')
+md5sums=('aae873ee270d6c7b21a6ff3bec3f08ad')
 
 prepare() {
   cd $srcdir/${pkgname}_$pkgver
@@ -34,10 +27,22 @@ prepare() {
     -e '68,88d' \
     -i ant/build.gant
 
-  # Get the ANT_HOME environment variable
-  source /etc/profile.d/apache-ant.sh
+  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"
 
   chmod +x org.eclim/nailgun/configure bin/sphinx
+
+  # 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;/' {} +
 }
 
 build() {
@@ -53,11 +58,13 @@ build() {
   ant -lib /usr/share/groovy/lib \
       -Declipse.home=/usr/lib/eclipse \
       -Dvim.files=/usr/share/vim/vimfiles \
+      -Dfile.encoding=utf-8 \
       build
-
 }
 
 package() {
+  depends=('eclipse' 'java-environment' 'libnsl' 'vim')
+
   cd $srcdir/${pkgname}_$pkgver
 
   mkdir -p $pkgdir/usr/lib/eclipse