bin/autoproj_bootstrap in autoproj-1.9.5.rc1 vs bin/autoproj_bootstrap in autoproj-1.9.5.rc2

@@ -2012,16 +2012,18 @@
                 end
             end
         end
 
         File.open(filename, "w") do |io|
-            io.write <<-EOF
-            if test -n "$AUTOPROJ_CURRENT_ROOT" && test "$AUTOPROJ_CURRENT_ROOT" != "#{Autoproj.root_dir}"; then
-                echo "the env.sh from $AUTOPROJ_CURRENT_ROOT is already loaded. Start a new shell before sourcing this one"
-                return
-            fi
-            EOF
+            if Autobuild.env_inherit
+                io.write <<-EOF
+                if test -n "$AUTOPROJ_CURRENT_ROOT" && test "$AUTOPROJ_CURRENT_ROOT" != "#{Autoproj.root_dir}"; then
+                    echo "the env.sh from $AUTOPROJ_CURRENT_ROOT is already loaded. Start a new shell before sourcing this one"
+                    return
+                fi
+                EOF
+            end
             Autobuild.export_env_sh(io)
         end
     end
 
     # Load a definition file given at +path+. +source+ is the package set from
@@ -2078,50 +2080,89 @@
     @root_dir = Dir.pwd
 end
 
 DEFS = <<EODEFS
 --- 
-ruby20: ignore
 pip: 
   debian,ubuntu: python-pip
+cvs: 
+  fedora: cvs
+  darwin: cvs
+  debian,ubuntu: cvs
 lsb_release: 
+  fedora: redhat-lsb
+  arch: ignore
   gentoo: sys-apps/lsb-release
   darwin: ignore
-  fedora: redhat-lsb
   debian,ubuntu: lsb-release
-  arch: ignore
+cmake: 
+  fedora: cmake
+  arch: cmake
+  gentoo: dev-util/cmake
+  darwin: cmake
+  debian,ubuntu: cmake
+autobuild: gem
+none: ignore
+archive: 
+  fedora: 
+  - tar
+  - unzip
+  arch: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  darwin: 
+  - gnutar
+  - unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
+autotools: 
+  fedora: 
+  - automake
+  - autoconf
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  darwin: 
+  - automake
+  - autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
 svn: 
+  fedora: subversion
+  arch: subversion
   gentoo: dev-util/subversion
   darwin: subversion
-  fedora: subversion
   debian,ubuntu: subversion
-  arch: subversion
+ruby20: ignore
 autoproj: gem
 build-essential: 
+  fedora: ignore
+  arch: ignore
   gentoo: ignore
   darwin: ignore
-  fedora: ignore
   debian,ubuntu: build-essential
-  arch: ignore
-cmake: 
-  gentoo: dev-util/cmake
-  darwin: cmake
-  fedora: cmake
-  debian,ubuntu: cmake
-  arch: cmake
 ruby19: 
+  fedora: 
+    "17": 
+    - ruby
+    - rubygems
+  arch: 
+  - ruby
+  - rake
   gentoo: 
   - dev-lang/ruby:1.9
   - rake
+  default: nonexistent
   darwin: 
   - ruby19
   - rake
-  default: nonexistent
-  fedora: 
-    "17": 
-    - ruby
-    - rubygems
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
@@ -2131,76 +2172,37 @@
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - rake
   - rubygems-integration
-  arch: 
-  - ruby
-  - rake
 ruby18: 
+  fedora: 
+    "15,16": 
+    - ruby
+    - rubygems
   gentoo: 
   - dev-lang/ruby:1.8
   - rake
+  default: nonexistent
   darwin: 
   - ruby
   - rb-rake
-  default: nonexistent
-  fedora: 
-    "15,16": 
-    - ruby
-    - rubygems
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
   - rubygems1.8
   - ri1.8
   - libopenssl-ruby1.8
   - rake
-autobuild: gem
-cvs: 
-  darwin: cvs
-  fedora: cvs
-  debian,ubuntu: cvs
-archive: 
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-  darwin: 
-  - gnutar
-  - unzip
-  fedora: 
-  - tar
-  - unzip
-  debian,ubuntu: 
-  - tar
-  - unzip
-  arch: 
-  - tar
-  - unzip
-none: ignore
-autotools: 
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  darwin: 
-  - automake
-  - autoconf
-  fedora: 
-  - automake
-  - autoconf
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-  arch: automake autoconf
 git: 
+  fedora: git
+  arch: git
   gentoo: dev-vcs/git
   darwin: git-core
-  fedora: git
   ubuntu: git-core
   debian: 
     lenny: git
     default: git-core
-  arch: git
 
 EODEFS
 
 Autoproj::OSDependencies.define_osdeps_mode_option
 osdeps_mode = Autoproj::OSDependencies.osdeps_mode.join(",")