Merge branch 'features/travis' into develop

35 files changed, 77 insertions, 97 deletions

diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index e2e3b7d6b7..01834383b8 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -27,11 +27,10 @@ from spack import *
 
 
 class Adios(Package):
-    """
-    The Adaptable IO System (ADIOS) provides a simple,
+    """The Adaptable IO System (ADIOS) provides a simple,
     flexible way for scientists to describe the
     data in their code that may need to be written,
-    read, or processed outside of the running simulation
+    read, or processed outside of the running simulation.
     """
 
     homepage = "http://www.olcf.ornl.gov/center-projects/adios/"
diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py
index 891061c62f..804460ce14 100644
--- a/var/spack/repos/builtin/packages/antlr/package.py
+++ b/var/spack/repos/builtin/packages/antlr/package.py
@@ -26,6 +26,11 @@ from spack import *
 
 
 class Antlr(Package):
+    """ANTLR (ANother Tool for Language Recognition) is a powerful parser
+    generator for reading, processing, executing, or translating structured
+    text or binary files. It's widely used to build languages, tools, and
+    frameworks. From a grammar, ANTLR generates a parser that can build and
+    walk parse trees."""
 
     homepage = "http://www.antlr.org"
     url      = "https://github.com/antlr/antlr/tarball/v2.7.7"
diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py
index 728c2345f2..0e71125d41 100644
--- a/var/spack/repos/builtin/packages/arpack-ng/package.py
+++ b/var/spack/repos/builtin/packages/arpack-ng/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class ArpackNg(Package):
-    """
-    ARPACK-NG is a collection of Fortran77 subroutines designed to solve large
+    """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large
     scale eigenvalue problems.
 
     Important Features:
@@ -53,6 +52,7 @@ class ArpackNg(Package):
 
     arpack-ng is replacing arpack almost everywhere.
     """
+
     homepage = 'https://github.com/opencollab/arpack-ng'
     url = 'https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz'
 
diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py
index be8db684f5..811d34afa8 100644
--- a/var/spack/repos/builtin/packages/asciidoc/package.py
+++ b/var/spack/repos/builtin/packages/asciidoc/package.py
@@ -26,8 +26,9 @@ from spack import *
 
 
 class Asciidoc(Package):
-    """ A presentable text document format for writing articles, UNIX man
+    """A presentable text document format for writing articles, UNIX man
     pages and other small to medium sized documents."""
+
     homepage = "http://asciidoc.org"
     url      = "http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index 815c184577..eecdcfdad7 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -26,10 +26,10 @@ from spack import *
 
 
 class Astyle(Package):
-    """
-    A Free, Fast, and Small Automatic Formatter for C, C++, C++/CLI,
+    """A Free, Fast, and Small Automatic Formatter for C, C++, C++/CLI,
     Objective-C, C#, and Java Source Code.
     """
+
     homepage = "http://astyle.sourceforge.net/"
     url      = "http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index e5aed5ed65..113bef61b8 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Caliper(Package):
-    """
-    Caliper is a generic context annotation system. It gives programmers the
+    """Caliper is a generic context annotation system. It gives programmers the
     ability to provide arbitrary program context information to (performance)
     tools at runtime.
     """
diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py
index c68b3ffc0d..35d9662f6f 100644
--- a/var/spack/repos/builtin/packages/cfitsio/package.py
+++ b/var/spack/repos/builtin/packages/cfitsio/package.py
@@ -26,11 +26,12 @@ from spack import *
 
 
 class Cfitsio(Package):
-    """
-    CFITSIO is a library of C and Fortran subroutines for reading and writing
+    """CFITSIO is a library of C and Fortran subroutines for reading and writing
     data files in FITS (Flexible Image Transport System) data format.
     """
+
     homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/'
+
     version('3.370', 'abebd2d02ba5b0503c633581e3bfa116')
 
     def url_for_version(self, v):
diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py
index d6d7f51558..85d948cc57 100644
--- a/var/spack/repos/builtin/packages/cityhash/package.py
+++ b/var/spack/repos/builtin/packages/cityhash/package.py
@@ -27,6 +27,8 @@ from spack.util.environment import *
 
 
 class Cityhash(Package):
+    """CityHash, a family of hash functions for strings."""
+
     homepage = "https://github.com/google/cityhash"
     url      = "https://github.com/google/cityhash"
 
diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py
index 09237f87c3..8c835b3886 100644
--- a/var/spack/repos/builtin/packages/cube/package.py
+++ b/var/spack/repos/builtin/packages/cube/package.py
@@ -22,13 +22,11 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
 
 
 class Cube(Package):
