From 71fb29fccf083f70254524f346cac7675ba60f48 Mon Sep 17 00:00:00 2001 From: Justin S <3630356+codeandkey@users.noreply.github.com> Date: Tue, 14 Apr 2020 11:13:16 -0500 Subject: muscle: add 3.8.31 (#15974) * muscle: add 3.8.31 * muscle: use build_directory property * muscle: add url_for_version, fix version comparison --- var/spack/repos/builtin/packages/muscle/package.py | 27 +++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/muscle/package.py b/var/spack/repos/builtin/packages/muscle/package.py index 4e62064362..0f5d5f5097 100644 --- a/var/spack/repos/builtin/packages/muscle/package.py +++ b/var/spack/repos/builtin/packages/muscle/package.py @@ -12,15 +12,36 @@ class Muscle(MakefilePackage): that are consistently better than CLUSTALW.""" homepage = "http://drive5.com/muscle/" - url = "http://www.drive5.com/muscle/muscle_src_3.8.1551.tar.gz" + version('3.8.31', sha256='43c5966a82133bd7da5921e8142f2f592c2b5f53d802f0527a2801783af809ad') version('3.8.1551', sha256='c70c552231cd3289f1bad51c9bd174804c18bb3adcf47f501afec7a68f9c482e') + @property + def build_directory(self): + if self.spec.satisfies('@3.8.31'): + return 'src' + else: + return '.' + + def url_for_version(self, version): + fmt_new = 'https://drive5.com/muscle/downloads{0}/muscle{0}_src.tar.gz' + fmt_old = 'https://drive5.com/muscle/muscle_src_{0}.tar.gz' + + if version == Version('3.8.31'): + return fmt_new.format(version.dotted) + else: + return fmt_old.format(version.dotted) + def edit(self, spec, prefix): - makefile = FileFilter('Makefile') + mkfile_name = 'Makefile' + + if self.spec.satisfies('@3.8.31'): + mkfile_name = 'mk' + + makefile = FileFilter(join_path(self.build_directory, mkfile_name)) makefile.filter('-static', '') makefile.filter('-funroll-loops', '') def install(self, spec, prefix): mkdirp(prefix.bin) - install('muscle', prefix.bin) + install(join_path(self.build_directory, 'muscle'), prefix.bin) -- cgit v1.2.3-70-g09d2