Fix up versions to match new version format, minor formatting.

5 files changed, 14 insertions, 17 deletions

diff --git a/var/spack/packages/dtcmp/package.py b/var/spack/packages/dtcmp/package.py
index 400028bd6f..9d940583c1 100644
--- a/var/spack/packages/dtcmp/package.py
+++ b/var/spack/packages/dtcmp/package.py
@@ -2,13 +2,13 @@ import os
 from spack import *
 
 class Dtcmp(Package):
-    """The Datatype Comparison Library provides comparison operations and parallel sort algorithms for MPI applications."""
+    """The Datatype Comparison Library provides comparison operations and
+       parallel sort algorithms for MPI applications."""
 
     homepage = "https://github.com/hpc/dtcmp"
     url      = "https://github.com/hpc/dtcmp/releases/download/v1.0.3/dtcmp-1.0.3.tar.gz"
 
-    versions = { '1.0.3' : 'cdd8ccf71e8ff67de2558594a7fcd317' }
-    #version('1.0.3', 'cdd8ccf71e8ff67de2558594a7fcd317')
+    version('1.0.3', 'cdd8ccf71e8ff67de2558594a7fcd317')
 
     depends_on('mpi')
     depends_on('lwgrp')
diff --git a/var/spack/packages/fileutils/package.py b/var/spack/packages/fileutils/package.py
index 8ddd3d060b..449ed0c72e 100644
--- a/var/spack/packages/fileutils/package.py
+++ b/var/spack/packages/fileutils/package.py
@@ -2,14 +2,13 @@ import os
 from spack import *
 
 class Fileutils(Package):
-    """FileUtils provides a suite of MPI-based tools to manage large files and datasets on parallel file systems."""
+    """FileUtils provides a suite of MPI-based tools to manage large files
+       and datasets on parallel file systems."""
 
     homepage = "https://github.com/hpc/fileutils"
     url      = "https://github.com/hpc/fileutils/releases/download/v0.0.1-alpha.4/fileutils-0.0.1-alpha.4.tar.gz"
 
-    versions = { '0.0.1-alpha.4' : 'a01dbe5a2e03f3c70c7a98ec0a2554e1' }
-
-    force_url = True
+    version('0.0.1-alpha.4', 'a01dbe5a2e03f3c70c7a98ec0a2554e1')
 
     depends_on('mpi')
     depends_on('libcircle')
diff --git a/var/spack/packages/libarchive/package.py b/var/spack/packages/libarchive/package.py
index 88c6ce45ab..cbd4b89cd0 100644
--- a/var/spack/packages/libarchive/package.py
+++ b/var/spack/packages/libarchive/package.py
@@ -1,7 +1,8 @@
 from spack import *
 
 class Libarchive(Package):
-    """libarchive: C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats."""
+    """libarchive: C library and command-line tools for reading and
+       writing tar, cpio, zip, ISO, and other archive formats."""
     homepage = "http://www.libarchive.org"
     url      = "http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz"
 
diff --git a/var/spack/packages/libcircle/package.py b/var/spack/packages/libcircle/package.py
index ae539969e7..e398125328 100644
--- a/var/spack/packages/libcircle/package.py
+++ b/var/spack/packages/libcircle/package.py
@@ -2,17 +2,13 @@ import os
 from spack import *
 
 class Libcircle(Package):
-    """libcircle provides an efficient distributed queue on a cluster, using self-stabilizing work stealing."""
+    """libcircle provides an efficient distributed queue on a cluster,
+       using self-stabilizing work stealing."""
 
     homepage = "https://github.com/hpc/libcircle"
-    #url      = "https://github.com/hpc/lwgrp/releases/download/v1.0.2/lwgrp-1.0.2.tar.gz"
     url      = "https://github.com/adammoody/libcircle/releases/download/v0.2.1-rc.1/libcircle-0.2.1-rc.1.tar.gz"
 
-    versions = { '0.2.1-rc.1' : 'a10a14e76ac2ad7357a4b21b794e8e4e' }
-
-    # need this hack because the URL plus version string below confuses URL expansion
-    # at url_for_version() in lib/spack/package.py
-    force_url = True
+    version('0.2.1-rc.1', 'a10a14e76ac2ad7357a4b21b794e8e4e')
 
     depends_on('mpi')
 
diff --git a/var/spack/packages/lwgrp/package.py b/var/spack/packages/lwgrp/package.py
index d4054e195f..5963382b92 100644
--- a/var/spack/packages/lwgrp/package.py
+++ b/var/spack/packages/lwgrp/package.py
@@ -2,12 +2,13 @@ import os
 from spack import *
 
 class Lwgrp(Package):
-    """Thie light-weight group library provides process group representations using O(log N) space and time."""
+    """Thie light-weight group library provides process group
+       representations using O(log N) space and time."""
 
     homepage = "https://github.com/hpc/lwgrp"
     url      = "https://github.com/hpc/lwgrp/releases/download/v1.0.2/lwgrp-1.0.2.tar.gz"
 
-    versions = { '1.0.2' : 'ab7ba3bdd8534a651da5076f47f27d8a' }
+    version('1.0.2', 'ab7ba3bdd8534a651da5076f47f27d8a')
 
     depends_on('mpi')