3 files changed, 21 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/apr-util/apr-util.new/package.py b/var/spack/repos/builtin/packages/apr-util/package.py
index 8f19c84d22..8f19c84d22 100644
--- a/var/spack/repos/builtin/packages/apr-util/apr-util.new/package.py
+++ b/var/spack/repos/builtin/packages/apr-util/package.py
diff --git a/var/spack/repos/builtin/packages/apr/apr.new/package.py b/var/spack/repos/builtin/packages/apr/package.py
index 5cbbad350b..8a440766ec 100644
--- a/var/spack/repos/builtin/packages/apr/apr.new/package.py
+++ b/var/spack/repos/builtin/packages/apr/package.py
@@ -31,19 +31,6 @@ class Apr(Package):
 
     version('1.5.2',    '98492e965963f852ab29f9e61b2ad700')
 
-    #variant('ncurses', default=True, description='Enables the build of the ncurses gui')
-    #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('ncurses', when='+ncurses')
-    #depends_on('qt', when='+qt')
-    #depends_on('python@2.7.11:', when='+doc')
-    #depends_on('py-sphinx', when='+doc')
-
-    #def url_for_version(self, version):
-    #    """Handle CMake's version-based custom URLs."""
-    #    return 'https://cmake.org/files/v%s/cmake-%s.tar.gz' % (version.up_to(2), version)
-
     def install(self, spec, prefix):
         options = ['--prefix=%s' % prefix]
         configure(*options)
diff --git a/var/spack/repos/builtin/packages/subversion/subversion.new/package.py b/var/spack/repos/builtin/packages/subversion/package.py
index b1c3380238..5db1c3eb92 100644
--- a/var/spack/repos/builtin/packages/subversion/subversion.new/package.py
+++ b/var/spack/repos/builtin/packages/subversion/package.py
@@ -37,7 +37,13 @@ class Subversion(Package):
     depends_on('apr-util')
     depends_on('zlib')
     depends_on('sqlite')
+
+    # Optional: We need swig if we want the Perl, Python or Ruby
+    # bindings.
     #depends_on('swig')
+    #depends_on('python')
+    #depends_on('perl')
+    #depends_on('ruby')
 
     def install(self, spec, prefix):
 
@@ -53,7 +59,19 @@ class Subversion(Package):
         configure(*options)
         make()
         make('install')
-        #make('swig-py') # python bindings
-        #make('install-swig-py')
-        #make('swig-pl') # perl bindings
+
+        # python bindings
+        #make('swig-py',
+        #     'swig-pydir=/usr/lib/python2.7/site-packages/libsvn',
+        #     'swig_pydir_extra=/usr/lib/python2.7/site-packages/svn')
+        #make('install-swig-py',
+        #     'swig-pydir=/usr/lib/python2.7/site-packages/libsvn',
+        #     'swig_pydir_extra=/usr/lib/python2.7/site-packages/svn')
+
+        # perl bindings
+        #make('swig-pl')
         #make('install-swig-pl')
+
+        # ruby bindings
+        #make('swig-rb')
+        #make('isntall-swig-rb')