Converting Luc's packages to the new version format.

7 files changed, 63 insertions, 22 deletions

diff --git a/var/spack/packages/extrae/package.py b/var/spack/packages/extrae/package.py
index a4dae485b5..3b842bc1ec 100644
--- a/var/spack/packages/extrae/package.py
+++ b/var/spack/packages/extrae/package.py
@@ -1,10 +1,17 @@
 from spack import *
 
 class Extrae(Package):
-    """Extrae is the package devoted to generate tracefiles which can be analyzed later by Paraver. Extrae is a tool that uses different interposition mechanisms to inject probes into the target application so as to gather information regarding the application performance. The Extrae instrumentation package can instrument the MPI programin model, and the following parallel programming models either alone or in conjunction with MPI : OpenMP, CUDA, OpenCL, pthread, OmpSs"""
+    """Extrae is the package devoted to generate tracefiles which can
+       be analyzed later by Paraver. Extrae is a tool that uses
+       different interposition mechanisms to inject probes into the
+       target application so as to gather information regarding the
+       application performance. The Extrae instrumentation package can
+       instrument the MPI programin model, and the following parallel
+       programming models either alone or in conjunction with MPI :
+       OpenMP, CUDA, OpenCL, pthread, OmpSs"""
     homepage = "http://www.bsc.es/computer-sciences/extrae"
     url      = "http://www.bsc.es/ssl/apps/performanceTools/files/extrae-2.5.1.tar.bz2"
-    versions = { '2.5.1' : '422376b9c68243bd36a8a73fa62de106', }
+    version('2.5.1', '422376b9c68243bd36a8a73fa62de106')
 
     #depends_on("mpi")
     depends_on("openmpi@:1.6")
diff --git a/var/spack/packages/hwloc/package.py b/var/spack/packages/hwloc/package.py
index 57c2ae2fa9..31a31f376a 100644
--- a/var/spack/packages/hwloc/package.py
+++ b/var/spack/packages/hwloc/package.py
@@ -1,11 +1,21 @@
 from spack import *
 
 class Hwloc(Package):
-    """The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering information about modern computing hardware so as to exploit it accordingly and efficiently."""
+    """The Portable Hardware Locality (hwloc) software package
+       provides a portable abstraction (across OS, versions,
+       architectures, ...) of the hierarchical topology of modern
+       architectures, including NUMA memory nodes, sockets, shared
+       caches, cores and simultaneous multithreading. It also gathers
+       various system attributes such as cache and memory information
+       as well as the locality of I/O devices such as network
+       interfaces, InfiniBand HCAs or GPUs. It primarily aims at
+       helping applications with gathering information about modern
+       computing hardware so as to exploit it accordingly and
+       efficiently."""
     homepage = "http://www.open-mpi.org/projects/hwloc/"
     url      = "http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz"
 
-    versions = { '1.9' : '1f9f9155682fe8946a97c08896109508', }
+    version('1.9', '1f9f9155682fe8946a97c08896109508')
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
diff --git a/var/spack/packages/ompss/package.py b/var/spack/packages/ompss/package.py
index 8335ef0a80..544671de38 100644
--- a/var/spack/packages/ompss/package.py
+++ b/var/spack/packages/ompss/package.py
@@ -7,10 +7,17 @@ import glob
 #./mcxx-1.99.2/config.log:    $ ./configure --prefix=/usr/gapps/exmatex/ompss --with-nanox=/usr/gapps/exmatex/ompss --enable-ompss --with-mpi=/opt/mvapich2-intel-shmem-1.7 --enable-tl-openmp-profile --enable-tl-openmp-intel
 
 class Ompss(Package):