-    """
-    Cube the profile viewer for Score-P and Scalasca profiles. It displays a
+    """Cube the profile viewer for Score-P and Scalasca profiles. It displays a
     multi-dimensional performance space consisting of the dimensions:
     - performance metric
     - call path
diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py
index ef30c50ebe..85adeca996 100644
--- a/var/spack/repos/builtin/packages/datamash/package.py
+++ b/var/spack/repos/builtin/packages/datamash/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Datamash(Package):
-    """
-    GNU datamash is a command-line program which performs basic numeric,
+    """GNU datamash is a command-line program which performs basic numeric,
     textual and statistical operations on input textual data files.
     """
 
diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py
index 36d6850c1a..42dc24e373 100644
--- a/var/spack/repos/builtin/packages/eigen/package.py
+++ b/var/spack/repos/builtin/packages/eigen/package.py
@@ -26,10 +26,8 @@ from spack import *
 
 
 class Eigen(Package):
-    """
-    Eigen is a C++ template library for linear algebra
-
-    Matrices, vectors, numerical solvers, and related algorithms
+    """Eigen is a C++ template library for linear algebra matrices,
+    vectors, numerical solvers, and related algorithms.
     """
 
     homepage = 'http://eigen.tuxfamily.org/'
diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py
index 447964f286..3dca1ba187 100644
--- a/var/spack/repos/builtin/packages/espresso/package.py
+++ b/var/spack/repos/builtin/packages/espresso/package.py
@@ -23,17 +23,16 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
-
 import os
 
 
 class Espresso(Package):
-    """
-    QE is an integrated suite of Open-Source computer codes for
+    """QE is an integrated suite of Open-Source computer codes for
     electronic-structure calculations and materials modeling at
     the nanoscale. It is based on density-functional theory, plane
     waves, and pseudopotentials.
     """
+
     homepage = 'http://quantum-espresso.org'
     url = 'http://www.qe-forge.org/gf/download/frsrelease/204/912/espresso-5.3.0.tar.gz'
 
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py
index 4fdfafc992..4f54b3a841 100644
--- a/var/spack/repos/builtin/packages/gdal/package.py
+++ b/var/spack/repos/builtin/packages/gdal/package.py
@@ -26,14 +26,13 @@ from spack import *
 
 
 class Gdal(Package):
-    """
-    GDAL is a translator library for raster and vector geospatial
+    """GDAL is a translator library for raster and vector geospatial
     data formats that is released under an X/MIT style Open Source
     license by the Open Source Geospatial Foundation. As a library,
     it presents a single raster abstract data model and vector
     abstract data model to the calling application for all supported
     formats. It also comes with a variety of useful command line
-    utilities for data translation and processing
+    utilities for data translation and processing.
     """
 
     homepage   = "http://www.gdal.org/"
diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py
index 9145009fa4..a14e166ed4 100644
--- a/var/spack/repos/builtin/packages/gdb/package.py
+++ b/var/spack/repos/builtin/packages/gdb/package.py
@@ -22,16 +22,15 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
 
 
 class Gdb(Package):
     """GDB, the GNU Project debugger, allows you to see what is going on
-       `inside' another program while it executes -- or what another
-       program was doing at the moment it crashed.
-
+    'inside' another program while it executes -- or what another
+    program was doing at the moment it crashed.
     """
+
     homepage = "https://www.gnu.org/software/gdb"
     url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py
index 72f490e2f4..1d375f2186 100644
--- a/var/spack/repos/builtin/packages/gmsh/package.py
+++ b/var/spack/repos/builtin/packages/gmsh/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Gmsh(Package):
-    """
-    Gmsh is a free 3D finite element grid generator with a built-in CAD engine
+    """Gmsh is a free 3D finite element grid generator with a built-in CAD engine
     and post-processor. Its design goal is to provide a fast, light and
     user-friendly meshing tool with parametric input and advanced visualization
     capabilities. Gmsh is built around four modules: geometry, mesh, solver and
