veewee 0.3.10 → 0.3.11

data/doc/kvm.md

@@ -21,7 +21,7 @@ To check if your kernel can run kvm:
     $ kvm_ok
     
     # or look for vmx or svm in /proc/cpuinfo
-    $ egrep '^flags.*(vmx|svm)' /proc/cpuinfo
+    $ grep '^flags' /proc/cpuinfo | grep -E --color '(vmx|svm)' 
 
 The kernel modules needed are the following: `kvm`, `kvm_intel` or `kvm-amd`.
 

data/lib/veewee/provider/virtualbox/box.rb

@@ -22,8 +22,6 @@ require 'veewee/provider/virtualbox/box/helper/buildinfo'
 require 'veewee/provider/virtualbox/box/helper/console_type'
 require 'veewee/provider/virtualbox/box/up'
 
-require 'whichr'
-
 module Veewee
   module Provider
     module Virtualbox

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.3.10"
+  ::Veewee::VERSION="0.3.11"
 end

data/templates/gentoo-latest-amd64/cleanup.sh

@@ -19,5 +19,9 @@ eclean -d distfiles
 rm /tmp/*
 rm -rf /var/log/*
 rm -rf /var/tmp/*
+rm /etc/profile.d/settings.sh
+
+# clean root
 rm -rf /root/.gem
+#rm -rf /root/*
 DATAEOF

data/templates/gentoo-latest-amd64/definition.rb

@@ -21,7 +21,6 @@ Veewee::Definition.declare({
     '<Wait>' * 30,
     '<Enter>',
     '<Wait>' * 20,
-    '<Wait><Wait>ifconfig -a<Enter>',
     'passwd<Enter><Wait><Wait>',
     'vagrant<Enter><Wait>',
     'vagrant<Enter><Wait>',
@@ -42,6 +41,7 @@ Veewee::Definition.declare({
     'settings.sh',
     'base.sh',
     'kernel.sh',
+    'usb.sh',
     'git.sh',
     'subversion.sh',
     'virtualbox.sh',

data/templates/gentoo-latest-amd64/kernel.sh

@@ -58,6 +58,8 @@ CONFIG_CIFS=m
 CONFIG_CIFS_UPCAL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_DFS_UPCALL=y
+# for FUSE fs
+CONFIG_FUSE_FS=m
 # reduce size
 CONFIG_NR_CPUS=$nr_cpus
 CONFIG_COMPAT_VDSO=n

data/templates/gentoo-latest-amd64/reboot.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 source /etc/profile
 
-reboot
+/sbin/reboot
+ps aux | grep sshd | grep -v grep | awk '{print $2}' | xargs kill

data/templates/gentoo-latest-amd64/usb.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+source /etc/profile
+
+# Set up for better USB support
+
+# install usbutils (which includes 'lsusb') and libusb
+chroot "$chroot" emerge sys-apps/usbutils
+
+# add exFAT filesystem support.
+# (exFAT requires a kernel with a FUSE module)
+#chroot "$chroot" emerge sys-fs/fuse sys-fs/exfat-utils sys-fs/fuse-exfat

data/templates/gentoo-latest-amd64/vagrant.sh

@@ -7,7 +7,12 @@ mkdir -p "$chroot/home/vagrant/.ssh"
 chmod 700 "$chroot/home/vagrant/.ssh"
 wget --no-check-certificate "$vagrant_ssh_key_url" -O "$chroot/home/vagrant/.ssh/authorized_keys"
 chmod 600 "$chroot/home/vagrant/.ssh/authorized_keys"
+
+# record virtualbox version
 cp -f /root/.vbox_version "$chroot/home/vagrant/.vbox_version"
+vbox_version=$(cat /root/.vbox_version)
+echo "export vbox_version=$vbox_version" >> /etc/profile.d/settings.sh
+cp /etc/profile.d/settings.sh $CHROOT/etc/profile.d/
 
 mkdir -p "$chroot/root/.ssh" 2> /dev/null
 

data/templates/gentoo-latest-i686/add_vim.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+source /etc/profile
+
+# add required use flags and keywords
+#cat <<DATAEOF >> "$chroot/etc/portage/package.use/vim"
+#app-editors/vim minimal
+#DATAEOF
+
+cat <<DATAEOF >> "$chroot/etc/portage/package.accept_keywords/vim"
+app-vim/bash-support ~x86 ~amd64
+DATAEOF
+
+# install vim
+chroot "$chroot" emerge app-editors/vim
+
+
+# install vim plugins
+chroot "$chroot" emerge app-vim/puppet-syntax app-vim/bash-support
+
+# install spf13 (experimental)
+#chroot "$chroot" emerge dev-vcs/git # be aware of huge dependency
+#chroot "$chroot" wget --no-check-certificate -qO- http://j.mp/spf13-vim3

data/templates/gentoo-latest-i686/base.sh

@@ -24,15 +24,33 @@ wget -nv --tries=5 "$stage3url"
 tar xpf "$stage3file" && rm "$stage3file"
 
 # prepeare chroot, update env
-mount --bind /proc "$chroot/proc"
-mount --bind /dev "$chroot/dev"
+mount -t proc none "$chroot/proc"
+mount --rbind /dev "$chroot/dev"
 
 # copy nameserver information, save build timestamp
 cp /etc/resolv.conf "$chroot/etc/"
 date -u > "$chroot/etc/vagrant_box_build_time"
+
+# retrieve and extract latest portage tarball
+chroot "$chroot" wget --tries=5 "${portageurl}"
+chroot "$chroot" tar -xjpf portage-latest.tar.bz2 -C /usr
+chroot "$chroot" rm -rf portage-latest.tar.bz2
 chroot "$chroot" env-update
 
-# bring up eth0 and sshd on boot
+# bring up network interface and sshd on boot (Alt. for new systemd naming scheme, enp0s3)
+#chroot "$chroot" /bin/bash <<DATAEOF
+#cd /etc/conf.d
+#sed -i "s/eth0/enp0s3/" /etc/udhcpd.conf
+#echo 'config_enp0s3=( "dhcp" )' >> net
+#ln -s net.lo /etc/init.d/net.enp0s3
+#rc-update add net.enp0s3 default
+#rc-update add sshd default
+#DATAEOF
+
+# bring up network interface and sshd on boot (for older systemd naming scheme, eth0)
+chroot "$chroot" /bin/bash <<DATAEOF
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+DATAEOF
 chroot "$chroot" /bin/bash <<DATAEOF
 cd /etc/conf.d
 echo 'config_eth0=( "dhcp" )' >> net
@@ -61,13 +79,62 @@ ACCEPT_KEYWORDS="$accept_keywords"
 MAKEOPTS="-j$((1 + $nr_cpus)) -l$nr_cpus.5"
 EMERGE_DEFAULT_OPTS="-j$nr_cpus --quiet-build=y"
 FEATURES="\${FEATURES} parallel-fetch"
+USE="nls cjk unicode"
+
+PYTHON_TARGETS="python2_7 python3_2 python3_3"
+USE_PYTHON="3.2 2.7"
 
 # english only
-LINGUAS=""
+LINGUAS="en"
 
 # for X support if needed
 INPUT_DEVICES="evdev"
 VIDEO_CARDS="virtualbox"
+
+# Additional portage overlays (space char separated)
+PORTDIR_OVERLAY="/usr/local/portage"
+
+# Including /usr/local/portage overlay
+source "/usr/local/portage/make.conf"
+DATAEOF
+
+# Create an empty portage overlay
+mkdir -p "$chroot/usr/local/portage"
+
+touch "$chroot/usr/local/portage/make.conf"
+chown root:portage "$chroot/usr/local/portage/make.conf"
+chmod g+s "$chroot/usr/local/portage/make.conf"
+chmod 775 "$chroot/usr/local/portage/make.conf"
+
+mkdir -p "$chroot/usr/local/portage/profiles"
+echo "local_repo" >> "$chroot/usr/local/portage/profiles/repo_name"
+chown root:portage "$chroot/usr/local/portage" "$chroot/usr/local/portage/profiles/repo_name"
+chmod g+s "$chroot/usr/local/portage" "$chroot/usr/local/portage/profiles/repo_name"
+chmod 775 "$chroot/usr/local/portage" "$chroot/usr/local/portage/profiles/repo_name"
+
+mkdir -p "$chroot/usr/local/portage/metadata"
+echo "masters = gentoo" >> "$chroot/usr/local/portage/metadata/layout.conf"
+chown root:portage "$chroot/usr/local/portage/metadata/layout.conf"
+chmod g+s "$chroot/usr/local/portage/metadata/layout.conf"
+chmod 775 "$chroot/usr/local/portage/metadata/layout.conf"
+
+# This distribution does not like flags described in single files
+# all 'package.*', except 'package.keywords', should be directories.
+mkdir -p "$chroot/etc/portage/package.license"
+mkdir -p "$chroot/etc/portage/package.use"
+mkdir -p "$chroot/etc/portage/package.accept_keywords"
+mkdir -p "$chroot/etc/portage/package.mask"
+mkdir -p "$chroot/etc/portage/package.unmask"
+
+
+# Some forced updates for this system
+cat <<DATAEOF >> "$chroot/etc/portage/package.unmask/python-2.7"
+=dev-lang/python-2.7.5*
+DATAEOF
+
+cat <<DATAEOF >> "$chroot/etc/portage/package.unmask/pam"
+=sys-libs/pam-1.1.6-r2
+=sys-libs/pam-1.1.7
 DATAEOF
 
 # set localtime
@@ -76,9 +143,13 @@ chroot "$chroot" ln -sf "/usr/share/zoneinfo/$timezone" /etc/localtime
 # set locale
 chroot "$chroot" /bin/bash <<DATAEOF
 echo LANG=\"$locale\" > /etc/env.d/02locale
+echo LANG_ALL=\"$locale\" >> /etc/env.d/02locale
+echo LANGUAGE=\"$locale\" >> /etc/env.d/02locale
 env-update && source /etc/profile
 DATAEOF
 
+# NOTE: LC_ALL, LC_TYPE will be set in vagrant.sh
+
 # update portage tree to most current state
 # emerge-webrsync is recommended by Gentoo for first sync
 chroot "$chroot" emerge-webrsync

data/templates/gentoo-latest-i686/cleanup.sh

@@ -19,5 +19,9 @@ eclean -d distfiles
 rm /tmp/*
 rm -rf /var/log/*
 rm -rf /var/tmp/*
+rm /etc/profile.d/settings.sh
+
+# clean root
 rm -rf /root/.gem
-DATAEOF
+#rm -rf /root/*
+DATAEOF

data/templates/gentoo-latest-i686/definition.rb

@@ -21,7 +21,6 @@ Veewee::Definition.declare({
     '<Wait>' * 30,
     '<Enter>',
     '<Wait>' * 20,
-    '<Wait><Wait>ifconfig -a<Enter>',
     'passwd<Enter><Wait><Wait>',
     'vagrant<Enter><Wait>',
     'vagrant<Enter><Wait>',
@@ -42,17 +41,20 @@ Veewee::Definition.declare({
     'settings.sh',
     'base.sh',
     'kernel.sh',
+    'usb.sh',
+    'git.sh',
+    'subversion.sh',
     'virtualbox.sh',
     'vagrant.sh',
-    #Choose your ruby way : source or portage?
-    'ruby_portage.sh',
-    #'ruby_source.sh',
-    'chef.sh',
-    'puppet.sh',
+    'ruby.sh',
+    'add_chef.sh',
+    'add_puppet.sh',
+    'add_vim.sh',
     'cron.sh',
     'syslog.sh',
     'nfs.sh',
     'grub.sh',
+    'wipe_sources.sh',
     'cleanup.sh',
     'zerodisk.sh',
     'reboot.sh'

data/templates/gentoo-latest-i686/git.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+source /etc/profile
+
+# remove git's dependency on 50+ perl modules.
+cat <<DATAEOF >> "$chroot/etc/portage/package.use/git"
+# git with no dependency
+dev-vcs/git -curl -perl -gpg -webdav
+
+# git with massive dependency with subversion support
+#dev-vcs/git -gpg perl -webdav subversion
+#>=dev-vcs/subversion-1.7.13 -dso perl
+DATAEOF
+
+# install git
+chroot "$chroot" emerge dev-vcs/git
+
+# for git-quiltimport
+#chroot "$chroot" emerge dev-util/quilt
+# for git-instaweb : || ( www-servers/lighttpd  www-servers/apache)
+#chroot "$chroot" emerge www-servers/lighttpd
+

data/templates/gentoo-latest-i686/grub.sh

@@ -1,24 +1,24 @@
 #!/bin/bash
 source /etc/profile
 
+# use grub2
+cat <<DATAEOF >> "$chroot/etc/portage/package.accept_keywords/grub"
+sys-boot/grub:2
+DATAEOF
+
 # install grub
 chroot "$chroot" emerge grub
 
-# add installed kernel entry
-cat <<DATAEOF > "$chroot/boot/grub/grub.conf"
-default 0
-timeout 1
-
-title=Gentoo Linux ($kernel_version-gentoo)
-root (hd0,0)
-kernel /boot/kernel-genkernel-x86-$kernel_version-gentoo root=/dev/ram0 real_root=/dev/sda4
-initrd /boot/initramfs-genkernel-x86-$kernel_version-gentoo
-DATAEOF
+# tweak timeout
+chroot "$chroot" sed -i "s/GRUB_TIMEOUT=.*/GRUB_TIMEOUT=1/g" /etc/default/grub
 
 # make the disk bootable
 chroot "$chroot" /bin/bash <<DATAEOF
 source /etc/profile && \
 env-update && \
 grep -v rootfs /proc/mounts > /etc/mtab && \