-    """OmpSs is an effort to integrate features from the StarSs programming model developed by BSC into a single programming model. In particular, our objective is to extend OpenMP with new directives to support asynchronous parallelism and heterogeneity (devices like GPUs). However, it can also be understood as new directives extending other accelerator based APIs like CUDA or OpenCL. Our OmpSs environment is built on top of our Mercurium compiler and Nanos++ runtime system."""
+    """OmpSs is an effort to integrate features from the StarSs
+       programming model developed by BSC into a single programming
+       model. In particular, our objective is to extend OpenMP with
+       new directives to support asynchronous parallelism and
+       heterogeneity (devices like GPUs). However, it can also be
+       understood as new directives extending other accelerator based
+       APIs like CUDA or OpenCL. Our OmpSs environment is built on top
+       of our Mercurium compiler and Nanos++ runtime system."""
     homepage = "http://pm.bsc.es/"
     url      = "http://pm.bsc.es/sites/default/files/ftp/ompss/releases/ompss-14.06.tar.gz"
-    versions  = { '14.06' : '99be5dce74c0d7eea42636d26af47b4181ae2e11' }
+    version('14.06', '99be5dce74c0d7eea42636d26af47b4181ae2e11')
 
     # all dependencies are optional, really
     depends_on("mpi")
diff --git a/var/spack/packages/papi/package.py b/var/spack/packages/papi/package.py
index 15a621985b..596f7114d6 100644
--- a/var/spack/packages/papi/package.py
+++ b/var/spack/packages/papi/package.py
@@ -2,12 +2,18 @@ from spack import *
 import os
 
 class Papi(Package):
-    """PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables software engineers to see, in near real time, the relation between software performance and processor events.
-    In addition Component PAPI provides access to a collection of components that expose performance measurement opportunites across the hardware and software stack."""
+    """PAPI provides the tool designer and application engineer with a
+       consistent interface and methodology for use of the performance
+       counter hardware found in most major microprocessors. PAPI
+       enables software engineers to see, in near real time, the
+       relation between software performance and processor events.  In
+       addition Component PAPI provides access to a collection of
+       components that expose performance measurement opportunites
+       across the hardware and software stack."""
     homepage = "http://icl.cs.utk.edu/papi/index.html"
     url      = "http://icl.cs.utk.edu/projects/papi/downloads/papi-5.3.0.tar.gz"
 
-    versions = { '5.3.0' : '367961dd0ab426e5ae367c2713924ffb', }
+    version('5.3.0', '367961dd0ab426e5ae367c2713924ffb')
 
     def install(self, spec, prefix):
         os.chdir("src/")
diff --git a/var/spack/packages/paraver/package.py b/var/spack/packages/paraver/package.py
index d437adfa5d..45bac95b28 100644
--- a/var/spack/packages/paraver/package.py
+++ b/var/spack/packages/paraver/package.py
@@ -2,13 +2,14 @@ from spack import *
 import os
 
 class Paraver(Package):
-    """"A very powerful performance visualization and analysis tool based on
-     traces that can be used to analyse any information that is expressed on its input trace format.
-      Traces for parallel MPI, OpenMP and other programs can be genereated with Extrae."""
+    """"A very powerful performance visualization and analysis tool
+        based on traces that can be used to analyse any information that
+        is expressed on its input trace format.  Traces for parallel MPI,
+        OpenMP and other programs can be genereated with Extrae."""
     homepage = "http://www.bsc.es/computer-sciences/performance-tools/paraver"
     url      = "http://www.bsc.es/ssl/apps/performanceTools/files/paraver-sources-4.5.2.tar.gz"
 
-    versions = { '4.5.2' : 'ea463dd494519395c99ebae294edee17', }
+    version('4.5.2', 'ea463dd494519395c99ebae294edee17')
 
     depends_on("boost")
     #depends_on("extrae")
@@ -22,7 +23,7 @@ class Paraver(Package):
         make("install")
 
         os.chdir("../paraver-kernel")
-		#"--with-extrae=%s" % spec['extrae'].prefix, 
+		#"--with-extrae=%s" % spec['extrae'].prefix,
         configure("--prefix=%s" % prefix, "--with-ptools-common-files=%s" % prefix, "--with-boost=%s" % spec['boost'].prefix, "--with-boost-serialization=boost_serialization")
         make()
         make("install")
