autoproj_bootstrap in autoproj-1.8.0.rc4

- old
+ new
@@ -1731,96 +1731,96 @@
     end
     @root_dir = Dir.pwd
 end
 
 DEFS = <<EODEFS
----
+--- 
+archive: 
+  debian,ubuntu: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  arch: 
+  - tar
+  - unzip
 none: ignore
-ruby18:
-  debian,ubuntu:
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
+cvs: 
+  debian,ubuntu: cvs
+build-essential: 
+  debian,ubuntu: build-essential
+  gentoo: ignore
+  arch: ignore
+autotools: 
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  arch: automake autoconf
+cmake: 
+  debian,ubuntu: cmake
+  gentoo: dev-util/cmake
+  arch: cmake
+lsb_release: 
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
+  arch: ignore
+zlib: 
+  debian,ubuntu: zlib1g-dev
+svn: 
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch: subversion
+libxml2: 
+  debian,ubuntu: libxml2-dev
+  gentoo: dev-libs/libxml2
+  arch: libxml2
+autobuild: gem
+libxslt: 
+  debian,ubuntu: libxslt1-dev
+  gentoo: dev-libs/libxslt
+  arch: libxslt
+ruby19: 
+  gentoo: 
+  - dev-lang/ruby:1.9
   - rake
-  gentoo:
-  - dev-lang/ruby:1.8
+  arch: 
+  - ruby
   - rake
-ruby19:
-  debian:
+  ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  ubuntu:
+  debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
   - rake
-  gentoo:
-  - dev-lang/ruby:1.9
+ruby18: 
+  debian,ubuntu: 
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
   - rake
-  arch:
-  - ruby
+  gentoo: 
+  - dev-lang/ruby:1.8
   - rake
-build-essential:
-  debian,ubuntu: build-essential
-  gentoo: ignore
-  arch: ignore
-libxml2:
-  debian,ubuntu: libxml2-dev
-  gentoo: dev-libs/libxml2
-  arch: libxml2
-libxslt:
-  debian,ubuntu: libxslt1-dev
-  gentoo: dev-libs/libxslt
-  arch: libxslt
-zlib:
-  debian,ubuntu: zlib1g-dev
-autobuild: gem
-autoproj: gem
-git:
-  debian:
-    lenny: git
-    default: git-core
-  ubuntu: git-core
+git: 
   gentoo: dev-vcs/git
   arch: git
-svn:
-  debian,ubuntu: subversion
-  gentoo: dev-util/subversion
-  arch: subversion
-cmake:
-  debian,ubuntu: cmake
-  gentoo: dev-util/cmake
-  arch: cmake
-autotools:
-  debian,ubuntu:
-  - automake1.9
-  - autoconf
-  gentoo:
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  arch: automake autoconf
-lsb_release:
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
-  arch: ignore
-archive:
-  debian,ubuntu:
-  - tar
-  - unzip
-  gentoo:
-  - app-arch/tar
-  - app-arch/unzip
-  arch:
-  - tar
-  - unzip
-cvs:
-  debian,ubuntu: cvs
+  ubuntu: git-core
+  debian: 
+    lenny: git
+    default: git-core
+autoproj: gem
 
 EODEFS
 
 Autoproj::OSDependencies.define_osdeps_mode_option
 osdeps_mode = Autoproj::OSDependencies.osdeps_mode