From 8c2a972e71c1cc8e28c0c90e7de7470df43b8a52 Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Wed, 3 Jan 2018 11:13:09 +0000
Subject: development/eclim: Updated for version 2.7.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/eclim/eclim.SlackBuild | 46 +++++++++++++++++++++-----------------
 development/eclim/eclim.info       |  8 +++----
 2 files changed, 28 insertions(+), 26 deletions(-)

(limited to 'development/eclim')

diff --git a/development/eclim/eclim.SlackBuild b/development/eclim/eclim.SlackBuild
index dbec5cc06dd9..f4c1035394ff 100644
--- a/development/eclim/eclim.SlackBuild
+++ b/development/eclim/eclim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for eclim
 
-# Copyright 2016-2017 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2018 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eclim
-VERSION=${VERSION:-2.7.0}
+VERSION=${VERSION:-2.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,16 +42,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -71,7 +67,7 @@ find -L . \
 
 # http://eclim.org/install.html#install-source
 (
-  # rebuild nailgun
+  # build nailgun
   cd org.eclim/nailgun
 
   chmod +x configure
@@ -92,15 +88,6 @@ chmod +x bin/sphinx
 # allow building with root - eek
 sed -i "s/'root'/'dummy'/g" ant/build.gant
 
-# eclim fails to build with ant-1.9.7 on slackbuilds.org
-# revert gant jar to fix
-# https://github.com/ervandew/eclim/issues/330
-rm -f ant/lib/gant-1.9.11-patched.jar
-cp $CWD/gant_groovy2.2-1.9.11.jar ant/lib
-
-sed -i '/useCache=/d' build.xml
-sed -i '/cacheDir=/d' build.xml
-
 ECLIPSE_HOME=${ECLIPSE_HOME:-/opt/eclipse-java}
 ECLIPSE_HOME=${ECLIPSE_HOME%/}
 
@@ -108,7 +95,7 @@ ECLIPSE_HOME=${ECLIPSE_HOME%/}
 sed -i \
     -e "s|File(getVariable('eclipse')|File('$ECLIPSE_HOME/'|g" \
     -e 's|${user.home}/\.|${vim.files}/|g' \
-    -e '68,88d' \
+    -e '69,88d' \
     ant/build.gant
 
 ant build -Declipse.home=$ECLIPSE_HOME -Dvim.files=/usr/share/vim/vimfiles
@@ -120,13 +107,30 @@ ant docs vimdocs -Declipse.home=$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vim
 ant deploy -Declipse.home=$PKG$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
 
 # tidy up
-sed -i "s#$PKG##" $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/eclimd \
-	$PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/plugin.properties \
-	$PKG/usr/share/vim/vimfiles/eclim/plugin/eclim.vim
-sed -i "s#\${eclipse.home}#$ECLIPSE_HOME#" $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/native/linux/eclimd $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/native/linux/eclimd.desktop
+sed -i "s|$PKG||" \
+  $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/bin/eclimd \
+  $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/plugin.properties \
+  $PKG/usr/share/vim/vimfiles/eclim/plugin/eclim.vim
+
+# generate tags for help files
+echo "ignored" | vim \
+  -c "set rtp^=$PKG/usr/share/vim/vimfiles" \
+  -c "source $PKG/usr/share/vim/vimfiles/plugin/eclim.vim" \
+  -c 'EclimHelp' \
+  -c 'q!' -
+
 find $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/nailgun \! -name ng -mindepth 1 -print0 | xargs -0 rm -rf
 rm -rf build/doc/site/.doctrees
 
+# neovim support
+mkdir -p $PKG/usr/share/nvim/runtime/plugin
+(
+  cd $PKG/usr/share/nvim/runtime
+
+  ln -s ../../vim/vimfiles/eclim eclim
+  ln -s ../../../vim/vimfiles/plugin/eclim.vim plugin/eclim.vim
+)
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   build/doc/site \
diff --git a/development/eclim/eclim.info b/development/eclim/eclim.info
index 453f7ab0606c..40a202d44b8a 100644
--- a/development/eclim/eclim.info
+++ b/development/eclim/eclim.info
@@ -1,10 +1,8 @@
 PRGNAM="eclim"
-VERSION="2.7.0"
+VERSION="2.7.1"
 HOMEPAGE="http://eclim.org"
-DOWNLOAD="https://github.com/ervandew/eclim/releases/download/2.7.0/eclim_2.7.0.tar.gz \
-          http://central.maven.org/maven2/org/codehaus/gant/gant_groovy2.2/1.9.11/gant_groovy2.2-1.9.11.jar"
-MD5SUM="8d23eb014423bf481349e854e21d18d0 \
-        557e401f2e4633ed6ebdab582fb16921"
+DOWNLOAD="https://github.com/ervandew/eclim/releases/download/2.7.1/eclim_2.7.1.tar.gz"
+MD5SUM="b7c283fff4813617eaf2c67c96072b9a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant eclipse-java Sphinx"
-- 
cgit v1.2.3