-grub-install --no-floppy /dev/sda
-DATAEOF
+mkdir -p /boot/grub2 && \
+ln -sf /boot/grub2 /boot/grub && \
+grub2-mkconfig -o /boot/grub/grub.cfg && \
+grub2-install --no-floppy /dev/sda
+DATAEOF

data/templates/gentoo-latest-i686/kernel.sh

@@ -2,13 +2,13 @@
 source /etc/profile
 
 # add required use flags and keywords
-cat <<DATAEOF >> "$chroot/etc/portage/package.use"
+cat <<DATAEOF >> "$chroot/etc/portage/package.use/kernel"
 sys-kernel/gentoo-sources symlink
 sys-kernel/genkernel -cryptsetup
 DATAEOF
 
-cat <<DATAEOF >> "$chroot/etc/portage/package.keywords"
-dev-util/kbuild ~x86
+cat <<DATAEOF >> "$chroot/etc/portage/package.accept_keywords/kernel"
+dev-util/kbuild ~x86 ~amd64
 DATAEOF
 
 # get, configure, compile and install the kernel and modules
@@ -58,6 +58,8 @@ CONFIG_CIFS=m
 CONFIG_CIFS_UPCAL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_DFS_UPCALL=y
+# for FUSE fs
+CONFIG_FUSE_FS=m
 # reduce size
 CONFIG_NR_CPUS=$nr_cpus
 CONFIG_COMPAT_VDSO=n