@@ -33,7 +34,7 @@ class Paraver(Package):
         make("install")
 
         os.chdir("../wxparaver")
-		#"--with-extrae=%s" % spec['extrae'].prefix, 
+		#"--with-extrae=%s" % spec['extrae'].prefix,
         configure("--prefix=%s" % prefix, "--with-paraver=%s" % prefix, "--with-boost=%s" % spec['boost'].prefix, "--with-boost-serialization=boost_serialization", "--with-wxdir=%s" % spec['wx'].prefix.bin)
         make()
         make("install")
diff --git a/var/spack/packages/wx/package.py b/var/spack/packages/wx/package.py
index de12f141b8..1813a8c8a5 100644
--- a/var/spack/packages/wx/package.py
+++ b/var/spack/packages/wx/package.py
@@ -1,13 +1,20 @@
 from spack import *
 
 class Wx(Package):
-    """wxWidgets is a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base. It has popular language bindings for Python, Perl, Ruby and many other languages, and unlike other cross-platform toolkits, wxWidgets gives applications a truly native look and feel because it uses the platform's native API rather than emulating the GUI. It's also extensive, free, open-source and mature."""
+    """wxWidgets is a C++ library that lets developers create
+       applications for Windows, Mac OS X, Linux and other platforms
+       with a single code base. It has popular language bindings for
+       Python, Perl, Ruby and many other languages, and unlike other
+       cross-platform toolkits, wxWidgets gives applications a truly
+       native look and feel because it uses the platform's native API
+       rather than emulating the GUI. It's also extensive, free,
+       open-source and mature."""
     homepage = "http://www.wxwidgets.org/"
 
-    url      = "https://sourceforge.net/projects/wxwindows/files/2.8.12/wxWidgets-2.8.12.tar.gz"
-    versions = { '2.8.12' : '2fa39da14bc06ea86fe902579fedc5b1', }
-#    url      = "https://sourceforge.net/projects/wxwindows/files/3.0.1/wxWidgets-3.0.1.tar.bz2"
-#    versions = { '3.0.1' : 'dad1f1cd9d4c370cbc22700dc492da31', }
+    version('2.8.12', '2fa39da14bc06ea86fe902579fedc5b1',
+            url="https://sourceforge.net/projects/wxwindows/files/2.8.12/wxWidgets-2.8.12.tar.gz")
+    version('3.0.1', 'dad1f1cd9d4c370cbc22700dc492da31',
+            url="https://sourceforge.net/projects/wxwindows/files/3.0.1/wxWidgets-3.0.1.tar.bz2")
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix, "--enable-unicode", "--disable-precomp-headers")
diff --git a/var/spack/packages/wxpropgrid/package.py b/var/spack/packages/wxpropgrid/package.py
index 5cc244ca65..790cead517 100644
--- a/var/spack/packages/wxpropgrid/package.py
+++ b/var/spack/packages/wxpropgrid/package.py
@@ -1,11 +1,14 @@
 from spack import *
 
 class Wxpropgrid(Package):
-    """wxPropertyGrid is a property sheet control for wxWidgets. In other words, it is a specialized two-column grid for editing properties such as strings, numbers, flagsets, string arrays, and colours."""
+    """wxPropertyGrid is a property sheet control for wxWidgets. In
+       other words, it is a specialized two-column grid for editing
+       properties such as strings, numbers, flagsets, string arrays,
+       and colours."""
     homepage = "http://wxpropgrid.sourceforge.net/"
     url      = "http://prdownloads.sourceforge.net/wxpropgrid/wxpropgrid-1.4.15-src.tar.gz"
 
-    versions = { '1.4.15' : 'f44b5cd6fd60718bacfabbf7994f1e93', }
+    version('1.4.15', 'f44b5cd6fd60718bacfabbf7994f1e93')
 
     depends_on("wx")