@@ -35,6 +34,7 @@ class Gmsh(Package):
     either interactively using the graphical user interface or in ASCII text
     files using Gmsh's own scripting language.
     """
+
     homepage = 'http://gmsh.info'
     url = 'http://gmsh.info/src/gmsh-2.11.0-source.tgz'
 
diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py
index 0659f7d650..21a6eede3f 100644
--- a/var/spack/repos/builtin/packages/libsplash/package.py
+++ b/var/spack/repos/builtin/packages/libsplash/package.py
@@ -26,10 +26,9 @@ from spack import *
 
 
 class Libsplash(Package):
-    """
-    libSplash aims at developing a HDF5-based I/O library for HPC simulations.
-    It is created as an easy-to-use frontend for the standard HDF5 library
-    with support for MPI processes in a cluster environment. While the
+    """libSplash aims at developing a HDF5-based I/O library for HPC
+    simulations. It is created as an easy-to-use frontend for the standard HDF5
+    library with support for MPI processes in a cluster environment. While the
     standard HDF5 library provides detailed low-level control, libSplash
     simplifies tasks commonly found in large-scale HPC simulations, such as
     iterative computations and MPI distributed processes.
diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py
index 69965bc423..c2daca80a5 100644
--- a/var/spack/repos/builtin/packages/lmod/package.py
+++ b/var/spack/repos/builtin/packages/lmod/package.py
@@ -27,14 +27,14 @@ from glob import glob
 
 
 class Lmod(Package):
-    """
-    Lmod is a Lua based module system that easily handles the MODULEPATH
+    """Lmod is a Lua based module system that easily handles the MODULEPATH
     Hierarchical problem. Environment Modules provide a convenient way to
     dynamically change the users' environment through modulefiles. This
     includes easily adding or removing directories to the PATH environment
     variable. Modulefiles for Library packages provide environment variables
     that specify where the library and header files can be found.
     """
+
     homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod'
     url = 'https://github.com/TACC/Lmod/archive/6.4.1.tar.gz'
 
diff --git a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py
index a61b9dd675..9e0e449813 100644
--- a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py
+++ b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class LuaLuafilesystem(Package):
-    """
-    LuaFileSystem is a Lua library developed to complement the set of
+    """LuaFileSystem is a Lua library developed to complement the set of
     functions related to file systems offered by the standard Lua distribution.
 
     LuaFileSystem offers a portable way to access the underlying directory
@@ -35,6 +34,7 @@ class LuaLuafilesystem(Package):
 
     LuaFileSystem is free software and uses the same license as Lua 5.1
     """
+
     homepage = 'http://keplerproject.github.io/luafilesystem'
     url = 'https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.tar.gz'
 
diff --git a/var/spack/repos/builtin/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py
index 113c48c18f..29e3b27d6e 100644
--- a/var/spack/repos/builtin/packages/mxml/package.py
+++ b/var/spack/repos/builtin/packages/mxml/package.py
@@ -26,10 +26,9 @@ from spack import *
 
 
 class Mxml(Package):
-    """
-    Mini-XML is a small XML library that you can use to read and write XML
+    """Mini-XML is a small XML library that you can use to read and write XML
     and XML-like data files in your application without requiring large
-    non-standard libraries
+    non-standard libraries.
     """
 
     homepage = "http://www.msweet.org"
diff --git a/var/spack/repos/builtin/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py
index 2147319d3f..0842a592cc 100644
--- a/var/spack/repos/builtin/packages/ncdu/package.py
+++ b/var/spack/repos/builtin/packages/ncdu/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Ncdu(Package):
-    """
-    Ncdu is a disk usage analyzer with an ncurses interface. It is designed
+    """Ncdu is a disk usage analyzer with an ncurses interface. It is designed
     to find space hogs on a remote server where you don't have an entire
     gaphical setup available, but it is a useful tool even on regular desktop
     systems. Ncdu aims to be fast, simple and easy to use, and should be able
diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py
index e901f8ed39..20c67716a4 100644
--- a/var/spack/repos/builtin/packages/opari2/package.py
+++ b/var/spack/repos/builtin/packages/opari2/package.py
@@ -22,13 +22,11 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
 
 
 class Opari2(Package):
-    """
-    OPARI2 is a source-to-source instrumentation tool for OpenMP and hybrid
+    """OPARI2 is a source-to-source instrumentation tool for OpenMP and hybrid
     codes. It surrounds OpenMP directives and runtime library calls with calls
     to the POMP2 measurement interface. OPARI2 will provide you with a new
     initialization method that allows for multi-directory and parallel builds
diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py
index 0003157985..d9760e2afc 100644
--- a/var/spack/repos/builtin/packages/opencoarrays/package.py
+++ b/var/spack/repos/builtin/packages/opencoarrays/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Opencoarrays(CMakePackage):
-    """
-    OpenCoarrays is an open-source software project that produces an
+    """OpenCoarrays is an open-source software project that produces an
     application binary interface (ABI) supporting coarray Fortran (CAF)
     compilers, an application programming interface (API) that supports users
     of non-CAF compilers, and an associated compiler wrapper and program
diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py
index 1bc5b04f6f..fc505e19a9 100644
--- a/var/spack/repos/builtin/packages/openjpeg/package.py
+++ b/var/spack/repos/builtin/packages/openjpeg/package.py
@@ -26,14 +26,14 @@ from spack import *
 
 
 class Openjpeg(Package):
