Add top-level attributes for hg, svn, and git A-L packages

author: Adam J. Stewart <ajstewart426@gmail.com> 2018-07-23 00:00:15 -0700
committer: Todd Gamblin <tgamblin@llnl.gov> 2018-07-25 23:10:10 -0700
commit: 4c6aca533ab0596a677d041b1766e88f045d42f4 (patch)
tree: 5a60f920b31d1c8f88104bc886b3803d20ca4f26
parent: 5f00056490665ef6ddd7389966480bca7d2f3a04 (diff)
download: spack-4c6aca533ab0596a677d041b1766e88f045d42f4.tar.gz
spack-4c6aca533ab0596a677d041b1766e88f045d42f4.tar.bz2
spack-4c6aca533ab0596a677d041b1766e88f045d42f4.tar.xz
spack-4c6aca533ab0596a677d041b1766e88f045d42f4.zip
152 files changed, 461 insertions, 486 deletions
diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py
index 5ed7b7c61e..29dd02bb6c 100644
--- a/var/spack/repos/builtin/packages/accfft/package.py
+++ b/var/spack/repos/builtin/packages/accfft/package.py
@@ -31,9 +31,9 @@ class Accfft(CMakePackage, CudaPackage):
     """
 
     homepage = "http://accfft.org"
-    url = "https://github.com/amirgholami/accfft.git"
+    git      = "https://github.com/amirgholami/accfft.git"
 
-    version('develop', git='https://github.com/amirgholami/accfft.git', branch='master')
+    version('develop', branch='master')
 
     variant('pnetcdf', default=True, description='Add support for parallel NetCDF')
     variant('shared', default=True, description='Enables the build of shared libraries')
diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index 3fabaff020..69d4ca0671 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -33,18 +33,19 @@ class Adios(AutotoolsPackage):
     """
 
     homepage = "http://www.olcf.ornl.gov/center-projects/adios/"
-    url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz"
+    url      = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz"
+    git      = "https://github.com/ornladios/ADIOS.git"
+
     maintainers = ['ax3l']
 
-    version('develop', git='https://github.com/ornladios/ADIOS.git',
-            branch='master')
+    version('develop', branch='master')
     version('1.13.1', '958aed11240d7f5a065ab5ee271ecb44')
     version('1.13.0', '68af36b821debbdf4748b20320a990ce')
     version('1.12.0', '84a1c71b6698009224f6f748c5257fc9')
     version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185')
     version('1.11.0', '5eead5b2ccf962f5e6d5f254d29d5238')
     version('1.10.0', 'eff450a4c0130479417cfd63186957f3')
-    version('1.9.0', '310ff02388bbaa2b1c1710ee970b5678')
+    version('1.9.0',  '310ff02388bbaa2b1c1710ee970b5678')
 
     variant('shared', default=True,
             description='Builds a shared version of the library')
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index 2ba986af86..bda425443a 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -30,11 +30,11 @@ class Adios2(CMakePackage):
 
     homepage = "https://www.olcf.ornl.gov/center-projects/adios/"
     url      = "https://github.com/ornladios/ADIOS2/archive/v2.0.0.tar.gz"
-    maintainers = ['ax3l']
+    git      = "https://github.com/ornladios/ADIOS2.git"
 
-    version('develop', branch='master',
-            git='https://github.com/ornladios/ADIOS2.git')
+    maintainers = ['ax3l']
 
+    version('develop', branch='master')
     version('2.1.0', '431fa5b015349f1838b96b8f5a1cc8f8')
     version('2.0.0', 'da39655b51745d2c5f3f1e46c5abc4d7')
 
diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py
index b6f00b7eeb..5597c1ec7e 100644
--- a/var/spack/repos/builtin/packages/adol-c/package.py
+++ b/var/spack/repos/builtin/packages/adol-c/package.py
@@ -29,11 +29,12 @@ class AdolC(AutotoolsPackage):
     """A package for the automatic differentiation of first and higher
     derivatives of vector functions in C and C++ programs by operator
     overloading."""
+
     homepage = "https://projects.coin-or.org/ADOL-C"
     url      = "http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.6.1.tgz"
+    git      = "https://gitlab.com/adol-c/adol-c.git"
 
-    version('develop',  git='https://gitlab.com/adol-c/adol-c.git',
-            branch='master')
+    version('develop',  branch='master')
     version('2.6.3', 'f78f67f70d5874830a1ad1c0f54e54f7')
     version('2.6.2', '0f9547584c99c0673e4f81cf64e8d865')
     version('2.6.1', '1032b28427d6e399af4610e78c0f087b')
diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py
index 40b7a286aa..eccbe67ce1 100644
--- a/var/spack/repos/builtin/packages/albany/package.py
+++ b/var/spack/repos/builtin/packages/albany/package.py
@@ -34,11 +34,11 @@ class Albany(CMakePackage):
        ice-sheet flow, quantum device modeling, and many other applications."""
 
     homepage = "http://gahansen.github.io/Albany"
-    url      = "https://github.com/gahansen/Albany/tarball/master"
+    git      = "https://github.com/gahansen/Albany.git"
 
     maintainers = ['gahansen']
 
-    version('develop', git='https://github.com/gahansen/Albany.git', branch='master')
+    version('develop', branch='master')
 
     variant('lcm',          default=True,
             description='Enable LCM')
diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py
index e579e8bbfe..467f5740be 100644
--- a/var/spack/repos/builtin/packages/alquimia/package.py
+++ b/var/spack/repos/builtin/packages/alquimia/package.py
@@ -30,10 +30,11 @@ class Alquimia(CMakePackage):
     of mature geochemistry codes such as CrunchFlow and PFLOTRAN"""
 
     homepage = "https://github.com/LBL-EESA/alquimia-dev"
+    git      = "https://github.com/LBL-EESA/alquimia-dev.git"
 
-    version('xsdk-0.3.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.3.0')
-    version('xsdk-0.2.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.2.0')
-    version('develop', git='https://github.com/LBL-EESA/alquimia-dev.git')
+    version('develop')
+    version('xsdk-0.3.0', tag='xsdk-0.3.0')
+    version('xsdk-0.2.0', tag='xsdk-0.2.0')
 
     variant('shared', default=True,
             description='Enables the build of shared libraries')
diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py
index f8a7c2745d..f2745ed26d 100644
--- a/var/spack/repos/builtin/packages/amg/package.py
+++ b/var/spack/repos/builtin/packages/amg/package.py
@@ -35,8 +35,8 @@ class Amg(MakefilePackage):
     homepage = "https://codesign.llnl.gov/amg2013.php"
     git      = "https://github.com/LLNL/AMG"
 
-    version('1.0', git=git, tag='1.0')
-    version('develop', git=git, branch='master')
+    version('develop', branch='master')
+    version('1.0', tag='1.0')
 
     variant('openmp', default=True, description='Build with OpenMP support')
     variant('optflags', default=False, description='Additional optimizations')
diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py
index 0e232e6a50..e80b924b11 100644
--- a/var/spack/repos/builtin/packages/amp/package.py
+++ b/var/spack/repos/builtin/packages/amp/package.py
@@ -41,14 +41,11 @@ class Amp(CMakePackage):
     to allow application domain scientists, computer scientists and
     mathematicians to simulate, collaborate, and conduct research on
     various aspects of massively parallel simulation algorithms."""
-    homepage = "https://bitbucket.org/AdvancedMultiPhysics/amp"
-
-    # ###################### Versions ##########################
-    version("develop", hg="https://bitbucket.org/AdvancedMultiPhysics/amp")
 
-    # ###################### Variants ##########################
+    homepage = "https://bitbucket.org/AdvancedMultiPhysics/amp"
+    hg       = homepage
 
-    # ###################### Dependencies ##########################
+    version('develop')
 
     # Everything should be compiled position independent (-fpic)
     depends_on('blas')
diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py
index d19f429421..4810af5e25 100644
--- a/var/spack/repos/builtin/packages/amrex/package.py
+++ b/var/spack/repos/builtin/packages/amrex/package.py
@@ -31,11 +31,11 @@ class Amrex(CMakePackage):
     """
 
     homepage = "https://ccse.lbl.gov/AMReX/index.html"
-    url      = "https://github.com/AMReX-Codes/amrex.git"
+    git      = "https://github.com/AMReX-Codes/amrex.git"
 
