+ General cleanup of package.py.

1 files changed, 0 insertions, 33 deletions

diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py
index 0c8bbfc425..1cb5910e46 100644
--- a/var/spack/repos/builtin/packages/dia/package.py
+++ b/var/spack/repos/builtin/packages/dia/package.py
@@ -7,15 +7,7 @@ class Dia(Package):
 
     version('0.97.3',    '0e744a0f6a6c4cb6a089e4d955392c3c')
 
-    #variant('ncurses', default=True, description='Enables the build of the ncurses gui')
-    #variant('openssl', default=True, description="Enables CMake's OpenSSL features")
-    #variant('qt', default=False, description='Enables the build of cmake-gui')
-    #variant('doc', default=False, description='Enables the generation of html and man page documentation')
-
     depends_on('gtkplus@2.6.0:')
-    # depends_on('openssl', when='+openssl')
-    #depends_on('qt', when='+qt')
-    #depends_on('python@2.7.11:', when='+doc')
     depends_on('cairo')
     #depends_on('libart') # optional dependency, not yet supported by spack.
     depends_on('libpng')
@@ -28,21 +20,7 @@ class Dia(Package):
         """Handle Dia's version-based custom URLs."""
         return 'https://ftp.gnome.org/pub/gnome/source/dia/%s/dia-%s.tar.xz' % (version.up_to(2), version)
 
-    # def validate(self, spec):
-    #     """
-    #     Checks if incompatible versions of qt were specified
-
-    #     :param spec: spec of the package
-    #     :raises RuntimeError: in case of inconsistencies
-    #     """
-
-    #     if '+qt' in spec and spec.satisfies('^qt@5.4.0'):
-    #         msg = 'qt-5.4.0 has broken CMake modules.'
-    #         raise RuntimeError(msg)
-
     def install(self, spec, prefix):
-        # Consistency check
-        # self.validate(spec)
 
         # configure, build, install:
         options = ['--prefix=%s' % prefix,
@@ -51,17 +29,6 @@ class Dia(Package):
                    '--with-python',
                    '--with-swig']
 
-        # if '+qt' in spec:
-        #     options.append('--qt-gui')
-
-        # if '+doc' in spec:
-        #     options.append('--sphinx-html')
-        #     options.append('--sphinx-man')
-
-        # if '+openssl' in spec:
-        #     options.append('--')
-        #     options.append('-DCMAKE_USE_OPENSSL=ON')
-
         configure(*options)
         make()
         make('install')