development/eclim: Updated for version 2.7.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

2 files changed, 13 insertions, 31 deletions

diff --git a/development/eclim/eclim.SlackBuild b/development/eclim/eclim.SlackBuild
index 1b2683c1ec..dbec5cc06d 100644
--- a/development/eclim/eclim.SlackBuild
+++ b/development/eclim/eclim.SlackBuild
@@ -23,10 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eclim
-# temporarily build the oxygen branch until released so i don't hold up
-# updating the eclipse slackbuilds any longer
-GITREV=${GITREV:-c977952934d6317380458618484bd577e2cab2d0}
-VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')}
+VERSION=${VERSION:-2.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,15 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$GITREV
-tar xvf $CWD/$PRGNAM-$GITREV.tar.gz
-cd $PRGNAM-$GITREV
-
-# this is a git submodule, but not filled when directly downloading a revision
-rm -rf doc/theme
-tar xvf $CWD/sphinx-bootstrap-theme-f32f006f06092eb57814b41fe66e1b423d622e88.tar.gz
-mv sphinx-bootstrap-theme-f32f006f06092eb57814b41fe66e1b423d622e88 doc/theme
-
+rm -rf "$PRGNAM"_"$VERSION"
+tar xvf $CWD/"$PRGNAM"_"$VERSION".tar.gz
+cd $"$PRGNAM"_"$VERSION"
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -78,11 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# manually set the version - will be removed when 2.7.0 is finally released
-echo "2.6.0" > .version
-sed -i 's/^    version = dotversion.getText.*$/    version = "2.6.0.24-gc977952"/' ant/build.gant
-sed -i 's/^    release = version/    release = "2.6.0"/' ant/build.gant
-
 # http://eclim.org/install.html#install-source
 (
   # rebuild nailgun
@@ -133,14 +119,12 @@ mkdir -p $PKG$ECLIPSE_HOME
 ant docs vimdocs -Declipse.home=$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
 ant deploy -Declipse.home=$PKG$ECLIPSE_HOME -Dvim.files=$PKG/usr/share/vim/vimfiles
 
-# manually set the version - will be removed when 2.7.0 is finally released
-ECLIM_VERSION=2.6.0.24-gc977952
 # tidy up
-sed -i "s#$PKG##" $PKG$ECLIPSE_HOME/plugins/org.eclim_$ECLIM_VERSION/bin/eclimd \
-  $PKG$ECLIPSE_HOME/plugins/org.eclim_$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_$ECLIM_VERSION/bin/native/linux/eclimd $PKG$ECLIPSE_HOME/plugins/org.eclim_$ECLIM_VERSION/bin/native/linux/eclimd.desktop
-find $PKG$ECLIPSE_HOME/plugins/org.eclim_$ECLIM_VERSION/nailgun \! -name ng -mindepth 1 -print0 | xargs -0 rm -rf
+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
+find $PKG$ECLIPSE_HOME/plugins/org.eclim_$VERSION/nailgun \! -name ng -mindepth 1 -print0 | xargs -0 rm -rf
 rm -rf build/doc/site/.doctrees
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/eclim/eclim.info b/development/eclim/eclim.info
index a2e00d6ace..453f7ab060 100644
--- a/development/eclim/eclim.info
+++ b/development/eclim/eclim.info
@@ -1,14 +1,12 @@
 PRGNAM="eclim"
-VERSION="gitc977952"
+VERSION="2.7.0"
 HOMEPAGE="http://eclim.org"
-DOWNLOAD="https://github.com/ervandew/eclim/archive/c977952934d6317380458618484bd577e2cab2d0/eclim-c977952934d6317380458618484bd577e2cab2d0.tar.gz \
-          https://github.com/ervandew/sphinx-bootstrap-theme/archive/f32f006f06092eb57814b41fe66e1b423d622e88/sphinx-bootstrap-theme-f32f006f06092eb57814b41fe66e1b423d622e88.tar.gz \
+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="8fd30a6460d7711a988ae67630d7f49c \
-        b76e2dcd46e21c16ad783e57a16c9cdb \
+MD5SUM="8d23eb014423bf481349e854e21d18d0 \
         557e401f2e4633ed6ebdab582fb16921"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant eclipse-java sphinxcontrib-plantuml"
+REQUIRES="apache-ant eclipse-java Sphinx"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"