-    """
-    OpenJPEG is an open-source JPEG 2000 codec written in C language.
+    """OpenJPEG is an open-source JPEG 2000 codec written in C language.
     It has been developed in order to promote the use of JPEG 2000, a
     still-image compression standard from the Joint Photographic
     Experts Group (JPEG).
     Since April 2015, it is officially recognized by ISO/IEC and
     ITU-T as a JPEG 2000 Reference Software.
     """
+
     homepage = "https://github.com/uclouvain/openjpeg"
     url      = "https://github.com/uclouvain/openjpeg/archive/version.2.1.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py
index 2306dace55..81c0195651 100644
--- a/var/spack/repos/builtin/packages/parallel/package.py
+++ b/var/spack/repos/builtin/packages/parallel/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Parallel(Package):
-    """
-    GNU parallel is a shell tool for executing jobs in parallel using
+    """GNU parallel is a shell tool for executing jobs in parallel using
     one or more computers. A job can be a single command or a small
     script that has to be run for each of the lines in the input.
     """
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 66e1abdf1a..73091bb182 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -27,8 +27,7 @@ from spack import *
 
 
 class Petsc(Package):
-    """
-    PETSc is a suite of data structures and routines for the scalable
+    """PETSc is a suite of data structures and routines for the scalable
     (parallel) solution of scientific applications modeled by partial
     differential equations.
     """
diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py
index 037a2eb4f3..c51f1f82a8 100644
--- a/var/spack/repos/builtin/packages/pngwriter/package.py
+++ b/var/spack/repos/builtin/packages/pngwriter/package.py
@@ -26,14 +26,13 @@ from spack import *
 
 
 class Pngwriter(Package):
-    """
-    PNGwriter is a very easy to use open source graphics library that uses PNG
-    as its output format. The interface has been designed to be as simple and
-    intuitive as possible. It supports plotting and reading pixels in the RGB
-    (red, green, blue), HSV (hue, saturation, value/brightness) and CMYK (cyan,
-    magenta, yellow, black) colour spaces, basic shapes, scaling, bilinear
-    interpolation, full TrueType antialiased and rotated text support, bezier
-    curves, opening existing PNG images and more.
+    """PNGwriter is a very easy to use open source graphics library that uses
+    PNG as its output format. The interface has been designed to be as simple
+    and intuitive as possible. It supports plotting and reading pixels in the
+    RGB (red, green, blue), HSV (hue, saturation, value/brightness) and CMYK
+    (cyan, magenta, yellow, black) colour spaces, basic shapes, scaling,
+    bilinear interpolation, full TrueType antialiased and rotated text support,
+    bezier curves, opening existing PNG images and more.
     """
 
     homepage = "http://pngwriter.sourceforge.net/"
diff --git a/var/spack/repos/builtin/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py
index c2a698b0bd..1a5b6df3d7 100644
--- a/var/spack/repos/builtin/packages/py-coverage/package.py
+++ b/var/spack/repos/builtin/packages/py-coverage/package.py
@@ -27,7 +27,7 @@ from spack import *
 
 class PyCoverage(Package):
     """ Testing coverage checker for python """
-    # FIXME: add a proper url for your package's homepage here.
+
     homepage = "http://nedbatchelder.com/code/coverage/"
     url      = "https://pypi.python.org/packages/source/c/coverage/coverage-4.0a6.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/py-prettytable/package.py b/var/spack/repos/builtin/packages/py-prettytable/package.py
index cf814733d4..fa1c17ae8c 100644
--- a/var/spack/repos/builtin/packages/py-prettytable/package.py
+++ b/var/spack/repos/builtin/packages/py-prettytable/package.py
@@ -22,16 +22,15 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-from spack import depends_on, extends, version
-from spack import Package
+from spack import *
 
 
 class PyPrettytable(Package):
-    """
-    PrettyTable is a simple Python library designed to make
+    """PrettyTable is a simple Python library designed to make
     it quick and easy to represent tabular data in visually
-    appealing ASCII tables
+    appealing ASCII tables.
     """
+
     homepage = "https://code.google.com/archive/p/prettytable/"
     url      = "https://pypi.python.org/packages/e0/a1/36203205f77ccf98f3c6cf17cf068c972e6458d7e58509ca66da949ca347/prettytable-0.7.2.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py
index 672a3ee587..5caf3ff143 100644
--- a/var/spack/repos/builtin/packages/py-tuiview/package.py
+++ b/var/spack/repos/builtin/packages/py-tuiview/package.py
@@ -26,10 +26,10 @@ from spack import *
 
 
 class PyTuiview(Package):
+    """TuiView is a lightweight raster GIS with powerful raster attribute
+    table manipulation abilities.
     """
-       TuiView is a lightweight raster GIS with powerful raster attribute
-       table manipulation abilities.
-    """
+
     homepage = "https://bitbucket.org/chchrsc/tuiview"
     url      = "https://bitbucket.org/chchrsc/tuiview/get/tuiview-1.1.7.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py
