Add top-level attributes for git R-Z packages

71 files changed, 204 insertions, 194 deletions

diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py
index 64313f127a..48d8cd12f6 100644
--- a/var/spack/repos/builtin/packages/raft/package.py
+++ b/var/spack/repos/builtin/packages/raft/package.py
@@ -31,10 +31,11 @@ class Raft(CMakePackage):
        Toolbox under development at Brazilian Synchrotron Light Source."""
 
     homepage = "https://bitbucket.org/gill_martinez/raft_aps"
-    url = "https://bitbucket.org/gill_martinez/raft_aps/get/1.2.3.tar.gz"
+    url      = "https://bitbucket.org/gill_martinez/raft_aps/get/1.2.3.tar.gz"
+    git      = "https://bitbucket.org/gill_martinez/raft_aps.git"
 
+    version('develop', git=git)
     version('1.2.3', '4d1b106d9b3493e63dde96f7dd44b834')
-    version('develop', git='https://bitbucket.org/gill_martinez/raft_aps.git')
 
     depends_on('mpi')
     depends_on('cmake', type='build')
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py
index 29a48078d4..660d9d6547 100644
--- a/var/spack/repos/builtin/packages/raja/package.py
+++ b/var/spack/repos/builtin/packages/raja/package.py
@@ -27,16 +27,18 @@ from spack import *
 
 class Raja(CMakePackage):
     """RAJA Parallel Framework."""
+
     homepage = "http://software.llnl.gov/RAJA/"
+    git      = "https://github.com/LLNL/RAJA.git"
 
-    version('master', git='https://github.com/LLNL/RAJA.git', branch='master', submodules='True')
-    version('develop', git='https://github.com/LLNL/RAJA.git', branch='develop', submodules='True')
-    version('0.5.3', git='https://github.com/LLNL/RAJA.git', tag='v0.5.3', submodules="True")
-    version('0.5.2', git='https://github.com/LLNL/RAJA.git', tag='v0.5.2', submodules="True")
-    version('0.5.1', git='https://github.com/LLNL/RAJA.git', tag='v0.5.1', submodules="True")
-    version('0.5.0', git='https://github.com/LLNL/RAJA.git', tag='v0.5.0', submodules="True")
-    version('0.4.1', git='https://github.com/LLNL/RAJA.git', tag='v0.4.1', submodules="True")
-    version('0.4.0', git='https://github.com/LLNL/RAJA.git', tag='v0.4.0', submodules="True")
+    version('develop', branch='develop', submodules='True')
+    version('master',  branch='master',  submodules='True')
+    version('0.5.3', tag='v0.5.3', submodules="True")
+    version('0.5.2', tag='v0.5.2', submodules="True")
+    version('0.5.1', tag='v0.5.1', submodules="True")
+    version('0.5.0', tag='v0.5.0', submodules="True")
+    version('0.4.1', tag='v0.4.1', submodules="True")
+    version('0.4.0', tag='v0.4.0', submodules="True")
 
     variant('cuda', default=False, description='Build with CUDA backend')
     variant('openmp', default=True, description='Build OpenMP backend')
diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py
index 88963be60b..82df492092 100644
--- a/var/spack/repos/builtin/packages/rankstr/package.py
+++ b/var/spack/repos/builtin/packages/rankstr/package.py
@@ -30,11 +30,12 @@ class Rankstr(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/rankstr"
     url      = "https://github.com/ECP-VeloC/rankstr/archive/v0.0.1.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/rankstr.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('0.0.1', 'abe06fa6a78cfe20ec0c78717ac2f2ed')
-    version('master', git='https://github.com/ecp-veloc/rankstr.git',
-            branch='master')
 
     depends_on('mpi')
 
diff --git a/var/spack/repos/builtin/packages/readfq/package.py b/var/spack/repos/builtin/packages/readfq/package.py
index 0550f0cc40..6fad0215c1 100644
--- a/var/spack/repos/builtin/packages/readfq/package.py
+++ b/var/spack/repos/builtin/packages/readfq/package.py
@@ -31,8 +31,9 @@ class Readfq(Package):
     interface."""
 
     homepage = "https://github.com/lh3/readfq"
+    git      = "https://github.com/lh3/readfq.git"
 
-    version('2013.04.10', git='https://github.com/lh3/readfq.git', commit='4fb766095d8f459e0f8025be70f9173673905d12')
+    version('2013.04.10', commit='4fb766095d8f459e0f8025be70f9173673905d12')
 
     def install(self, spec, prefix):
         install_tree('.', prefix.bin)
diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py
index 8f2ac8af04..2211da06e7 100644
--- a/var/spack/repos/builtin/packages/redset/package.py
+++ b/var/spack/repos/builtin/packages/redset/package.py
@@ -30,11 +30,12 @@ class Redset(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/redset"
     url      = "https://github.com/ECP-VeloC/redset/archive/v0.0.1.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/redset.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('0.0.2', '370d4dd477ebcfdd28dcc6375c22f731')
-    version('master', git='https://github.com/ecp-veloc/redset.git',
-            branch='master')
 
     depends_on('mpi')
     depends_on('rankstr')
diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py
index abd8e82821..120ef6bd83 100644
--- a/var/spack/repos/builtin/packages/relion/package.py
+++ b/var/spack/repos/builtin/packages/relion/package.py
@@ -32,11 +32,11 @@ class Relion(CMakePackage, CudaPackage):
     electron cryo-microscopy (cryo-EM)."""
 
     homepage = "http://http://www2.mrc-lmb.cam.ac.uk/relion"
-    url      = "https://github.com/3dem/relion"
+    git      = "https://github.com/3dem/relion.git"
 
-    version('2.1', git='https://github.com/3dem/relion.git', tag='2.1')
-    version('2.0.3', git='https://github.com/3dem/relion.git', tag='2.0.3')
-    version('develop', git='https://github.com/3dem/relion.git')
+    version('develop')
+    version('2.1', tag='2.1')
+    version('2.0.3', tag='2.0.3')
 
     variant('gui', default=True, description="build the gui")
     variant('cuda', default=True, description="enable compute on gpu")
diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py
index 7a3a643ddb..900ceb6b5e 100644
--- a/var/spack/repos/builtin/packages/rmlab/package.py
+++ b/var/spack/repos/builtin/packages/rmlab/package.py
@@ -26,15 +26,14 @@ from spack import *
 
 
 class Rmlab(CMakePackage):
-    """C++ File API for the reMarkable tablet
-    """
+    """C++ File API for the reMarkable tablet"""
 
     homepage = "https://github.com/ax3l/lines-are-beautiful"
-    url      = "https://plasma.ninja/blog/devices/remarkable/binary/format/2017/12/26/reMarkable-lines-file-format.html"
+    git      = "https://github.com/ax3l/lines-are-beautiful.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='develop',
-            git='https://github.com/ax3l/lines-are-beautiful.git')
+    version('develop', branch='develop')
 
     variant('png', default=True,
             description='Enable PNG conversion support')
diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py
index ffa9a91caa..12c1f4223d 100644
--- a/var/spack/repos/builtin/packages/rose/package.py
+++ b/var/spack/repos/builtin/packages/rose/package.py
@@ -35,11 +35,11 @@ class Rose(Package):
        (Developed at Lawrence Livermore National Lab)"""
 
     homepage = "http://rosecompiler.org/"
-    url = "https://github.com/rose-compiler/rose/archive/v0.9.7.tar.gz"
+    url      = "https://github.com/rose-compiler/rose/archive/v0.9.7.tar.gz"
+    git      = "https://github.com/rose-compiler/rose.git"
 
+    version('master', branch='master')
     version('0.9.7', 'e14ce5250078df4b09f4f40559d46c75')
-    version('master', branch='master',
-            git='https://github.com/rose-compiler/rose.git')
 
     patch('add_spack_compiler_recognition.patch')
 
diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py
index 88632f0fdf..4b098c34ac 100644
--- a/var/spack/repos/builtin/packages/rust/package.py
+++ b/var/spack/repos/builtin/packages/rust/package.py
@@ -33,10 +33,11 @@ def get_submodules():
 
 class Rust(Package):
     """The rust programming language toolchain"""
+
     homepage = "http://www.rust-lang.org"
-    url = "https://github.com/rust-lang/rust"
+    git      = "https://github.com/rust-lang/rust.git"
 
-    version('1.8.0', tag='1.8.0', git="https://github.com/rust-lang/rust")
+    version('1.8.0', tag='1.8.0')
 
     resource(name='cargo',
              git="https://github.com/rust-lang/cargo.git",
diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py
index d205ca5090..5d65806e48 100644
--- a/var/spack/repos/builtin/packages/sabre/package.py
+++ b/var/spack/repos/builtin/packages/sabre/package.py
@@ -37,9 +37,9 @@ class Sabre(MakefilePackage):
     """
 
     homepage = "https://github.com/najoshi/sabre"
-    url = "https://github.com/najoshi/sabre"
+    git      = "https://github.com/najoshi/sabre.git"
 
-    version('2013-09-27', git='https://github.com/najoshi/sabre.git', commit='039a55e500ba07b7e6432ea6ec2ddcfb3471d949')
+    version('2013-09-27', commit='039a55e500ba07b7e6432ea6ec2ddcfb3471d949')
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py
index 98e07478c7..3b8631a0ca 100644
--- a/var/spack/repos/builtin/packages/sambamba/package.py
+++ b/var/spack/repos/builtin/packages/sambamba/package.py
@@ -29,9 +29,9 @@ class Sambamba(Package):
     """Sambamba: process your BAM data faster (bioinformatics)"""
 
     homepage = "http://lomereiter.github.io/sambamba/"
+    git      = "https://github.com/lomereiter/sambamba.git"
 
-    version('0.6.6', git='https://github.com/lomereiter/sambamba.git',
-            tag='v0.6.6', submodules=True)
+    version('0.6.6', tag='v0.6.6', submodules=True)
 
     depends_on('ldc~shared', type=('build', 'link'))
     depends_on('python', type='build')
diff --git a/var/spack/repos/builtin/packages/satsuma2/package.py b/var/spack/repos/builtin/packages/satsuma2/package.py
index 3bbec608c6..e171ed316b 100644
--- a/var/spack/repos/builtin/packages/satsuma2/package.py
+++ b/var/spack/repos/builtin/packages/satsuma2/package.py
@@ -33,9 +33,9 @@ class Satsuma2(CMakePackage):
     """
 
     homepage = "https://github.com/bioinfologics/satsuma2"
-    url      = "https://github.com/bioinfologics/satsuma2"
+    git      = "https://github.com/bioinfologics/satsuma2.git"
 
-    version('2016-11-22', git='https://github.com/bioinfologics/satsuma2.git', commit='da694aeecf352e344b790bea4a7aaa529f5b69e6')
+    version('2016-11-22', commit='da694aeecf352e344b790bea4a7aaa529f5b69e6')
 
     def install(self, spec, prefix):
         install_tree(join_path('spack-build', 'bin'), prefix.bin)
diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py
index 641560f6de..1e5ea83f5b 100644
--- a/var/spack/repos/builtin/packages/savanna/package.py
+++ b/var/spack/repos/builtin/packages/savanna/package.py
@@ -32,12 +32,10 @@ class Savanna(MakefilePackage):
     """
 
     homepage = "https://github.com/CODARcode/savanna"
-    url = "https://github.com/CODARcode/savanna/archive/v0.5.tar.gz"
+    git      = "https://github.com/CODARcode/savanna.git"
 
-    version('develop', git='https://github.com/CODARcode/savanna.git',
-            branch='master', submodules=True)
-    version('0.5', git='https://github.com/CODARcode/savanna.git',
-            tag='0.5', submodules=True)
+    version('develop', branch='master', submodules=True)
+    version('0.5', tag='0.5', submodules=True)
 
     variant('tau', default=False, description='Enable TAU profiling support')
 
diff --git a/var/spack/repos/builtin/packages/saws/package.py b/var/spack/repos/builtin/packages/saws/package.py
index 901fdd9577..53aa4c11e2 100644
--- a/var/spack/repos/builtin/packages/saws/package.py
+++ b/var/spack/repos/builtin/packages/saws/package.py
@@ -30,7 +30,9 @@ class Saws(AutotoolsPackage):
        scientific or engineering application code into a webserver,
        allowing one to examine (and even modify) the state of the
        simulation with any browser from anywhere."""
+
     homepage = "https://bitbucket.org/saws/saws/wiki/Home"
+    git      = "https://bitbucket.org/saws/saws.git"
 
-    version('develop', git='https://bitbucket.org/saws/saws.git', tag='master')
-    version('0.1.0', git='https://bitbucket.org/saws/saws.git', tag='v0.1.0')
+    version('develop', tag='master')
+    version('0.1.0', tag='v0.1.0')
diff --git a/var/spack/repos/builtin/packages/scorec-core/package.py b/var/spack/repos/builtin/packages/scorec-core/package.py
index 673749ab0e..329d7c8a01 100644
--- a/var/spack/repos/builtin/packages/scorec-core/package.py
+++ b/var/spack/repos/builtin/packages/scorec-core/package.py
@@ -31,9 +31,9 @@ class ScorecCore(CMakePackage):
     """
 
     homepage = 'https://www.scorec.rpi.edu/'
-    url = 'https://github.com/SCOREC/core.git'
+    git      = 'https://github.com/SCOREC/core.git'
 
-    version('develop', git=url)
+    version('develop')
 
     depends_on('mpi')
     depends_on('zoltan')
diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py
index 9758db1f35..7ec0a5351e 100644
--- a/var/spack/repos/builtin/packages/scr/package.py
+++ b/var/spack/repos/builtin/packages/scr/package.py
@@ -34,15 +34,16 @@ class Scr(CMakePackage):
        capability for MPI codes"""
 
     homepage = "http://computation.llnl.gov/projects/scalable-checkpoint-restart-for-mpi"
+    url      = "https://github.com/LLNL/scr/archive/v1.2.0.tar.gz"
+    git      = "https://github.com/llnl/scr.git"
 
     # NOTE: scr-v1.1.8 is built with autotools and is not properly build here.
     # scr-v1.1.8 will be deprecated with the upcoming release of v1.2.0
     # url      = "https://github.com/LLNL/scr/releases/download/v1.1.8/scr-1.1.8.tar.gz"
     # version('1.1.8', '6a0f11ad18e27fcfc00a271ff587b06e')
 
-    url = "https://github.com/LLNL/scr/archive/v1.2.0.tar.gz"
+    version('master', branch='master')
     version('1.2.0', '060e9e9c7604c1765f3991f9cd6e9d2d')
-    version('master', git='https://github.com/llnl/scr.git', branch='master')
 
     depends_on('pdsh+static_modules', type=('build', 'run'))
     depends_on('zlib')
diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py
index 096d968b1f..05d9d94e0b 100644
--- a/var/spack/repos/builtin/packages/shuffile/package.py
+++ b/var/spack/repos/builtin/packages/shuffile/package.py
@@ -30,11 +30,12 @@ class Shuffile(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/shuffile"
     url      = "https://github.com/ECP-VeloC/shuffile/archive/v0.0.1.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/shuffile.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('0.0.2', 'eca45150d83e21ac51049133a2308d34')
-    version('master', git='https://github.com/ecp-veloc/shuffile.git',
-            branch='master')
 
     depends_on('mpi')
     depends_on('kvtree')
diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py
index 6ed7145254..568e8e4eed 100644
--- a/var/spack/repos/builtin/packages/simulationio/package.py
+++ b/var/spack/repos/builtin/packages/simulationio/package.py
@@ -28,13 +28,14 @@ from spack import *
 
 class Simulationio(CMakePackage):
     """SimulationIO: Efficient and convenient I/O for large PDE simulations"""
+
     homepage = "https://github.com/eschnett/SimulationIO"
     url      = "https://github.com/eschnett/SimulationIO/archive/version/0.1.0.tar.gz"
+    git      = "https://github.com/eschnett/SimulationIO.git"
 
+    version('develop', branch='master')
     version('1.0.0', '5cbf1d0084eb436d861ffcdd297eaa08')
     version('0.1.0', '00f7dabc08ed1ab77858785ce0809f50')
-    version('develop',
-            git='https://github.com/eschnett/SimulationIO.git', branch='master')
 
     variant('julia', default=False)
     variant('python', default=True)
diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py
index 5951973916..e85b51d6ad 100644
--- a/var/spack/repos/builtin/packages/singularity/package.py
+++ b/var/spack/repos/builtin/packages/singularity/package.py
@@ -31,11 +31,12 @@ class Singularity(AutotoolsPackage):
 
     homepage = "https://www.sylabs.io/singularity/"
     url      = "https://github.com/singularityware/singularity/releases/download/2.5.2/singularity-2.5.2.tar.gz"
+    git      = "https://github.com/singularityware/singularity.git"
 
     # Versions before 2.5.2 suffer from a serious security problem.
     # https://nvd.nist.gov/vuln/detail/CVE-2018-12021
+    version('develop', branch='master')
     version('2.5.2', '2edc1a8ac9a4d7d26fba6244f1c5fd95')
-    version('develop', git='https://github.com/singularityware/singularity.git', branch='master')
 
     depends_on('libarchive', when='@2.5.2:')
     # these are only needed if we're grabbing the unreleased tree
diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py
index cdd69f48cb..9bdb4436e3 100644
--- a/var/spack/repos/builtin/packages/slepc/package.py
+++ b/var/spack/repos/builtin/packages/slepc/package.py
@@ -27,13 +27,13 @@ from spack import *
 
 
 class Slepc(Package):
-    """
-    Scalable Library for Eigenvalue Problem Computations.
-    """
+    """Scalable Library for Eigenvalue Problem Computations."""
 
     homepage = "http://www.grycap.upv.es/slepc"
-    url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz"
+    url      = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz"
+    git      = "https://bitbucket.org/slepc/slepc.git"
 
+    version('develop', git=git)
     version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17')
     version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b')
     version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13')
@@ -43,7 +43,6 @@ class Slepc(Package):
     version('3.7.1', '670216f263e3074b21e0623c01bc0f562fdc0bffcd7bd42dd5d8edbe73a532c2')
     version('3.6.3', '384939d009546db37bc05ed81260c8b5ba451093bf891391d32eb7109ccff876')
     version('3.6.2', '2ab4311bed26ccf7771818665991b2ea3a9b15f97e29fd13911ab1293e8e65df')
-    version('develop', git='https://bitbucket.org/slepc/slepc.git')
 
     variant('arpack', default=True, description='Enables Arpack wrappers')
 
diff --git a/var/spack/repos/builtin/packages/snap/package.py b/var/spack/repos/builtin/packages/snap/package.py
index d12c3520ea..7ed808a8e4 100644
--- a/var/spack/repos/builtin/packages/snap/package.py
+++ b/var/spack/repos/builtin/packages/snap/package.py
@@ -34,10 +34,11 @@ class Snap(MakefilePackage):
     It is modeled off the Los Alamos National Laboratory code PARTISN."""
 
     homepage = "https://github.com/lanl/SNAP"
-    url      = ""
-    tags     = ['proxy-app']
+    git      = "https://github.com/lanl/SNAP.git"
 
-    version('master', git='https://github.com/lanl/SNAP.git')
+    tags = ['proxy-app']
+
+    version('master')
 
     variant('openmp', default=False, description='Build with OpenMP support')
     variant('opt', default=True, description='Build with debugging')
diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py
index dd8ee25ab6..93421d429b 100644
--- a/var/spack/repos/builtin/packages/snbone/package.py
+++ b/var/spack/repos/builtin/packages/snbone/package.py
@@ -31,9 +31,9 @@ class Snbone(MakefilePackage):
        continuous finite element based transport equation solver."""
 
     homepage = "https://github.com/ANL-CESAR/"
-    url = "https://github.com/ANL-CESAR/SNbone.git"
+    git      = "https://github.com/ANL-CESAR/SNbone.git"
 
-    version('develop', git='https://github.com/ANL-CESAR/SNbone.git')
+    version('develop')
 
     tags = ['proxy-app']
 
diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py
index 501055b9ec..cb91cbe516 100644
--- a/var/spack/repos/builtin/packages/sortmerna/package.py
+++ b/var/spack/repos/builtin/packages/sortmerna/package.py
@@ -30,9 +30,9 @@ class Sortmerna(CMakePackage):
        reads in metatranscriptomic and metagenomic data"""
 
     homepage = "https://github.com/biocore/sortmerna"
-    url      = "https://github.com/biocore/sortmerna"
+    git      = "https://github.com/biocore/sortmerna.git"
 
-    version('2017-07-13', git='https://github.com/biocore/sortmerna.git', commit='8bde6fa113a5d99a23ae81b48eeea6760e966094')
+    version('2017-07-13', commit='8bde6fa113a5d99a23ae81b48eeea6760e966094')
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py
index ae12663204..45dc004569 100644
--- a/var/spack/repos/builtin/packages/sosflow/package.py
+++ b/var/spack/repos/builtin/packages/sosflow/package.py
@@ -31,9 +31,9 @@ class Sosflow(CMakePackage):
     observation, introspection, feedback, and control of HPC applications."""
 
     homepage = "https://github.com/cdwdirect/sos_flow/wiki"
-    url      = "https://github.com/cdwdirect/sos_flow.git"
+    git      = "https://github.com/cdwdirect/sos_flow.git"
 
-    version('spack', git='https://github.com/cdwdirect/sos_flow.git', tag='spack-build-v0.9901')
+    version('spack', tag='spack-build-v0.9901')
 
     depends_on('libevpath')
     depends_on('sqlite@3:')
diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py
index 9c234ff158..b372109235 100644
--- a/var/spack/repos/builtin/packages/sst-dumpi/package.py
+++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py
@@ -39,14 +39,12 @@ class SstDumpi(AutotoolsPackage):
 
     homepage = "http://sst.sandia.gov/about_dumpi.html"
     url      = "https://github.com/sstsimulator/sst-dumpi/archive/6.1.0.tar.gz"
+    git      = "https://github.com/sstsimulator/sst-dumpi.git"
+
+    version('master', branch='master')
+    version('6.1.0', '31c3f40a697dc85bf23dd34270982319')
 
     depends_on('autoconf@1.68:', type='build')
     depends_on('automake@1.11.1:', type='build')
     depends_on('libtool@1.2.4:', type='build')
     depends_on('m4', type='build')
-
-    version('master',
-          git='https://github.com/sstsimulator/sst-dumpi.git',
-          branch='master')
-
-    version('6.1.0', '31c3f40a697dc85bf23dd34270982319')
diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py
index a5f3b69a26..20da0481af 100644
--- a/var/spack/repos/builtin/packages/sst-macro/package.py
+++ b/var/spack/repos/builtin/packages/sst-macro/package.py
@@ -40,6 +40,10 @@ class SstMacro(AutotoolsPackage):
 
     homepage = "http://sst.sandia.gov/about_sstmacro.html"
     url      = "https://github.com/sstsimulator/sst-macro/releases/download/v6.1.0_Final/sstmacro-6.1.0.tar.gz"
+    git      = "https://github.com/sstsimulator/sst-macro.git"
+
+    version('master', branch='master')
+    version('6.1.0', '98b737be6326b8bd711de832ccd94d14')
 
     depends_on('boost@1.59:')
     depends_on('autoconf@1.68:', type='build', when='@master')
@@ -47,13 +51,6 @@ class SstMacro(AutotoolsPackage):
     depends_on('libtool@1.2.4:', type='build', when='@master')
     depends_on('m4', type='build', when='@master')
 
-    version('master',
-          git='https://github.com/sstsimulator/sst-macro.git',
-          branch='master')
-
-    version('6.1.0', '98b737be6326b8bd711de832ccd94d14',
-          url='https://github.com/sstsimulator/sst-macro/releases/download/v6.1.0_Final/sstmacro-6.1.0.tar.gz')
-
     @run_before('autoreconf')
     def bootstrap(self):
         if '@master' in self.spec:
diff --git a/var/spack/repos/builtin/packages/stream/package.py b/var/spack/repos/builtin/packages/stream/package.py
index f4d01faa90..c4020f4312 100644
--- a/var/spack/repos/builtin/packages/stream/package.py
+++ b/var/spack/repos/builtin/packages/stream/package.py
@@ -31,8 +31,9 @@ class Stream(MakefilePackage):
     computation rate for simple vector kernels."""
 
     homepage = "https://www.cs.virginia.edu/stream/ref.html"
+    git      = "https://github.com/jeffhammond/STREAM.git"
 
-    version('5.10', git='https://github.com/jeffhammond/STREAM.git')
+    version('5.10')
 
     variant('openmp', default=False, description='Build with OpenMP support')
 
diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py
index ecd404a350..87567eafc2 100644
--- a/var/spack/repos/builtin/packages/superlu-dist/package.py
+++ b/var/spack/repos/builtin/packages/superlu-dist/package.py
@@ -30,11 +30,13 @@ from spack import *
 class SuperluDist(Package):
     """A general purpose library for the direct solution of large, sparse,
     nonsymmetric systems of linear equations on high performance machines."""
+
     homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
-    url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz"
+    url      = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz"
+    git      = "https://github.com/xiaoyeli/superlu_dist.git"
 
-    version('develop', git='https://github.com/xiaoyeli/superlu_dist', branch='master')
-    version('xsdk-0.2.0', git='https://github.com/xiaoyeli/superlu_dist', tag='xsdk-0.2.0')
+    version('develop', branch='master')
+    version('xsdk-0.2.0', tag='xsdk-0.2.0')
     version('5.4.0', 'e64645c5be352ae2c88327af2cac66e1')
     version('5.3.0', '35d5aa8e0a246efaf327988b20106714')
     version('5.2.2', 'a685ef7fb7859b24c8c9d5d5f121a8a5')
diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py
index 868fc88ec2..75ed9ac76e 100644
--- a/var/spack/repos/builtin/packages/sw4lite/package.py
+++ b/var/spack/repos/builtin/packages/sw4lite/package.py
@@ -34,9 +34,9 @@ class Sw4lite(MakefilePackage):
 
     homepage = "https://geodynamics.org/cig/software/sw4"
     url      = "https://github.com/geodynamics/sw4lite/archive/v1.0.zip"
+    git      = "https://github.com/geodynamics/sw4lite"
 
-    version('develop', git='https://github.com/geodynamics/sw4lite',
-            branch='master')
+    version('develop', branch='master')
     version('1.0', '3d911165f4f2ff6d5f9c1bd56ab6723f')
 
     variant('openmp', default=True, description='Build with OpenMP support')
diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py
index ba77704770..1ffecb82ce 100644
--- a/var/spack/repos/builtin/packages/swfft/package.py
+++ b/var/spack/repos/builtin/packages/swfft/package.py
@@ -30,12 +30,12 @@ class Swfft(MakefilePackage):
     """A stand-alone version of HACC's distributed-memory, pencil-decomposed,
     parallel 3D FFT."""
 
-    homepage = 'https://xgitlab.cels.anl.gov/hacc/SWFFT'
-    url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0"
+    homepage = "https://xgitlab.cels.anl.gov/hacc/SWFFT"
+    url      = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0"
+    git      = "https://xgitlab.cels.anl.gov/hacc/SWFFT"
 
     version('1.0', '0fbc34544b97ba9c3fb19ef2d7a0f076')
-    version('develop', git='https://xgitlab.cels.anl.gov/hacc/SWFFT',
-            branch='master')
+    version('develop', branch='master')
 
     depends_on('mpi')
     depends_on('fftw')
diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py
index 5c42c5f5d8..6a8837f6a0 100644
--- a/var/spack/repos/builtin/packages/symengine/package.py
+++ b/var/spack/repos/builtin/packages/symengine/package.py
@@ -31,11 +31,12 @@ class Symengine(CMakePackage):
 
     homepage = "https://github.com/symengine/symengine"
     url      = "https://github.com/symengine/symengine/archive/v0.2.0.tar.gz"
+    git      = "https://github.com/symengine/symengine.git"
 
+    version('develop', git=git)
     version('0.3.0', 'e61d7513cca4963cd062616891de54c6')
     version('0.2.0', '45401561add36a13c1f0b0c5f8d7422d')
     version('0.1.0', '41ad7daed61fc5a77c285eb6c7303425')
-    version('develop', git='https://github.com/symengine/symengine.git')
 
     variant('boostmp',      default=False,
             description='Compile with Boost multi-precision integer library')
diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py
index 149a29e14f..850e2f795f 100644
--- a/var/spack/repos/builtin/packages/sz/package.py
+++ b/var/spack/repos/builtin/packages/sz/package.py
@@ -31,9 +31,9 @@ class Sz(AutotoolsPackage):
 
     homepage = "https://collab.cels.anl.gov/display/ESR/SZ"
     url      = "https://github.com/disheng222/SZ/archive/v1.4.13.5.tar.gz"
+    git      = "https://github.com/disheng222/SZ.git"
 
-    version('develop', git='https://github.com/disheng222/SZ.git',
-            branch='master')
+    version('develop', branch='master')
     version('1.4.13.5', 'a2f6147c3c74d74c938dd17d914a4cb8')
     version('1.4.13.4', '1c47170a9eebeadbf0f7e9b675d68d76')
     version('1.4.12.3', '5f51be8530cdfa5280febb410ac6dd94')
diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py
index f098e465d3..b192112003 100644
--- a/var/spack/repos/builtin/packages/tabix/package.py
+++ b/var/spack/repos/builtin/packages/tabix/package.py
@@ -29,9 +29,9 @@ class Tabix(MakefilePackage):
     """Generic indexer for TAB-delimited genome position files"""
 
     homepage = "https://github.com/samtools/tabix"
-    url      = "https://github.com/samtools/tabix"
+    git      = "https://github.com/samtools/tabix.git"
 
-    version('2013-12-16', git='https://github.com/samtools/tabix.git', commit='1ae158ac79b459f5feeed7490c67519b14ce9f35')
+    version('2013-12-16', commit='1ae158ac79b459f5feeed7490c67519b14ce9f35')
 
     depends_on('perl', type=('build', 'run'))
     depends_on('python', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/tassel/package.py b/var/spack/repos/builtin/packages/tassel/package.py
index 33cf6e8e80..d2c803997e 100644
--- a/var/spack/repos/builtin/packages/tassel/package.py
+++ b/var/spack/repos/builtin/packages/tassel/package.py
@@ -30,10 +30,9 @@ class Tassel(Package):
        evolutionary patterns, and linkage disequilibrium."""
 
     homepage = "http://www.maizegenetics.net/tassel"
-    url      = "https://bitbucket.org/tasseladmin/tassel-5-source/get/master.tar.gz"
+    git      = "https://bitbucket.org/tasseladmin/tassel-5-standalone.git"
 
-    version('2017-07-22', git='https://bitbucket.org/tasseladmin/tassel-5-standalone.git',
-            commit='ae96ae75c3c9a9e8026140b6c775fa4685bdf531')
+    version('2017-07-22', commit='ae96ae75c3c9a9e8026140b6c775fa4685bdf531')
 
     depends_on('java', type=('build', 'run'))
     depends_on('perl', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/tcoffee/package.py b/var/spack/repos/builtin/packages/tcoffee/package.py
index a3f2bec266..2aac10efdd 100644
--- a/var/spack/repos/builtin/packages/tcoffee/package.py
+++ b/var/spack/repos/builtin/packages/tcoffee/package.py
@@ -29,9 +29,9 @@ class Tcoffee(MakefilePackage):
     """T-Coffee is a multiple sequence alignment program."""
 
     homepage = "http://www.tcoffee.org/"
-    url      = "https://github.com/cbcrg/tcoffee"
+    git      = "https://github.com/cbcrg/tcoffee.git"
 
-    version('2017-08-17', git='https://github.com/cbcrg/tcoffee.git', commit='f389b558e91d0f82e7db934d9a79ce285f853a71')
+    version('2017-08-17', commit='f389b558e91d0f82e7db934d9a79ce285f853a71')
 
     depends_on('perl', type=('build', 'run'))
     depends_on('blast-plus')
diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py
index 7f04668eb4..dc1f834920 100644
--- a/var/spack/repos/builtin/packages/tethex/package.py
+++ b/var/spack/repos/builtin/packages/tethex/package.py
@@ -34,11 +34,12 @@ class Tethex(CMakePackage):
 
     homepage = "https://github.com/martemyev/tethex"
     url      = "https://github.com/martemyev/tethex/archive/v0.0.7.tar.gz"
+    git      = "https://github.com/martemyev/tethex.git"
 
     maintainers = ['davydden']
 
+    version('develop', git=git)
     version('0.0.7', '6c9e4a18a6637deb4400c6d77ec03184')
-    version('develop', git='https://github.com/martemyev/tethex.git')
 
     variant('build_type', default='Release',
             description='The build type to build',
diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py
index 5d9b1bb40d..f3cfb139ad 100644
--- a/var/spack/repos/builtin/packages/tioga/package.py
+++ b/var/spack/repos/builtin/packages/tioga/package.py
@@ -29,11 +29,10 @@ class Tioga(CMakePackage):
     """Topology Independent Overset Grid Assembly (TIOGA)"""
 
     homepage = "https://github.com/jsitaraman/tioga"
-    url      = "https://github.com/jsitaraman/tioga.git"
+    git      = "https://github.com/jsitaraman/tioga.git"
 
     # The master branch doesn't support CMake
-    version('develop', git="https://github.com/jsitaraman/tioga.git",
-            branch='nalu-api')
+    version('develop', branch='nalu-api')
 
     variant('shared', default=False,
             description="Enable building shared libraries")
diff --git a/var/spack/repos/builtin/packages/tmuxinator/package.py b/var/spack/repos/builtin/packages/tmuxinator/package.py
index 240a4b16d9..3f472fe785 100644
--- a/var/spack/repos/builtin/packages/tmuxinator/package.py
+++ b/var/spack/repos/builtin/packages/tmuxinator/package.py
@@ -27,12 +27,11 @@ from spack import *
 
 class Tmuxinator(Package):
     """A session configuration creator and manager for tmux"""
+
     homepage = "https://github.com/tmuxinator/tmuxinator"
-    url      = "https://github.com/tmuxinator/tmuxinator"
+    git      = "https://github.com/tmuxinator/tmuxinator.git"
 
-    version('0.6.11',
-            git='https://github.com/tmuxinator/tmuxinator',
-            tag='v0.6.11')
+    version('0.6.11', tag='v0.6.11')
 
     extends('ruby')
 
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 9cce2f028e..b91811e17b 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -45,17 +45,15 @@ class Trilinos(CMakePackage):
     """
     homepage = "https://trilinos.org/"
     url      = "https://github.com/trilinos/Trilinos/archive/trilinos-release-12-12-1.tar.gz"
+    git      = "https://github.com/trilinos/Trilinos.git"
 
     maintainers = ['aprokop']
 
     # ###################### Versions ##########################
 
-    version('xsdk-0.2.0',
-            git='https://github.com/trilinos/Trilinos.git', tag='xsdk-0.2.0')
-    version('develop',
-            git='https://github.com/trilinos/Trilinos.git', branch='develop')
-    version('master',
-            git='https://github.com/trilinos/Trilinos.git', branch='master')
+    version('xsdk-0.2.0', tag='xsdk-0.2.0')
+    version('develop', branch='develop')
+    version('master', branch='master')
     version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7')
     version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810')
     version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15')
diff --git a/var/spack/repos/builtin/packages/tycho2/package.py b/var/spack/repos/builtin/packages/tycho2/package.py
index 0f54c2e661..0eed0746cb 100644
--- a/var/spack/repos/builtin/packages/tycho2/package.py
+++ b/var/spack/repos/builtin/packages/tycho2/package.py
@@ -31,9 +31,9 @@ class Tycho2(MakefilePackage):
        on unstructured, 3D tetrahedral meshes.
     """
     homepage = "https://github.com/lanl/tycho2"
-    url      = "https://github.com/lanl/tycho2/tarball/v0.1"
+    git      = "https://github.com/lanl/tycho2.git"
 
-    version('develop', git='https://github.com/lanl/tycho2', branch='master')
+    version('develop', branch='master')
 
     depends_on("mpi")
 
diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py
index e08f2f1eb7..618a3ec20f 100644
--- a/var/spack/repos/builtin/packages/typhon/package.py
+++ b/var/spack/repos/builtin/packages/typhon/package.py
@@ -32,10 +32,9 @@ class Typhon(CMakePackage):
     """
 
     homepage = "https://github.com/UK-MAC/Typhon"
-    url      = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz"
+    git      = "https://github.com/UK-MAC/Typhon.git"
 
-    version('develop', git='https://github.com/UK-MAC/Typhon',
-            branch='develop')
+    version('develop', branch='develop')
 
     version('3.0.1', '89045decfba5fd468ef05ad4c924df8c')
     version('3.0', 'ec67cd1aa585ce2410d4fa50514a916f')
diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py
index f5f4461841..02f87f7746 100644
--- a/var/spack/repos/builtin/packages/typhonio/package.py
+++ b/var/spack/repos/builtin/packages/typhonio/package.py
@@ -31,10 +31,10 @@ class Typhonio(CMakePackage):
 
     homepage = "http://uk-mac.github.io/typhonio/"
     url      = "https://github.com/UK-MAC/typhonio/archive/v1.6_CMake.tar.gz"
+    git      = "https://github.com/UK-MAC/typhonio.git"
 
+    version('develop', branch='cmake_build')
     version('1.6_CMake', '8e8b2940a57874205e6d451856db5c2755884bf9')
-    version('develop', git='https://github.com/UK-MAC/typhonio.git',
-            branch='cmake_build')
 
     variant('build_type', default='Release', description='The build type to build',
         values=('Debug', 'Release'))
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py
index 9285e3b932..df3628e2da 100644
--- a/var/spack/repos/builtin/packages/umpire/package.py
+++ b/var/spack/repos/builtin/packages/umpire/package.py
@@ -29,13 +29,14 @@ from spack import *
 class Umpire(CMakePackage):
     """An application-focused API for memory management on NUMA & GPU
     architectures"""
-    url = 'https://github.com/LLNL/Umpire/releases/download/v0.1.4/umpire-0.1.4.tar.gz'
+
     homepage = 'https://github.com/LLNL/Umpire'
+    git      = 'https://github.com/LLNL/Umpire.git'
 
-    version('master', git='https://github.com/LLNL/Umpire.git', branch='master', submodules='True')
-    version('develop', git='https://github.com/LLNL/Umpire.git', branch='develop', submodules='True')
-    version('0.1.4', git='https://github.com/LLNL/Umpire.git', tag='v0.1.4', submodules='True')
-    version('0.1.3', git='https://github.com/LLNL/Umpire.git', tag='v0.1.3', submodules='True')
+    version('develop', branch='develop', submodules='True')
+    version('master', branch='master', submodules='True')
+    version('0.1.4', tag='v0.1.4', submodules='True')
+    version('0.1.3', tag='v0.1.3', submodules='True')
 
     variant('cuda', default=False, description='Build with CUDA support')
     variant('fortran', default=False, description='Build C/Fortran API')
diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py
index 20c8431788..baa22f157d 100644
--- a/var/spack/repos/builtin/packages/valgrind/package.py
+++ b/var/spack/repos/builtin/packages/valgrind/package.py
@@ -35,17 +35,17 @@ class Valgrind(AutotoolsPackage):
 
     Valgrind is Open Source / Free Software, and is freely available
     under the GNU General Public License, version 2.
-
     """
     homepage = "http://valgrind.org/"
-    url = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2"
+    url      = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2"
+    git      = "git://sourceware.org/git/valgrind.git"
 
+    version('develop', git=git)
     version('3.13.0', '817dd08f1e8a66336b9ff206400a5369')
     version('3.12.0', '6eb03c0c10ea917013a7622e483d61bb')
     version('3.11.0', '4ea62074da73ae82e0162d6550d3f129')
     version('3.10.1', '60ddae962bc79e7c95cfc4667245707f')
     version('3.10.0', '7c311a72a20388aceced1aa5573ce970')
-    version('develop', git='git://sourceware.org/git/valgrind.git')
 
     variant('mpi', default=True,
             description='Activates MPI support for valgrind')
diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py
index 1f55c1c873..21512e4d8e 100644
--- a/var/spack/repos/builtin/packages/veclibfort/package.py
+++ b/var/spack/repos/builtin/packages/veclibfort/package.py
@@ -33,9 +33,10 @@ class Veclibfort(Package):
 
     homepage = "https://github.com/mcg1969/vecLibFort"
     url      = "https://github.com/mcg1969/vecLibFort/archive/0.4.2.tar.gz"
+    git      = "https://github.com/mcg1969/vecLibFort.git"
 
+    version('develop', git=git)
     version('0.4.2', '83395ffcbe8a2122c3f726a5c3a7cf93')
-    version('develop', git='https://github.com/mcg1969/vecLibFort.git')
 
     variant('shared', default=True,
             description="Build shared libraries as well as static libs.")
diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py
index 0d098e7e85..0db99088c6 100644
--- a/var/spack/repos/builtin/packages/veloc/package.py
+++ b/var/spack/repos/builtin/packages/veloc/package.py
@@ -31,12 +31,13 @@ class Veloc(CMakePackage):
 
     homepage = "https://github.com/ECP-VeloC/VELOC"
     url      = "https://github.com/ECP-VeloC/VELOC/archive/veloc-1.0rc1.zip"
-    tags     = ['ecp']
+    git      = "https://github.com/ecp-veloc/veloc.git"
 
+    tags = ['ecp']
+
+    version('master', branch='master')
     version('1.0',    '98fe2d9abd2a1b53d7a52267dab91fae')
     version('1.0rc1', 'c6db0de56b5b865183b1fa719ac74c1d')
-    version('master', git='https://github.com/ecp-veloc/veloc.git',
-            branch='master')
 
     depends_on('boost~atomic~chrono~clanglibcpp~date_time~debug~exception'
                '~filesystem~graph~icu~iostreams~locale~log~math~mpi'
diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py
index 0562c600be..6ff2cf642f 100644
--- a/var/spack/repos/builtin/packages/verrou/package.py
+++ b/var/spack/repos/builtin/packages/verrou/package.py
@@ -41,11 +41,9 @@ class Verrou(AutotoolsPackage):
 
     homepage = "https://github.com/edf-hpc/verrou"
     url      = "https://github.com/edf-hpc/verrou/archive/v2.0.0.tar.gz"
+    git      = "https://github.com/edf-hpc/verrou.git"
 
-    version('develop',
-            git='https://github.com/edf-hpc/verrou.git',
-            branch='master')
-
+    version('develop', branch='master')
     version('2.0.0', '388d493df3f253c9b049ce0ceae55fd6')
     version('1.1.0', '9752d776fb534890e5e29f9721ee6125')
 
diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py
index 50dd0ed40e..011137cc37 100644
--- a/var/spack/repos/builtin/packages/votca-csg/package.py
+++ b/var/spack/repos/builtin/packages/votca-csg/package.py
@@ -35,8 +35,9 @@ class VotcaCsg(CMakePackage):
     """
     homepage = "http://www.votca.org"
     url      = "https://github.com/votca/csg/tarball/v1.4"
+    git      = "https://github.com/votca/csg.git"
 
-    version('develop', git='https://github.com/votca/csg', branch='master')
+    version('develop', branch='master')
     version('1.4', 'd009e761e5e3afd51eed89c420610a67')
     version('1.4.1', 'e4195d69db2036e9d76f22115ae31f81')
 
diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py
index 202c7c7bbf..a1a95a7048 100644
--- a/var/spack/repos/builtin/packages/votca-ctp/package.py
+++ b/var/spack/repos/builtin/packages/votca-ctp/package.py
@@ -34,10 +34,9 @@ class VotcaCtp(CMakePackage):
        This package contains the VOTCA charge transport engine.
     """
     homepage = "http://www.votca.org"
-    # No release yet
-    # url      = "https://github.com/votca/ctp/tarball/v1.4"
+    git      = "https://github.com/votca/ctp.git"
 
-    version('develop', git='https://github.com/votca/ctp', branch='master')
+    version('develop', branch='master')
 
     depends_on("cmake@2.8:", type='build')
     depends_on("votca-tools@develop", when='@develop')
diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py
index 579df3c8c2..5c43d13b51 100644
--- a/var/spack/repos/builtin/packages/votca-tools/package.py
+++ b/var/spack/repos/builtin/packages/votca-tools/package.py
@@ -35,8 +35,9 @@ class VotcaTools(CMakePackage):
     """
     homepage = "http://www.votca.org"
     url      = "https://github.com/votca/tools/tarball/v1.4"
+    git      = "https://github.com/votca/tools.git"
 
-    version('develop', git='https://github.com/votca/tools', branch='master')
+    version('develop', branch='master')
     version('1.4', 'cd47868e9f28e2c7b9d01f95aa0185ca')
     version('1.4.1', '3176b72f8a41ec053cc740a5398e7dc4')
 
diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py
index ce06ba19a3..c4740f0f8b 100644
--- a/var/spack/repos/builtin/packages/votca-xtp/package.py
+++ b/var/spack/repos/builtin/packages/votca-xtp/package.py
@@ -35,8 +35,9 @@ class VotcaXtp(CMakePackage):
     """
     homepage = "http://www.votca.org"
     url      = "https://github.com/votca/xtp/tarball/v1.4"
+    git      = "https://github.com/votca/xtp.git"
 
-    version('develop', git='https://github.com/votca/xtp', branch='master')
+    version('develop', branch='master')
     version('1.4.1', '31a2dbd8bd48bf337bc88b20ab312050')
 
     depends_on("cmake@2.8:", type='build')
diff --git a/var/spack/repos/builtin/packages/vpfft/package.py b/var/spack/repos/builtin/packages/vpfft/package.py
index 331a55d2cc..5035021823 100644
--- a/var/spack/repos/builtin/packages/vpfft/package.py
+++ b/var/spack/repos/builtin/packages/vpfft/package.py
@@ -35,10 +35,11 @@ class Vpfft(MakefilePackage):
     """
 
     homepage = "http://www.exmatex.org/vpfft.html"
-    url      = "https://github.com/exmatex/VPFFT/archive/master.tar.gz"
-    tag      = ['proxy-app']
+    git      = "https://github.com/exmatex/VPFFT.git"
 
-    version('develop', git='https://github.com/exmatex/VPFFT.git')
+    tag = ['proxy-app']
+
+    version('develop')
 
     depends_on('eigen')
     depends_on('fftw')
diff --git a/var/spack/repos/builtin/packages/vpic/package.py b/var/spack/repos/builtin/packages/vpic/package.py
index b5be3c6b82..db229fe0ea 100644
--- a/var/spack/repos/builtin/packages/vpic/package.py
+++ b/var/spack/repos/builtin/packages/vpic/package.py
@@ -36,9 +36,9 @@ class Vpic(CMakePackage):
        order finite-difference-time-domain (FDTD) solve.
     """
     homepage = "https://github.com/lanl/vpic"
-    url      = "https://github.com/lanl/vpic/tarball/v1.0"
+    git      = "https://github.com/lanl/vpic.git"
 
-    version('develop', git='https://github.com/lanl/vpic', branch='master', submodules=True)
+    version('develop', branch='master', submodules=True)
 
     depends_on("cmake@3.1:", type='build')
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/vtkh/package.py b/var/spack/repos/builtin/packages/vtkh/package.py
index 117c9dc773..2f16afa901 100644
--- a/var/spack/repos/builtin/packages/vtkh/package.py
+++ b/var/spack/repos/builtin/packages/vtkh/package.py
@@ -33,12 +33,9 @@ class Vtkh(Package):
     and DIY2 to provide a toolkit with hybrid parallel capabilities."""
 
     homepage = "https://github.com/Alpine-DAV/vtk-h"
-    url      = "https://github.com/Alpine-DAV/vtk-h"
+    git      = "https://github.com/Alpine-DAV/vtk-h.git"
 
-    version('master',
-            git='https://github.com/Alpine-DAV/vtk-h.git',
-            branch='master',
-            submodules=True)
+    version('master', branch='master', submodules=True)
 
     maintainers = ['cyrush']
 
diff --git a/var/spack/repos/builtin/packages/vtkm/package.py b/var/spack/repos/builtin/packages/vtkm/package.py
index f9075b33da..a9c76cd5ee 100644
--- a/var/spack/repos/builtin/packages/vtkm/package.py
+++ b/var/spack/repos/builtin/packages/vtkm/package.py
@@ -37,13 +37,11 @@ class Vtkm(Package):
 
     homepage = "https://m.vtk.org/"
     url      = "https://gitlab.kitware.com/api/v4/projects/vtk%2Fvtk-m/repository/archive.tar.gz?sha=v1.1.0"
+    git      = "https://gitlab.kitware.com/vtk/vtk-m.git"
 
+    version('master', branch='master')
     version('1.1.0', "6aab1c0885f6ffaaffcf07930873d0df")
 
-    version('master',
-            git='https://gitlab.kitware.com/vtk/vtk-m.git',
-            branch='master')
-
     variant("cuda", default=False, description="build cuda support")
     variant("tbb", default=True, description="build TBB support")
 
diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py
index fa3cc8c13e..cf825ec5da 100644
--- a/var/spack/repos/builtin/packages/wgsim/package.py
+++ b/var/spack/repos/builtin/packages/wgsim/package.py
@@ -35,8 +35,9 @@ class Wgsim(Package):
     can be partly compensated by simulating INDEL polymorphisms."""
 
     homepage = "https://github.com/lh3/wgsim"
+    git      = "https://github.com/lh3/wgsim.git"
 
-    version('2011.10.17', git='https://github.com/lh3/wgsim.git', commit='a12da3375ff3b51a5594d4b6fa35591173ecc229')
+    version('2011.10.17', commit='a12da3375ff3b51a5594d4b6fa35591173ecc229')
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py
index 72851b4121..e116ca6c0a 100644
--- a/var/spack/repos/builtin/packages/wt/package.py
+++ b/var/spack/repos/builtin/packages/wt/package.py
@@ -31,11 +31,11 @@ class Wt(CMakePackage):
     Wt is a C++ library for developing web applications."""
 
     homepage = "http://www.webtoolkit.eu/wt"
-    url = "https://github.com/emweb/wt/archive/3.3.7.tar.gz"
+    url      = "https://github.com/emweb/wt/archive/3.3.7.tar.gz"
+    git      = "https://github.com/emweb/wt.git"
 
+    version('master', branch='master')
     version('3.3.7', '09858901f2dcf5c3d36a9237daba3e3f')
-    version('master', branch='master',
-            git='https://github.com/emweb/wt.git')
 
     # wt builds in parallel, but requires more than 5 GByte RAM per -j <njob>
     # which most machines do not provide and crash the build
diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py
index cf9312603d..a3a119185e 100644
--- a/var/spack/repos/builtin/packages/wx/package.py
+++ b/var/spack/repos/builtin/packages/wx/package.py
@@ -35,15 +35,16 @@ class Wx(AutotoolsPackage):
        native look and feel because it uses the platform's native API
        rather than emulating the GUI. It's also extensive, free,
        open-source and mature."""
+
     homepage = "http://www.wxwidgets.org/"
     url      = "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2"
+    git      = "https://github.com/wxWidgets/wxWidgets.git"
 
+    version('develop', branch='master')
     version('3.1.0', '2170839cfa9d9322e8ee8368b21a15a2497b4f11')
     version('3.0.2', '6461eab4428c0a8b9e41781b8787510484dea800')
     version('3.0.1', '73e58521d6871c9f4d1e7974c6e3a81629fddcf8')
 
-    version('develop', git='https://github.com/wxWidgets/wxWidgets.git', branch='master')
-
     patch('math_include.patch', when='@3.0.1:3.0.2')
 
     depends_on('pkgconfig', type='build')
diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py
index 20b0c9cd2c..f1d53071dd 100644
--- a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py
+++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py
@@ -30,14 +30,11 @@ class XcbUtilXrm(AutotoolsPackage):
     for the X resource manager."""
 
     homepage = "https://github.com/Airblader/xcb-util-xrm"
-    url      = "https://github.com/Airblader/xcb-util-xrm/archive/v1.2.tar.gz"
+    git      = "https://github.com/Airblader/xcb-util-xrm.git"
 
     # This GitHub project includes some git submodules, which must be fetched
     # in order to build it.
-    version('1.2',
-            git='https://github.com/Airblader/xcb-util-xrm',
-            tag='v1.2',
-            submodules=True)
+    version('1.2', tag='v1.2', submodules=True)
 
     depends_on('autoconf', type='build')
     depends_on('automake', type='build')
diff --git a/var/spack/repos/builtin/packages/xclip/package.py b/var/spack/repos/builtin/packages/xclip/package.py
index 76b8cc0d81..43b1b79081 100644
--- a/var/spack/repos/builtin/packages/xclip/package.py
+++ b/var/spack/repos/builtin/packages/xclip/package.py
@@ -34,9 +34,9 @@ class Xclip(AutotoolsPackage):
        which can then be redirected to a file or another program."""
 
     homepage = "https://github.com/astrand/xclip"
-    url      = "https://github.com/astrand/xclip"
+    git      = "https://github.com/astrand/xclip.git"
 
-    version('0.13', git='https://github.com/astrand/xclip', commit='9aa7090c3b8b437c6489edca32ae43d82e0c1281')
+    version('0.13', commit='9aa7090c3b8b437c6489edca32ae43d82e0c1281')
 
     depends_on('libxmu')
     depends_on('libx11')
diff --git a/var/spack/repos/builtin/packages/xhmm/package.py b/var/spack/repos/builtin/packages/xhmm/package.py
index e85102daeb..7e5d16b12a 100644
--- a/var/spack/repos/builtin/packages/xhmm/package.py
+++ b/var/spack/repos/builtin/packages/xhmm/package.py
@@ -32,10 +32,9 @@ class Xhmm(MakefilePackage):
     (or targeted sequencing, more generally)."""
 
     homepage = "http://atgu.mgh.harvard.edu/xhmm/index.shtml"
-    url      = "https://bitbucket.org/statgen/xhmm.git"
+    git      = "https://bitbucket.org/statgen/xhmm.git"
 
-    version('20160104', git='https://bitbucket.org/statgen/xhmm.git',
-            commit='cc14e528d90932f059ac4fe94e869e81221fd732')
+    version('20160104', commit='cc14e528d90932f059ac4fe94e869e81221fd732')
 
     depends_on('lapack')
 
diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py
index a0d6713d2c..6aecbf3368 100644
--- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py
+++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py
@@ -33,9 +33,10 @@ class Xsdktrilinos(CMakePackage):
     """
     homepage = "https://trilinos.org/"
     url      = "https://github.com/trilinos/xSDKTrilinos/archive/trilinos-release-12-8-1.tar.gz"
+    git      = "https://github.com/trilinos/xSDKTrilinos.git"
 
-    version('develop', git='https://github.com/trilinos/xSDKTrilinos.git', tag='master')
-    version('xsdk-0.2.0', git='https://github.com/trilinos/xSDKTrilinos.git', tag='xsdk-0.2.0')
+    version('develop', tag='master')
+    version('xsdk-0.2.0', tag='xsdk-0.2.0')
     version('12.8.1', '9cc338ded17d1e10ea6c0dc18b22dcd4')
     version('12.6.4', '44c4c54ccbac73bb8939f68797b9454a')
 
diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py
index e08eab8606..46913d671f 100644
--- a/var/spack/repos/builtin/packages/xsimd/package.py
+++ b/var/spack/repos/builtin/packages/xsimd/package.py
@@ -30,10 +30,11 @@ class Xsimd(CMakePackage):
 
     homepage = "http://quantstack.net/xsimd"
     url      = "https://github.com/QuantStack/xsimd/archive/3.1.0.tar.gz"
+    git      = "https://github.com/QuantStack/xsimd.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='master',
-            git='https://github.com/QuantStack/xsimd.git')
+    version('develop', branch='master')
     version('4.0.0', '4186ec94985daa3fc284d9d0d4aa03e8')
     version('3.1.0', '29c1c525116cbda28f610e2bf24a827e')
 
diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py
index 4607c04891..a189334324 100644
--- a/var/spack/repos/builtin/packages/xtensor-python/package.py
+++ b/var/spack/repos/builtin/packages/xtensor-python/package.py
@@ -30,10 +30,11 @@ class XtensorPython(CMakePackage):
 
     homepage = "https://xtensor-python.readthedocs.io"
     url      = "https://github.com/QuantStack/xtensor-python/archive/0.17.0.tar.gz"
+    git      = "https://github.com/QuantStack/xtensor-python.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='master',
-            git='https://github.com/QuantStack/xtensor-python.git')
+    version('develop', branch='master')
     version('0.17.0', '51d22e42909a81201c3421d9e119eed0')
 
     depends_on('xtensor@0.15.1:0.15.99', when='@0.17.0:')
diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py
index d09e33edb4..b27094085a 100644
--- a/var/spack/repos/builtin/packages/xtensor/package.py
+++ b/var/spack/repos/builtin/packages/xtensor/package.py
@@ -30,10 +30,11 @@ class Xtensor(CMakePackage):
 
     homepage = "http://quantstack.net/xtensor"
     url      = "https://github.com/QuantStack/xtensor/archive/0.13.1.tar.gz"
+    git      = "https://github.com/QuantStack/xtensor.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='master',
-            git='https://github.com/QuantStack/xtensor.git')
+    version('develop', branch='master')
     version('0.15.1', 'c24ecc406003bd1ac22291f1f7cac29a')
     version('0.13.1', '80e7e33f05066d17552bf0f8b582dcc5')
 
diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py
index faf6e905c8..33b7a500a2 100644
--- a/var/spack/repos/builtin/packages/xtl/package.py
+++ b/var/spack/repos/builtin/packages/xtl/package.py
@@ -30,10 +30,11 @@ class Xtl(CMakePackage):
 
     homepage = "https://github.com/QuantStack/xtl"
     url      = "https://github.com/QuantStack/xtl/archive/0.3.4.tar.gz"
+    git      = "https://github.com/QuantStack/xtl.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='master',
-            git='https://github.com/QuantStack/xtl.git')
+    version('develop', branch='master')
     version('0.4.0', '48c76b63ab12e497a53fb147c41ae747')
     version('0.3.4', 'b76548a55f1e171a9c849e5ed543e8b3')
     version('0.3.3', '09b6d9611e460d9280bf1156bcca20f5')
diff --git a/var/spack/repos/builtin/packages/yajl/package.py b/var/spack/repos/builtin/packages/yajl/package.py
index 604144c6e5..c42ead6a2d 100644
--- a/var/spack/repos/builtin/packages/yajl/package.py
+++ b/var/spack/repos/builtin/packages/yajl/package.py
@@ -30,6 +30,7 @@ class Yajl(CMakePackage):
 
     homepage = "http://lloyd.github.io/yajl/"
     url      = "https://github.com/lloyd/yajl/archive/2.1.0.zip"
+    git      = "https://github.com/lloyd/yajl.git"
 
-    version('develop', git='https://github.com/lloyd/yajl.git', branch='master')
+    version('develop', branch='master')
     version('2.1.0', '5eb9c16539bf354b937fcb20e263d1eb')
diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py
index c9141e3201..b73a8b95b4 100644
--- a/var/spack/repos/builtin/packages/yaml-cpp/package.py
+++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py
@@ -30,10 +30,11 @@ class YamlCpp(CMakePackage):
 
     homepage = "https://github.com/jbeder/yaml-cpp"
     url      = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.tar.gz"
+    git      = "https://github.com/jbeder/yaml-cpp.git"
 
+    version('develop', branch='master')
     version('0.6.2', '5b943e9af0060d0811148b037449ef82')
     version('0.5.3', '2bba14e6a7f12c7272f87d044e4a7211')
-    version('develop', git='https://github.com/jbeder/yaml-cpp', branch='master')
 
     variant('shared', default=True,
             description='Enable build of shared libraries')
diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py
index 7483312ac2..9bcc2ee8ab 100644
--- a/var/spack/repos/builtin/packages/yasm/package.py
+++ b/var/spack/repos/builtin/packages/yasm/package.py
@@ -30,10 +30,12 @@ class Yasm(AutotoolsPackage):
        supports the x86 and AMD64 instruction sets, accepts NASM and
        GAS assembler syntaxes and outputs binary, ELF32 and ELF64
        object formats."""
+
     homepage = "http://yasm.tortall.net"
     url      = "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz"
+    git      = "https://github.com/yasm/yasm.git"
 
-    version('develop', git='https://github.com/yasm/yasm/')
+    version('develop', git=git)
     version('1.3.0', 'fc9e586751ff789b34b1f21d572d96af')
 
     depends_on('autoconf', when='@develop')
diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py
index 6ec6139cd5..2f4a3a349e 100644
--- a/var/spack/repos/builtin/packages/yorick/package.py
+++ b/var/spack/repos/builtin/packages/yorick/package.py
@@ -40,12 +40,11 @@ class Yorick(Package):
 
     homepage = "http://dhmunro.github.io/yorick-doc/"
     url      = "https://github.com/dhmunro/yorick/archive/y_2_2_04.tar.gz"
+    git      = "https://github.com/dhmunro/yorick.git"
 
+    version('master', branch='master')
     version('2.2.04', '1b5b0da6ad81b2d9dba64d991ec17939')
-    version('master', branch='master',
-            git='https://github.com/dhmunro/yorick.git')
-    version('f90-plugin', branch='f90-plugin',
-            git='https://github.com/trmwzm/yorick.git')
+    version('f90-plugin', branch='f90-plugin')
 
     variant('X', default=False, description='Enable X11 support')
 
diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py
index c9645145f6..68504675e1 100644
--- a/var/spack/repos/builtin/packages/zeromq/package.py
+++ b/var/spack/repos/builtin/packages/zeromq/package.py
@@ -26,12 +26,13 @@ from spack import *
 
 
 class Zeromq(AutotoolsPackage):
-    """ The ZMQ networking/concurrency library and core API """
+    """The ZMQ networking/concurrency library and core API"""
+
     homepage = "http://zguide.zeromq.org/"
     url      = "http://download.zeromq.org/zeromq-4.1.2.tar.gz"
+    git      = "https://github.com/zeromq/libzmq.git"
 
-    version('develop', branch='master',
-            git='https://github.com/zeromq/libzmq.git')
+    version('develop', branch='master')
     version('4.2.5', 'a1c95b34384257e986842f4d006957b8',
             url='https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz')
     version('4.2.2', '52499909b29604c1e47a86f1cb6a9115')