-    version('17.06', git='https://github.com/AMReX-Codes/amrex.git', commit='836d3c7')
-    version('master', git='https://github.com/AMReX-Codes/amrex.git', tag='master')
-    version('develop', git='https://github.com/AMReX-Codes/amrex.git', tag='development')
+    version('develop', tag='development')
+    version('master', tag='master')
+    version('17.06', commit='836d3c7')
 
     variant('dims',
         default='3',
diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py
index 049b70d03d..ca72e9e8eb 100644
--- a/var/spack/repos/builtin/packages/amrvis/package.py
+++ b/var/spack/repos/builtin/packages/amrvis/package.py
@@ -32,10 +32,9 @@ class Amrvis(MakefilePackage):
     """
 
     homepage = "https://github.com/AMReX-Codes/Amrvis"
-    url      = "https://github.com/AMReX-Codes/Amrvis.git"
+    git      = "https://github.com/AMReX-Codes/Amrvis.git"
 
-    version('master',
-            git='https://github.com/AMReX-Codes/Amrvis.git', tag='master')
+    version('master', tag='master')
 
     variant(
         'dims',
diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py
index 1d99f62157..76a1929b2d 100644
--- a/var/spack/repos/builtin/packages/arpack-ng/package.py
+++ b/var/spack/repos/builtin/packages/arpack-ng/package.py
@@ -54,13 +54,14 @@ class ArpackNg(Package):
     """
 
     homepage = 'https://github.com/opencollab/arpack-ng'
-    url = 'https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz'
+    url      = 'https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz'
+    git      = 'https://github.com/opencollab/arpack-ng.git'
 
+    version('develop', branch='master')
     version('3.6.0', 'f2607c1d5f80e922d55751fbed86a8ec')
     version('3.5.0', '9762c9ae6d739a9e040f8201b1578874')
     version('3.4.0', 'ae9ca13f2143a7ea280cb0e2fd4bfae4')
     version('3.3.0', 'ed3648a23f0a868a43ef44c97a21bad5')
-    version('develop', git='https://github.com/opencollab/arpack-ng.git', branch='master')
 
     variant('shared', default=True,
             description='Enables the build of shared libraries')
diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py
index 22a3da578b..018221fe6c 100644
--- a/var/spack/repos/builtin/packages/ascent/package.py
+++ b/var/spack/repos/builtin/packages/ascent/package.py
@@ -47,14 +47,11 @@ class Ascent(Package):
     simulations."""
 
     homepage = "https://github.com/Alpine-DAV/ascent"
-    url      = "https://github.com/Alpine-DAV/ascent"
+    git      = "https://github.com/Alpine-DAV/ascent.git"
 
     maintainers = ['cyrush']
 
-    version('develop',
-            git='https://github.com/Alpine-DAV/ascent.git',
-            branch='develop',
-            submodules=True)
+    version('develop', branch='develop', submodules=True)
 
     ###########################################################################
     # package variants
diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py
index 69ec2c0d1f..e58c8ade24 100644
--- a/var/spack/repos/builtin/packages/aspa/package.py
+++ b/var/spack/repos/builtin/packages/aspa/package.py
@@ -32,12 +32,14 @@ class Aspa(MakefilePackage):
     demands upon the exascale ecosystem that need to be identified and
     quantified.
     """
-    tags = ['proxy-app']
+
     homepage = "http://www.exmatex.org/aspa.html"
-    url = "https://github.com/exmatex/ASPA/archive/master.tar.gz"
+    git      = "https://github.com/exmatex/ASPA.git"
+
+    tags = ['proxy-app']
+
+    version('master', branch='master')
 
-    version('master', git='https://github.com/exmatex/ASPA.git',
-            description='master')
     variant('mpi', default=True, description='Build with MPI Support')
 
     depends_on('lapack')
diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py
index c55494f521..f19f6b470b 100644
--- a/var/spack/repos/builtin/packages/aspect/package.py
+++ b/var/spack/repos/builtin/packages/aspect/package.py
@@ -31,11 +31,12 @@ class Aspect(CMakePackage):
 
     homepage = "https://aspect.geodynamics.org"
     url      = "https://github.com/geodynamics/aspect/releases/download/v2.0.0/aspect-2.0.0.tar.gz"
+    git      = "https://github.com/geodynamics/aspect.git"
 
     maintainers = ['tjhei']
 
+    version('develop', branch='master')
     version('2.0.0', 'dfecc571fb221f28a0800034cd29c95c')
-    version('develop', git='https://github.com/geodynamics/aspect.git', branch='master')
 
     variant('build_type', default='Release',
             description='The build type to build',
diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py
index a9198a2ff6..21ba3f797e 100644
--- a/var/spack/repos/builtin/packages/axl/package.py
+++ b/var/spack/repos/builtin/packages/axl/package.py
@@ -40,11 +40,12 @@ class Axl(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/AXL"
     url      = "https://github.com/ECP-VeloC/AXL/archive/v0.1.0.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/axl.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('0.1.0', '1ff16c046c3a080c252e0bf4251b83bc')
-    version('master', git='https://github.com/ecp-veloc/axl.git',
-            branch='master')
 
     variant('async_api', default='daemon',
             description="Set of async transfer APIs to enable",
diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py
index ff860baf77..71de10bc22 100644
--- a/var/spack/repos/builtin/packages/bash-completion/package.py
+++ b/var/spack/repos/builtin/packages/bash-completion/package.py
@@ -27,12 +27,14 @@ from spack import *
 
 class BashCompletion(AutotoolsPackage):
     """Programmable completion functions for bash."""
+
     homepage = "https://github.com/scop/bash-completion"
-    url = "https://github.com/scop/bash-completion/archive/2.3.tar.gz"
+    url      = "https://github.com/scop/bash-completion/archive/2.3.tar.gz"
+    git      = "https://github.com/scop/bash-completion.git"
 
+    version('develop',  git=git)
     version('2.7', 'f72c9e2e877d188c3159956a3496a450e7279b76')
     version('2.3', '67e50f5f3c804350b43f2b664c33dde811d24292')
-    version('develop',  git='https://github.com/scop/bash-completion.git')
 
     # Build dependencies
     depends_on('automake', type='build')
diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py
index 7c05e7d4b9..7144e468d2 100644
--- a/var/spack/repos/builtin/packages/bbcp/package.py
+++ b/var/spack/repos/builtin/packages/bbcp/package.py
@@ -27,10 +27,11 @@ from spack import *
 
 class Bbcp(Package):
     """Securely and quickly copy data from source to target"""
+
     homepage = "http://www.slac.stanford.edu/~abh/bbcp/"
+    git      = "http://www.slac.stanford.edu/~abh/bbcp/bbcp.git"
 
-    version('git', git='http://www.slac.stanford.edu/~abh/bbcp/bbcp.git',
-            branch="master")
+    version('git', branch='master')
 
     depends_on('zlib')
     depends_on('openssl')
diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py
index 98a309aeb3..24546d01d3 100644
--- a/var/spack/repos/builtin/packages/benchmark/package.py
+++ b/var/spack/repos/builtin/packages/benchmark/package.py
@@ -30,12 +30,12 @@ class Benchmark(CMakePackage):
 
     homepage = "https://github.com/google/benchmark"
     url      = "https://github.com/google/benchmark/archive/v1.1.0.tar.gz"
-
-    version('develop', branch='master',
-            git='https://github.com/google/benchmark.git')
+    git      = "https://github.com/google/benchmark.git"
 
     # first properly installed CMake config packages in
     # 1.2.0 release: https://github.com/google/benchmark/issues/363
+
+    version('develop', branch='master')
     version('1.4.0', 'ccfaf2cd93ae20191b94f730b945423e')
     version('1.3.0', '19ce86516ab82d6ad3b17173cf307aac')
     version('1.2.0', '48d0b090cd7a84af2c4a28c8dc963c74')
diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py
index b8337713f0..30435af0e3 100644
--- a/var/spack/repos/builtin/packages/biopieces/package.py
+++ b/var/spack/repos/builtin/packages/biopieces/package.py
@@ -32,10 +32,10 @@ class Biopieces(Package):
        simple and complex tasks."""
 
     homepage = "http://maasha.github.io/biopieces/"
-    url      = "https://github.com/maasha/biopieces/archive/2.0.tar.gz"
+    git      = "https://github.com/maasha/biopieces.git"
 
     version('2016-04-12', commit='982f80f7c55e2cae67737d80fe35a4e784762856',
-            git='https://github.com/maasha/biopieces.git', submodules=True)
+            submodules=True)
 
     depends_on('perl', type=('build', 'run'))
     depends_on('perl-module-build', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py
index 093cfab3c4..fe9b04d26b 100644
--- a/var/spack/repos/builtin/packages/bml/package.py
+++ b/var/spack/repos/builtin/packages/bml/package.py
@@ -32,12 +32,13 @@ class Bml(CMakePackage):
 
     homepage = "http://lanl.github.io/bml/"
     url      = "https://github.com/lanl/bml/tarball/v1.2.2"
+    git      = "https://github.com/lanl/bml.git"
 
+    version('develop', branch='master')
     version('1.3.0', '2bf8546b27a89666dab3e8f4873cd117')
     version('1.2.3', '8133137fb56a27fade44d1588449c2ac')
     version('1.2.2', 'c86959cb0188e9d0a9a2cbad03b2782d')
     version('1.1.0', '271adecee08aee678be9eeceee06b6fb')
-    version('develop', git='https://github.com/lanl/bml', branch='master')
 
     variant('shared', default=True, description='Build shared libs')
     variant('mpi', default=True, description='Build with MPI Support')
diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py
index 56f9acabb8..1a2a39a8e1 100644
--- a/var/spack/repos/builtin/packages/bohrium/package.py
+++ b/var/spack/repos/builtin/packages/bohrium/package.py
@@ -32,15 +32,16 @@ import os
 class Bohrium(CMakePackage, CudaPackage):
     """Library for automatic acceleration of array operations"""
 
-    homepage    = "http://bh107.org"
-    url         = "https://github.com/bh107/bohrium/archive/v0.8.9.tar.gz"
+    homepage = "http://bh107.org"
+    url      = "https://github.com/bh107/bohrium/archive/v0.8.9.tar.gz"
+    git      = "https://github.com/bh107/bohrium.git"
+
     maintainers = ['mfherbst']
 
     #
     # Versions
     #
-    version("develop", git="https://github.com/bh107/bohrium.git",
-            branch="master")
+    version("develop", branch="master")
     version('0.9.0', sha256="6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93")
 
     #
diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py
index 8fe1e13dfc..eb2b0c100b 100644
--- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py
+++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py
@@ -26,18 +26,15 @@ from spack import *
 
 
 class BookleafCpp(CMakePackage):
-    """
-    BookLeaf is a 2D unstructured hydrodynamics mini-app.
-    """
+    """BookLeaf is a 2D unstructured hydrodynamics mini-app."""
 
     homepage = "https://github.com/UK-MAC/BookLeaf_Cpp"
     url      = "https://github.com/UK-MAC/BookLeaf_Cpp/archive/v2.0.tar.gz"
+    git      = "https://github.com/UK-MAC/BookLeaf_Cpp.git"
 
-    version('develop', git='https://github.com/UK-MAC/BookLeaf_Cpp',
-            branch='develop')
-
+    version('develop', branch='develop')
     version('2.0.1', '34a5a9e7b2b5ffc98562656a4406ba5b')
-    version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85')
+    version('2.0',   '69819ebcbae5eaa63d1a4de2c77cac85')
 
     variant('typhon', default=True, description='Use Typhon')
     variant('parmetis', default=False, description='Use ParMETIS')
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 8ec6b24593..6fac5541c7 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -38,30 +38,21 @@ class Boost(Package):
     """
     homepage = "http://www.boost.org"
     url      = "http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2"
+    git      = "https://github.com/boostorg/boost.git"
     list_url = "http://sourceforge.net/projects/boost/files/boost/"
     list_depth = 1
 
-    version('develop',
-            git='https://github.com/boostorg/boost.git',
-            branch='develop',
-            submodules=True)
-
-    version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae',
-            url='https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2')
-    version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459',
-            url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2')
-    version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d',
-            url='https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2')
-    version('1.65.0', '5512d3809801b0a1b9dd58447b70915d',
-            url='https://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.bz2')
+    version('develop', branch='develop', submodules=True)
+    version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae')
+    version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459')
+    version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d')
+    version('1.65.0', '5512d3809801b0a1b9dd58447b70915d')
     # NOTE: 1.64.0 seems fine for *most* applications, but if you need
     #       +python and +mpi, there seem to be errors with out-of-date
     #       API calls from mpi/python.
     #       See: https://github.com/spack/spack/issues/3963
-    version('1.64.0', '93eecce2abed9d2442c9676914709349',
-            url='https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2')
-    version('1.63.0', '1c837ecd990bb022d07e7aab32b09847',
-            url='https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.bz2')
+    version('1.64.0', '93eecce2abed9d2442c9676914709349')
+    version('1.63.0', '1c837ecd990bb022d07e7aab32b09847')
     version('1.62.0', '5fb94629535c19e48703bdb2b2e9490f')
     version('1.61.0', '6095876341956f65f9d35939ccea1a9f')
     version('1.60.0', '65a840e1a0b13a558ff19eeb2c4f0cbe')
@@ -182,7 +173,11 @@ class Boost(Package):
     patch('boost_1.63.0_pgi_17.4_workaround.patch', when='@1.63.0%pgi@17.4')
 
     def url_for_version(self, version):
-        url = "http://downloads.sourceforge.net/project/boost/boost/{0}/boost_{1}.tar.bz2"
+        if version >= Version('1.63.0'):
+            url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2"
+        else:
+            url = "http://downloads.sourceforge.net/project/boost/boost/{0}/boost_{1}.tar.bz2"
+
         return url.format(version.dotted, version.underscored)
 
     def determine_toolset(self, spec):
diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py
index 8546fe396f..999a08d891 100644
--- a/var/spack/repos/builtin/packages/branson/package.py
+++ b/var/spack/repos/builtin/packages/branson/package.py
@@ -32,10 +32,11 @@ class Branson(CMakePackage):
 
     homepage = "https://github.com/lanl/branson"
     url      = "https://github.com/lanl/branson/archive/1.01.zip"
+    git      = "https://github.com/lanl/branson"
 
     tags = ['proxy-app']
 
-    version('develop', git='https://github.com/lanl/branson', branch='develop')
+    version('develop', branch='develop')
     version('1.01', 'cf7095a887a8dd7d417267615bd0452a')
 
     depends_on('mpi@2:')
diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py
index 2396bf5354..570fd76230 100644
--- a/var/spack/repos/builtin/packages/breakdancer/package.py
+++ b/var/spack/repos/builtin/packages/breakdancer/package.py
@@ -37,10 +37,9 @@ class Breakdancer(CMakePackage):
     100bp) using normally mapped read pairs.."""
 
     homepage = "http://gmt.genome.wustl.edu/packages/breakdancer"
-    url      = "https://github.com/genome/breakdancer.git"
+    git      = "https://github.com/genome/breakdancer.git"
 
-    version('master', git='https://github.com/genome/breakdancer.git',
-            submodules='true')
+    version('master', submodules='true')
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/brigand/package.py b/var/spack/repos/builtin/packages/brigand/package.py
index 2431de57e1..dddff731c0 100644
--- a/var/spack/repos/builtin/packages/brigand/package.py
+++ b/var/spack/repos/builtin/packages/brigand/package.py
@@ -27,15 +27,13 @@ from spack import *
 
 
 class Brigand(Package):
-    """
-    Brigand Meta-programming library
-    """
+    """Brigand Meta-programming library"""
 
     homepage = "https://github.com/edouarda/brigand"
     url      = "https://github.com/edouarda/brigand/archive/1.0.0.tar.gz"
+    git      = "https://github.com/edouarda/brigand.git"
 
-    version('master', git='https://github.com/edouarda/brigand.git',
-            branch='master')
+    version('master', branch='master')
     version('1.3.0', '0bea9713b3b712229aed289e218d577b')
     version('1.2.0', '32c0f73e7e666d33ff123334f5c9c92f')
     version('1.1.0', '073b7c8e2cbda3a81bbeb1ea5b9ca0eb')
diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py
index 48c4c50719..a6b97da35d 100644
--- a/var/spack/repos/builtin/packages/busco/package.py
+++ b/var/spack/repos/builtin/packages/busco/package.py
@@ -31,14 +31,14 @@ class Busco(PythonPackage):
 
     homepage = "http://busco.ezlab.org/"
     url      = "https://gitlab.com/api/v4/projects/ezlab%2Fbusco/repository/archive.tar.gz?sha=2.0.1"
+    git      = "https://gitlab.com/ezlab/busco.git"
 
     # TODO: check the installation procedure for version 3.0.2
     # and uncomment the following line
     # version('3.0.2', '31d80042bb7e96422843fa43d0acbd21')
 
     # There is no tag for version 3.0.1
-    version('3.0.1', git='https://gitlab.com/ezlab/busco.git',
-            commit='078252e00399550d7b0e8941cd4d986c8e868a83')
+    version('3.0.1', commit='078252e00399550d7b0e8941cd4d986c8e868a83')
     version('2.0.1', '4dbcc8a0c18fa8f8312c103eb2fbb4e2')
 
     depends_on('python', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index 6c9a5a4064..b2ba46253f 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -36,18 +36,18 @@ class Caliper(CMakePackage):
     """
 
     homepage = "https://github.com/LLNL/Caliper"
-    url      = ""
+    git      = "https://github.com/LLNL/Caliper.git"
 
-    version('master', git='https://github.com/LLNL/Caliper.git')
-    version('1.7.0',  git='https://github.com/LLNL/Caliper.git', tag='v1.7.0')
+    version('master')
+    version('1.7.0', tag='v1.7.0')
     # version 1.6.0 is broken b/c it downloads the wrong gotcha version
-    version('1.6.0',  git='https://github.com/LLNL/Caliper.git', tag='v1.6.0')
+    version('1.6.0', tag='v1.6.0')
 
     is_linux = sys.platform.startswith('linux')
 
-    variant('mpi', default=True, 
+    variant('mpi', default=True,
             description='Enable MPI wrappers')
-    variant('dyninst', default=False, 
+    variant('dyninst', default=False,
             description='Enable symbol translation support with dyninst')
     # libunwind has some issues on Mac
     variant('callpath', default=sys.platform != 'darwin',
diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py
index 147c2181e7..715c19f041 100644
--- a/var/spack/repos/builtin/packages/camellia/package.py
+++ b/var/spack/repos/builtin/packages/camellia/package.py
@@ -31,10 +31,11 @@ class Camellia(CMakePackage):
     """
 
     homepage = "https://bitbucket.org/nateroberts/Camellia"
-    url      = "https://bitbucket.org/nateroberts/camellia.git"
+    git      = "https://bitbucket.org/nateroberts/camellia.git"
 
     maintainers = ['CamelliaDPG']
-    version('master', git='https://bitbucket.org/nateroberts/camellia.git', branch='master')
+
+    version('master', branch='master')
 
     variant('moab', default=True, description='Compile with MOAB to include support for reading standard mesh formats')
 
diff --git a/var/spack/repos/builtin/packages/cares/package.py b/var/spack/repos/builtin/packages/cares/package.py
index 23d2eacaab..894f646c00 100644
--- a/var/spack/repos/builtin/packages/cares/package.py
+++ b/var/spack/repos/builtin/packages/cares/package.py
@@ -30,10 +30,9 @@ class Cares(CMakePackage):
 
     homepage = "https://c-ares.haxx.se"
     url      = "https://github.com/c-ares/c-ares/archive/cares-1_13_0.tar.gz"
+    git      = "https://github.com/c-ares/c-ares.git"
 
-    version('develop', branch='master',
-            git='https://github.com/c-ares/c-ares.git')
-
+    version('develop', branch='master')
     version('1.13.0', 'cdb21052a7eb85261da22f83c0654cfd')
 
     def url_for_version(self, version):
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
index 6e9a2beea1..668cd5c8d5 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
@@ -48,13 +48,10 @@ class CbtfArgonavisGui(QMakePackage):
        performance information by loading in the Sqlite database files.
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
-    url = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git"
+    git      = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git"
 
-    version('1.3.0.0', branch='1.3.0.0',
-            git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git')
-
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git')
+    version('develop', branch='master')
+    version('1.3.0.0', branch='1.3.0.0')
 
     depends_on("cmake@3.0.2:", type='build')
 
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
index 9fe4752e41..0ec1114211 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
@@ -46,19 +46,13 @@ from spack import *
 class CbtfArgonavis(CMakePackage):
     """CBTF Argo Navis project contains the CUDA collector and supporting
        libraries that was done as a result of a DOE SBIR grant.
-
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
-    url = "https://github.com/OpenSpeedShop/cbtf-argonavis.git"
-
-    version('1.9.1.1', branch='1.9.1.1',
-            git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
-
-    version('1.9.1.0', branch='1.9.1.0',
-            git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
+    git      = "https://github.com/OpenSpeedShop/cbtf-argonavis.git"
 
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
+    version('develop', branch='master')
+    version('1.9.1.1', branch='1.9.1.1')
+    version('1.9.1.0', branch='1.9.1.0')
 
     variant('cti', default=False,
             description="Build MRNet with the CTI startup option")
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index bdf17ddd4b..6ca54a8433 100644
--- a/var/spack/repos/builtin/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
@@ -50,19 +50,13 @@ class CbtfKrell(CMakePackage):
        CBTF project.  These contributions include many performance data
        collectors and support libraries as well as some example tools
        that drive the data collection at HPC levels of scale.
-
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
-    url = "https://github.com/OpenSpeedShop/cbtf-krell.git"
-
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/cbtf-krell.git')
-
-    version('1.9.1.1', branch='1.9.1.1',
-            git='https://github.com/OpenSpeedShop/cbtf-krell.git')
+    git      = "https://github.com/OpenSpeedShop/cbtf-krell.git"
 
-    version('1.9.1.0', branch='1.9.1.0',
-            git='https://github.com/OpenSpeedShop/cbtf-krell.git')
+    version('develop', branch='master')
+    version('1.9.1.1', branch='1.9.1.1')
+    version('1.9.1.0', branch='1.9.1.0')
 
     # MPI variants
     variant('openmpi', default=False,
diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index e52652e862..b61723575b 100644
--- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
@@ -46,17 +46,13 @@ from spack import *
 class CbtfLanl(CMakePackage):
     """CBTF LANL project contains a memory tool and data center type system
        command monitoring tool."""
-    homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
-    url = "https://github.com/OpenSpeedShop/cbtf-lanl.git"
-
-    version('1.9.1.1', branch='1.9.1.1',
-            git='https://github.com/OpenSpeedShop/cbtf-lanl.git')
 
-    version('1.9.1.0', branch='1.9.1.0',
-            git='https://github.com/OpenSpeedShop/cbtf-lanl.git')
+    homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
+    git      = "https://github.com/OpenSpeedShop/cbtf-lanl.git"
 
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/cbtf-lanl.git')
+    version('develop', branch='master')
+    version('1.9.1.1', branch='1.9.1.1')
+    version('1.9.1.0', branch='1.9.1.0')
 
     variant('build_type', default='None', values=('None'),
             description='CMake build type')
diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py
index 7a1ac536f5..e50b205180 100644
--- a/var/spack/repos/builtin/packages/cbtf/package.py
+++ b/var/spack/repos/builtin/packages/cbtf/package.py
@@ -51,17 +51,11 @@ class Cbtf(CMakePackage):
 
     """
     homepage = "http://sourceforge.net/p/cbtf/wiki/Home"
-    url = "https://github.com/OpenSpeedShop/cbtf.git"
+    git      = "https://github.com/OpenSpeedShop/cbtf.git"
 
-    # Use when the git repository is available
-    version('1.9.1.1', branch='1.9.1.1',
-            git='https://github.com/OpenSpeedShop/cbtf.git')
-
-    version('1.9.1.0', branch='1.9.1.0',
-            git='https://github.com/OpenSpeedShop/cbtf.git')
-
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/cbtf.git')
+    version('develop', branch='master')
+    version('1.9.1.1', branch='1.9.1.1')
+    version('1.9.1.0', branch='1.9.1.0')
 
     variant('cti', default=False,
             description="Build MRNet with the CTI startup option")
diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py
index 5eda8af773..c1e2b519cb 100644
--- a/var/spack/repos/builtin/packages/cdbfasta/package.py
+++ b/var/spack/repos/builtin/packages/cdbfasta/package.py
@@ -29,9 +29,9 @@ class Cdbfasta(MakefilePackage):
     """Fast indexing and retrieval of fasta records from flat file databases"""
 
     homepage = "https://github.com/gpertea/cdbfasta"
-    url      = "https://github.com/gpertea/cdbfasta"
+    git      = "https://github.com/gpertea/cdbfasta.git"
 
-    version('2017-03-16', git='https://github.com/gpertea/cdbfasta.git', commit='b3e481fe02dfbc767a3842bcb1b687c60376a5e8')
+    version('2017-03-16', commit='b3e481fe02dfbc767a3842bcb1b687c60376a5e8')
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py
index b232e97442..fcd81db8de 100644
--- a/var/spack/repos/builtin/packages/charm/package.py
+++ b/var/spack/repos/builtin/packages/charm/package.py
@@ -38,9 +38,9 @@ class Charm(Package):
 
     homepage = "http://charmplusplus.org"
     url      = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz"
+    git      = "https://github.com/UIUC-PPL/charm"
 
-    version("develop", git="https://github.com/UIUC-PPL/charm")
-
+    version("develop", git=git)
     version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d")
     version("6.8.1", "3e95ffa760909154ef16b643c9bb8193")
     version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba")
diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py
index 8baa39cc73..74717b88d4 100644
--- a/var/spack/repos/builtin/packages/chombo/package.py
+++ b/var/spack/repos/builtin/packages/chombo/package.py
@@ -34,14 +34,13 @@ class Chombo(MakefilePackage):
        logically rectangular (i.e. Cartesian) grids."""
 
     homepage = "https://commons.lbl.gov/display/chombo"
-    url      = "http://bitbucket.org/drhansj/chombo-xsdk.git"
+    git      = "http://bitbucket.org/drhansj/chombo-xsdk.git"
 
     tags = ['ecp', 'ecp-apps']
 
     # Use whatever path Brian V. and Terry L. agreed upon, but preserve version
-    version('3.2', git='http://bitbucket.org/drhansj/chombo-xsdk.git', commit='71d856c')
-    version('develop', git='http://bitbucket.org/drhansj/chombo-xsdk.git', tag='master')
-#    version('3.2', svn='https://anag-repo.lbl.gov/svn/Chombo/release/3.2')
+    version('3.2', commit='71d856c')
+    version('develop', tag='master')
 
     variant('mpi', default=True, description='Enable MPI parallel support')
     variant('hdf5', default=True, description='Enable HDF5 support')
diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py
index 70856c6c8b..02200ace49 100644
--- a/var/spack/repos/builtin/packages/cityhash/package.py
+++ b/var/spack/repos/builtin/packages/cityhash/package.py
@@ -29,12 +29,10 @@ class Cityhash(AutotoolsPackage):
     """CityHash, a family of hash functions for strings."""
 
     homepage = "https://github.com/google/cityhash"
-    url      = "https://github.com/google/cityhash"
+    git      = "https://github.com/google/cityhash.git"
 
-    version('2013-07-31', git='https://github.com/google/cityhash.git',
-            commit='8af9b8c2b889d80c22d6bc26ba0df1afb79a30db')
-    version('master', branch='master',
-            git='https://github.com/google/cityhash.git')
+    version('master', branch='master')
+    version('2013-07-31', commit='8af9b8c2b889d80c22d6bc26ba0df1afb79a30db')
 
     def configure_args(self):
         return ['--enable-sse4.2']
diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py
index ec31849a54..e6165b63de 100644
--- a/var/spack/repos/builtin/packages/clamr/package.py
+++ b/var/spack/repos/builtin/packages/clamr/package.py
@@ -32,10 +32,10 @@ class Clamr(CMakePackage):
     """
 
     homepage = "https://github.com/lanl/CLAMR"
-    url      = "https://github.com/lanl/CLAMR.git"
+    git      = "https://github.com/lanl/CLAMR.git"
     tags     = ['proxy-app']
 
-    version('master', git='https://github.com/lanl/CLAMR.git')
+    version('master')
 
     variant(
         'graphics', default='opengl',
diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py
index f2488de89c..ec5e5ecdaa 100644
--- a/var/spack/repos/builtin/packages/cleverleaf/package.py
+++ b/var/spack/repos/builtin/packages/cleverleaf/package.py
@@ -31,14 +31,12 @@ class Cleverleaf(CMakePackage):
        Livermore National Laboratory. The primary goal of CleverLeaf is
        to evaluate the application of AMR to the Lagrangian-Eulerian
        hydrodynamics scheme used by CloverLeaf.
-
     """
 
     homepage = "http://uk-mac.github.io/CleverLeaf/"
-    url      = "https://github.com/UK-MAC/CleverLeaf/tarball/master"
+    git      = "https://github.com/UK-MAC/CleverLeaf_ref.git"
 
-    version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git',
-            branch='develop')
+    version('develop', branch='develop')
 
     depends_on('samrai@3.8.0:')
     depends_on('hdf5+mpi')
diff --git a/var/spack/repos/builtin/packages/cnmem/package.py b/var/spack/repos/builtin/packages/cnmem/package.py
index 573b72f1ad..555db814f0 100644
--- a/var/spack/repos/builtin/packages/cnmem/package.py
+++ b/var/spack/repos/builtin/packages/cnmem/package.py
@@ -27,8 +27,10 @@ from spack import *
 
 class Cnmem(CMakePackage):
     """CNMem mempool for CUDA devices"""
+
     homepage = "https://github.com/NVIDIA/cnmem"
+    git      = "https://github.com/NVIDIA/cnmem.git"
 
-    version('git', git='https://github.com/NVIDIA/cnmem.git', branch="master")
+    version('git', branch='master')
 
     depends_on('cmake@2.8.8:', type='build')
diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py
index 0112281c5a..52c7e16abe 100644
--- a/var/spack/repos/builtin/packages/cnpy/package.py
+++ b/var/spack/repos/builtin/packages/cnpy/package.py
@@ -31,9 +31,9 @@ class Cnpy(CMakePackage):
     """cnpy: library to read/write .npy and .npz files in C/C++."""
 
     homepage = "https://github.com/rogersce/cnpy"
-    url      = "https://github.com/rogersce/cnpy"
+    git      = "https://github.com/rogersce/cnpy.git"
 
-    version('master', git='https://github.com/rogersce/cnpy.git', branch="master")
+    version('master', branch='master')
 
     def cmake_args(self):
         args = []
diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py
index 52d4e8f896..b78e1ed8b3 100644
--- a/var/spack/repos/builtin/packages/cntk/package.py
+++ b/var/spack/repos/builtin/packages/cntk/package.py
@@ -32,8 +32,9 @@ class Cntk(Package):
 
     homepage = "https://www.microsoft.com/en-us/research/product/cognitive-toolkit"
     url      = "https://github.com/Microsoft/CNTK/archive/v2.0.tar.gz"
+    git      = "https://github.com/Microsoft/CNTK.git"
 
-    version('master', git='https://github.com/Microsoft/CNTK.git', branch='master')
+    version('master', branch='master')
     version('2.0', '8038780f1169ceea578e5ef4d69e4c6f')
 
     variant('opencv', default=False, description="Enable OpenCV support.")
diff --git a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py
index 71d65aba17..6969424e8c 100644
--- a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py
+++ b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py
@@ -32,10 +32,10 @@ class Cntk1bitsgd(Package):
     the Computational Network Toolkit (CNTK)."""
 
     homepage = "https://github.com/CNTK-components/CNTK1bitSGD"
+    git      = "https://github.com/CNTK-components/CNTK1bitSGD.git"
 
-    version('master', git='https://github.com/CNTK-components/CNTK1bitSGD.git')
-    version('c8b77d', git='https://github.com/CNTK-components/CNTK1bitSGD.git',
-            commit='c8b77d6e325a4786547b27624890276c1483aed1')
+    version('master')
+    version('c8b77d', commit='c8b77d6e325a4786547b27624890276c1483aed1')
 
     def install(self, spec, prefix):
         mkdirp(prefix.include)
diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py
index 956643add4..c2754f5f8a 100644
--- a/var/spack/repos/builtin/packages/codar-cheetah/package.py
+++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py
@@ -32,11 +32,11 @@ class CodarCheetah(Package):
     """
 
     homepage = "https://github.com/CODARcode/cheetah"
-    url = "https://github.com/CODARcode/cheetah/archive/v0.1.tar.gz"
+    url      = "https://github.com/CODARcode/cheetah/archive/v0.1.tar.gz"
+    git      = "https://github.com/CODARcode/cheetah.git"
 
+    version('develop', branch='master')
     version('0.1', '6918021f74fa7a2f1de26c0bb31a63ef')
-    version('develop', git='https://github.com/CODARcode/cheetah.git',
-            branch='master')
 
     depends_on('python@3:', type=('build', 'run'))
     depends_on('savanna')
diff --git a/var/spack/repos/builtin/packages/coevp/package.py b/var/spack/repos/builtin/packages/coevp/package.py
index 655f91062e..a6a8214fb5 100644
--- a/var/spack/repos/builtin/packages/coevp/package.py
+++ b/var/spack/repos/builtin/packages/coevp/package.py
@@ -39,9 +39,9 @@ class Coevp(MakefilePackage):
     proxy application provides the adaptive sampling support."""
 
     homepage = 'https://github.com/exmatex/CoEVP'
+    git      = 'https://github.com/exmatex/CoEVP.git'
 
-    version('develop', git='https://github.com/exmatex/CoEVP.git',
-            branch='master')
+    version('develop', branch='master')
 
     variant('mpi', default=True, description='Build with MPI Support')
     variant('silo', default=False, description='Build with silo Support')
diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py
index 606ac973c6..c098dae60d 100644
--- a/var/spack/repos/builtin/packages/cohmm/package.py
+++ b/var/spack/repos/builtin/packages/cohmm/package.py
@@ -35,10 +35,9 @@ class Cohmm(MakefilePackage):
     tags = ['proxy-app']
 
     homepage = "http://www.exmatex.org/cohmm.html"
-    url = "https://github.com/exmatex/CoHMM/archive/sad.tar.gz"
+    git      = "https://github.com/exmatex/CoHMM.git"
 
-    version('develop', git='https://github.com/exmatex/CoHMM.git',
-            branch='sad')
+    version('develop', branch='sad')
 
     variant('openmp', default=True, description='Build with OpenMP Support')
     variant('gnuplot', default=False, description='Enable gnu plot Support')
diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py
index 6fee9ac97f..2aed00a924 100644
--- a/var/spack/repos/builtin/packages/comd/package.py
+++ b/var/spack/repos/builtin/packages/comd/package.py
@@ -41,9 +41,10 @@ class Comd(MakefilePackage):
 
     homepage = "http://www.exmatex.org/comd.html"
     url      = "https://github.com/ECP-copa/CoMD/archive/v1.1.tar.gz"
+    git      = "https://github.com/ECP-copa/CoMD.git"
 
+    version('develop', branch='master')
     version('1.1', '5051310a8d2c93cccba63de40bcfaa78')
-    version('develop', git='https://github.com/ECP-copa/CoMD', branch='master')
 
     variant('mpi', default=True, description='Build with MPI support')
     variant('openmp', default=False, description='Build with OpenMP support')
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py
index d37300cd07..fac04a1751 100644
--- a/var/spack/repos/builtin/packages/conduit/package.py
+++ b/var/spack/repos/builtin/packages/conduit/package.py
@@ -46,8 +46,10 @@ class Conduit(Package):
     coupling between packages in-core, serialization, and I/O tasks."""
 
     homepage = "http://software.llnl.gov/conduit"
-    url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz"
+    url      = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz"
+    git      = "https://github.com/LLNL/conduit.git"
 
+    version('master', branch='master', submodules=True)
     version('0.3.1', 'b98d1476199a46bde197220cd9cde042')
     version('0.3.0', '6396f1d1ca16594d7c66d4535d4f898e')
     # note: checksums on github automatic release source tars changed ~9/17
@@ -56,11 +58,6 @@ class Conduit(Package):
 
     maintainers = ['cyrush']
 
-    version('master',
-            git='https://github.com/LLNL/conduit.git',
-            branch="master",
-            submodules=True)
-
     ###########################################################################
     # package variants
     ###########################################################################
diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py
index 042f961ecd..001206132a 100644
--- a/var/spack/repos/builtin/packages/cosp2/package.py
+++ b/var/spack/repos/builtin/packages/cosp2/package.py
@@ -37,10 +37,9 @@ class Cosp2(MakefilePackage):
     tags = ['proxy-app']
 
     homepage = "http://www.exmatex.org/cosp2.html"
-    url = "https://github.com/exmatex/CoSP2/archive/master.tar.gz"
+    git      = "https://github.com/exmatex/CoSP2.git"
 
-    version('master', git='https://github.com/exmatex/CoSP2.git',
-            description='master')
+    version('master', branch='master')
 
     variant('double', default=True,
             description='Build with double precision.')
diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py
index 98a6d0a9f6..40ed6a0de4 100644
--- a/var/spack/repos/builtin/packages/cppad/package.py
+++ b/var/spack/repos/builtin/packages/cppad/package.py
@@ -30,9 +30,10 @@ class Cppad(CMakePackage):
 
     homepage = "https://www.coin-or.org/CppAD/"
     url      = "http://www.coin-or.org/download/source/CppAD/cppad-20170114.gpl.tgz"
+    git      = "https://github.com/coin-or/CppAD.git"
 
+    version('develop', git=git)
     version('20170114', '565a534dc813fa1289764222cd8c11ea')
-    version('develop', git='https://github.com/coin-or/CppAD.git')
 
     def cmake_args(self):
         # This package does not obey CMAKE_INSTALL_PREFIX
diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py
index 98f7c2d0d2..ec6da2769f 100644
--- a/var/spack/repos/builtin/packages/cppzmq/package.py
+++ b/var/spack/repos/builtin/packages/cppzmq/package.py
@@ -30,10 +30,9 @@ class Cppzmq(CMakePackage):
 
     homepage = "http://www.zeromq.org"
     url      = "https://github.com/zeromq/cppzmq/archive/v4.2.2.tar.gz"
+    git      = "https://github.com/zeromq/cppzmq.git"
 
-    version('develop', branch='master',
-            git='https://github.com/zeromq/cppzmq.git')
-
+    version('develop', branch='master')
     version('4.2.2', 'bd809b47296e77fe9f192bd9dafd5cc3')
 
     depends_on('cmake@3.0.0:', type='build')
diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py
index 157288a25c..8cc013acd8 100644
--- a/var/spack/repos/builtin/packages/cpu-features/package.py
+++ b/var/spack/repos/builtin/packages/cpu-features/package.py
@@ -29,10 +29,9 @@ class CpuFeatures(CMakePackage):
     """A cross platform C99 library to get cpu features at runtime."""
 
     homepage = "https://github.com/google/cpu_features"
-    url      = "https://github.com/google/cpu_features/archive/v0.1.0.tar.gz"
+    git      = "https://github.com/google/cpu_features.git"
 
-    version('develop', branch='master',
-            git='https://github.com/google/cpu_features.git')
+    version('develop', branch='master')
 
     depends_on('cmake@3.0.0:', type='build')
 
diff --git a/var/spack/repos/builtin/packages/cpuinfo/package.py b/var/spack/repos/builtin/packages/cpuinfo/package.py
index fbc375f607..02c0587d84 100644
--- a/var/spack/repos/builtin/packages/cpuinfo/package.py
+++ b/var/spack/repos/builtin/packages/cpuinfo/package.py
@@ -30,6 +30,6 @@ class Cpuinfo(CMakePackage):
     for performance optimization information about host CPU."""
 
     homepage = "https://github.com/Maratyszcza/cpuinfo/"
-    url      = "https://github.com/Maratyszcza/cpuinfo.git"
+    git      = "https://github.com/Maratyszcza/cpuinfo.git"
 
-    version('master', git='https://github.com/Maratyszcza/cpuinfo.git')
+    version('master')
diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py
index 38b23793e3..cdafb9296d 100644
--- a/var/spack/repos/builtin/packages/cuda-memtest/package.py
+++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py
@@ -35,11 +35,11 @@ class CudaMemtest(CMakePackage):
     """
 
     homepage = "https://github.com/ComputationalRadiationPhysics/cuda_memtest"
-    url      = "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git"
+    git      = "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git"
+
     maintainers = ['ax3l']
 
-    version('master', branch='dev',
-            git='https://github.com/ComputationalRadiationPhysics/cuda_memtest.git')
+    version('master', branch='dev')
 
     depends_on('cmake@2.8.5:', type='build')
     # depends_on('nvml', when='+nvml')
diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py
index d5fb3819fc..396ba83b0d 100644
--- a/var/spack/repos/builtin/packages/dataspaces/package.py
+++ b/var/spack/repos/builtin/packages/dataspaces/package.py
@@ -41,9 +41,9 @@ class Dataspaces(AutotoolsPackage):
 
     homepage = "http://www.dataspaces.org"
     url      = "http://personal.cac.rutgers.edu/TASSL/projects/data/downloads/dataspaces-1.6.2.tar.gz"
+    git      = "https://github.com/melrom/dataspaces.git"
 
-    version('develop', git='https://github.com/melrom/dataspaces.git',
-            branch='master')
+    version('develop', branch='master')
     version('1.6.2', '73caa4920b6f2c0c6d6cb87640ff04be')
 
     variant('dimes',
diff --git a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py
index ac7492ea91..24e3a8a37d 100644
--- a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py
+++ b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py
@@ -30,9 +30,9 @@ class DealiiParameterGui(CMakePackage):
     files."""
 
     homepage = "https://github.com/dealii/parameter_gui"
-    url      = "https://github.com/dealii/parameter_gui"
+    git      = "https://github.com/dealii/parameter_gui.git"
 
-    version('develop', git='https://github.com/dealii/parameter_gui.git', branch='master')
+    version('develop', branch='master')
 
     depends_on('qt')
 
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index 8b56b9de8c..f1b4e848ca 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -28,8 +28,10 @@ from spack import *
 class Dealii(CMakePackage, CudaPackage):
     """C++ software library providing well-documented tools to build finite
     element codes for a broad variety of PDEs."""
+
     homepage = "https://www.dealii.org"
-    url = "https://github.com/dealii/dealii/releases/download/v8.4.1/dealii-8.4.1.tar.gz"
+    url      = "https://github.com/dealii/dealii/releases/download/v8.4.1/dealii-8.4.1.tar.gz"
+    git      = "https://github.com/dealii/dealii.git"
 
     maintainers = ['davydden', 'jppelteret']
 
@@ -37,6 +39,7 @@ class Dealii(CMakePackage, CudaPackage):
     # only add for immediate deps.
     transitive_rpaths = False
 
+    version('develop', branch='master')
     version('9.0.0', 'a4d45a67b2b028ecf81a6cb621cfaf84')
     version('8.5.1', '39b9ebd6ab083d63cfc9044319aaa2ee')
     version('8.5.0', 'ef999cc310b007559a6343bf5b1759bc')
@@ -46,7 +49,6 @@ class Dealii(CMakePackage, CudaPackage):
     version('8.3.0', 'fc6cdcb16309ef4bea338a4f014de6fa')
     version('8.2.1', '71c728dbec14f371297cd405776ccf08')
     version('8.1.0', 'aa8fadc2ce5eb674f44f997461bf668d')
-    version('develop', git='https://github.com/dealii/dealii.git', branch='master')
 
     variant('mpi',      default=True,  description='Compile with MPI')
     variant('assimp',   default=True,
diff --git a/var/spack/repos/builtin/packages/delly2/package.py b/var/spack/repos/builtin/packages/delly2/package.py
index ae3311d8e9..e219955144 100644
--- a/var/spack/repos/builtin/packages/delly2/package.py
+++ b/var/spack/repos/builtin/packages/delly2/package.py
@@ -32,10 +32,9 @@ class Delly2(MakefilePackage):
        short-read massively parallel sequencing data.."""
 
     homepage = "https://github.com/dellytools/delly"
-    url      = "https://github.com/dellytools/delly"
+    git      = "https://github.com/dellytools/delly.git"
 
-    version('2017-08-03', commit='e32a9cd55c7e3df5a6ae4a91f31a0deb354529fc',
-            git='https://github.com/dellytools/delly.git')
+    version('2017-08-03', commit='e32a9cd55c7e3df5a6ae4a91f31a0deb354529fc')
 
     depends_on('htslib')
     depends_on('boost')
diff --git a/var/spack/repos/builtin/packages/dlpack/package.py b/var/spack/repos/builtin/packages/dlpack/package.py
index 9edf7a49a9..5121b6ed84 100644
--- a/var/spack/repos/builtin/packages/dlpack/package.py
+++ b/var/spack/repos/builtin/packages/dlpack/package.py
@@ -30,8 +30,9 @@ class Dlpack(Package):
     in deep learning systems."""
 
     homepage = "https://github.com/sjtuhpcc/dlpack"
+    git      = "https://github.com/dmlc/dlpack.git"
 
-    version('master', git='https://github.com/dmlc/dlpack.git', branch='master')
+    version('master', branch='master')
 
     def install(self, spec, prefix):
         install_tree('include', prefix.include)
diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py
index eb1b1ee09a..da63a3404c 100644
--- a/var/spack/repos/builtin/packages/dmlc-core/package.py
+++ b/var/spack/repos/builtin/packages/dmlc-core/package.py
@@ -31,11 +31,10 @@ class DmlcCore(CMakePackage):
     distributed machine learning libraries."""
 
     homepage = "https://github.com/dmlc/dmlc-core"
-    url      = "https://github.com/dmlc/dmlc-core.git"
+    git      = "https://github.com/dmlc/dmlc-core.git"
 
-    version('master', git='https://github.com/dmlc/dmlc-core.git')
-    version('20170508', git='https://github.com/dmlc/dmlc-core.git',
-    commit='a6c5701219e635fea808d264aefc5b03c3aec314')
+    version('master')
+    version('20170508', commit='a6c5701219e635fea808d264aefc5b03c3aec314')
 
     variant('openmp', default=False, description='Enable OpenMP support')
 
diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py
index df7c0a3f7f..e2aa774126 100644
--- a/var/spack/repos/builtin/packages/dyninst/package.py
+++ b/var/spack/repos/builtin/packages/dyninst/package.py
@@ -30,17 +30,16 @@ class Dyninst(Package):
     are executing without recompiling, re-linking, or re-executing."""
 
     homepage = "https://paradyn.org"
-    url = "https://github.com/dyninst/dyninst/archive/v9.2.0.tar.gz"
-    list_url = "http://www.dyninst.org/downloads/dyninst-8.x"
+    git      = "https://github.com/dyninst/dyninst.git"
 
-    version('develop', git="https://github.com/dyninst/dyninst.git", branch='master')
-    version('9.3.2', git="https://github.com/dyninst/dyninst.git", tag='v9.3.2')
-    version('9.3.0', git="https://github.com/dyninst/dyninst.git", tag='v9.3.0')
-    version('9.2.0', git="https://github.com/dyninst/dyninst.git", tag='v9.2.0')
-    version('9.1.0', git="https://github.com/dyninst/dyninst.git", tag='v9.1.0')
-    version('8.2.1', git="https://github.com/dyninst/dyninst.git", tag='v8.2.1')
-    version('8.1.2', git="https://github.com/dyninst/dyninst.git", tag='v8.1.2')
-    version('8.1.1', git="https://github.com/dyninst/dyninst.git", tag='v8.1.1')
+    version('develop', branch='master')
+    version('9.3.2', tag='v9.3.2')
+    version('9.3.0', tag='v9.3.0')
+    version('9.2.0', tag='v9.2.0')
+    version('9.1.0', tag='v9.1.0')
+    version('8.2.1', tag='v8.2.1')
+    version('8.1.2', tag='v8.1.2')
+    version('8.1.1', tag='v8.1.1')
 
     variant('stat_dysect', default=False,
             description="patch for STAT's DySectAPI")
diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py
index c6ac087ed2..8a700abb0d 100644
--- a/var/spack/repos/builtin/packages/ebms/package.py
+++ b/var/spack/repos/builtin/packages/ebms/package.py
@@ -37,9 +37,9 @@ class Ebms(MakefilePackage):
     """
 
     homepage = "https://github.com/ANL-CESAR/EBMS"
-    url = "https://github.com/ANL-CESAR/EBMS/archive/master.tar.gz"
+    git      = "https://github.com/ANL-CESAR/EBMS.git"
 
-    version('develop', git='https://github.com/ANL-CESAR/EBMS.git')
+    version('develop')
 
     variant('mpi', default=True, description='Build with MPI support')
 
diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py
index b82d57b147..a1ac76b889 100644
--- a/var/spack/repos/builtin/packages/elemental/package.py
+++ b/var/spack/repos/builtin/packages/elemental/package.py
@@ -33,8 +33,9 @@ class Elemental(CMakePackage):
 
     homepage = "http://libelemental.org"
     url      = "https://github.com/elemental/Elemental/archive/v0.87.7.tar.gz"
+    git      = "https://github.com/elemental/Elemental.git"
 
-    version('develop', git='https://github.com/elemental/Elemental.git', branch='master')
+    version('develop', branch='master')
     version('0.87.7', '6c1e7442021c59a36049e37ea69b8075')
     version('0.87.6', '9fd29783d45b0a0e27c0df85f548abe9')
 
diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py
index 7ff1416eef..90f7805da5 100644
--- a/var/spack/repos/builtin/packages/er/package.py
+++ b/var/spack/repos/builtin/packages/er/package.py
@@ -30,11 +30,12 @@ class Er(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/er"
     url      = "https://github.com/ECP-VeloC/er/archive/v0.0.1.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/er.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('0.0.2', '24ad8f87bce2b6d900f1fb67452c3672')
-    version('master', git='https://github.com/ecp-veloc/er.git',
-            branch='master')
 
     depends_on('mpi')
     depends_on('kvtree')
diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py
index 1d764e2733..f3f95d850b 100644
--- a/var/spack/repos/builtin/packages/everytrace-example/package.py
+++ b/var/spack/repos/builtin/packages/everytrace-example/package.py
@@ -29,9 +29,9 @@ class EverytraceExample(CMakePackage):
     """Get stack trace EVERY time a program exits."""
 
     homepage = "https://github.com/citibeth/everytrace-example"
-    version('develop',
-            git='https://github.com/citibeth/everytrace-example.git',
-            branch='develop')
+    git      = "https://github.com/citibeth/everytrace-example.git"
+
+    version('develop', branch='develop')
 
     depends_on('everytrace+mpi+fortran')
 
diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py
index e0cb9630ff..0ce78ac2d4 100644
--- a/var/spack/repos/builtin/packages/everytrace/package.py
+++ b/var/spack/repos/builtin/packages/everytrace/package.py
@@ -29,13 +29,13 @@ class Everytrace(CMakePackage):
     """Get stack trace EVERY time a program exits."""
 
     homepage = "https://github.com/citibeth/everytrace"
-    url = "https://github.com/citibeth/everytrace/archive/0.2.2.tar.gz"
+    url      = "https://github.com/citibeth/everytrace/archive/0.2.2.tar.gz"
+    git      = "https://github.com/citibeth/everytrace.git"
 
     maintainers = ['citibeth']
 
+    version('develop', branch='develop')
     version('0.2.2', 'dd60b8bf68cbf3dc2be305a040f2fe3e')
-    version('develop',
-            git='https://github.com/citibeth/everytrace.git', branch='develop')
 
     variant('mpi', default=True, description='Enables MPI parallelism')
     variant('fortran', default=True,
diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py
index f2932eda7f..f4a493342b 100644
--- a/var/spack/repos/builtin/packages/examinimd/package.py
+++ b/var/spack/repos/builtin/packages/examinimd/package.py
@@ -41,9 +41,10 @@ class Examinimd(MakefilePackage):
 
     homepage = "https://github.com/ECP-copa/ExaMiniMD"
     url      = "https://github.com/ECP-copa/ExaMiniMD/archive/1.0.zip"
+    git      = "https://github.com/ECP-copa/ExaMiniMD.git"
 
+    version('develop', branch='master')
     version('1.0', '5db7679a4b9296c0cc3b2ff3a7e8f38f')
-    version('develop', git='https://github.com/ECP-copa/ExaMiniMD', branch='master')
 
     variant('mpi', default=True, description='Build with MPI support')
     variant('openmp', default=False, description='Build with OpenMP support')
diff --git a/var/spack/repos/builtin/packages/exampm/package.py b/var/spack/repos/builtin/packages/exampm/package.py
index eba2fbc442..eb808203a2 100644
--- a/var/spack/repos/builtin/packages/exampm/package.py
+++ b/var/spack/repos/builtin/packages/exampm/package.py
@@ -29,9 +29,8 @@ class Exampm(CMakePackage):
     """Exascale Material Point Method (MPM) Mini-App"""
 
     homepage = "https://github.com/ECP-copa/ExaMPM"
-    url      = "https://github.com/ECP-copa/ExaMPM"
+    git      = "https://github.com/ECP-copa/ExaMPM.git"
 
-    version('develop', git='https://github.com/ECP-copa/ExaMPM',
-            branch='master')
+    version('develop', branch='master')
 
     tags = ['proxy-app']
diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py
index 5c759df4bc..f796827317 100644
--- a/var/spack/repos/builtin/packages/exasp2/package.py
+++ b/var/spack/repos/builtin/packages/exasp2/package.py
@@ -44,10 +44,10 @@ class Exasp2(MakefilePackage):
 
     homepage = "https://github.com/ECP-copa/ExaSP2"
     url      = "https://github.com/ECP-copa/ExaSP2/tarball/v1.0"
+    git      = "https://github.com/ECP-copa/ExaSP2.git"
 
+    version('develop', branch='master')
     version('1.0', 'dba545995acc73f2bd1101bcb377bff5')
-    version('develop', git='https://github.com/ECP-copa/ExaSP2',
-            branch='master')
 
     variant('mpi', default=True, description='Build With MPI Support')
 
diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py
index 3a17a52dde..4b504c3153 100644
--- a/var/spack/repos/builtin/packages/exodusii/package.py
+++ b/var/spack/repos/builtin/packages/exodusii/package.py
@@ -35,13 +35,12 @@ class Exodusii(CMakePackage):
        data transfer between codes.  An Exodus II data file is a random
        access, machine independent, binary file that is written and read
        via C, C++, or Fortran API routines.
-
     """
 
     homepage = "https://github.com/gsjaardema/seacas"
-    url      = "https://github.com/gsjaardema/seacas/archive/master.zip"
+    git      = "https://github.com/gsjaardema/seacas.git"
 
-    version('2016-08-09', git='https://github.com/gsjaardema/seacas.git', commit='2ffeb1b')
+    version('2016-08-09', commit='2ffeb1b')
 
     variant('mpi', default=True, description='Enables MPI parallelism.')
 
diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py
index 6d792f5479..f4ca8e9641 100644
--- a/var/spack/repos/builtin/packages/express/package.py
+++ b/var/spack/repos/builtin/packages/express/package.py
@@ -32,10 +32,9 @@ class Express(CMakePackage):
        target sequences from sampled subsequences."""
 
     homepage = "http://bio.math.berkeley.edu/eXpress/"
-    url      = "https://github.com/adarob/eXpress"
+    git      = "https://github.com/adarob/eXpress.git"
 
-    version('2015-11-29', commit='f845cab2c7f2d9247b35143e4aa05869cfb10e79',
-            git='https://github.com/adarob/eXpress.git')
+    version('2015-11-29', commit='f845cab2c7f2d9247b35143e4aa05869cfb10e79')
 
     depends_on('boost')
     depends_on('bamtools')
diff --git a/var/spack/repos/builtin/packages/falcon/package.py b/var/spack/repos/builtin/packages/falcon/package.py
index ec6cd1814d..f0a565cf35 100644
--- a/var/spack/repos/builtin/packages/falcon/package.py
+++ b/var/spack/repos/builtin/packages/falcon/package.py
@@ -36,11 +36,9 @@ class Falcon(PythonPackage):
     front-end written in Python for convenience."""
 
     homepage = "https://github.com/PacificBiosciences/FALCON"
-    url      = "https://github.com/PacificBiosciences/FALCON.git"
+    git      = "https://github.com/PacificBiosciences/FALCON.git"
 
-    version('2017-05-30',
-            git='https://github.com/PacificBiosciences/FALCON.git',
-            commit='86cec6157291679095ea6080b0cde6561eccc041')
+    version('2017-05-30', commit='86cec6157291679095ea6080b0cde6561eccc041')
 
     depends_on('py-setuptools', type='run')
     depends_on('py-pypeflow', type='run')
diff --git a/var/spack/repos/builtin/packages/farmhash/package.py b/var/spack/repos/builtin/packages/farmhash/package.py
index b95c920f7b..23c9af82a4 100644
--- a/var/spack/repos/builtin/packages/farmhash/package.py
+++ b/var/spack/repos/builtin/packages/farmhash/package.py
@@ -28,14 +28,12 @@ from shutil import copyfile
 
 
 class Farmhash(CMakePackage):
-    """
-    FarmHash provides hash functions for strings and other data.
-    """
+    """FarmHash provides hash functions for strings and other data."""
 
     homepage = "https://github.com/google/farmhash"
+    git      = "https://github.com/google/farmhash.git"
 
-    version('92e897', git='https://github.com/google/farmhash.git', 
-            commit='92e897b282426729f4724d91a637596c7e2fe28f')
+    version('92e897', commit='92e897b282426729f4724d91a637596c7e2fe28f')
 
     def patch(self):
         copyfile(join_path(os.path.dirname(__file__), "CMakeLists.txt"),
diff --git a/var/spack/repos/builtin/packages/fast-gbs/package.py b/var/spack/repos/builtin/packages/fast-gbs/package.py
index 0805539630..feddf105d9 100644
--- a/var/spack/repos/builtin/packages/fast-gbs/package.py
+++ b/var/spack/repos/builtin/packages/fast-gbs/package.py
@@ -31,9 +31,9 @@ class FastGbs(Package):
        genotyping-by-sequencing (GBS) libraries."""
 
     homepage = "https://bitbucket.org/jerlar73/fast-gbs"
-    url      = "https://bitbucket.org/jerlar73/fast-gbs"
+    git      = "https://bitbucket.org/jerlar73/fast-gbs.git"
 
-    version('2017-01-25', git='https://bitbucket.org/jerlar73/fast-gbs.git', commit='3b3cbffa84d269419692067c6a3de08b3b88849c')
+    version('2017-01-25', commit='3b3cbffa84d269419692067c6a3de08b3b88849c')
 
     depends_on('parallel', type='run')
     depends_on('python@2.7:', type='run')
diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py
index bf2ab45b11..fca9a5bd95 100644
--- a/var/spack/repos/builtin/packages/fastqvalidator/package.py
+++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py
@@ -29,10 +29,9 @@ class Fastqvalidator(MakefilePackage):
     """The fastQValidator validates the format of fastq files."""
 
     homepage = "http://genome.sph.umich.edu/wiki/FastQValidator"
-    url      = "https://github.com/statgen/fastQValidator/archive/v0.1.1a.tar.gz"
+    git      = "https://github.com/statgen/fastQValidator.git"
 
-    version('2017-01-10', commit='6d619a34749e9d33c34ef0d3e0e87324ca77f320',
-            git='https://github.com/statgen/fastQValidator.git')
+    version('2017-01-10', commit='6d619a34749e9d33c34ef0d3e0e87324ca77f320')
 
     resource(
         name='libStatGen',
diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py
index 3ad9f6689d..061e39b247 100644
--- a/var/spack/repos/builtin/packages/fermikit/package.py
+++ b/var/spack/repos/builtin/packages/fermikit/package.py
@@ -30,8 +30,10 @@ class Fermikit(MakefilePackage):
     reads"""
 
     homepage = "https://github.com/lh3/fermikit"
+    git      = "https://github.com/lh3/fermikit.git"
 
-    version('2017-11-7', git='https://github.com/lh3/fermikit.git', commit='bf9c7112221577ba110665bddca8f1987250bdc7', submodules=True)
+    version('2017-11-7', commit='bf9c7112221577ba110665bddca8f1987250bdc7',
+            submodules=True)
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py
index 73a016ad7f..c96a9c0176 100644
--- a/var/spack/repos/builtin/packages/flang/package.py
+++ b/var/spack/repos/builtin/packages/flang/package.py
@@ -29,10 +29,12 @@ import os
 
 class Flang(CMakePackage):
     """Flang is a Fortran compiler targeting LLVM."""
+
     homepage = "https://github.com/flang-compiler/flang"
     url      = "https://github.com/flang-compiler/flang/archive/flang_20180319.tar.gz"
+    git      = "https://github.com/flang-compiler/flang.git"
 
-    version('develop', git='https://github.com/flang-compiler/flang', branch='master')
+    version('develop', branch='master')
     version('20180319', 'e659bad83b791f90af2c5cd672864669')
 
     depends_on(
diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py
index 1160ea642e..78bd88e96d 100644
--- a/var/spack/repos/builtin/packages/flecsale/package.py
+++ b/var/spack/repos/builtin/packages/flecsale/package.py
@@ -28,10 +28,11 @@ from spack import *
 
 class Flecsale(CMakePackage):
     """Flecsale is an ALE code based on FleCSI"""
+
     homepage = "https://github.com/laristra/flecsale"
-    url      = "https://github.com/laristra/flecsale/tarball/v1.0"
+    git      = "https://github.com/laristra/flecsale.git"
 
-    version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=True)
+    version('develop', branch='master', submodules=True)
 
     variant('mpi', default=True,
             description='Build on top of mpi conduit for mpi inoperability')
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index 049b28d15d..aefa2c2d0d 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -37,9 +37,9 @@ class Flecsi(CMakePackage):
        interfaces,and dependency closures.
     """
     homepage = "http://flecsi.lanl.gov/"
-    url      = "https://github.com/laristra/flecsi/tarball/v1.0"
+    git      = "https://github.com/laristra/flecsi.git"
 
-    version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=True)
+    version('develop', branch='master', submodules=True)
 
     variant('mpi', default=True,
             description='Build on top of mpi conduit for mpi inoperability')
diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py
index f7e7055a4a..134dffa587 100644
--- a/var/spack/repos/builtin/packages/flint/package.py
+++ b/var/spack/repos/builtin/packages/flint/package.py
@@ -30,10 +30,11 @@ class Flint(Package):
 
     homepage = "http://www.flintlib.org"
     url      = "http://mirrors.mit.edu/sage/spkg/upstream/flint/flint-2.5.2.tar.gz"
+    git      = "https://github.com/wbhart/flint2.git"
 
+    version('develop', git=git)
     version('2.5.2', 'cda885309362150196aed66a5e0f0383')
     version('2.4.5', '6504b9deabeafb9313e57153a1730b33')
-    version('develop', git='https://github.com/wbhart/flint2.git')
 
     # Overlap in functionality between gmp and mpir
     # All other dependencies must also be built with
diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py
index 2e8ab8c889..ddad8365e4 100644
--- a/var/spack/repos/builtin/packages/flux/package.py
+++ b/var/spack/repos/builtin/packages/flux/package.py
@@ -31,10 +31,10 @@ class Flux(AutotoolsPackage):
 
     homepage = "https://github.com/flux-framework/flux-core"
     url      = "https://github.com/flux-framework/flux-core/releases/download/v0.8.0/flux-core-0.8.0.tar.gz"
+    git      = "https://github.com/flux-framework/flux-core.git"
 
+    version('master', branch='master')
     version('0.8.0', md5='9ee12974a8b2ab9a30533f69826f3bec')
-    version('master', branch='master',
-            git='https://github.com/flux-framework/flux-core')
 
     variant('doc', default=False, description='Build flux manpages')
 
diff --git a/var/spack/repos/builtin/packages/fp16/package.py b/var/spack/repos/builtin/packages/fp16/package.py
index c1f0dbf625..7cdc8293a4 100644
--- a/var/spack/repos/builtin/packages/fp16/package.py
+++ b/var/spack/repos/builtin/packages/fp16/package.py
@@ -30,9 +30,9 @@ class Fp16(Package):
     conversion to/from half-precision floating point formats"""
 
     homepage = "https://github.com/Maratyszcza/FP16/"
-    url      = "https://github.com/Maratyszcza/FP16.git"
+    git      = "https://github.com/Maratyszcza/FP16.git"
 
-    version('master', git='https://github.com/Maratyszcza/FP16.git')
+    version('master')
 
     def install(self, spec, prefix):
         install_tree('include', prefix.include)
diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py
index f8e20550e5..4d1ab6f773 100644
--- a/var/spack/repos/builtin/packages/freebayes/package.py
+++ b/var/spack/repos/builtin/packages/freebayes/package.py
@@ -30,9 +30,9 @@ class Freebayes(MakefilePackage):
        genotyping."""
 
     homepage = "https://github.com/ekg/freebayes"
+    git      = "https://github.com/ekg/freebayes.git"
 
-    version('1.1.0', git='https://github.com/ekg/freebayes.git',
-            commit='39e5e4bcb801556141f2da36aba1df5c5c60701f',
+    version('1.1.0', commit='39e5e4bcb801556141f2da36aba1df5c5c60701f',
             submodules=True)
 
     depends_on('cmake', type='build')
diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py
index 0cb1b1bf73..c31f10dc30 100644
--- a/var/spack/repos/builtin/packages/funhpc/package.py
+++ b/var/spack/repos/builtin/packages/funhpc/package.py
@@ -28,9 +28,12 @@ from spack import *
 
 class Funhpc(CMakePackage):
     """FunHPC: Functional HPC Programming"""
+
     homepage = "https://github.com/eschnett/FunHPC.cxx"
-    url = "https://github.com/eschnett/FunHPC.cxx/archive/version/0.1.0.tar.gz"
+    url      = "https://github.com/eschnett/FunHPC.cxx/archive/version/0.1.0.tar.gz"
+    git      = "https://github.com/eschnett/FunHPC.cxx.git"
 
+    version('develop', branch='master')
     version('1.3.0', '71a1e57c4d882cdf001f29122edf7fc6')
     version('1.2.0', 'ba2bbeea3091e999b6b85eaeb1b67a83')
     version('1.1.1', '7b9ef638b02fffe35b75517e8eeff580')
@@ -38,8 +41,6 @@ class Funhpc(CMakePackage):
     version('1.0.0', 'f34e71ccd5548b42672e692c913ba5ee')
     version('0.1.1', 'f0248710f2de88ed2a595ad40d99997c')
     version('0.1.0', '00f7dabc08ed1ab77858785ce0809f50')
-    version('develop',
-            git='https://github.com/eschnett/FunHPC.cxx', branch='master')
 
     variant('pic', default=True,
             description="Produce position-independent code")
diff --git a/var/spack/repos/builtin/packages/gccxml/package.py b/var/spack/repos/builtin/packages/gccxml/package.py
index fc54b3a91f..995a63bd0c 100644
--- a/var/spack/repos/builtin/packages/gccxml/package.py
+++ b/var/spack/repos/builtin/packages/gccxml/package.py
@@ -27,11 +27,11 @@ class Gccxml(CMakePackage):
     the GCC C++ compiler."""
 
     homepage = "http://gccxml.github.io"
-    url      = "https://github.com/gccxml/gccxml/archive/v0.6.x.tar.gz"
+    git      = "https://github.com/gccxml/gccxml.git"
 
-    version('develop', git='https://github.com/gccxml/gccxml.git', branch='master')
-    version('latest', git='https://github.com/gccxml/gccxml.git',
-            commit='3afa8ba5be6866e603dcabe80aff79856b558e24', preferred=True)
+    version('develop', branch='master')
+    version('latest', commit='3afa8ba5be6866e603dcabe80aff79856b558e24',
+            preferred=True)
 
     patch('darwin-gcc.patch', when='%gcc platform=darwin')
     # taken from https://github.com/gccxml/gccxml/issues/11#issuecomment-140334118
diff --git a/var/spack/repos/builtin/packages/gemmlowp/package.py b/var/spack/repos/builtin/packages/gemmlowp/package.py
index 7f3847f7c7..9ff88511e6 100644
--- a/var/spack/repos/builtin/packages/gemmlowp/package.py
+++ b/var/spack/repos/builtin/packages/gemmlowp/package.py
@@ -29,8 +29,9 @@ class Gemmlowp(Package):
     """Google low-precision matrix multiplication library"""
 
     homepage = "https://github.com/google/gemmlowp"
-    version('a6f29d9ac', git='https://github.com/google/gemmlowp.git',
-            commit='a6f29d8ac48d63293f845f2253eccbf86bc28321')
+    git      = "https://github.com/google/gemmlowp.git"
+
+    version('a6f29d9ac', commit='a6f29d8ac48d63293f845f2253eccbf86bc28321')
 
     def install(self, spec, prefix):
         header_directories = ('eight_bit_int_gemm', 'fixedpoint',
diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py
index b413ae4205..634b0e79a8 100644
--- a/var/spack/repos/builtin/packages/geopm/package.py
+++ b/var/spack/repos/builtin/packages/geopm/package.py
@@ -38,13 +38,14 @@ class Geopm(AutotoolsPackage):
 
     homepage = "https://geopm.github.io"
     url      = "https://github.com/geopm/geopm/releases/download/v0.4.0/geopm-0.4.0.tar.gz"
+    git      = "https://github.com/geopm/geopm.git"
 
     # Add additional proper versions and checksums here. "spack checksum geopm"
+    version('develop', branch='dev')
+    version('master', branch='master')
     version('0.5.0', '61b454bc74d4606fe84818aef16c1be4')
     version('0.4.0', 'd4cc8fffe521296dab379857d7e2064d')
     version('0.3.0', '568fd37234396fff134f8d57b60f2b83')
-    version('master', git='https://github.com/geopm/geopm.git', branch='master')
-    version('develop', git='https://github.com/geopm/geopm.git', branch='dev')
 
     # Variants reflecting most ./configure --help options
     variant('debug', default=False, description='Enable debug.')
diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py
index 7a89adca66..deadd8338b 100644
--- a/var/spack/repos/builtin/packages/ghost/package.py
+++ b/var/spack/repos/builtin/packages/ghost/package.py
@@ -35,10 +35,9 @@ class Ghost(CMakePackage, CudaPackage):
     """
 
     homepage = "https://www.bitbucket.org/essex/ghost/"
-    url      = "https://bitbucket.org/essex/ghost/"
+    git      = "https://bitbucket.org/essex/ghost/ghost.git"
 
-    version('develop',
-            git='https://bitbucket.org/essex/ghost/ghost.git', branch='devel')
+    version('develop', branch='devel')
 
     variant('shared', default=True,
             description='Enables the build of shared libraries')
diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py
index 3250fcd53d..99b02c99f3 100644
--- a/var/spack/repos/builtin/packages/git-lfs/package.py
+++ b/var/spack/repos/builtin/packages/git-lfs/package.py
@@ -33,13 +33,13 @@ class GitLfs(Package):
        Git LFS server."""
 
     homepage = "https://git-lfs.github.com"
-    git_url  = "https://github.com/github/git-lfs.git"
+    git      = "https://github.com/github/git-lfs.git"
 
-    version('2.3.0', git=git_url, tag='v2.3.0')
-    version('2.2.1', git=git_url, tag='v2.2.1')
-    version('2.0.2', git=git_url, tag='v2.0.2')
-    version('1.4.1', git=git_url, tag='v1.4.1')
-    version('1.3.1', git=git_url, tag='v1.3.1')
+    version('2.3.0', tag='v2.3.0')
+    version('2.2.1', tag='v2.2.1')
+    version('2.0.2', tag='v2.0.2')
+    version('1.4.1', tag='v1.4.1')
+    version('1.3.1', tag='v1.3.1')
 
     # TODO: Add tests by following the instructions at this location:
     # https://github.com/github/git-lfs/blob/master/CONTRIBUTING.md#building
diff --git a/var/spack/repos/builtin/packages/gloo/package.py b/var/spack/repos/builtin/packages/gloo/package.py
index 5fe40d7a22..66961d5656 100644
--- a/var/spack/repos/builtin/packages/gloo/package.py
+++ b/var/spack/repos/builtin/packages/gloo/package.py
@@ -29,6 +29,6 @@ class Gloo(CMakePackage):
     """Gloo is a collective communications library."""
 
     homepage = "https://github.com/facebookincubator/gloo"
-    url      = "https://github.com/facebookincubator/gloo.git"
+    git      = "https://github.com/facebookincubator/gloo.git"
 
-    version('master', git='https://github.com/facebookincubator/gloo.git')
+    version('master')
diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py
index c97cf5704c..a79ca2dd1a 100644
--- a/var/spack/repos/builtin/packages/glvis/package.py
+++ b/var/spack/repos/builtin/packages/glvis/package.py
@@ -29,7 +29,7 @@ class Glvis(MakefilePackage):
     """GLVis: an OpenGL tool for visualization of FEM meshes and functions"""
 
     homepage = "http://glvis.org"
-    url      = "https://github.com/GLVis/glvis"
+    git      = "https://github.com/glvis/glvis.git"
 
     maintainers = ['goxberry', 'v-dobrev', 'tzanio']
 
@@ -52,7 +52,7 @@ class Glvis(MakefilePackage):
     # If this quick verification procedure fails, additional discussion
     # will be required to verify the new version.
 
-    version('develop', git='https://github.com/glvis/glvis', branch='master')
+    version('develop', branch='master')
 
     version('3.4',
             '289fbd2e09d4456e5fee6162bdc3e0b4c8c8d54625f3547ad2a69fef319279e7',
diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py
index acfff70415..419d276653 100644
--- a/var/spack/repos/builtin/packages/gotcha/package.py
+++ b/var/spack/repos/builtin/packages/gotcha/package.py
@@ -30,16 +30,14 @@ class Gotcha(CMakePackage):
     enables tools to intercept calls into shared libraries"""
 
     homepage = "http://github.com/LLNL/gotcha"
-    url = "http://github.com/LLNL/gotcha"
+    git      = "https://github.com/LLNL/gotcha.git"
 
-    variant('test', default=False, description='Build tests for Gotcha')
+    version('develop', branch='develop')
+    version('master', branch='master')
+    version('1.0.2', tag='1.0.2')
+    version('0.0.2', tag='0.0.2')
 
-    version('develop', git='https://github.com/LLNL/gotcha.git',
-            branch="develop")
-    version('master', git='https://github.com/LLNL/gotcha.git',
-            branch="master")
-    version('1.0.2', git='https://github.com/LLNL/gotcha.git', tag="1.0.2")
-    version('0.0.2', git='https://github.com/LLNL/gotcha.git', tag="0.0.2")
+    variant('test', default=False, description='Build tests for Gotcha')
 
     def configure_args(self):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py
index bc35f1b247..21a461e663 100644
--- a/var/spack/repos/builtin/packages/graphmap/package.py
+++ b/var/spack/repos/builtin/packages/graphmap/package.py
@@ -29,9 +29,9 @@ class Graphmap(MakefilePackage):
     """A highly sensitive and accurate mapper for long, error-prone reads"""
 
     homepage = "https://github.com/isovic/graphmap"
-    url      = "https://github.com/isovic/graphmap/archive/v0.3.0.tar.gz"
+    git      = "https://github.com/isovic/graphmap.git"
 
-    version('0.3.0', git='https://github.com/isovic/graphmap.git', commit='eb8c75d68b03be95464318afa69b645a59f8f6b7')
+    version('0.3.0', commit='eb8c75d68b03be95464318afa69b645a59f8f6b7')
 
     def edit(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py
index 905c0c8892..a06e5e3458 100644
--- a/var/spack/repos/builtin/packages/graphviz/package.py
+++ b/var/spack/repos/builtin/packages/graphviz/package.py
@@ -29,11 +29,12 @@ import sys
 
 class Graphviz(AutotoolsPackage):
     """Graph Visualization Software"""
+
     homepage = 'http://www.graphviz.org'
+    git      = 'https://gitlab.com/graphviz/graphviz.git'
 
     # This commit hash is tag='stable_release_2.40.1'
-    version('2.40.1', git='https://gitlab.com/graphviz/graphviz.git',
-            commit='67cd2e5121379a38e0801cc05cce5033f8a2a609')
+    version('2.40.1', commit='67cd2e5121379a38e0801cc05cce5033f8a2a609')
 
     # We try to leave language bindings enabled if they don't cause
     # build issues or add dependencies.
diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py
index 1add3141f1..aa663890e8 100644
--- a/var/spack/repos/builtin/packages/gromacs/package.py
+++ b/var/spack/repos/builtin/packages/gromacs/package.py
@@ -39,17 +39,18 @@ class Gromacs(CMakePackage):
     """
 
     homepage = 'http://www.gromacs.org'
-    url = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz'
+    url      = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz'
+    git      = 'https://github.com/gromacs/gromacs.git'
 
+    version('develop', branch='master')
     version('2018.2', '7087462bb08393aec4ce3192fa4cd8df')
     version('2018.1', '7ee393fa3c6b7ae351d47eae2adf980e')
-    version('2018', '6467ffb1575b8271548a13abfba6374c')
+    version('2018',   '6467ffb1575b8271548a13abfba6374c')
     version('2016.5', 'f41807e5b2911ccb547a3fd11f105d47')
     version('2016.4', '19c8b5c85f3ec62df79d2249a3c272f8')
     version('2016.3', 'e9e3a41bd123b52fbcc6b32d09f8202b')
-    version('5.1.4', 'ba2e34d59b3982603b4935d650c08040')
-    version('5.1.2', '614d0be372f1a6f1f36382b7a6fcab98')
-    version('develop', git='https://github.com/gromacs/gromacs', branch='master')
+    version('5.1.4',  'ba2e34d59b3982603b4935d650c08040')
+    version('5.1.2',  '614d0be372f1a6f1f36382b7a6fcab98')
 
     variant('mpi', default=True, description='Activate MPI support')
     variant('shared', default=True,
diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py
index b90a50977c..aca4d55256 100644
--- a/var/spack/repos/builtin/packages/gslib/package.py
+++ b/var/spack/repos/builtin/packages/gslib/package.py
@@ -29,11 +29,11 @@ class Gslib(Package):
     """Highly scalable Gather-scatter code with AMG and XXT solvers"""
 
     homepage = "https://github.com/gslib/gslib"
-    url      = "https://github.com/gslib/gslib"
+    git      = "https://github.com/gslib/gslib.git"
 
-    version('1.0.2', git='https://github.com/gslib/gslib.git', tag='v1.0.2')
-    version('1.0.1', git='https://github.com/gslib/gslib.git', tag='v1.0.1')
-    version('1.0.0', git='https://github.com/gslib/gslib.git', tag='v1.0.0')
+    version('1.0.2', tag='v1.0.2')
+    version('1.0.1', tag='v1.0.1')
+    version('1.0.0', tag='v1.0.0')
 
     variant('mpi', default=True, description='Build with MPI')
     variant('mpiio', default=True, description='Build with MPI I/O')
diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py
index e3d1c568b8..7dcac0ccf9 100644
--- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py
+++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py
@@ -31,10 +31,10 @@ class GtkorvoAtl(CMakePackage):
     """
 
     homepage = "https://github.com/GTkorvo/atl"
-    url = "https://github.com/GTkorvo/atl/archive/v2.1.tar.gz"
+    url      = "https://github.com/GTkorvo/atl/archive/v2.1.tar.gz"
+    git      = "https://github.com/GTkorvo/atl.git"
 
-    version('develop', git='https://github.com/GTkorvo/atl.git',
-            branch='master')
+    version('develop', branch='master')
     version('2.2', 'f0e3581e4b4c6943bf4b203685630564')
     version('2.1', 'b2324ff041bccba127330a0e1b241978')
 
diff --git a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py
index 40f55d3425..e6a741bb4f 100644
--- a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py
+++ b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py
@@ -26,14 +26,13 @@ from spack import *
 
 
 class GtkorvoCercsEnv(CMakePackage):
-    """A utility library used by some GTkorvo packages.
-    """
+    """A utility library used by some GTkorvo packages."""
 
     homepage = "https://github.com/GTkorvo/cercs_env"
-    url = "https://github.com/GTkorvo/cercs_env/archive/v1.0.tar.gz"
+    url      = "https://github.com/GTkorvo/cercs_env/archive/v1.0.tar.gz"
+    git      = "https://github.com/GTkorvo/cercs_env.git"
 
-    version('develop', git='https://github.com/GTkorvo/cercs_env.git',
-            branch='master')
+    version('develop', branch='master')
     version('1.0', '08f0532d0c2f7bc9b53dfa7a1c40ea4d')
 
     def cmake_args(self):
diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py
index b863be21f4..a39c88ba25 100644
--- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py
+++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py
@@ -32,10 +32,10 @@ class GtkorvoDill(CMakePackage):
     """
 
     homepage = "https://github.com/GTkorvo/dill"
-    url = "https://github.com/GTkorvo/dill/archive/v2.1.tar.gz"
+    url      = "https://github.com/GTkorvo/dill/archive/v2.1.tar.gz"
+    git      = "https://github.com/GTkorvo/dill.git"
 
-    version('develop', git='https://github.com/GTkorvo/dill.git',
-            branch='master')
+    version('develop', branch='master')
     version('2.4', '6836673b24f395eaae044b8bb976511d')
     version('2.1', '14c835e79b66c9acd2beee01d56e6200')
 
diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py
index d4cae6fe88..07c200e523 100644
--- a/var/spack/repos/builtin/packages/h5z-zfp/package.py
+++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py
@@ -30,11 +30,11 @@ class H5zZfp(MakefilePackage):
        HDF5 library using ZFP compression."""
 
     homepage = "http://h5z-zfp.readthedocs.io/en/latest"
-    url      = "https://github.com/LLNL/H5Z-ZFP"
+    git      = "https://github.com/LLNL/H5Z-ZFP.git"
 
-    version('develop', git='https://github.com/LLNL/H5Z-ZFP.git', tag='master')
-    version('0.7.0', git='https://github.com/LLNL/H5Z-ZFP.git', commit='58ac811')
-    version('0.8.0', git='https://github.com/LLNL/H5Z-ZFP.git', commit='af165c4')
+    version('develop', tag='master')
+    version('0.8.0', commit='af165c4')
+    version('0.7.0', commit='58ac811')
 
     variant('fortran', default=True, description='Enable Fortran support')
 
diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py
index e3a5c3cc12..a8d60c4e37 100644
--- a/var/spack/repos/builtin/packages/hacckernels/package.py
+++ b/var/spack/repos/builtin/packages/hacckernels/package.py
@@ -33,12 +33,11 @@ class Hacckernels(CMakePackage):
     cores and beyond."""
 
     homepage = "https://xgitlab.cels.anl.gov/hacc/HACCKernels"
-    url      = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FHACCKernels/repository/archive.tar.gz"
+    git      = "https://xgitlab.cels.anl.gov/hacc/HACCKernels.git"
 
     tags = ['proxy-app']
 
-    version('develop', git='https://xgitlab.cels.anl.gov/hacc/HACCKernels.git',
-            branch='master')
+    version('develop', branch='master')
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py
index 033a552145..35580bfe15 100644
--- a/var/spack/repos/builtin/packages/hapcut2/package.py
+++ b/var/spack/repos/builtin/packages/hapcut2/package.py
@@ -31,10 +31,10 @@ class Hapcut2(MakefilePackage):
        and accuracy."""
 
     homepage = "https://github.com/vibansal/HapCUT2"
-    url      = "https://github.com/vibansal/HapCUT2"
+    git      = "https://github.com/vibansal/HapCUT2.git"
 
-    version('2017-07-10', git='https://github.com/vibansal/HapCUT2.git',
-            commit='2966b94c2c2f97813b757d4999b7a6471df1160e', submodules=True)
+    version('2017-07-10', commit='2966b94c2c2f97813b757d4999b7a6471df1160e',
+            submodules=True)
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin/packages/hapdip/package.py b/var/spack/repos/builtin/packages/hapdip/package.py
index 066282c461..15a5615822 100644
--- a/var/spack/repos/builtin/packages/hapdip/package.py
+++ b/var/spack/repos/builtin/packages/hapdip/package.py
@@ -30,8 +30,9 @@ class Hapdip(Package):
     WGS Illumina data."""
 
     homepage = "https://github.com/lh3/hapdip"
+    git      = "https://github.com/lh3/hapdip.git"
 
-    version('2018.02.20', git='https://github.com/lh3/hapdip.git', commit='7c12f684471999a543fdacce972c9c86349758a3')
+    version('2018.02.20', commit='7c12f684471999a543fdacce972c9c86349758a3')
 
     depends_on('k8', type='run')
 
diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py
index 168bcb07ac..b0ff9536c7 100644
--- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py
+++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py
@@ -48,10 +48,9 @@ def _install_shlib(name, src, dst):
 class Hdf5Blosc(Package):
     """Blosc filter for HDF5"""
     homepage = "https://github.com/Blosc/hdf5-blosc"
-    url      = "https://github.com/Blosc/hdf5-blosc"
+    git      = "https://github.com/Blosc/hdf5-blosc.git"
 
-    version('master', git='https://github.com/Blosc/hdf5-blosc',
-            branch='master')
+    version('master', branch='master')
 
     depends_on("c-blosc")
     depends_on("hdf5")
diff --git a/var/spack/repos/builtin/packages/highwayhash/package.py b/var/spack/repos/builtin/packages/highwayhash/package.py
index 71b2472db7..7ab78df158 100644
--- a/var/spack/repos/builtin/packages/highwayhash/package.py
+++ b/var/spack/repos/builtin/packages/highwayhash/package.py
@@ -34,9 +34,9 @@ class Highwayhash(MakefilePackage):
     """
 
     homepage = "https://github.com/google/highwayhash"
+    git      = "https://github.com/google/highwayhash.git"
 
-    version('dfcb97', git='https://github.com/google/highwayhash.git',
-            commit='dfcb97ca4fe9277bf9dc1802dd979b071896453b')
+    version('dfcb97', commit='dfcb97ca4fe9277bf9dc1802dd979b071896453b')
 
     build_targets = ['all', 'libhighwayhash.a']
 
diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py
index 5393f19464..2720973271 100644
--- a/var/spack/repos/builtin/packages/hiop/package.py
+++ b/var/spack/repos/builtin/packages/hiop/package.py
@@ -33,10 +33,9 @@ class Hiop(CMakePackage):
     specialized linear algebra kernels."""
 
     homepage = "https://github.com/LLNL/hiop"
-    url      = "https://github.com/LLNL/hiop"
+    git      = "https://github.com/LLNL/hiop.git"
 
-    version('0.1', git='https://github.com/LLNL/hiop',
-            tag='v0.1')
+    version('0.1', tag='v0.1')
 
     variant('mpi', default=True,
             description='Enable/Disable MPI')
diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py
index 3aed18ce27..5b74cf82f3 100644
--- a/var/spack/repos/builtin/packages/hoomd-blue/package.py
+++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py
@@ -39,10 +39,6 @@ class HoomdBlue(CMakePackage):
     homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/"
     git      = "https://bitbucket.org/glotzer/hoomd-blue"
 
-    # TODO: There is a bug in Spack that requires a url to be defined
-    # even if it isn't used. This URL can hopefully be removed someday.
-    url      = "https://bitbucket.org/glotzer/hoomd-blue/get/v2.1.6.tar.bz2"
-
     version('develop', git=git, submodules=True)
 
     # Bitbucket has tarballs for each release, but they cannot be built.
@@ -50,8 +46,8 @@ class HoomdBlue(CMakePackage):
     # with a .git directory, causing the build to fail. As a workaround,
     # clone a specific tag from Bitbucket instead of using the tarballs.
     # https://bitbucket.org/glotzer/hoomd-blue/issues/238
-    version('2.2.2', git=git, tag='v2.2.2', submodules=True)
-    version('2.1.6', git=git, tag='v2.1.6', submodules=True)
+    version('2.2.2', tag='v2.2.2', submodules=True)
+    version('2.1.6', tag='v2.1.6', submodules=True)
 
     variant('mpi',  default=True,  description='Compile with MPI enabled')
     variant('cuda', default=True,  description='Compile with CUDA Toolkit')
diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
index dcd9d93172..78f33e161d 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
@@ -30,10 +30,10 @@ class HpctoolkitExternals(Package):
     HpctoolkitExternals package provides all these prerequisites."""
 
     homepage = "http://hpctoolkit.org"
-    url = "https://github.com/HPCToolkit/hpctoolkit-externals"
+    git      = "https://github.com/HPCToolkit/hpctoolkit-externals"
 
-    version('2017.06', git=url, tag='release-2017.06')
-    version('master', git=url)
+    version('master')
+    version('2017.06', tag='release-2017.06')
 
     parallel = False
 
diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py
index 8b66e168ea..9dfa96d7d8 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py
@@ -34,10 +34,10 @@ class Hpctoolkit(Package):
     and attributes them to the full calling context in which they occur."""
 
     homepage = "http://hpctoolkit.org"
-    url = "https://github.com/HPCToolkit/hpctoolkit"
+    git      = "https://github.com/HPCToolkit/hpctoolkit"
 
-    version('2017.06', git=url, tag='release-2017.06')
-    version('master', git=url)
+    version('master')
+    version('2017.06', tag='release-2017.06')
 
     variant('mpi', default=True, description='Enable MPI supoort')
     variant('papi', default=True, description='Enable PAPI counter support')
diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py
index 2a43115799..5f6a6e37dd 100644
--- a/var/spack/repos/builtin/packages/hpgmg/package.py
+++ b/var/spack/repos/builtin/packages/hpgmg/package.py
@@ -37,9 +37,11 @@ class Hpgmg(Package):
 
     homepage = "https://bitbucket.org/hpgmg/hpgmg"
     url      = "https://hpgmg.org/static/hpgmg-0.tar.gz"
-    tags     = ['proxy-app']
+    git      = "https://bitbucket.org/hpgmg/hpgmg.git"
 
-    version('develop', git='https://bitbucket.org/hpgmg/hpgmg.git', branch='master')
+    tags = ['proxy-app']
+
+    version('develop', branch='master')
     version('a0a5510df23b', 'b9c50f25e541428d4735fb07344d1d0ed9fc821bdde918d8e0defa78c0d9b4f9')
     version('0.3',          '12a65da216fec91daea78594ae4b5a069c8f1a700f1ba21eed9f45a79a68c793')
 
diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py
index c398e19279..d14d6b87fd 100644
--- a/var/spack/repos/builtin/packages/hub/package.py
+++ b/var/spack/repos/builtin/packages/hub/package.py
@@ -28,10 +28,12 @@ import os
 
 class Hub(Package):
     """The github git wrapper"""
+
     homepage = "https://github.com/github/hub"
-    url = "https://github.com/github/hub/archive/v2.2.3.tar.gz"
+    url      = "https://github.com/github/hub/archive/v2.2.3.tar.gz"
+    git      = "https://github.com/github/hub"
 
-    version('head', git='https://github.com/github/hub')
+    version('head', git=git)
     version('2.2.3', '6675992ddd16d186eac7ba4484d57f5b')
     version('2.2.2', '7edc8f5b5d3c7c392ee191dd999596fc')
     version('2.2.1', '889a31ee9d10ae9cb333480d8dbe881f')
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py
index 47787505aa..cb804e4275 100644
--- a/var/spack/repos/builtin/packages/hydrogen/package.py
+++ b/var/spack/repos/builtin/packages/hydrogen/package.py
@@ -33,8 +33,9 @@ class Hydrogen(CMakePackage):
 
     homepage = "http://libelemental.org"
     url      = "https://github.com/LLNL/Elemental/archive/0.99.tar.gz"
+    git      = "https://github.com/LLNL/Elemental.git"
 
-    version('develop', git='https://github.com/LLNL/Elemental.git', branch='hydrogen')
+    version('develop', branch='hydrogen')
     version('0.99', 'b678433ab1d498da47acf3dc5e056c23')
 
     variant('shared', default=True,
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index a6020464f6..a20e925208 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -33,17 +33,18 @@ class Hypre(Package):
        unstructured grid problems."""
 
     homepage = "http://computation.llnl.gov/project/linear_solvers/software.php"
-    url      = "http://computation.llnl.gov/project/linear_solvers/download/hypre-2.10.0b.tar.gz"
+    url      = "https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz"
+    git      = "https://github.com/LLNL/hypre.git"
 
-    version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1', url='https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz')
-    version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b', url='https://github.com/LLNL/hypre/archive/v2.13.0.tar.gz')
-    version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c', url='https://github.com/LLNL/hypre/archive/v2.12.1.tar.gz')
+    version('develop', branch='master')
+    version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1')
+    version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b')
+    version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c')
     version('2.11.2', 'd507943a1a3ce5681c3308e2f3a6dd34')
     version('2.11.1', '3f02ef8fd679239a6723f60b7f796519')
     version('2.10.1', 'dc048c4cabb3cd549af72591474ad674')
     version('2.10.0b', '768be38793a35bb5d055905b271f5b8e')
-    version('develop', git='https://github.com/LLNL/hypre', branch='master')
-    version('xsdk-0.2.0', git='https://github.com/LLNL/hypre', tag='xsdk-0.2.0')
+    version('xsdk-0.2.0', tag='xsdk-0.2.0')
 
     # hypre does not know how to build shared libraries on Darwin
     variant('shared', default=(sys.platform != 'darwin'),
@@ -62,6 +63,14 @@ class Hypre(Package):
     depends_on("blas")
     depends_on("lapack")
 
+    def url_for_version(self, version):
+        if version >= Version('2.12.0'):
+            url = 'https://github.com/LLNL/hypre/archive/v{0}.tar.gz'
+        else:
+            url = 'http://computation.llnl.gov/project/linear_solvers/download/hypre-{0}.tar.gz'
+
+        return url.format(version)
+
     def install(self, spec, prefix):
         # Note: --with-(lapack|blas)_libs= needs space separated list of names
         lapack = spec['lapack'].libs
diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py
index 1a2181c24f..87e831ea2e 100644
--- a/var/spack/repos/builtin/packages/icet/package.py
+++ b/var/spack/repos/builtin/packages/icet/package.py
@@ -31,9 +31,9 @@ class Icet(CMakePackage):
 
     homepage = "http://icet.sandia.gov"
     url      = "https://gitlab.kitware.com/api/v4/projects/icet%2Ficet/repository/archive.tar.bz2?sha=IceT-2.1.1"
+    git      = "https://gitlab.kitware.com/icet/icet.git"
 
-    version('develop', branch='master',
-            git='https://gitlab.kitware.com/icet/icet.git')
+    version('develop', branch='master')
     version('2.1.1', '4f971c51105a64937460d482adca2a6c')
 
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py
index 25f8057679..5905868ae3 100644
--- a/var/spack/repos/builtin/packages/intel-xed/package.py
+++ b/var/spack/repos/builtin/packages/intel-xed/package.py
@@ -33,11 +33,9 @@ class IntelXed(Package):
     a lightweight library for decoding the length of an instruction."""
 
     homepage = "https://intelxed.github.io/"
-    url = "https://github.com/intelxed/xed"
+    git      = "https://github.com/intelxed/xed.git"
 
-    version('2018.02.14',
-            git='https://github.com/intelxed/xed',
-            commit='44d06033b69aef2c20ab01bfb518c52cd71bb537')
+    version('2018.02.14', commit='44d06033b69aef2c20ab01bfb518c52cd71bb537')
 
     resource(name='mbuild',
              git='https://github.com/intelxed/mbuild',
diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py
index 11325a24e2..59e8b8734a 100644
--- a/var/spack/repos/builtin/packages/isaac-server/package.py
+++ b/var/spack/repos/builtin/packages/isaac-server/package.py
@@ -30,12 +30,12 @@ class IsaacServer(CMakePackage):
 
     homepage = "http://computationalradiationphysics.github.io/isaac/"
     url      = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz"
+    git      = "https://github.com/ComputationalRadiationPhysics/isaac.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='dev',
-            git='https://github.com/ComputationalRadiationPhysics/isaac.git')
-    version('master', branch='master',
-            git='https://github.com/ComputationalRadiationPhysics/isaac.git')
+    version('develop', branch='dev')
+    version('master', branch='master')
     version('1.4.0', '3ad05c8fad4673366077204c5d39285f')
     version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b')
     version('1.3.2', 'c557daa74de52fd79e734c9758fca38b')
diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py
index 4783ffecbf..4c853e67cf 100644
--- a/var/spack/repos/builtin/packages/isaac/package.py
+++ b/var/spack/repos/builtin/packages/isaac/package.py
@@ -30,12 +30,12 @@ class Isaac(CMakePackage):
 
     homepage = "http://computationalradiationphysics.github.io/isaac/"
     url      = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz"
+    git      = "https://github.com/ComputationalRadiationPhysics/isaac.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='dev',
-            git='https://github.com/ComputationalRadiationPhysics/isaac.git')
-    version('master', branch='master',
-            git='https://github.com/ComputationalRadiationPhysics/isaac.git')
+    version('develop', branch='dev')
+    version('master', branch='master')
     version('1.4.0', '3ad05c8fad4673366077204c5d39285f')
     version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b')
     version('1.3.2', 'c557daa74de52fd79e734c9758fca38b')
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 5cc134de61..0d4f5e883c 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -30,19 +30,18 @@ import sys
 
 class Julia(Package):
     """The Julia Language: A fresh approach to technical computing"""
+
     homepage = "http://julialang.org"
     url      = "https://github.com/JuliaLang/julia/releases/download/v0.4.3/julia-0.4.3-full.tar.gz"
+    git      = "https://github.com/JuliaLang/julia.git"
 
-    version('master',
-            git='https://github.com/JuliaLang/julia.git', branch='master')
-    version('release-0.5',
-            git='https://github.com/JuliaLang/julia.git', branch='release-0.5')
-    version('0.6.2', '255d80bc8d56d5f059fe18f0798e32f6')        
-    version('0.5.2', '8c3fff150a6f96cf0536fb3b4eaa5cbb')    
+    version('master', branch='master')
+    version('0.6.2', '255d80bc8d56d5f059fe18f0798e32f6')
+    version('release-0.5', branch='release-0.5')
+    version('0.5.2', '8c3fff150a6f96cf0536fb3b4eaa5cbb')
     version('0.5.1', 'bce119b98f274e0f07ce01498c463ad5')
     version('0.5.0', 'b61385671ba74767ab452363c43131fb')
-    version('release-0.4',
-            git='https://github.com/JuliaLang/julia.git', branch='release-0.4')
+    version('release-0.4', branch='release-0.4')
     version('0.4.7', '75a7a7dd882b7840829d8f165e9b9078')
     version('0.4.6', 'd88db18c579049c23ab8ef427ccedf5d')
     version('0.4.5', '69141ff5aa6cee7c0ec8c85a34aa49a6')
diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py
index 30565a5180..a7d8d836dd 100644
--- a/var/spack/repos/builtin/packages/kahip/package.py
+++ b/var/spack/repos/builtin/packages/kahip/package.py
@@ -44,8 +44,9 @@ class Kahip(SConsPackage):
 
     homepage  = 'http://algo2.iti.kit.edu/documents/kahip/index.html'
     url       = 'http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz'
+    git       = 'https://github.com/schulzchristian/KaHIP.git'
 
-    version('develop', git='https://github.com/schulzchristian/KaHIP.git')
+    version('develop', git=git)
     version('2.00', '0a66b0a604ad72cfb7e3dce00e2c9fdfac82b855')
 
     depends_on('argtable')
diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py
index 376aebaa94..69981c85ca 100644
--- a/var/spack/repos/builtin/packages/kaldi/package.py
+++ b/var/spack/repos/builtin/packages/kaldi/package.py
@@ -35,13 +35,11 @@ class Kaldi(Package):    # Does not use Autotools
     Kaldi is intended for use by speech recognition researchers."""
 
     homepage = "https://github.com/kaldi-asr/kaldi"
-    url      = "https://github.com/kaldi-asr/kaldi/archive/master.zip"
+    git      = "https://github.com/kaldi-asr/kaldi.git"
 
-    version('master', git='https://github.com/kaldi-asr/kaldi.git')
-    version('2018-07-11', git='https://github.com/kaldi-asr/kaldi.git',
-            commit='6f2140b032b0108bc313eefdca65151289642773')
-    version('2015-10-07', git='https://github.com/kaldi-asr/kaldi.git',
-            commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e')
+    version('master')
+    version('2018-07-11', commit='6f2140b032b0108bc313eefdca65151289642773')
+    version('2015-10-07', commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e')
 
     variant('shared', default=True,
             description='build shared libraries')
diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py
index 95d5846d61..79a61c2e62 100644
--- a/var/spack/repos/builtin/packages/kealib/package.py
+++ b/var/spack/repos/builtin/packages/kealib/package.py
@@ -43,8 +43,9 @@ class Kealib(CMakePackage):
     """
     homepage = "http://www.kealib.org/"
     url      = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.10.tar.gz"
+    hg       = "https://bitbucket.org/chchrsc/kealib"
 
-    version('develop', hg='https://bitbucket.org/chchrsc/kealib')
+    version('develop', hg=hg)
     version('1.4.10', '5684aeb2085a67a4270c73e79d4ab768')
     version('1.4.9',  'a095d0b9d6de1d609ffaf242e00cc2b6')
     version('1.4.8',  '1af2514c908f9168ff6665cc012815ad')
diff --git a/var/spack/repos/builtin/packages/kentutils/package.py b/var/spack/repos/builtin/packages/kentutils/package.py
index 9e807df0e1..c66925a088 100644
--- a/var/spack/repos/builtin/packages/kentutils/package.py
+++ b/var/spack/repos/builtin/packages/kentutils/package.py
@@ -29,9 +29,9 @@ class Kentutils(MakefilePackage):
     """Jim Kent command line bioinformatic utilities"""
 
     homepage = "https://github.com/ENCODE-DCC/kentUtils"
-    url      = "https://github.com/ENCODE-DCC/kentUtils"
+    git      = "https://github.com/ENCODE-DCC/kentUtils.git"
 
-    version('302.1', git='https://github.com/ENCODE-DCC/kentUtils.git', commit='d8376c5d52a161f2267346ed3dc94b5dce74c2f9')
+    version('302.1', commit='d8376c5d52a161f2267346ed3dc94b5dce74c2f9')
 
     depends_on('libpng')
     depends_on('openssl')
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index ef1651ff4f..98304b4cda 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -31,7 +31,9 @@ class Kokkos(Package):
 
     homepage = "https://github.com/kokkos/kokkos"
     url      = "https://github.com/kokkos/kokkos/archive/2.03.00.tar.gz"
+    git      = "https://github.com/kokkos/kokkos.git"
 
+    version('develop', branch='develop')
     version('2.7.00',  'b357f9374c1008754babb4495f95e392')
     version('2.5.00',  '2db83c56587cb83b772d0c81a3228a21')
     version('2.04.11', 'd4849cee6eb9001d61c30f1d9fe74336')
@@ -42,8 +44,6 @@ class Kokkos(Package):
     version('2.03.00', 'f205d659d4304747759fabfba32d43c3')
     version('2.02.15', 'de41e38f452a50bb03363c519fe20769')
     version('2.02.07', 'd5baeea70109249f7dca763074ffb202')
-    version('develop', git='https://github.com/kokkos/kokkos',
-            branch='develop')
 
     variant('qthreads', default=False, description="enable Qthreads backend")
     variant('cuda', default=False, description="enable Cuda backend")
diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py
index 3fa405b669..1c6258f0f0 100644
--- a/var/spack/repos/builtin/packages/krims/package.py
+++ b/var/spack/repos/builtin/packages/krims/package.py
@@ -29,15 +29,16 @@ class Krims(CMakePackage):
     """The bucket of Krimskrams every C or C++ project needs"""
 
     homepage = "http://lazyten.org/krims"
-    url = "https://github.com/lazyten/krims/archive/v0.2.1.tar.gz"
+    url      = "https://github.com/lazyten/krims/archive/v0.2.1.tar.gz"
+    git      = "https://github.com/lazyten/krims.git"
+
     maintainers = ['mfherbst']
 
     #
     # Versions
     #
+    version("develop", branch="master")
     version("0.2.1", "bf219656fd81c342a4782bad7d7beed0")
-    version("develop", git="https://github.com/lazyten/krims.git",
-            branch="master")
 
     #
     # Variants
diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py
index 35470eee1a..2a67665fd8 100644
--- a/var/spack/repos/builtin/packages/kvasir-mpl/package.py
+++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py
@@ -30,9 +30,9 @@ class KvasirMpl(Package):
     """Kvasir metaprogramming library"""
 
     homepage = "https://github.com/kvasir-io/mpl"
+    git      = "https://github.com/kvasir-io/mpl.git"
 
-    version('develop', git='https://github.com/kvasir-io/mpl.git',
-            branch='development')
+    version('develop', branch='development')
 
     def install(self, spec, prefix):
         install_tree('src', prefix.include)
diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py
index 3a8fb66811..aeff98804d 100644
--- a/var/spack/repos/builtin/packages/kvtree/package.py
+++ b/var/spack/repos/builtin/packages/kvtree/package.py
@@ -31,11 +31,12 @@ class Kvtree(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/KVTree"
     url      = "https://github.com/ECP-VeloC/KVTree/archive/v1.0.0.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/kvtree.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('1.0.1', 'f007b4b930d12fc0eb784b4dc3af823e')
-    version('master', git='https://github.com/ecp-veloc/kvtree.git',
-            branch='master')
 
     variant('mpi', default=True, description="Build with MPI message packing")
     depends_on('mpi', when='+mpi')
diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py
index e828904bdd..11abe46fdf 100644
--- a/var/spack/repos/builtin/packages/laghos/package.py
+++ b/var/spack/repos/builtin/packages/laghos/package.py
@@ -34,11 +34,11 @@ class Laghos(MakefilePackage):
     tags = ['proxy-app', 'ecp-proxy-app']
 
     homepage = "https://codesign.llnl.gov/laghos.php"
-    git      = "https://github.com/CEED/Laghos"
     url      = "https://github.com/CEED/Laghos/archive/v1.0.tar.gz"
+    git      = "https://github.com/CEED/Laghos.git"
 
+    version('develop', branch='master')
     version('1.0', '4c091e115883c79bed81c557ef16baff')
-    version('develop', git=git, branch='master')
 
     variant('metis', default=True, description='Enable/disable METIS support')
 
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index 459166c36e..238e56500a 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -35,15 +35,16 @@ class Lammps(CMakePackage):
     """
     homepage = "http://lammps.sandia.gov/"
     url      = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz"
+    git      = "https://github.com/lammps/lammps"
 
     tags = ['ecp', 'ecp-apps']
 
+    version('develop', branch='master')
     version('20180629', '6d5941863ee25ad2227ff3b7577d5e7c')
     version('20180316', '25bad35679583e0dd8cb8753665bb84b')
     version('20180222', '4d0513e3183bd57721814d217fdaf957')
     version('20170922', '4306071f919ec7e759bda195c26cfd9a')
     version('20170901', '767e7f07289663f033474dfe974974e7')
-    version('develop', git='https://github.com/lammps/lammps', branch='master')
 
     def url_for_version(self, version):
         vdate = dt.datetime.strptime(str(version), "%Y%m%d")
diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py
index 8b1d60c024..ce4246123f 100644
--- a/var/spack/repos/builtin/packages/latte/package.py
+++ b/var/spack/repos/builtin/packages/latte/package.py
@@ -31,14 +31,15 @@ class Latte(CMakePackage):
 
     homepage = "https://github.com/lanl/latte"
     url      = "https://github.com/lanl/latte/tarball/v1.0"
+    git      = "https://github.com/lanl/latte.git"
 
     tags = ['ecp', 'ecp-apps']
 
+    version('develop', branch='master')
     version('1.2.1', '56db44afaba2a89e6ca62ac565c3c012')
     version('1.2.0', 'b9bf8f84a0e0cf7b0e278a1bc7751b3d')
     version('1.1.1', 'ab11867ba6235189681cf6e50a50cc50')
     version('1.0.1', 'd0b99edbcf7a19abe0a68a192d6f6234')
-    version('develop', git='https://github.com/lanl/latte', branch='master')
 
     variant('mpi', default=True,
             description='Build with mpi')
diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py
index 3b5a2829d1..d564732848 100644
--- a/var/spack/repos/builtin/packages/lazyten/package.py
+++ b/var/spack/repos/builtin/packages/lazyten/package.py
@@ -30,15 +30,16 @@ class Lazyten(CMakePackage):
     """Lightweight linear algebra library based on lazy matrices"""
 
     homepage = "http://lazyten.org"
-    url = "https://github.com/lazyten/lazyten/archive/v0.4.1.tar.gz"
+    url      = "https://github.com/lazyten/lazyten/archive/v0.4.1.tar.gz"
+    git      = "https://github.com/lazyten/lazyten.git"
+
     maintainers = ['mfherbst']
 
     #
     # Versions
     #
+    version("develop", branch="master")
     version('0.4.1', 'd06f7996144e1bf1b0aee82c2af36e83')
-    version("develop", git="https://github.com/lazyten/lazyten.git",
-            branch="master")
 
     #
     # Variants
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index 8b0faccabe..ff8d8a3047 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -34,8 +34,9 @@ class Lbann(CMakePackage):
 
     homepage = "http://software.llnl.gov/lbann/"
     url      = "https://github.com/LLNL/lbann/archive/v0.91.tar.gz"
+    git      = "https://github.com/LLNL/lbann.git"
 
-    version('develop', git='https://github.com/LLNL/lbann.git', branch="develop")
+    version('develop', branch='develop')
     version('0.93', '1913a25a53d4025fa04c16f14afdaa55')
     version('0.92', 'c0eb1595a7c74640e96f280beb497564')
     version('0.91', '83b0ec9cd0b7625d41dfb06d2abd4134')
diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py
index fb497216d4..82235a8f86 100644
--- a/var/spack/repos/builtin/packages/legion/package.py
+++ b/var/spack/repos/builtin/packages/legion/package.py
@@ -42,8 +42,9 @@ class Legion(CMakePackage):
     """
     homepage = "http://legion.stanford.edu/"
     url      = "https://github.com/StanfordLegion/legion/tarball/legion-17.02.0"
+    git      = "https://github.com/StanfordLegion/legion.git"
 
-    version('develop', git='https://github.com/StanfordLegion/legion', branch='master')
+    version('develop', branch='master')
     version('18.05.0', 'ab5ac8cd4aa4c91e6187bf1333a031bf')
     version('18.02.0', '14937b386100347b051a5fc514636353')
     version('17.10.0', 'ebfc974dc82a9d7f3ba53242ecae62e1')
diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py
index e3967b4a0f..c2a3e3676d 100644
--- a/var/spack/repos/builtin/packages/libceed/package.py
+++ b/var/spack/repos/builtin/packages/libceed/package.py
@@ -26,16 +26,14 @@ from spack import *
 
 
 class Libceed(Package):
-    """The CEED API Library: Code for Efficient Extensible Discretizations
-    """
+    """The CEED API Library: Code for Efficient Extensible Discretizations."""
 
     homepage = "https://github.com/CEED/libCEED"
-    url      = 'https://github.com/CEED/libCEED'
+    git      = "https://github.com/CEED/libCEED.git"
 
-    version('develop', git='https://github.com/CEED/libCEED.git',
-            branch='master')
-    version('0.2', git='https://github.com/CEED/libCEED.git', tag='v0.2')
-    version('0.1', git='https://github.com/CEED/libCEED.git', tag='v0.1')
+    version('develop', branch='master')
+    version('0.2', tag='v0.2')
+    version('0.1', tag='v0.1')
 
     variant('occa', default=True, description='Enable OCCA backends')
     variant('cuda', default=False, description='Enable CUDA support')
diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py
index 09fe1d1a35..19fd42f700 100644
--- a/var/spack/repos/builtin/packages/libev/package.py
+++ b/var/spack/repos/builtin/packages/libev/package.py
@@ -31,9 +31,10 @@ class Libev(AutotoolsPackage):
 
     homepage = "http://software.schmorp.de/pkg/libev.html"
     url      = "http://dist.schmorp.de/libev/libev-4.24.tar.gz"
+    git      = "https://github.com/enki/libev.git"
     list_url = "http://dist.schmorp.de/libev/Attic/"
 
-    version('develop', git='https://github.com/enki/libev')
+    version('develop', git=git)
     version('4.24', '94459a5a22db041dec6f98424d6efe54')
 
     depends_on('autoconf', type='build', when='@develop')
diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py
index e7598160e9..b8ae807afa 100644
--- a/var/spack/repos/builtin/packages/libevpath/package.py
+++ b/var/spack/repos/builtin/packages/libevpath/package.py
@@ -33,10 +33,10 @@ class Libevpath(CMakePackage):
     """
 
     homepage = "https://github.com/GTkorvo/evpath"
-    url = "https://github.com/GTkorvo/evpath/archive/v4.1.1.tar.gz"
+    url      = "https://github.com/GTkorvo/evpath/archive/v4.1.1.tar.gz"
+    git      = "https://github.com/GTkorvo/evpath.git"
 
-    version('develop', git='https://github.com/GTkorvo/evpath.git',
-            branch='master')
+    version('develop', branch='master')
     version('4.4.0', 'd8630eb358ec90ae2d188e0e6c74022a')
     version('4.2.4', '757ce010a6b7564dc62d3c79edd861d5')
     version('4.2.1', 'f928dc0dee41668afc91634c7051ce1a')
diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py
index 3ebd03c600..68638251d6 100644
--- a/var/spack/repos/builtin/packages/libffs/package.py
+++ b/var/spack/repos/builtin/packages/libffs/package.py
@@ -34,13 +34,13 @@ class Libffs(CMakePackage):
     """
 
     homepage = "http://www.cc.gatech.edu/systems/projects/FFS"
-    url = "https://github.com/GTkorvo/ffs/archive/v1.1.tar.gz"
+    url      = "https://github.com/GTkorvo/ffs/archive/v1.1.tar.gz"
+    git      = "https://github.com/GTkorvo/ffs.git"
 
-    version('develop', git='https://github.com/GTkorvo/ffs.git',
-            branch='master')
-    version('1.5', 'c41c5f5f448b627740deecd695b7bbf8')
+    version('develop', branch='master')
+    version('1.5',   'c41c5f5f448b627740deecd695b7bbf8')
     version('1.1.1', 'aa1c8ad5cf35e8cf76735e3a60891509')
-    version('1.1', '561c6b3abc53e12b3c01192e8ef2ffbc')
+    version('1.1',   '561c6b3abc53e12b3c01192e8ef2ffbc')
 
     depends_on('flex', type='build', when='@:1.4')
     depends_on('bison', type='build', when='@:1.4')
diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py
index 4411a4f58c..4c5aeada97 100644
--- a/var/spack/repos/builtin/packages/libharu/package.py
+++ b/var/spack/repos/builtin/packages/libharu/package.py
@@ -34,11 +34,11 @@ class Libharu(AutotoolsPackage):
 
     homepage = "http://libharu.org"
     url      = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"
+    git      = "https://github.com/libharu/libharu.git"
 
+    version('master', branch='master')
     version('2.3.0', '4f916aa49c3069b3a10850013c507460')
     version('2.2.0', 'b65a6fc33a0bdad89bec6b7def101f01')
-    version('master', branch='master',
-            git='https://github.com/libharu/libharu.git')
 
     depends_on('libtool', type=('build'))
     depends_on('autoconf', type=('build'))
diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py
index f909e8b516..168389d450 100644
--- a/var/spack/repos/builtin/packages/libmonitor/package.py
+++ b/var/spack/repos/builtin/packages/libmonitor/package.py
@@ -27,9 +27,12 @@ from spack import *
 
 class Libmonitor(AutotoolsPackage):
     """Libmonitor is a library for process and thread control."""
+
     homepage = "https://github.com/HPCToolkit/libmonitor"
-    version('20130218', git='https://github.com/HPCToolkit/libmonitor.git',
-            commit='4f2311e')
+    git      = "https://github.com/HPCToolkit/libmonitor.git"
+
+    version('20130218', commit='4f2311e')
+
     variant('krellpatch', default=False,
             description="build with openspeedshop based patch.")
 
diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py
index 74957725d8..fa454bfcdc 100644
--- a/var/spack/repos/builtin/packages/libquo/package.py
+++ b/var/spack/repos/builtin/packages/libquo/package.py
@@ -33,9 +33,10 @@ class Libquo(AutotoolsPackage):
 
     homepage = "https://github.com/lanl/libquo"
     url      = "https://github.com/lanl/libquo/archive/v1.2.9.tar.gz"
+    git      = "https://github.com/lanl/libquo.git"
 
-    version('develop', git='https://github.com/lanl/libquo', branch='master')
-    version('1.3', '3ff74162837425a15ecf695ca0201e4a')
+    version('develop', branch='master')
+    version('1.3',   '3ff74162837425a15ecf695ca0201e4a')
     version('1.2.9', 'ca82ab33f13e2b89983f81e7c02e98c2')
 
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py
index c52c06370a..9994184557 100644
--- a/var/spack/repos/builtin/packages/librom/package.py
+++ b/var/spack/repos/builtin/packages/librom/package.py
@@ -30,10 +30,9 @@ class Librom(AutotoolsPackage):
     """libROM: library for computing large-scale reduced order models"""
 
     homepage = "https://github.com/LLNL/libROM"
-    url      = "https://github.com/LLNL/libROM"
+    git      = "https://github.com/LLNL/libROM.git"
 
-    version('develop', git='https://github.com/LLNL/libROM',
-            branch='master')
+    version('develop', branch='master')
 
     depends_on('lapack')
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/libshm/package.py b/var/spack/repos/builtin/packages/libshm/package.py
index 99b415b313..7ac2fcea03 100644
--- a/var/spack/repos/builtin/packages/libshm/package.py
+++ b/var/spack/repos/builtin/packages/libshm/package.py
@@ -30,9 +30,9 @@ class Libshm(Package):
     making an easy C++11 access to a shared memory."""
 
     homepage = "https://github.com/afeldman/libshm"
-    url      = "https://github.com/afeldman/libshm.git"
+    git      = "https://github.com/afeldman/libshm.git"
 
-    version('master', git='https://github.com/afeldman/libshm.git')
+    version('master')
 
     def install(self, spec, prefix):
         install_tree('include', prefix.include)
diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py
index 5cca529a76..672a0268d2 100644
--- a/var/spack/repos/builtin/packages/libsplash/package.py
+++ b/var/spack/repos/builtin/packages/libsplash/package.py
@@ -36,12 +36,11 @@ class Libsplash(CMakePackage):
 
     homepage = "https://github.com/ComputationalRadiationPhysics/libSplash"
     url      = "https://github.com/ComputationalRadiationPhysics/libSplash/archive/v1.4.0.tar.gz"
+    git      = "https://github.com/ComputationalRadiationPhysics/libSplash.git"
     maintainers = ['ax3l']
 
-    version('develop', branch='dev',
-            git='https://github.com/ComputationalRadiationPhysics/libSplash.git')
-    version('master', branch='master',
-            git='https://github.com/ComputationalRadiationPhysics/libSplash.git')
+    version('develop', branch='dev')
+    version('master', branch='master')
     version('1.7.0', '22dea94734fe4f4c5f4e875ce70900d3')
     version('1.6.0', 'c05bce95abfe1ae4cd9d9817acf58d94')
     version('1.5.0', 'c1efec4c20334242c8a3b6bfdc0207e3')
diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py
index e97f328d18..e88ce2c8ad 100644
--- a/var/spack/repos/builtin/packages/libxsmm/package.py
+++ b/var/spack/repos/builtin/packages/libxsmm/package.py
@@ -33,9 +33,9 @@ class Libxsmm(MakefilePackage):
 
     homepage = 'https://github.com/hfp/libxsmm'
     url      = 'https://github.com/hfp/libxsmm/archive/1.9.tar.gz'
+    git      = 'https://github.com/hfp/libxsmm.git'
 
-    version('develop', git='https://github.com/hfp/libxsmm.git')
-
+    version('develop', git=git)
     version('1.9',   'a001a491d9b98239bc2bfd906bd09d90')
     version('1.8.3', '3415928340929c3a29773934de05c978')
     version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4')
diff --git a/var/spack/repos/builtin/packages/linkphase3/package.py b/var/spack/repos/builtin/packages/linkphase3/package.py
index 3c574a5811..25bc77dec3 100644
--- a/var/spack/repos/builtin/packages/linkphase3/package.py
+++ b/var/spack/repos/builtin/packages/linkphase3/package.py
@@ -29,10 +29,9 @@ class Linkphase3(Package):
     """Haplotype reconstruction in pedigreed populations."""
 
     homepage = "https://github.com/tdruet/LINKPHASE3"
-    url      = "https://github.com/tdruet/LINKPHASE3"
+    git      = "https://github.com/tdruet/LINKPHASE3.git"
 
-    version('2017-06-14', commit='559913593fc818bb1adb29796a548cf5bf323827',
-            git='https://github.com/tdruet/LINKPHASE3.git')
+    version('2017-06-14', commit='559913593fc818bb1adb29796a548cf5bf323827')
 
     def install(self, spec, prefix):
         fortran = Executable(self.compiler.fc)
diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
index 310df251aa..1b29312f7e 100644
--- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
+++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
@@ -32,19 +32,14 @@ class LlvmOpenmpOmpt(CMakePackage):
        changes for OMPT, the OpenMP Tools interface"""
 
     homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp"
+    git      = "https://github.com/OpenMPToolsInterface/LLVM-openmp.git"
 
     # tr6_forwards branch
-    version('tr6_forwards', branch='tr6_forwards',
-            git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git')
-
-    version('3.9.2b2',
-            git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git',
-            commit='5cdca5dd3c0c336d42a335ca7cff622e270c9d47')
+    version('tr6_forwards', branch='tr6_forwards')
+    version('3.9.2b2', commit='5cdca5dd3c0c336d42a335ca7cff622e270c9d47')
 
     # align-to-tr-rebased branch
-    version('3.9.2b',
-            git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git',
-            commit='982a08bcf3df9fb5afc04ac3bada47f19cc4e3d3')
+    version('3.9.2b', commit='982a08bcf3df9fb5afc04ac3bada47f19cc4e3d3')
 
     # variant for building llvm-openmp-ompt as a stand alone library
     variant('standalone', default=False,
diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py
index aa26cb6ab6..268f0ed817 100644
--- a/var/spack/repos/builtin/packages/lrzip/package.py
+++ b/var/spack/repos/builtin/packages/lrzip/package.py
@@ -34,9 +34,10 @@ class Lrzip(Package):
     but not both."""
 
     homepage = 'http://lrzip.kolivas.org'
-    url = 'https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz'
+    url      = 'https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz'
+    git      = 'https://github.com/ckolivas/lrzip.git'
 
-    version('master', git='https://github.com/ckolivas/lrzip.git')
+    version('master', git=git)
     version('0.630', '3ca7f1d1365aa105089d1fbfc6b0924a')
     version('0.621', '1f07227b39ae81a98934411e8611e341')
     version('0.616', 'd40bdb046d0807ef602e36b1e9782cc0')
diff --git a/var/spack/repos/builtin/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py
index 7893864d29..2190529f8c 100644
--- a/var/spack/repos/builtin/packages/lwm2/package.py
+++ b/var/spack/repos/builtin/packages/lwm2/package.py
@@ -31,8 +31,9 @@ class Lwm2(AutotoolsPackage):
        measurements from a program.
     """
     homepage = "https://jay.grs.rwth-aachen.de/redmine/projects/lwm2"
+    hg       = "https://jay.grs.rwth-aachen.de/hg/lwm2"
 
-    version('torus', hg='https://jay.grs.rwth-aachen.de/hg/lwm2', revision='torus')
+    version('torus', revision='torus')
 
     depends_on("papi")
     depends_on("mpi")
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index a8c4b819bd..f4b5a6012e 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -40,9 +40,10 @@ class Opencv(CMakePackage):
     """
 
     homepage = 'http://opencv.org/'
-    url = 'https://github.com/Itseez/opencv/archive/3.1.0.tar.gz'
+    url      = 'https://github.com/Itseez/opencv/archive/3.1.0.tar.gz'
+    git      = 'https://github.com/opencv/opencv.git'
 
-    version('master', git="https://github.com/opencv/opencv.git", branch="master")
+    version('master', branch='master')
     version('3.4.1',    'a0b7a47899e67b3490ea31edc4f6e8e6')
     version('3.4.0',    '170732dc760e5f7ddeccbe53ba5d16a6')
     version('3.3.1',    'b1ed9aea030bb5bd9df28524d97de84c')
diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py
index 29afcef8ac..907857aace 100644
--- a/var/spack/repos/builtin/packages/plasma/package.py
+++ b/var/spack/repos/builtin/packages/plasma/package.py
@@ -22,11 +22,11 @@ class Plasma(MakefilePackage):
 
     homepage = "https://bitbucket.org/icl/plasma/"
     url      = "https://bitbucket.org/icl/plasma/downloads/plasma-17.1.tar.gz"
+    hg       = "https://luszczek@bitbucket.org/icl/plasma"
 
+    version("develop", hg=hg)
     version("17.1", "64b410b76023a41b3f07a5f0dca554e1")
 
-    version("develop", hg="https://luszczek@bitbucket.org/icl/plasma")
-
     variant('shared', default=True, description="Build shared library (disables static library)")
 
     depends_on("blas")
diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py
index 599b9a907e..665aee5e99 100644
--- a/var/spack/repos/builtin/packages/xios/package.py
+++ b/var/spack/repos/builtin/packages/xios/package.py
@@ -31,9 +31,8 @@ class Xios(Package):
     """XML-IO-SERVER library for IO management of climate models."""
 
     homepage = "https://forge.ipsl.jussieu.fr/ioserver/wiki"
-    url = "https://forge.ipsl.jussieu.fr/ioserver"
 
-    version('1.0', revision=910, 
+    version('1.0', revision=910,
             svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-1.0')
     version('develop', svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk')
author	Adam J. Stewart <ajstewart426@gmail.com>	2018-07-23 00:00:15 -0700
committer	Todd Gamblin <tgamblin@llnl.gov>	2018-07-25 23:10:10 -0700
commit	4c6aca533ab0596a677d041b1766e88f045d42f4 (patch)
tree	5a60f920b31d1c8f88104bc886b3803d20ca4f26
parent	5f00056490665ef6ddd7389966480bca7d2f3a04 (diff)
download	spack-4c6aca533ab0596a677d041b1766e88f045d42f4.tar.gz spack-4c6aca533ab0596a677d041b1766e88f045d42f4.tar.bz2 spack-4c6aca533ab0596a677d041b1766e88f045d42f4.tar.xz spack-4c6aca533ab0596a677d041b1766e88f045d42f4.zip