From 6c723ef3878b198e69f9367fa832089940c33819 Mon Sep 17 00:00:00 2001
From: Petar Petrov
Date: Sun, 17 Jul 2016 00:54:00 +0700
Subject: academic/jalview: Remove p7zip dep.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/jalview/README             | 7 +------
 academic/jalview/jalview.SlackBuild | 6 ++----
 academic/jalview/jalview.info       | 6 +++---
 3 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'academic')

diff --git a/academic/jalview/README b/academic/jalview/README
index e53e932a40..ba6e70c2c7 100644
--- a/academic/jalview/README
+++ b/academic/jalview/README
@@ -10,10 +10,5 @@ Waterhouse AM, Procter JB, Martin DMA, Clamp M, Barton GJ (2009)
 Jalview Version 2-a multiple sequence alignment editor and analysis
 workbench. Bioinformatics 25: 1189-1191.
 
-NOTE1:
-The silly requirement of p7zip is just for extracting the program's
-contents at build time. You do not need it in order to use Jalview
-later on, but it's a nice tool to have anyways... ;)
-
-NOTE2:
+NOTE:
 The 'source' is hosted at SourceForge by the SlackBuild maintainer.
diff --git a/academic/jalview/jalview.SlackBuild b/academic/jalview/jalview.SlackBuild
index dd3d0327c1..e44ee197fa 100644
--- a/academic/jalview/jalview.SlackBuild
+++ b/academic/jalview/jalview.SlackBuild
@@ -27,10 +27,9 @@
 
 PRGNAM=jalview
 VERSION=${VERSION:-2.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-SRCNAM=install-jalview.bin
 ARCH=noarch
 
 CWD=$(pwd)
@@ -44,9 +43,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-7z e $CWD/$SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/academic/jalview/jalview.info b/academic/jalview/jalview.info
index 55566539fd..52980c0424 100644
--- a/academic/jalview/jalview.info
+++ b/academic/jalview/jalview.info
@@ -1,12 +1,12 @@
 PRGNAM="jalview"
 VERSION="2.9"
 HOMEPAGE="http://www.jalview.org/"
-DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/JalView/2.9/install-jalview.bin \
+DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/JalView/2.9/jalview-2.9.tar.gz \
 	http://sourceforge.net/projects/sboppetrov/files/JalView/TheJalviewTutorial_screen.pdf"
-MD5SUM="5de4a0daa112e8b6673985aef373bfdd \
+MD5SUM="841d95fffafefef6b79f1f4f4d41dd04 \
 	5e2f8da8f2528049f055263aecd2f8af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk p7zip"
+REQUIRES="jdk"
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
-- 
cgit v1.2.3