index d40e08740f..e0f7972304 100644
--- a/var/spack/repos/builtin/packages/scorep/package.py
+++ b/var/spack/repos/builtin/packages/scorep/package.py
@@ -22,15 +22,13 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
 
 
 class Scorep(Package):
-    """
-    The Score-P measurement infrastructure is a highly scalable and easy-to-use
-    tool suite for profiling, event tracing, and online analysis of HPC
-    applications.
+    """The Score-P measurement infrastructure is a highly scalable and
+    easy-to-use tool suite for profiling, event tracing, and online analysis
+    of HPC applications.
     """
 
     homepage = "http://www.vi-hps.org/projects/score-p"
diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py
index 17335603e6..7edfb44a4d 100644
--- a/var/spack/repos/builtin/packages/screen/package.py
+++ b/var/spack/repos/builtin/packages/screen/package.py
@@ -26,8 +26,7 @@ from spack import *
 
 
 class Screen(Package):
-    """
-    Screen is a full-screen window manager that multiplexes a physical
+    """Screen is a full-screen window manager that multiplexes a physical
     terminal between several processes, typically interactive shells.
     """
 
diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py
index 636aa26bd2..c591c48d19 100644
--- a/var/spack/repos/builtin/packages/swiftsim/package.py
+++ b/var/spack/repos/builtin/packages/swiftsim/package.py
@@ -22,15 +22,12 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
-
 import llnl.util.tty as tty
 
 
 class Swiftsim(Package):
-    """
-    SPH With Inter-dependent Fine-grained Tasking (SWIFT) provides
+    """SPH With Inter-dependent Fine-grained Tasking (SWIFT) provides
     astrophysicists with a state of the art framework to perform
     particle based simulations.
     """
diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py
index a77df8d37c..1801b41c37 100644
--- a/var/spack/repos/builtin/packages/tau/package.py
+++ b/var/spack/repos/builtin/packages/tau/package.py
@@ -22,21 +22,18 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
-
 import os
 import os.path
-
 from llnl.util.filesystem import join_path
 
 
 class Tau(Package):
-    """
-    A portable profiling and tracing toolkit for performance
+    """A portable profiling and tracing toolkit for performance
     analysis of parallel programs written in Fortran, C, C++, UPC,
     Java, Python.
     """
+
     homepage = "http://www.cs.uoregon.edu/research/tau"
     url      = "https://www.cs.uoregon.edu/research/tau/tau_releases/tau-2.25.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py
index d0c2d3d497..9f3ad8a4dc 100644
--- a/var/spack/repos/builtin/packages/xerces-c/package.py
+++ b/var/spack/repos/builtin/packages/xerces-c/package.py
@@ -26,9 +26,9 @@ from spack import *
 
 
 class XercesC(Package):
-    """ Xerces-C++ is a validating XML parser written in a portable subset of C++.
-    Xerces-C++ makes it easy to give your application the ability to read and
-    write XML data. A shared library is provided for parsing, generating,
+    """Xerces-C++ is a validating XML parser written in a portable subset of
+    C++. Xerces-C++ makes it easy to give your application the ability to read
+    and write XML data. A shared library is provided for parsing, generating,
     manipulating, and validating XML documents using the DOM, SAX, and SAX2
     APIs.
     """
diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py
index 4c27cd3ec2..a70d307be9 100644
--- a/var/spack/repos/builtin/packages/zsh/package.py
+++ b/var/spack/repos/builtin/packages/zsh/package.py
@@ -26,11 +26,11 @@ from spack import *
 
 
 class Zsh(Package):
+    """Zsh is a shell designed for interactive use, although it is also a
+    powerful scripting language. Many of the useful features of bash, ksh, and
+    tcsh were incorporated into zsh; many original features were added.
     """
-    Zsh is a shell designed for interactive use, although it is also a powerful
-    scripting language. Many of the useful features of bash, ksh, and tcsh were
-    incorporated into zsh; many original features were added.
-    """
+
     homepage = "http://www.zsh.org"
     url = "http://downloads.sourceforge.net/project/zsh/zsh/5.1.1/zsh-5.1.1.tar.gz"