data/templates/gentoo-latest-i686/reboot.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 source /etc/profile
 
-reboot
+/sbin/reboot
+ps aux | grep sshd | grep -v grep | awk '{print $2}' | xargs kill

data/templates/gentoo-latest-i686/{ruby_portage.sh → ruby.sh}

@@ -6,8 +6,8 @@ cat <<DATAEOF >> "$chroot/etc/portage/make.conf"
 RUBY_TARGETS="ruby19"
 DATAEOF
 
-cat <<DATAEOF >> "$chroot/etc/portage/package.keywords"
-dev-util/ragel ~x86
+cat <<DATAEOF >> "$chroot/etc/portage/package.accept_keywords/ruby"
+dev-util/ragel ~x86 ~amd64
 DATAEOF
 
 chroot "$chroot" /bin/bash <<DATAEOF

data/templates/gentoo-latest-i686/settings.sh

@@ -3,18 +3,24 @@
 cat <<DATAEOF > "/etc/profile.d/veewee.sh"
 # stage 3 filename and full url
 # retrieve from Gentoo current autobuild txt - these change regularly
+
+# distfiles source
+distfiles_url=http://distfiles.gentoo.org
+
 build_arch="x86"
 build_proc="i686"
-stage3current=\`curl -s http://distfiles.gentoo.org/releases/\${build_arch}/autobuilds/latest-stage3-\${build_proc}.txt|grep -v "^#"\`
-export stage3url="http://distfiles.gentoo.org/releases/\${build_arch}/autobuilds/\${stage3current}"
+stage3current=\`curl -s \${distfiles_url}/releases/\${build_arch}/autobuilds/latest-stage3-\${build_proc}.txt|grep -v "^#"\`
+export stage3url="\${distfiles_url}/releases/\${build_arch}/autobuilds/\${stage3current}"
 export stage3file=\${stage3current##*/}
+export portageurl="\${distfiles_url}/snapshots/portage-latest.tar.bz2"
 
 # these two (configuring the compiler) and the stage3 url can be changed to build a 32 bit system
 export accept_keywords="x86"
 export chost="i686-pc-linux-gnu"
 
 # kernel version to use
-export kernel_version="3.7.10"
+export kernel_version="3.10.7-r1"
+export kernel_image_version="3.10.7-gentoo-r1"
 
 # timezone (as a subdirectory of /usr/share/zoneinfo)
 export timezone="UTC"
@@ -25,9 +31,6 @@ export locale="en_US.utf8"
 # chroot directory for the installation
 export chroot=/mnt/gentoo
 
-# ruby version, works only with ruby_source
-export ruby_version="1.9.3-p327"
-
 # number of cpus in the host system (to speed up make and for kernel config)
 export nr_cpus=$(</proc/cpuinfo grep processor|wc -l)
 

data/templates/gentoo-latest-i686/subversion.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+source /etc/profile
+
+# install subversion
+chroot "$chroot" emerge subversion

data/templates/gentoo-latest-i686/usb.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+source /etc/profile
+
+# Set up for better USB support
+
+# install usbutils (which includes 'lsusb') and libusb
+chroot "$chroot" emerge sys-apps/usbutils
+
+# add exFAT filesystem support.
+# (exFAT requires a kernel with a FUSE module)
+#chroot "$chroot" emerge sys-fs/fuse sys-fs/exfat-utils sys-fs/fuse-exfat

data/templates/gentoo-latest-i686/vagrant.sh

@@ -7,16 +7,19 @@ mkdir -p "$chroot/home/vagrant/.ssh"
 chmod 700 "$chroot/home/vagrant/.ssh"
 wget --no-check-certificate "$vagrant_ssh_key_url" -O "$chroot/home/vagrant/.ssh/authorized_keys"
 chmod 600 "$chroot/home/vagrant/.ssh/authorized_keys"
+
+# record virtualbox version
 cp -f /root/.vbox_version "$chroot/home/vagrant/.vbox_version"
+vbox_version=$(cat /root/.vbox_version)
+echo "export vbox_version=$vbox_version" >> /etc/profile.d/settings.sh
+cp /etc/profile.d/settings.sh $CHROOT/etc/profile.d/
 
-# for passwordless logins
 mkdir -p "$chroot/root/.ssh" 2> /dev/null
-cat /tmp/ssh-root.pub >> "$chroot/root/.ssh/authorized_keys"
 
 # add vagrant user
 chroot $chroot /bin/bash <<DATAEOF
 groupadd -r vagrant
-useradd -m -r vagrant -g vagrant -G wheel,vboxsf,vboxguest -c 'added by vagrant, veewee basebox creation'
+useradd -m -r vagrant -g vagrant -G wheel,vboxsf,vboxguest -c 'Vagrant user'
 
 # set passwords (for after reboot)
 passwd<<EOF
@@ -42,6 +45,7 @@ DATAEOF
 # configure ssh daemon
 # veewee validate uses password authentication, so we have to enable it
 cat <<DATAEOF > "$chroot/etc/ssh/sshd_config"
+Protocol 2
 HostBasedAuthentication no
 IgnoreUserKnownHosts yes
 PasswordAuthentication yes
@@ -54,4 +58,34 @@ Subsystem sftp internal-sftp
 UseDNS no
 UsePAM yes
 UsePrivilegeSeparation sandbox
-DATAEOF
+
+# X11 features need openssh emerged with USE flag "X"
+X11Forwarding yes
+X11DisplayOffset 10
+X11UseLocalhost yes
+DATAEOF
+
+
+# Set locale (glibc)
+
+# generate locale
+chroot "$chroot" /bin/bash <<DATAEOF
+echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
+#echo ja_JP.UTF-8 UTF-8 >> /etc/locale.gen
+#echo fa_IR UTF-8 >> /etc/locale.gen
+locale-gen
+DATAEOF
+
+# set locale
+chroot "$chroot" /bin/bash <<DATAEOF
+echo LC_ALL=\"$locale\" >> /etc/env.d/02locale
+echo LC_TYPE=\"$locale\" >> /etc/env.d/02locale
+env-update && source /etc/profile
+DATAEOF
+
+# make hostname shorter 
+cat <<DATAEOF > "$chroot/etc/conf.d/hostname"
+# Set to the hostname of this machine
+hostname="local"
+DATAEOF
+

data/templates/gentoo-latest-i686/virtualbox.sh

@@ -2,8 +2,13 @@
 source /etc/profile
 
 # add package keywords
-cat <<DATAEOF >> "$chroot/etc/portage/package.keywords"
-app-emulation/virtualbox-guest-additions ~x86
+cat <<DATAEOF >> "$chroot/etc/portage/package.accept_keywords/virtualbox-guest-additions"
+app-emulation/virtualbox-guest-additions ~x86 ~amd64
+DATAEOF
+
+# unmask
+cat <<DATAEOF >> "$chroot/etc/portage/package.unmask/virtualbox-guest-additions"
+>=app-emulation/virtualbox-guest-additions-4.3.0
 DATAEOF
 
 # install the virtualbox guest additions, add vagrant and root to group vboxguest
@@ -12,7 +17,8 @@ chroot "$chroot" /bin/bash <<DATAEOF
 emerge sys-apps/dbus app-emulation/virtualbox-guest-additions
 # we need this as gentoo doesn't do it on its own
 groupadd -r vboxsf
-mkdir /media && chgrp vboxsf /media
+mkdir -p /media && chgrp vboxsf /media
 rc-update add dbus default # required by virtualbox-guest-additions service
 rc-update add virtualbox-guest-additions default
-DATAEOF
+DATAEOF
+

data/templates/gentoo-latest-i686/wipe_sources.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+source /etc/profile
+
+# remove kernel source ( for less disk usage.)
+chroot "$chroot" /bin/bash <<DATAEOF
+pushd /usr/src/linux
+make clean
+popd
+#emerge -C sys-kernel/gentoo-sources
+DATAEOF

data/templates/gentoo-latest-i686/zerodisk.sh

@@ -12,4 +12,4 @@ rm "$chroot/EMPTY"
 swapoff /dev/sda3
 shred -n 0 -z /dev/sda3
 mkswap /dev/sda3
-exit
+exit

data/veewee.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
   s.add_dependency "childprocess"
   s.add_dependency "grit"
   s.add_dependency "fission", "0.4.0"
-  s.add_dependency "whichr"
 
   # Modified dependency version, as libxml-ruby dependency has been removed in version 2.1.1
   # See : https://github.com/ckruse/CFPropertyList/issues/14

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veewee
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -219,22 +219,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: whichr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -1224,26 +1208,31 @@ files:
 - templates/gentoo-latest-amd64/settings.sh
 - templates/gentoo-latest-amd64/subversion.sh
 - templates/gentoo-latest-amd64/syslog.sh
+- templates/gentoo-latest-amd64/usb.sh
 - templates/gentoo-latest-amd64/vagrant.sh
 - templates/gentoo-latest-amd64/virtualbox.sh
 - templates/gentoo-latest-amd64/wipe_sources.sh
 - templates/gentoo-latest-amd64/zerodisk.sh
+- templates/gentoo-latest-i686/add_chef.sh
+- templates/gentoo-latest-i686/add_puppet.sh
+- templates/gentoo-latest-i686/add_vim.sh
 - templates/gentoo-latest-i686/base.sh
-- templates/gentoo-latest-i686/chef.sh
 - templates/gentoo-latest-i686/cleanup.sh
 - templates/gentoo-latest-i686/cron.sh
 - templates/gentoo-latest-i686/definition.rb
+- templates/gentoo-latest-i686/git.sh
 - templates/gentoo-latest-i686/grub.sh
 - templates/gentoo-latest-i686/kernel.sh
 - templates/gentoo-latest-i686/nfs.sh
-- templates/gentoo-latest-i686/puppet.sh
 - templates/gentoo-latest-i686/reboot.sh
-- templates/gentoo-latest-i686/ruby_portage.sh
-- templates/gentoo-latest-i686/ruby_source.sh
+- templates/gentoo-latest-i686/ruby.sh
 - templates/gentoo-latest-i686/settings.sh
+- templates/gentoo-latest-i686/subversion.sh
 - templates/gentoo-latest-i686/syslog.sh
+- templates/gentoo-latest-i686/usb.sh
 - templates/gentoo-latest-i686/vagrant.sh
 - templates/gentoo-latest-i686/virtualbox.sh
+- templates/gentoo-latest-i686/wipe_sources.sh
 - templates/gentoo-latest-i686/zerodisk.sh
 - templates/nixos-minimal-0.2-i686/configuration.nix
 - templates/nixos-minimal-0.2-i686/definition.rb
@@ -1917,7 +1906,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1876719226549566323
+      hash: -4081033819412174145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/templates/gentoo-latest-i686/ruby_source.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-source /etc/profile
-
-chroot "$chroot" /bin/bash <<DATAEOF
- env-update && source /etc/profile
- emerge libyaml
- wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-$ruby_version.tar.gz
- tar xzf ruby-$ruby_version.tar.gz
- cd ruby-$ruby_version
- ./configure
- make
- make install
- cd ..
- rm -rf ruby-$ruby_version*
-DATAEOF