diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
index 7182c36d0c46..9b6a00a3b88a 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.3 2012/05/31 10:07:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.4 2012/06/01 06:16:11 scarabeus Exp $
 
 EAPI=4
 
@@ -52,13 +52,10 @@ done
 RDEPEND="${SPELL_DICTS_DEPEND}"
 unset X SPELL_DICTS SPELL_DICTS_DEPEND
 
-# blockers for old libreoffice with bundled linguas
 RDEPEND+="
-	!=app-office/libreoffice-3.4.9999-r1
-	!=app-office/libreoffice-9999-r1
 	|| (
-		>=app-office/libreoffice-3.4.4.2-r1
-		>=app-office/libreoffice-bin-3.4.4.2-r1
+		>=app-office/libreoffice-$(get_version_component_range 1-2 ${MY_PV})
+		>=app-office/libreoffice-bin-$(get_version_component_range 1-2 ${MY_PV})
 	)
 "
 
@@ -93,10 +90,6 @@ src_unpack() {
 			rpm_unpack ./"${rpmdir}/"*.rpm
 		fi
 	done
-	OO_EXTENSIONS=()
-	for i in ${ooextused[@]}; do
-		OO_EXTENSIONS+=( ${i} )
-	done
 }
 
 src_prepare() { :; }
@@ -113,14 +106,4 @@ src_install() {
 	fi
 	# remove extensions that are in the l10n for some weird reason
 	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/
-
-	echo "${OO_EXTENSIONS[@]}"
-	office-ext_src_install
-}
-
-pkg_postinst() {
-	office-ext_pkg_postinst
-}
-pkg_prerm() {
-	office-ext_pkg_prerm
 }
diff --git a/app-shells/sash/sash-3.7-r3.ebuild b/app-shells/sash/sash-3.7-r3.ebuild
index a424ab07459d..1004aad08866 100644
--- a/app-shells/sash/sash-3.7-r3.ebuild
+++ b/app-shells/sash/sash-3.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.2 2011/09/25 19:43:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.3 2012/06/01 06:53:42 jdhore Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="static"
 
 DEPEND="static? ( sys-libs/zlib[static-libs] )
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild
index d014c6c79cd3..417986d48d3a 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/miglayout/miglayout-4.0.ebuild,v 1.3 2012/05/29 15:18:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/miglayout/miglayout-4.0.ebuild,v 1.4 2012/06/01 06:45:52 jdhore Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="swt"
 
 COMMON_DEP="
diff --git a/dev-java/swt/swt-3.7.2.ebuild b/dev-java/swt/swt-3.7.2.ebuild
index ecc900f26352..57ac3fd1388f 100644
--- a/dev-java/swt/swt-3.7.2.ebuild
+++ b/dev-java/swt/swt-3.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.7.2.ebuild,v 1.3 2012/05/29 15:18:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.7.2.ebuild,v 1.4 2012/06/01 06:45:14 jdhore Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ SRC_URI="x86? (
 
 SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE="cairo gnome opengl webkit"
 COMMON=">=dev-libs/glib-2.6
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index f65107df4579..983f341e35d1 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,7 +1,6 @@
 DIST actionmailer-2.3.14.gem 273920 RMD160 a88a83a10272a7022f097bb4fb53d0a9e9b6027f SHA1 886a146a1fe0d757c610d1c0bc59ef1ab4fa0ceb SHA256 d947dae01726b9c1a218456f40147fd5c6ad3b73ec34656474a345f66920dbe5
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild b/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild
deleted file mode 100644
index a559776f5983..000000000000
--- a/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild,v 1.2 2012/05/01 18:24:08 armin76 Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionmailer"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.2.19"
-ruby_add_bdepend "test? (
-	>=dev-ruby/mocha-0.9.5
-	virtual/ruby-test-unit
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	sed -i -e '/dependency.*mail/s:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Rename private method to avoid conflict with the simple_format
-	# TextHelper. Already fixed in Rails 3.1.
-	sed -i -e 's/simple_format/format_paragraph/' lib/action_mailer/mail_helper.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-3.0.11.ebuild b/dev-ruby/actionmailer/actionmailer-3.0.11.ebuild
deleted file mode 100644
index ecd83e1e9c30..000000000000
--- a/dev-ruby/actionmailer/actionmailer-3.0.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.11.ebuild,v 1.2 2012/05/01 18:24:08 armin76 Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionmailer"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.2.19"
-ruby_add_bdepend "test? (
-	>=dev-ruby/mocha-0.9.5
-	virtual/ruby-test-unit
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/actionmailer/actionmailer-3.0.10.ebuild b/dev-ruby/actionmailer/actionmailer-3.2.5.ebuild
similarity index 68%
rename from dev-ruby/actionmailer/actionmailer-3.0.10.ebuild
rename to dev-ruby/actionmailer/actionmailer-3.2.5.ebuild
index d15ef89d375a..58c517517e5a 100644
--- a/dev-ruby/actionmailer/actionmailer-3.0.10.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-3.2.5.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.10.ebuild,v 1.2 2012/05/01 18:24:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.2.5.ebuild,v 1.1 2012/06/01 07:06:15 graaff Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
 
-inherit ruby-fakegem
+inherit ruby-fakegem versionator
 
 DESCRIPTION="Framework for designing email-service layers"
 HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
 SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-rails-*/actionmailer"
 
 ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.2.19"
+	>=dev-ruby/mail-2.4.4"
 ruby_add_bdepend "test? (
 	>=dev-ruby/mocha-0.9.5
 	virtual/ruby-test-unit
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 21ca2d9422c6..4279395735c7 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,7 +1,6 @@
 DIST actionpack-2.3.14.gem 749056 RMD160 fba269031390c0b502b2905adf76c39ca0a76328 SHA1 d3140bce6e6051e3a5d0b95b1f221bda77122768 SHA256 8cf13574f8a46d9bc04627e9aeb3622fb31ace4a599b41ea9623e1ad6e1ad8a1
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/actionpack/actionpack-3.0.10.ebuild b/dev-ruby/actionpack/actionpack-3.0.10.ebuild
deleted file mode 100644
index 7e0020194347..000000000000
--- a/dev-ruby/actionpack/actionpack-3.0.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.0.10.ebuild,v 1.2 2012/05/01 18:24:02 armin76 Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18"
-
-# The default test task tries to test activerecord with SQLite as well.
-RUBY_FAKEGEM_TASK_TEST="test_action_pack"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response."
-HOMEPAGE="http://rubyforge.org/projects/actionpack/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionpack"
-
-ruby_add_rdepend "
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-2.1.2:0
-	>=dev-ruby/erubis-2.6.6
-	>=dev-ruby/i18n-0.5.0:0.5
-	>=dev-ruby/rack-1.2.1:1.2
-	>=dev-ruby/rack-mount-0.6.14:0.6
-	>=dev-ruby/rack-test-0.5.7:0.5
-	>=dev-ruby/tzinfo-0.3.23"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/actionmailer-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Loosen erubis dependency since this is not slotted.
-	sed -i -e 's/~> 2.6.6/>= 2.6.6/' actionpack.gemspec || die
-}
diff --git a/dev-ruby/actionpack/actionpack-3.0.11.ebuild b/dev-ruby/actionpack/actionpack-3.0.11.ebuild
deleted file mode 100644
index ce9eac135d1d..000000000000
--- a/dev-ruby/actionpack/actionpack-3.0.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.0.11.ebuild,v 1.2 2012/05/01 18:24:02 armin76 Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18"
-
-# The default test task tries to test activerecord with SQLite as well.
-RUBY_FAKEGEM_TASK_TEST="test_action_pack"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response."
-HOMEPAGE="http://rubyforge.org/projects/actionpack/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionpack"
-
-ruby_add_rdepend "
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-2.1.2:0
-	>=dev-ruby/erubis-2.6.6
-	>=dev-ruby/i18n-0.5.0:0.5
-	>=dev-ruby/rack-1.2.1:1.2
-	>=dev-ruby/rack-mount-0.6.14:0.6
-	>=dev-ruby/rack-test-0.5.7:0.5
-	>=dev-ruby/tzinfo-0.3.23"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/actionmailer-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Loosen erubis dependency since this is not slotted.
-	sed -i -e 's/~> 2.6.6/>= 2.6.6/' actionpack.gemspec || die
-}
diff --git a/dev-ruby/actionpack/actionpack-3.2.5.ebuild b/dev-ruby/actionpack/actionpack-3.2.5.ebuild
new file mode 100644
index 000000000000..c28d4bbc4c4c
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.2.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.2.5.ebuild,v 1.1 2012/06/01 07:05:53 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 ree18"
+
+# The default test task tries to test activerecord with SQLite as well.
+RUBY_FAKEGEM_TASK_TEST="test_action_pack"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/actionpack"
+
+ruby_add_rdepend "
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/rack-cache-1.2
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/i18n-0.6:0.6
+	>=dev-ruby/rack-1.4.0:1.4
+	>=dev-ruby/rack-test-0.6.1:0.6
+	>=dev-ruby/journey-1.0.1:1.0
+	>=dev-ruby/sprockets-2.1.3:2.1"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/tzinfo-0.3.29
+		>=dev-ruby/uglifier-1.0.3
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\)/d" ../Gemfile || die
+
+	sed -i -e '/rack-ssl/d' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	# Avoid fragile tests depending on hash ordering
+	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
+	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
+	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 3a1ea9fd6441..3200302f2c8f 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,6 +1,5 @@
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/activemodel/activemodel-3.0.11.ebuild b/dev-ruby/activemodel/activemodel-3.0.11.ebuild
deleted file mode 100644
index 6243def4a28d..000000000000
--- a/dev-ruby/activemodel/activemodel-3.0.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.0.11.ebuild,v 1.2 2012/05/01 18:24:05 armin76 Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource."
-HOMEPAGE="http://github.com/rails/rails"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/activemodel"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-2.1.2
-	>=dev-ruby/i18n-0.5.0:0.5"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/ruby-debug
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-3.0.10.ebuild b/dev-ruby/activemodel/activemodel-3.2.5.ebuild
similarity index 72%
rename from dev-ruby/activemodel/activemodel-3.0.10.ebuild
rename to dev-ruby/activemodel/activemodel-3.2.5.ebuild
index 9e96979b4a01..f46a38891892 100644
--- a/dev-ruby/activemodel/activemodel-3.0.10.ebuild
+++ b/dev-ruby/activemodel/activemodel-3.2.5.ebuild
@@ -1,40 +1,38 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.0.10.ebuild,v 1.2 2012/05/01 18:24:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.2.5.ebuild,v 1.1 2012/06/01 07:05:08 graaff Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
 
-inherit ruby-fakegem
+inherit ruby-fakegem versionator
 
 DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource."
 HOMEPAGE="http://github.com/rails/rails"
 SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-rails-*/activemodel"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-2.1.2
-	>=dev-ruby/i18n-0.5.0:0.5"
+	>=dev-ruby/builder-3.0.0
+	>=dev-ruby/bcrypt-ruby-3.0.0"
 
 ruby_add_bdepend "
 	test? (
-		dev-ruby/ruby-debug
 		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 7ac96710caee..7366e75f0365 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,7 +1,6 @@
 DIST activerecord-2.3.14.gem 541184 RMD160 876ce70771df6ae2cfb43df0dc90e4d7ed106eed SHA1 31b021980a7f4b7459320ddff4fb75858cda2e82 SHA256 83a3c115c30427158dc3b5eec42dd1f88482171eac12ea11668171aaa41202f2
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/activerecord/activerecord-3.0.10.ebuild b/dev-ruby/activerecord/activerecord-3.0.10.ebuild
deleted file mode 100644
index d02a001a8fa9..000000000000
--- a/dev-ruby/activerecord/activerecord-3.0.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.0.10.ebuild,v 1.2 2012/05/01 18:24:21 armin76 Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="mysql postgres sqlite3"
-
-RUBY_S="rails-rails-*/activerecord"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-2.0.10-r1:2.0
-	>=dev-ruby/tzinfo-0.3.23
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3 )
-	mysql? ( dev-ruby/mysql2:0.2 )
-	postgres? ( dev-ruby/pg )"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			if use sqlite3; then
-				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-			fi
-			;;
-	esac
-}
diff --git a/dev-ruby/activerecord/activerecord-3.0.11.ebuild b/dev-ruby/activerecord/activerecord-3.0.11.ebuild
deleted file mode 100644
index 745c55fdac68..000000000000
--- a/dev-ruby/activerecord/activerecord-3.0.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.0.11.ebuild,v 1.2 2012/05/01 18:24:21 armin76 Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="mysql postgres sqlite3"
-
-RUBY_S="rails-rails-*/activerecord"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-2.0.10-r1:2.0
-	>=dev-ruby/tzinfo-0.3.23
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3 )
-	mysql? ( dev-ruby/mysql2:0.2 )
-	postgres? ( dev-ruby/pg )"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			if use sqlite3; then
-				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-			fi
-			;;
-	esac
-}
diff --git a/dev-ruby/activerecord/activerecord-3.2.5.ebuild b/dev-ruby/activerecord/activerecord-3.2.5.ebuild
new file mode 100644
index 000000000000..905f3b509945
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-3.2.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.5.ebuild,v 1.1 2012/06/01 07:06:38 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mysql postgres sqlite3"
+
+RUBY_S="rails-rails-*/activerecord"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-3.0.2:3.0
+	>=dev-ruby/tzinfo-0.3.29
+	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5 )
+	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
+	postgres? ( >=dev-ruby/pg-0.11.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-ruby-1.3.5
+		>=dev-ruby/mocha-0.9.5
+		virtual/ruby-test-unit
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\)/d" ../Gemfile || die
+	sed -i -e '/rack-ssl/d' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	# Avoid tests depending on hash ordering
+	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*rubyee18)
+			# Turn on travis support to avoid tripping bugs in ree18.
+			TRAVIS=true ${RUBY} -S rake test_sqlite3
+			;;
+		*)
+			if use sqlite3; then
+				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+			fi
+			;;
+	esac
+}
diff --git a/dev-ruby/activeresource/Manifest b/dev-ruby/activeresource/Manifest
index 63a01d366193..8e44a1fde1c9 100644
--- a/dev-ruby/activeresource/Manifest
+++ b/dev-ruby/activeresource/Manifest
@@ -1,7 +1,6 @@
 DIST activeresource-2.3.14.gem 47104 RMD160 39125858bcab9db4d7031ebf481efeb8f6bbd800 SHA1 d30bc200503ad56672aa78bd6d8494f34c5c0693 SHA256 301f1c3cf812052b11dfea0be6e547e112132019d28bf7e5c8601902fcabd525
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/activeresource/activeresource-3.0.11.ebuild b/dev-ruby/activeresource/activeresource-3.0.11.ebuild
deleted file mode 100644
index 1f905d98204e..000000000000
--- a/dev-ruby/activeresource/activeresource-3.0.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.0.11.ebuild,v 1.2 2012/05/01 18:24:20 armin76 Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activeresource.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Think Active Record for web resources.."
-HOMEPAGE="http://rubyforge.org/projects/activeresource/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/activeresource"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}"
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-}
diff --git a/dev-ruby/activeresource/activeresource-3.0.10.ebuild b/dev-ruby/activeresource/activeresource-3.2.5.ebuild
similarity index 70%
rename from dev-ruby/activeresource/activeresource-3.0.10.ebuild
rename to dev-ruby/activeresource/activeresource-3.2.5.ebuild
index 64fc2c07d543..39b33437587d 100644
--- a/dev-ruby/activeresource/activeresource-3.0.10.ebuild
+++ b/dev-ruby/activeresource/activeresource-3.2.5.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.0.10.ebuild,v 1.2 2012/05/01 18:24:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.2.5.ebuild,v 1.1 2012/06/01 07:05:30 graaff Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="activeresource.gemspec"
 
-inherit ruby-fakegem
+inherit ruby-fakegem versionator
 
 DESCRIPTION="Think Active Record for web resources.."
 HOMEPAGE="http://rubyforge.org/projects/activeresource/"
 SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-rails-*/activeresource"
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 3130d26bc9f4..fca2fdc63d28 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,7 +1,6 @@
 DIST activesupport-2.3.14.gem 431104 RMD160 0ece71e15413b40f53be83ab74013a70e16a4c5b SHA1 4f7d82d8d4eaf80d9eb1638341558cf8a207cc2e SHA256 c5affddb549fa05415f0e467a17bd0fa02925b414d1a5e2835270d7064b455fe
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/activesupport/activesupport-3.0.10.ebuild b/dev-ruby/activesupport/activesupport-3.0.10.ebuild
deleted file mode 100644
index e73e9305ae77..000000000000
--- a/dev-ruby/activesupport/activesupport-3.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.0.10.ebuild,v 1.2 2012/05/01 18:24:10 armin76 Exp $
-
-EAPI=4
-
-# jruby fails tests.
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="http://rubyforge.org/projects/activesupport/"
-SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/${PN}"
-
-ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8"
-
-# libxml-ruby and nokogiri are not strictly needed, but there are tests
-# using this code.
-ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri )"
-
-all_ruby_prepare() {
-	# don't support older mocha versions as the optional codepath
-	# breaks JRuby
-	epatch "${FILESDIR}"/${PN}-3.0.3-mocha-0.9.5.patch
-
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activesupport/activesupport-3.0.11.ebuild b/dev-ruby/activesupport/activesupport-3.0.11.ebuild
deleted file mode 100644
index 83b072973c20..000000000000
--- a/dev-ruby/activesupport/activesupport-3.0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.0.11.ebuild,v 1.3 2012/05/01 18:24:10 armin76 Exp $
-
-EAPI=4
-
-# jruby fails tests.
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="http://rubyforge.org/projects/activesupport/"
-SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/${PN}"
-
-ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8"
-
-# libxml-ruby and nokogiri are not strictly needed, but there are tests
-# using this code.
-ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# don't support older mocha versions as the optional codepath
-	# breaks JRuby
-	epatch "${FILESDIR}"/${PN}-3.0.3-mocha-0.9.5.patch
-
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild b/dev-ruby/activesupport/activesupport-3.2.5.ebuild
similarity index 51%
rename from dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild
rename to dev-ruby/activesupport/activesupport-3.2.5.ebuild
index 8c00bfbe2b1c..4379834f7cfd 100644
--- a/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild
+++ b/dev-ruby/activesupport/activesupport-3.2.5.ebuild
@@ -1,38 +1,46 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild,v 1.2 2012/05/01 18:24:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.5.ebuild,v 1.1 2012/06/01 07:04:36 graaff Exp $
 
 EAPI=4
 
 # jruby fails tests.
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ree18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem
+inherit ruby-fakegem versionator
 
 DESCRIPTION="Utility Classes and Extension to the Standard Library"
 HOMEPAGE="http://rubyforge.org/projects/activesupport/"
 SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-rails-*/${PN}"
 
-ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8"
+ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8
+	>=dev-ruby/multi_json-1.0
+	dev-ruby/i18n:0.6
+	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
 
-# libxml-ruby and nokogiri are not strictly needed, but there are tests
-# using this code.
-ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri dev-ruby/mocha )"
+# libxml-ruby, nokogiri, and builder are not strictly needed, but there
+# are tests using this code.
+ruby_add_bdepend "test? (
+	virtual/ruby-test-unit
+	>=dev-ruby/libxml-2.0.0
+	dev-ruby/nokogiri
+	dev-ruby/builder:0
+	)"
 
 all_ruby_prepare() {
 	# don't support older mocha versions as the optional codepath
@@ -40,6 +48,6 @@ all_ruby_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.0.3-mocha-0.9.5.patch
 
 	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
 	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
 }
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 78dab473d25d..0e2b62747be8 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,7 +1,6 @@
 DIST rails-2.3.14.gem 243200 RMD160 1149c42eb67d1fb00f92313264c9ad62ee41b986 SHA1 35f63d0e26aa9771779fc0e4f9163ff4e7390f34 SHA256 d73302e2ba500ac8efef9d0397c341c0c40b055a67a5fc43503df67d1df29852
-DIST rails-3.0.10.gem 3584 RMD160 e4af2761da084faf30ea2a29874853a0d5c92143 SHA1 c3482e6a97983e0e38d295d43591acbff07569b7 SHA256 834755313f61aae189be2c288702fbb0d64897d0c69ea49899e6509eb3f6601c
-DIST rails-3.0.11.gem 3584 RMD160 448ac2b36cca235d1a3b06b171347098a5efd2cc SHA1 b1d1c38db13863481c19a8a8918c1908222a69d9 SHA256 7ed7792bfd4696bc049d95e4e377b682b51796b93cc91a2af42a0392bbc2e08b
 DIST rails-3.0.12.gem 3584 RMD160 11117fa41d345152dcf0fb8f24840241ad768ca8 SHA1 aaec7ea18075e777f5d4a9b8c3c4e8fb11489dae SHA256 5ab5c1db3c93443b950dee6cdd6895521ca37ed52b0963950bbe6b240af041da
 DIST rails-3.1.3.gem 3584 RMD160 e8c8a24314690f73800f546f894e1a5be2f1de4c SHA1 c4194906a6c042b4f172da1ab8add276c0fa7715 SHA256 e817252efd196b32a16b0af6a92eecd8b2e0b1cbe1511b36fab6c8acdc53e81e
 DIST rails-3.1.4.gem 3584 RMD160 232441b45acabe2e7d323f5dd7da955c29fd4db0 SHA1 1878d5bbe0409447d958c1a997a65f6b8de0da03 SHA256 54daf5c2efb87ab97b6db0017095d9e4135384e68a007f9ed5570e8de9ffe347
 DIST rails-3.2.3.gem 3584 RMD160 93ff5f76420273d824de382fe9184dbf7ce0ef44 SHA1 4db7e5c288f5260dc299d55ec2aad9a330b611fc SHA256 b8d6e5332d0473ffda078440a1692b97ad0053320fc1d041f00e133f78ff7c22
+DIST rails-3.2.5.gem 3584 RMD160 659deeefcf926a4311001d35dd9dca48f18ea50e SHA1 f47c3cb38e61d1f1593c74884a4134df3147e5ed SHA256 d8888a6e10a1d680b9c8ba02047d2627cb23c6aefe30c058d454d07404dde73c
diff --git a/dev-ruby/rails/rails-3.0.10.ebuild b/dev-ruby/rails/rails-3.0.10.ebuild
deleted file mode 100644
index 64b648da2ccd..000000000000
--- a/dev-ruby/rails/rails-3.0.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.0.10.ebuild,v 1.2 2012/05/01 18:24:10 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-rails-0.16"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activeresource-${PV}
-	~dev-ruby/activesupport-${PV}
-	=dev-ruby/bundler-1.0*
-	~dev-ruby/railties-${PV}"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/rails/rails-3.0.11.ebuild b/dev-ruby/rails/rails-3.0.11.ebuild
deleted file mode 100644
index 56a3fff3bf11..000000000000
--- a/dev-ruby/rails/rails-3.0.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.0.11.ebuild,v 1.2 2012/05/01 18:24:10 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-rails-0.16"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activeresource-${PV}
-	~dev-ruby/activesupport-${PV}
-	=dev-ruby/bundler-1.0*
-	~dev-ruby/railties-${PV}"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/rails/rails-3.1.3-r1.ebuild b/dev-ruby/rails/rails-3.1.3-r1.ebuild
deleted file mode 100644
index 6e5638ea1dcf..000000000000
--- a/dev-ruby/rails/rails-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.1.3-r1.ebuild,v 1.2 2012/04/08 08:44:06 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+asset-pipeline"
-
-RDEPEND=">=app-admin/eselect-rails-0.18"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activeresource-${PV}
-	~dev-ruby/activesupport-${PV}
-	=dev-ruby/bundler-1*
-	~dev-ruby/railties-${PV}
-	asset-pipeline? (
-		dev-ruby/jquery-rails:0
-		dev-ruby/sass-rails
-		dev-ruby/uglifier
-		dev-ruby/coffee-rails
-	)"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/rails/rails-3.2.5.ebuild b/dev-ruby/rails/rails-3.2.5.ebuild
new file mode 100644
index 000000000000..9465f6d71c68
--- /dev/null
+++ b/dev-ruby/rails/rails-3.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.2.5.ebuild,v 1.1 2012/06/01 07:07:20 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activeresource-${PV}
+	~dev-ruby/activesupport-${PV}
+	=dev-ruby/bundler-1*
+	~dev-ruby/railties-${PV}
+	asset-pipeline? (
+		dev-ruby/jquery-rails
+		>=dev-ruby/sass-rails-3.2.3:3.2
+		>=dev-ruby/uglifier-1.0.3
+		>=dev-ruby/coffee-rails-3.2.1:3.2
+	)"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 3a1ea9fd6441..3200302f2c8f 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,6 +1,5 @@
-DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
-DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
 DIST rails-3.0.12.tgz 3509804 RMD160 40250f447aaf2b58598fb0f22669496394ac84da SHA1 a9a89f04a35c6be4b03c1f4a9900bf23ffb2fec2 SHA256 3d2a9212bb9f46fd87339d6b68eda782ac7d2d12f461713ac681428fd54ccd92
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 DIST rails-3.1.4.tgz 3642975 RMD160 81ca16fc808a2994f33f42776fb2ee6f898d00ba SHA1 deaa3521e916472044ae15411e30b726e0ce3d2f SHA256 0e34a2cd5fe7873d190d34bd0c850cdb148c41407b63dbbeb82c824a0a298750
 DIST rails-3.2.3.tgz 3785697 RMD160 af9cdc708137a2d1114ffc2b5bde6fff665a9e30 SHA1 1c0b0a4e915ebb6fe7dc350e2ea09615dd966fd1 SHA256 b709a1a4d0cda22f51c04e399aa4b85f58bb28f9a7a8e430b19f1947ed52c2dc
+DIST rails-3.2.5.tgz 3794800 RMD160 25a7d79dc15ed81b0bb6c9c15075be2d6e18b5fe SHA1 e308ed6e4578986e7037cb99a8bb3bcd46f0a552 SHA256 5a801066c3f46cc04219722fcf1efe9ceb34bc84f6f70aeeda928798f0db7372
diff --git a/dev-ruby/railties/railties-3.0.10.ebuild b/dev-ruby/railties/railties-3.0.10.ebuild
deleted file mode 100644
index fc6e0d0674ef..000000000000
--- a/dev-ruby/railties/railties-3.0.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.10.ebuild,v 1.2 2012/05/01 18:24:16 armin76 Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC="generate_guides"
-RUBY_FAKEGEM_DOCDIR="guides/output"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications."
-HOMEPAGE="http://github.com/rails/rails"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/railties"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/rdoc-3.4
-	>=dev-ruby/thor-0.14.4
-	>=dev-ruby/rake-0.8.7"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.9.5
-		virtual/ruby-test-unit
-	)
-	doc? (
-		>=dev-ruby/redcloth-4.1.1
-	)"
diff --git a/dev-ruby/railties/railties-3.0.11.ebuild b/dev-ruby/railties/railties-3.2.5.ebuild
similarity index 51%
rename from dev-ruby/railties/railties-3.0.11.ebuild
rename to dev-ruby/railties/railties-3.2.5.ebuild
index 7eeca18d4f14..a3f943737874 100644
--- a/dev-ruby/railties/railties-3.0.11.ebuild
+++ b/dev-ruby/railties/railties-3.2.5.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.11.ebuild,v 1.2 2012/05/01 18:24:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.2.5.ebuild,v 1.1 2012/06/01 07:07:00 graaff Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
 RUBY_FAKEGEM_TASK_DOC="generate_guides"
 RUBY_FAKEGEM_DOCDIR="guides/output"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
 
-inherit ruby-fakegem
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
 
 DESCRIPTION="Tools for creating, working with, and running Rails applications."
 HOMEPAGE="http://github.com/rails/rails"
 SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-rails-*/railties"
@@ -30,11 +32,14 @@ RUBY_S="rails-rails-*/railties"
 # investigation.
 RESTRICT="test"
 
+RDEPEND+=">=app-admin/eselect-rails-0.18"
+
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionpack-${PV}
 	>=dev-ruby/rdoc-3.4
-	>=dev-ruby/thor-0.14.4
+	>=dev-ruby/thor-0.14.6
+	>=dev-ruby/rack-ssl-1.3.2:1.3
 	>=dev-ruby/rake-0.8.7"
 
 ruby_add_bdepend "
@@ -45,3 +50,26 @@ ruby_add_bdepend "
 	doc? (
 		>=dev-ruby/redcloth-4.1.1
 	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 071c5e30d576..2d1cb6bd7aca 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,2 +1,3 @@
 DIST sprockets-2.0.3.tgz 135013 RMD160 02e5186ee5f3a93a8e2a735556914cffcb8a8073 SHA1 712a22cafc6757f8d8a7a37cbce4ee407ab8673a SHA256 9a76d91e93c96449ad269b729b1435ffd575dce2dbb1c0c6c299d22035bab40f
 DIST sprockets-2.1.2.tgz 135889 RMD160 2c1bf782d9e588fab0d7720e33ccafb090090a58 SHA1 fe9c0b7d41e7c7f80da852a9a6eb539d9a4aa128 SHA256 0ae4d718e8fc0b9d1a30573069b1f85b3cbdf5a24e838e347a54497fbf8a012b
+DIST sprockets-2.1.3.tgz 135907 RMD160 9a08a420c1b539f6c60a61ad5d5b696150edd44d SHA1 079f69a1574aee0d1ba2978a3064a0e6b044cf11 SHA256 87528fbb3fdb9ce250cc9587d5d65f0c2d5e85023600a8cab1fa4992612c0c9e
diff --git a/dev-ruby/sprockets/sprockets-2.1.3.ebuild b/dev-ruby/sprockets/sprockets-2.1.3.ebuild
new file mode 100644
index 000000000000..72b951b4144b
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-2.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets/sprockets-2.1.3.ebuild,v 1.1 2012/06/01 06:26:28 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Ruby library for compiling and serving web assets."
+HOMEPAGE="https://github.com/sstephenson/sprockets"
+SRC_URI="https://github.com/sstephenson/sprockets/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="sstephenson-sprockets-*"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_rdepend "
+	=dev-ruby/hike-1* >=dev-ruby/hike-1.2
+	=dev-ruby/rack-1*
+	>=dev-ruby/tilt-1.3.1"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-1*
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+
+	# Avoid failing tests. These no longer fail in upstream HEAD and we
+	# did not run tests before at all so its not a regression.
+	sed -i -e '/function() {}/ s:^:#:' test/test_environment.rb || die
+	rm test/test_asset.rb test/test_server.rb || die
+}
diff --git a/dev-util/a8/Manifest b/dev-util/a8/Manifest
index 554b67852ae1..e971f237df4d 100644
--- a/dev-util/a8/Manifest
+++ b/dev-util/a8/Manifest
@@ -1 +1,2 @@
 DIST a8-0.8.tar.gz 33148 RMD160 f031bbd2654614f58266283c636a20fc4282427f SHA1 a17105e3a439d9a49b2c9ae40ec175c46056643d SHA256 1d8412e3578775f6edfb7357e66ab5eb0e4b7b7bebfa0b90113e563e43cdbe91
+DIST a8-0.9.tar.gz 32845 RMD160 9e320f92051e054c022b84abca042a1c053f0cf9 SHA1 5bcf9b3d0e6ab46e4f0f81345ad0bc3d681dcb57 SHA256 8cb21758a217e0ee0cced13d59e5049a32679b9499808633ed27322fd3064ecf
diff --git a/dev-util/a8/a8-0.9.ebuild b/dev-util/a8/a8-0.9.ebuild
new file mode 100644
index 000000000000..6e77aaf6c822
--- /dev/null
+++ b/dev-util/a8/a8-0.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/a8/a8-0.9.ebuild,v 1.1 2012/06/01 06:22:56 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 3.*"
+
+inherit distutils eutils gnome2-utils
+
+DESCRIPTION="An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and a file browser"
+HOMEPAGE="http://code.google.com/p/abominade/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/argparse
+	>=dev-python/dbus-python-1
+	dev-python/logbook
+	dev-python/psutil
+	dev-python/pyyaml
+	>=dev-python/pygtk-2.22
+	>=dev-python/pygtkhelpers-0.4.3
+	x11-libs/vte:0[python]"
+RDEPEND="${DEPEND}
+	app-editors/gvim"
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doins a8/data/icons/a8.png
+
+	make_desktop_entry ${PN} ${PN} ${PN} 'Development;IDE'
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	distutils_pkg_postrm
+}
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
index 22b97b11df7c..290bf768669c 100644
--- a/dev-util/build/Manifest
+++ b/dev-util/build/Manifest
@@ -1 +1,2 @@
 DIST build-0.3.8.tar.bz2 71172 RMD160 405e502c753fcac92d3a3dabb390f5d33dc8a23a SHA1 473bbf01b2b6ae160cfb261546cd2d7eae0df3a0 SHA256 add405f3ca5b3be3d17f9a7b987a2e6424ec468366c7a9d9b25d7169330c80af
+DIST build-0.3.9.tar.bz2 71545 RMD160 899e07eaa466c47c7a88c8c342e3c0e781df5951 SHA1 27541dca3d7d9a2d2a38433daec695acf93ed334 SHA256 158a26af751dfc00d9b88021305ea74935542a9f970d1ac7e805cd239a3400b5
diff --git a/dev-util/build/build-0.3.9.ebuild b/dev-util/build/build-0.3.9.ebuild
new file mode 100644
index 000000000000..3a230f609ef5
--- /dev/null
+++ b/dev-util/build/build-0.3.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/build/build-0.3.9.ebuild,v 1.1 2012/06/01 07:02:44 dev-zero Exp $
+
+EAPI="4"
+
+inherit versionator
+
+DESCRIPTION="A massively-parallel software build system implemented on top of GNU make."
+HOMEPAGE="http://kolpackov.net/projects/build/"
+SLOT="$(get_version_component_range 1-2)"
+SRC_URI="http://www.codesynthesis.com/download/${PN}/${SLOT}/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	emake install_prefix="${D}/usr" install
+
+	dodoc documentation/[[:upper:]]*
+	dohtml -A xhtml documentation/*.{css,xhtml}
+
+	if use examples ; then
+		# preserving symlinks in the examples
+		cp -dpR examples "${D}/usr/share/doc/${PF}"
+	fi
+}
diff --git a/games-fps/xonotic/xonotic-0.6.0.ebuild b/games-fps/xonotic/xonotic-0.6.0.ebuild
index f518b153a2a9..3a51059ae653 100644
--- a/games-fps/xonotic/xonotic-0.6.0.ebuild
+++ b/games-fps/xonotic/xonotic-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/xonotic/xonotic-0.6.0.ebuild,v 1.2 2012/05/29 15:19:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/xonotic/xonotic-0.6.0.ebuild,v 1.3 2012/06/01 06:13:05 jdhore Exp $
 
 EAPI=3
 inherit eutils check-reqs games
@@ -12,7 +12,7 @@ SRC_URI="http://dl.xonotic.org/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug dedicated doc sdl"
 
 UIRDEPEND="
diff --git a/games-strategy/freecol/freecol-0.10.5.ebuild b/games-strategy/freecol/freecol-0.10.5.ebuild
index 835029c473d7..f78359a63695 100644
--- a/games-strategy/freecol/freecol-0.10.5.ebuild
+++ b/games-strategy/freecol/freecol-0.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.5.ebuild,v 1.3 2012/05/29 12:13:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.5.ebuild,v 1.4 2012/06/01 06:44:20 jdhore Exp $
 
 EAPI=2
 inherit base eutils java-pkg-2 java-ant-2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.43_rc2_pre955.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.43_rc2_pre955.ebuild
index e76520651112..c878f6b00337 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.43_rc2_pre955.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.43_rc2_pre955.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.43_rc2_pre955.ebuild,v 1.1 2008/10/27 18:51:55 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.43_rc2_pre955.ebuild,v 1.2 2012/06/01 02:32:55 zmedico Exp $
 
-inherit eutils subversion
+inherit eutils subversion user
 REVNO=${PV/0.43_rc2_pre}
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.81.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.81.ebuild
index 203e09c9c16a..863f0dcf4d72 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.81.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.81.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.81.ebuild,v 1.2 2009/04/28 07:37:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.81.ebuild,v 1.3 2012/06/01 02:32:55 zmedico Exp $
 
 EAPI=2
 
-inherit eutils
+inherit eutils user
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild
index 65d1ed0e90a9..fb4371913f62 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild,v 1.1 2009/07/31 08:06:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild,v 1.2 2012/06/01 02:32:55 zmedico Exp $
 
 EAPI=2
 
-inherit eutils perl-app
+inherit eutils perl-app user
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
index 85b09527551a..87b4005e97aa 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild,v 1.4 2010/03/25 15:30:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild,v 1.5 2012/06/01 02:32:55 zmedico Exp $
 
 EAPI=2
 
-inherit eutils perl-app
+inherit eutils perl-app user
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.83.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.83.ebuild
index 20b6199bdea7..e36488d5ed71 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.83.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.83.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83.ebuild,v 1.1 2009/09/16 01:22:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83.ebuild,v 1.2 2012/06/01 02:32:55 zmedico Exp $
 
 EAPI=2
 
-inherit eutils perl-app
+inherit eutils perl-app user
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
index e8324d860e38..0592f5a12453 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.1 2012/02/29 09:33:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.2 2012/06/01 02:32:55 zmedico Exp $
 
 EAPI=2
 
-inherit eutils perl-app
+inherit eutils perl-app user
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index 3bbd057cbf63..71c93bfa2535 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.2 2011/09/20 22:49:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.3 2012/06/01 02:32:55 zmedico Exp $
 
 EAPI=2
 
-inherit eutils git-2 perl-app
+inherit eutils git-2 perl-app user
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
diff --git a/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild b/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild
index adfad1840ef9..60c0d9ed74a9 100644
--- a/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild
+++ b/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild,v 1.4 2011/03/28 19:29:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild,v 1.5 2012/06/01 02:37:10 zmedico Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit eutils distutils
+inherit eutils distutils user
 
 DESCRIPTION="Render farm managing software"
 HOMEPAGE="http://www.drqueue.org/"
diff --git a/media-gfx/drqueue/drqueue-9999.ebuild b/media-gfx/drqueue/drqueue-9999.ebuild
index b9546c74465b..98744907c48d 100644
--- a/media-gfx/drqueue/drqueue-9999.ebuild
+++ b/media-gfx/drqueue/drqueue-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v 1.5 2011/09/20 22:43:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v 1.6 2012/06/01 02:37:10 zmedico Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit eutils distutils git-2
+inherit distutils git-2 user
 
 DESCRIPTION="Render farm managing software"
 HOMEPAGE="http://www.drqueue.org/"
diff --git a/media-libs/libextractor/libextractor-0.6.3-r1.ebuild b/media-libs/libextractor/libextractor-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..2de1592641c2
--- /dev/null
+++ b/media-libs/libextractor/libextractor-0.6.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.6.3-r1.ebuild,v 1.1 2012/06/01 07:10:22 ssuominen Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A library used to extract metadata from files of arbitrary type"
+HOMEPAGE="http://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg gsf gtk pdf qt4" # test
+
+RDEPEND="app-arch/bzip2
+	app-text/iso-codes
+	>=dev-libs/glib-2
+	media-gfx/exiv2
+	media-libs/flac
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libvorbis
+	>=sys-devel/libtool-2.2.6b
+	sys-libs/zlib
+	virtual/libintl
+	ffmpeg? ( >=virtual/ffmpeg-0.10 )
+	gsf? ( >=gnome-extra/libgsf-1.14.21 )
+	gtk? ( x11-libs/gtk+:2 )
+	pdf? ( app-text/poppler[cairo] )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+# test? ( app-forensics/zzuf )
+
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	sed -i \
+		-e 's:CODEC_TYPE_VIDEO:AVMEDIA_TYPE_VIDEO:' \
+		src/plugins/thumbnailffmpeg_extractor.c || die
+
+	# Missing AC_ARG_ENABLE wrt #415447
+	use gtk || { sed -i -e '/min_gtk_version=/s:=.*:=9999:' configure || die; }
+
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' configure || die
+}
+
+src_configure() {
+	local myconf
+
+	if use qt4; then
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags-only-I QtGui QtSvg)"
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-L QtGui QtSvg)"
+	else
+		myconf="--without-qt"
+	fi
+
+	# Missing AC_ARG_ENABLE wrt #415447. Both because of private _ZTI9MemStream.
+	local opt
+	for opt in ac_cv_header_poppler_goo_gmem_h ac_cv_lib_poppler__ZTI9MemStream; do
+		export ${opt}=$(usex pdf)
+	done
+
+	econf \
+		--enable-glib \
+		$(use_enable gsf) \
+		--disable-gnome \
+		$(use_enable ffmpeg) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
index 4a3ce70737bb..4f712d99a91f 100644
--- a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.11 2012/05/22 18:10:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.12 2012/06/01 02:41:52 zmedico Exp $
 
 EAPI=4
 
-unset _live_inherits
+inherit eutils libtool multilib
 
 if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
-	_live_inherits="autotools mercurial"
+	inherit autotools mercurial
 else
 	KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 fi
 
-inherit eutils libtool multilib ${_live_inherits}
-
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 0c4f6941121f..0098aad2c5b8 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.16 2012/05/22 18:10:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.17 2012/06/01 02:41:52 zmedico Exp $
 
 EAPI=4
 
-unset _live_inherits
+inherit libtool multilib
 
 if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
-	_live_inherits="autotools mercurial eutils"
+	inherit autotools mercurial eutils
 else
 	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 fi
 
-inherit libtool multilib ${_live_inherits}
-
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 
diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild
index ba5b0b70ebf4..6f62f42de6fa 100644
--- a/media-sound/mpd/mpd-0.16.2.ebuild
+++ b/media-sound/mpd/mpd-0.16.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.17 2012/05/05 08:39:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.18 2012/06/01 03:11:53 zmedico Exp $
 
 EAPI=4
-inherit eutils flag-o-matic linux-info multilib
+inherit eutils flag-o-matic linux-info multilib user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
diff --git a/media-sound/mpd/mpd-0.16.5.ebuild b/media-sound/mpd/mpd-0.16.5.ebuild
index 3e11b86a8f3d..2cdd67d97387 100644
--- a/media-sound/mpd/mpd-0.16.5.ebuild
+++ b/media-sound/mpd/mpd-0.16.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.10 2012/05/05 08:39:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.11 2012/06/01 03:11:53 zmedico Exp $
 
 EAPI=4
-inherit eutils flag-o-matic linux-info multilib
+inherit eutils flag-o-matic linux-info multilib user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
diff --git a/media-sound/mpd/mpd-0.16.6.ebuild b/media-sound/mpd/mpd-0.16.6.ebuild
index 6361e083c18a..5c1f4c54a7fe 100644
--- a/media-sound/mpd/mpd-0.16.6.ebuild
+++ b/media-sound/mpd/mpd-0.16.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.4 2012/05/05 08:39:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $
 
 EAPI=4
-inherit eutils flag-o-matic linux-info multilib
+inherit eutils flag-o-matic linux-info multilib user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
diff --git a/media-sound/mpd/mpd-0.16.7.ebuild b/media-sound/mpd/mpd-0.16.7.ebuild
index 2b594e377924..8b3bb4143f53 100644
--- a/media-sound/mpd/mpd-0.16.7.ebuild
+++ b/media-sound/mpd/mpd-0.16.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.7.ebuild,v 1.4 2012/05/05 08:39:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.7.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $
 
 EAPI=4
-inherit eutils flag-o-matic linux-info multilib systemd
+inherit eutils flag-o-matic linux-info multilib systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
diff --git a/media-sound/mpd/mpd-0.16.8.ebuild b/media-sound/mpd/mpd-0.16.8.ebuild
index 082778b0f6c0..6f037575a81c 100644
--- a/media-sound/mpd/mpd-0.16.8.ebuild
+++ b/media-sound/mpd/mpd-0.16.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.8.ebuild,v 1.4 2012/05/27 07:44:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.8.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $
 
 EAPI=4
-inherit eutils flag-o-matic linux-info multilib systemd
+inherit eutils flag-o-matic linux-info multilib systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
diff --git a/media-sound/mpd/mpd-9999.ebuild b/media-sound/mpd/mpd-9999.ebuild
index a75b6ee00525..889ab8dbb286 100644
--- a/media-sound/mpd/mpd-9999.ebuild
+++ b/media-sound/mpd/mpd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.6 2012/05/05 08:39:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.7 2012/06/01 03:11:53 zmedico Exp $
 
 EAPI=4
-inherit autotools eutils flag-o-matic linux-info multilib systemd git-2
+inherit autotools eutils flag-o-matic linux-info multilib systemd user git-2
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
index c4d40fc7049b..58a8a3699a2a 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild,v 1.11 2012/05/05 08:49:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild,v 1.12 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=3
 
-inherit autotools eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic multilib user versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index 57bc611b7625..dff41d4f5863 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.22 2012/05/05 08:49:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.23 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=3
 
-inherit autotools eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic multilib user versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
index 3aca7cff6450..8c2d420c8857 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild,v 1.4 2012/05/05 08:49:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild,v 1.5 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=4
 
-inherit eutils libtool flag-o-matic versionator
+inherit eutils flag-o-matic user versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
index 11b0c7de7fab..2394448c9fce 100644
--- a/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild,v 1.12 2012/05/05 08:49:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild,v 1.13 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool flag-o-matic versionator
+inherit autotools eutils flag-o-matic user versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/media-sound/pulseaudio/pulseaudio-1.1.ebuild b/media-sound/pulseaudio/pulseaudio-1.1.ebuild
index 4d2dc47080a3..f97e32da18d6 100644
--- a/media-sound/pulseaudio/pulseaudio-1.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1.ebuild,v 1.4 2012/05/05 08:49:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1.ebuild,v 1.5 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=4
 
-inherit eutils libtool flag-o-matic versionator
+inherit eutils flag-o-matic user versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/media-sound/pulseaudio/pulseaudio-2.0.ebuild b/media-sound/pulseaudio/pulseaudio-2.0.ebuild
index 1f4229c9cdd7..c8a1af4b3b67 100644
--- a/media-sound/pulseaudio/pulseaudio-2.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-2.0.ebuild,v 1.2 2012/05/13 14:24:32 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-2.0.ebuild,v 1.3 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=4
 
-inherit eutils libtool flag-o-matic versionator
+inherit eutils flag-o-matic user versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index aee889eef06b..0b4fa7473388 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.24 2012/05/05 08:49:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.25 2012/06/01 03:01:18 zmedico Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool flag-o-matic versionator git-2
+inherit autotools eutils flag-o-matic user versionator git-2
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
diff --git a/metadata/cache/app-office/libreoffice-l10n-3.5.4 b/metadata/cache/app-office/libreoffice-l10n-3.5.4
index 2d68b7f212b0..6d2bd432d922 100644
--- a/metadata/cache/app-office/libreoffice-l10n-3.5.4
+++ b/metadata/cache/app-office/libreoffice-l10n-3.5.4
@@ -1,5 +1,5 @@
 >=app-arch/rpm2targz-9.0.0.3g
-linguas_af? ( app-dicts/myspell-af ) linguas_bg? ( app-dicts/myspell-bg ) linguas_ca? ( app-dicts/myspell-ca ) linguas_cs? ( app-dicts/myspell-cs ) linguas_cy? ( app-dicts/myspell-cy ) linguas_da? ( app-dicts/myspell-da ) linguas_de? ( app-dicts/myspell-de ) linguas_el? ( app-dicts/myspell-el ) linguas_en? ( app-dicts/myspell-en ) linguas_eo? ( app-dicts/myspell-eo ) linguas_es? ( app-dicts/myspell-es ) linguas_et? ( app-dicts/myspell-et ) linguas_fr? ( app-dicts/myspell-fr ) linguas_ga? ( app-dicts/myspell-ga ) linguas_gl? ( app-dicts/myspell-gl ) linguas_he? ( app-dicts/myspell-he ) linguas_hr? ( app-dicts/myspell-hr ) linguas_hu? ( app-dicts/myspell-hu ) linguas_it? ( app-dicts/myspell-it ) linguas_ku? ( app-dicts/myspell-ku ) linguas_lt? ( app-dicts/myspell-lt ) linguas_mk? ( app-dicts/myspell-mk ) linguas_nb? ( app-dicts/myspell-nb ) linguas_nl? ( app-dicts/myspell-nl ) linguas_nn? ( app-dicts/myspell-nn ) linguas_pl? ( app-dicts/myspell-pl ) linguas_pt? ( app-dicts/myspell-pt ) linguas_ru? ( app-dicts/myspell-ru ) linguas_sk? ( app-dicts/myspell-sk ) linguas_sl? ( app-dicts/myspell-sl ) linguas_sv? ( app-dicts/myspell-sv ) linguas_tn? ( app-dicts/myspell-tn ) linguas_zu? ( app-dicts/myspell-zu ) !=app-office/libreoffice-3.4.9999-r1 !=app-office/libreoffice-9999-r1 || ( >=app-office/libreoffice-3.4.4.2-r1 >=app-office/libreoffice-bin-3.4.4.2-r1 )
+linguas_af? ( app-dicts/myspell-af ) linguas_bg? ( app-dicts/myspell-bg ) linguas_ca? ( app-dicts/myspell-ca ) linguas_cs? ( app-dicts/myspell-cs ) linguas_cy? ( app-dicts/myspell-cy ) linguas_da? ( app-dicts/myspell-da ) linguas_de? ( app-dicts/myspell-de ) linguas_el? ( app-dicts/myspell-el ) linguas_en? ( app-dicts/myspell-en ) linguas_eo? ( app-dicts/myspell-eo ) linguas_es? ( app-dicts/myspell-es ) linguas_et? ( app-dicts/myspell-et ) linguas_fr? ( app-dicts/myspell-fr ) linguas_ga? ( app-dicts/myspell-ga ) linguas_gl? ( app-dicts/myspell-gl ) linguas_he? ( app-dicts/myspell-he ) linguas_hr? ( app-dicts/myspell-hr ) linguas_hu? ( app-dicts/myspell-hu ) linguas_it? ( app-dicts/myspell-it ) linguas_ku? ( app-dicts/myspell-ku ) linguas_lt? ( app-dicts/myspell-lt ) linguas_mk? ( app-dicts/myspell-mk ) linguas_nb? ( app-dicts/myspell-nb ) linguas_nl? ( app-dicts/myspell-nl ) linguas_nn? ( app-dicts/myspell-nn ) linguas_pl? ( app-dicts/myspell-pl ) linguas_pt? ( app-dicts/myspell-pt ) linguas_ru? ( app-dicts/myspell-ru ) linguas_sk? ( app-dicts/myspell-sk ) linguas_sl? ( app-dicts/myspell-sl ) linguas_sv? ( app-dicts/myspell-sv ) linguas_tn? ( app-dicts/myspell-tn ) linguas_zu? ( app-dicts/myspell-zu ) || ( >=app-office/libreoffice-3.5 >=app-office/libreoffice-bin-3.5 )
 0
 linguas_bg? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bg.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bg.tar.gz ) ) linguas_bn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bn.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bn.tar.gz ) ) linguas_bo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bo.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bo.tar.gz ) ) linguas_bs? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bs.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bs.tar.gz ) ) linguas_ca_XV? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ca-XV.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ca-XV.tar.gz ) ) linguas_ca? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ca.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ca.tar.gz ) ) linguas_cs? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_cs.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_cs.tar.gz ) ) linguas_da? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_da.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_da.tar.gz ) ) linguas_de? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_de.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_de.tar.gz ) ) linguas_dz? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_dz.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_dz.tar.gz ) ) linguas_el? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_el.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_el.tar.gz ) ) linguas_en_GB? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_en-GB.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_en-GB.tar.gz ) ) linguas_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_en-US.tar.gz ) ) linguas_en_ZA? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_en-ZA.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_en-ZA.tar.gz ) ) linguas_eo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_eo.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_eo.tar.gz ) ) linguas_es? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_es.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_es.tar.gz ) ) linguas_et? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_et.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_et.tar.gz ) ) linguas_eu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_eu.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_eu.tar.gz ) ) linguas_fi? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_fi.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_fi.tar.gz ) ) linguas_fr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_fr.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_fr.tar.gz ) ) linguas_gl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_gl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_gl.tar.gz ) ) linguas_gu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_gu.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_gu.tar.gz ) ) linguas_he? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_he.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_he.tar.gz ) ) linguas_hi? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_hi.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_hi.tar.gz ) ) linguas_hr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_hr.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_hr.tar.gz ) ) linguas_hu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_hu.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_hu.tar.gz ) ) linguas_id? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_id.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_id.tar.gz ) ) linguas_is? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_is.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_is.tar.gz ) ) linguas_it? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_it.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_it.tar.gz ) ) linguas_ja? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ja.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ja.tar.gz ) ) linguas_ka? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ka.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ka.tar.gz ) ) linguas_km? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_km.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_km.tar.gz ) ) linguas_ko? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ko.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ko.tar.gz ) ) linguas_lb? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lb.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_lb.tar.gz ) ) linguas_mk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mk.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_mk.tar.gz ) ) linguas_nb? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nb.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_nb.tar.gz ) ) linguas_ne? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ne.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ne.tar.gz ) ) linguas_nl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_nl.tar.gz ) ) linguas_nn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nn.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_nn.tar.gz ) ) linguas_om? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_om.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_om.tar.gz ) ) linguas_pl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_pl.tar.gz ) ) linguas_pt_BR? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pt-BR.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_pt-BR.tar.gz ) ) linguas_pt? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pt.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_pt.tar.gz ) ) linguas_ru? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ru.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ru.tar.gz ) ) linguas_si? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_si.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_si.tar.gz ) ) linguas_sk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sk.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sk.tar.gz ) ) linguas_sl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sl.tar.gz ) ) linguas_sq? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sq.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sq.tar.gz ) ) linguas_sv? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sv.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sv.tar.gz ) ) linguas_tg? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tg.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_tg.tar.gz ) ) linguas_tr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tr.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_tr.tar.gz ) ) linguas_ug? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ug.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ug.tar.gz ) ) linguas_uk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_uk.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_uk.tar.gz ) ) linguas_vi? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_vi.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_vi.tar.gz ) ) linguas_zh_CN? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_zh-CN.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_zh-CN.tar.gz ) ) linguas_zh_TW? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_zh-TW.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_zh-TW.tar.gz ) ) linguas_af? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_af.tar.gz ) linguas_ar? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ar.tar.gz ) linguas_as? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_as.tar.gz ) linguas_ast? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ast.tar.gz ) linguas_be? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_be.tar.gz ) linguas_br? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_br.tar.gz ) linguas_brx? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_brx.tar.gz ) linguas_cy? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_cy.tar.gz ) linguas_dgo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_dgo.tar.gz ) linguas_fa? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_fa.tar.gz ) linguas_ga? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ga.tar.gz ) linguas_gd? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_gd.tar.gz ) linguas_kk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_kk.tar.gz ) linguas_kn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_kn.tar.gz ) linguas_kok? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_kok.tar.gz ) linguas_ks? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ks.tar.gz ) linguas_ku? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ku.tar.gz ) linguas_lo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lo.tar.gz ) linguas_lt? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lt.tar.gz ) linguas_lv? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lv.tar.gz ) linguas_mai? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mai.tar.gz ) linguas_ml? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ml.tar.gz ) linguas_mn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mn.tar.gz ) linguas_mni? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mni.tar.gz ) linguas_mr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mr.tar.gz ) linguas_my? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_my.tar.gz ) linguas_nr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nr.tar.gz ) linguas_nso? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nso.tar.gz ) linguas_oc? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_oc.tar.gz ) linguas_or? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_or.tar.gz ) linguas_pa_IN? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pa-IN.tar.gz ) linguas_ro? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ro.tar.gz ) linguas_rw? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_rw.tar.gz ) linguas_sa_IN? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sa-IN.tar.gz ) linguas_sat? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sat.tar.gz ) linguas_sd? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sd.tar.gz ) linguas_sh? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sh.tar.gz ) linguas_sr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sr.tar.gz ) linguas_ss? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ss.tar.gz ) linguas_st? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_st.tar.gz ) linguas_sw_TZ? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sw-TZ.tar.gz ) linguas_ta? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ta.tar.gz ) linguas_te? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_te.tar.gz ) linguas_th? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_th.tar.gz ) linguas_tn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tn.tar.gz ) linguas_ts? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ts.tar.gz ) linguas_tt? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tt.tar.gz ) linguas_uz? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_uz.tar.gz ) linguas_ve? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ve.tar.gz ) linguas_xh? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_xh.tar.gz ) linguas_zu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_zu.tar.gz )
 strip
@@ -14,7 +14,7 @@ offlinehelp linguas_bg linguas_bn linguas_bo linguas_bs linguas_ca_XV linguas_ca
 
 4
 
-compile configure install postinst prepare prerm unpack
+compile configure install prepare unpack
 
 
 
diff --git a/metadata/cache/app-shells/sash-3.7-r3 b/metadata/cache/app-shells/sash-3.7-r3
index 9d8d7b7ffbf2..e357a8712cc5 100644
--- a/metadata/cache/app-shells/sash-3.7-r3
+++ b/metadata/cache/app-shells/sash-3.7-r3
@@ -6,7 +6,7 @@ http://www.canb.auug.org.au/~dbell/programs/sash-3.7.tar.gz
 http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/
 freedist
 A small (static) UNIX Shell
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 eutils flag-o-matic multilib toolchain-funcs user
 static
 
diff --git a/metadata/cache/dev-java/miglayout-4.0 b/metadata/cache/dev-java/miglayout-4.0
index 3044f5a73d46..01654a6fe31a 100644
--- a/metadata/cache/dev-java/miglayout-4.0
+++ b/metadata/cache/dev-java/miglayout-4.0
@@ -6,7 +6,7 @@ http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
 http://www.miglayout.com/
 BSD
 Easy to use yet very powerful Java Swing layout manager
-amd64 ~x86
+amd64 x86
 eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 swt elibc_FreeBSD doc examples source
 
diff --git a/metadata/cache/dev-java/swt-3.7.2 b/metadata/cache/dev-java/swt-3.7.2
index 0207ca0d4e48..a32ff5c32129 100644
--- a/metadata/cache/dev-java/swt-3.7.2
+++ b/metadata/cache/dev-java/swt-3.7.2
@@ -6,7 +6,7 @@ x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/
 http://www.eclipse.org/
 CPL-1.0 LGPL-2.1 MPL-1.1
 GTK based SWT Library
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
 eutils java-ant-2 java-osgi java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 cairo gnome opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-ruby/actionmailer-3.0.10 b/metadata/cache/dev-ruby/actionmailer-3.0.10
deleted file mode 100644
index 5e8ee65718ed..000000000000
--- a/metadata/cache/dev-ruby/actionmailer-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-
-http://rubyforge.org/projects/actionmailer/
-MIT
-Framework for designing email-service layers
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/actionmailer-3.0.11 b/metadata/cache/dev-ruby/actionmailer-3.0.11
deleted file mode 100644
index 557740b1dd29..000000000000
--- a/metadata/cache/dev-ruby/actionmailer-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/actionmailer/
-MIT
-Framework for designing email-service layers
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/actionmailer-3.0.11-r2 b/metadata/cache/dev-ruby/actionmailer-3.0.11-r2
deleted file mode 100644
index 557740b1dd29..000000000000
--- a/metadata/cache/dev-ruby/actionmailer-3.0.11-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/actionmailer/
-MIT
-Framework for designing email-service layers
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/actionmailer-3.2.5 b/metadata/cache/dev-ruby/actionmailer-3.2.5
new file mode 100644
index 000000000000..34af64288821
--- /dev/null
+++ b/metadata/cache/dev-ruby/actionmailer-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/mail-2.4.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/mail-2.4.4[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/mail-2.4.4[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/mail-2.4.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/mail-2.4.4[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/mail-2.4.4[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+
+http://rubyforge.org/projects/actionmailer/
+MIT
+Framework for designing email-service layers
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/actionpack-3.0.10 b/metadata/cache/dev-ruby/actionpack-3.0.10
deleted file mode 100644
index 511e31b63d6c..000000000000
--- a/metadata/cache/dev-ruby/actionpack-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/activerecord-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.0.10[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/activerecord-3.0.10[ruby_targets_ree18] ~dev-ruby/actionmailer-3.0.10[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-
-http://rubyforge.org/projects/actionpack/
-MIT
-Eases web-request routing, handling, and response.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/actionpack-3.0.11 b/metadata/cache/dev-ruby/actionpack-3.0.11
deleted file mode 100644
index e8c3ec849d4f..000000000000
--- a/metadata/cache/dev-ruby/actionpack-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/activerecord-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.0.11[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/activerecord-3.0.11[ruby_targets_ree18] ~dev-ruby/actionmailer-3.0.11[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/actionpack/
-MIT
-Eases web-request routing, handling, and response.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/actionpack-3.2.5 b/metadata/cache/dev-ruby/actionpack-3.2.5
new file mode 100644
index 000000000000..04b8ddb86933
--- /dev/null
+++ b/metadata/cache/dev-ruby/actionpack-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby19] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/rack-cache-1.2[ruby_targets_ree18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ree18] >=dev-ruby/erubis-2.7.0[ruby_targets_ree18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ree18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ree18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ree18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ree18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bundler[ruby_targets_ree18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ree18] ~dev-ruby/actionmailer-3.2.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ree18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby19] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/rack-cache-1.2[ruby_targets_ree18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ree18] >=dev-ruby/erubis-2.7.0[ruby_targets_ree18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ree18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ree18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ree18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ree18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+
+http://rubyforge.org/projects/actionpack/
+MIT
+Eases web-request routing, handling, and response.
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/activemodel-3.0.10 b/metadata/cache/dev-ruby/activemodel-3.0.10
deleted file mode 100644
index 37c05d1efb3b..000000000000
--- a/metadata/cache/dev-ruby/activemodel-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-
-http://github.com/rails/rails
-MIT
-A toolkit for building modeling frameworks like Active Record and Active Resource.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activemodel-3.0.11 b/metadata/cache/dev-ruby/activemodel-3.0.11
deleted file mode 100644
index 89ee037fcb85..000000000000
--- a/metadata/cache/dev-ruby/activemodel-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://github.com/rails/rails
-MIT
-A toolkit for building modeling frameworks like Active Record and Active Resource.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activemodel-3.2.5 b/metadata/cache/dev-ruby/activemodel-3.2.5
new file mode 100644
index 000000000000..c3e56d5f3af0
--- /dev/null
+++ b/metadata/cache/dev-ruby/activemodel-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/builder-3.0.0[ruby_targets_ree18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/builder-3.0.0[ruby_targets_ree18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+
+http://github.com/rails/rails
+MIT
+A toolkit for building modeling frameworks like Active Record and Active Resource.
+~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/activerecord-3.0.10 b/metadata/cache/dev-ruby/activerecord-3.0.10
deleted file mode 100644
index e8f74bdfafac..000000000000
--- a/metadata/cache/dev-ruby/activerecord-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-
-http://rubyforge.org/projects/activerecord/
-MIT
-Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activerecord-3.0.11 b/metadata/cache/dev-ruby/activerecord-3.0.11
deleted file mode 100644
index 2d43cdbe4cff..000000000000
--- a/metadata/cache/dev-ruby/activerecord-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/activerecord/
-MIT
-Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activerecord-3.2.5 b/metadata/cache/dev-ruby/activerecord-3.2.5
new file mode 100644
index 000000000000..5d711d10c1df
--- /dev/null
+++ b/metadata/cache/dev-ruby/activerecord-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ree18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ree18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby19] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bundler[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ree18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ree18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+
+http://rubyforge.org/projects/activerecord/
+MIT
+Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/activeresource-3.0.10 b/metadata/cache/dev-ruby/activeresource-3.0.10
deleted file mode 100644
index 009ff1bc301a..000000000000
--- a/metadata/cache/dev-ruby/activeresource-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-
-http://rubyforge.org/projects/activeresource/
-MIT
-Think Active Record for web resources..
-~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activeresource-3.0.11 b/metadata/cache/dev-ruby/activeresource-3.0.11
deleted file mode 100644
index a1c3964fbc06..000000000000
--- a/metadata/cache/dev-ruby/activeresource-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/activeresource/
-MIT
-Think Active Record for web resources..
-~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activeresource-3.2.5 b/metadata/cache/dev-ruby/activeresource-3.2.5
new file mode 100644
index 000000000000..d4383d60b666
--- /dev/null
+++ b/metadata/cache/dev-ruby/activeresource-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+
+http://rubyforge.org/projects/activeresource/
+MIT
+Think Active Record for web resources..
+~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/activesupport-3.0.10 b/metadata/cache/dev-ruby/activesupport-3.0.10
deleted file mode 100644
index 3da29a972422..000000000000
--- a/metadata/cache/dev-ruby/activesupport-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-https://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-
-http://rubyforge.org/projects/activesupport/
-MIT
-Utility Classes and Extension to the Standard Library
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activesupport-3.0.11 b/metadata/cache/dev-ruby/activesupport-3.0.11
deleted file mode 100644
index f8f88bdca5dc..000000000000
--- a/metadata/cache/dev-ruby/activesupport-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-https://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/activesupport/
-MIT
-Utility Classes and Extension to the Standard Library
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activesupport-3.0.11-r1 b/metadata/cache/dev-ruby/activesupport-3.0.11-r1
deleted file mode 100644
index f8f88bdca5dc..000000000000
--- a/metadata/cache/dev-ruby/activesupport-3.0.11-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-https://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-
-http://rubyforge.org/projects/activesupport/
-MIT
-Utility Classes and Extension to the Standard Library
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/activesupport-3.2.5 b/metadata/cache/dev-ruby/activesupport-3.2.5
new file mode 100644
index 000000000000..d36d91394203
--- /dev/null
+++ b/metadata/cache/dev-ruby/activesupport-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] >=dev-ruby/multi_json-1.0[ruby_targets_ree18] dev-ruby/i18n:0.6[ruby_targets_ree18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/builder:0[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/builder:0[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/builder:0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] >=dev-ruby/multi_json-1.0[ruby_targets_ree18] dev-ruby/i18n:0.6[ruby_targets_ree18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+3.2
+https://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+
+http://rubyforge.org/projects/activesupport/
+MIT
+Utility Classes and Extension to the Standard Library
+~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/rails-3.0.10 b/metadata/cache/dev-ruby/rails-3.0.10
deleted file mode 100644
index 123e968562cf..000000000000
--- a/metadata/cache/dev-ruby/rails-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.10[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
->=app-admin/eselect-rails-0.16 ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.10[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-mirror://rubygems/rails-3.0.10.gem
-
-http://www.rubyonrails.org
-MIT
-ruby on rails is a web-application and persistance framework
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
-
-
-
-2
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rails-3.0.11 b/metadata/cache/dev-ruby/rails-3.0.11
deleted file mode 100644
index 86ddf519ba2c..000000000000
--- a/metadata/cache/dev-ruby/rails-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.11[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
->=app-admin/eselect-rails-0.16 ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.11[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-mirror://rubygems/rails-3.0.11.gem
-
-http://www.rubyonrails.org
-MIT
-ruby on rails is a web-application and persistance framework
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
-
-
-
-2
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rails-3.1.3-r1 b/metadata/cache/dev-ruby/rails-3.1.3-r1
deleted file mode 100644
index e341ff6149c4..000000000000
--- a/metadata/cache/dev-ruby/rails-3.1.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.1.3[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby18] dev-ruby/sass-rails[ruby_targets_ruby18] dev-ruby/uglifier[ruby_targets_ruby18] dev-ruby/coffee-rails[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby19] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby19] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby19] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby19] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.1.3[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby19] dev-ruby/sass-rails[ruby_targets_ruby19] dev-ruby/uglifier[ruby_targets_ruby19] dev-ruby/coffee-rails[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ree18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ree18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ree18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ree18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.1.3[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ree18] dev-ruby/sass-rails[ruby_targets_ree18] dev-ruby/uglifier[ruby_targets_ree18] dev-ruby/coffee-rails[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
->=app-admin/eselect-rails-0.18 ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.1.3[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby18] dev-ruby/sass-rails[ruby_targets_ruby18] dev-ruby/uglifier[ruby_targets_ruby18] dev-ruby/coffee-rails[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby19] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby19] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby19] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby19] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.1.3[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby19] dev-ruby/sass-rails[ruby_targets_ruby19] dev-ruby/uglifier[ruby_targets_ruby19] dev-ruby/coffee-rails[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ree18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ree18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ree18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ree18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.1.3[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ree18] dev-ruby/sass-rails[ruby_targets_ree18] dev-ruby/uglifier[ruby_targets_ree18] dev-ruby/coffee-rails[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.1
-mirror://rubygems/rails-3.1.3.gem
-
-http://www.rubyonrails.org
-MIT
-ruby on rails is a web-application and persistance framework
-~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-+asset-pipeline test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test
-|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
-
-
-4
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rails-3.2.5 b/metadata/cache/dev-ruby/rails-3.2.5
new file mode 100644
index 000000000000..6bdcf4d0d508
--- /dev/null
+++ b/metadata/cache/dev-ruby/rails-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.2.5[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby19] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.2.5[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ree18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.2.5[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ree18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ree18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ree18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.2.5[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby19] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.2.5[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ree18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.2.5[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ree18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ree18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ree18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+mirror://rubygems/rails-3.2.5.gem
+
+http://www.rubyonrails.org
+MIT
+ruby on rails is a web-application and persistance framework
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
++asset-pipeline test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/railties-3.0.10 b/metadata/cache/dev-ruby/railties-3.0.10
deleted file mode 100644
index f3febd7475f3..000000000000
--- a/metadata/cache/dev-ruby/railties-3.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-test
-http://github.com/rails/rails
-MIT
-Tools for creating, working with, and running Rails applications.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/railties-3.0.11 b/metadata/cache/dev-ruby/railties-3.0.11
deleted file mode 100644
index d1cebdf16f3e..000000000000
--- a/metadata/cache/dev-ruby/railties-3.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-3.0
-http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-test
-http://github.com/rails/rails
-MIT
-Tools for creating, working with, and running Rails applications.
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/railties-3.2.5 b/metadata/cache/dev-ruby/railties-3.2.5
new file mode 100644
index 000000000000..c3ee4e725815
--- /dev/null
+++ b/metadata/cache/dev-ruby/railties-3.2.5
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.6[ruby_targets_ruby18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/rdoc-3.4[ruby_targets_ruby19] >=dev-ruby/thor-0.14.6[ruby_targets_ruby19] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.6[ruby_targets_ree18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+>=app-admin/eselect-rails-0.18 ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.6[ruby_targets_ruby18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/rdoc-3.4[ruby_targets_ruby19] >=dev-ruby/thor-0.14.6[ruby_targets_ruby19] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.6[ruby_targets_ree18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3.2
+http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+test
+http://github.com/rails/rails
+MIT
+Tools for creating, working with, and running Rails applications.
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/sprockets-2.1.3 b/metadata/cache/dev-ruby/sprockets-2.1.3
new file mode 100644
index 000000000000..de95fd6f2863
--- /dev/null
+++ b/metadata/cache/dev-ruby/sprockets-2.1.3
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( =dev-ruby/hike-1*[ruby_targets_ruby18] >=dev-ruby/hike-1.2[ruby_targets_ruby18] =dev-ruby/rack-1*[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/hike-1*[ruby_targets_ree18] >=dev-ruby/hike-1.2[ruby_targets_ree18] =dev-ruby/rack-1*[ruby_targets_ree18] >=dev-ruby/tilt-1.3.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/json[ruby_targets_ruby18] dev-ruby/rack-test[ruby_targets_ruby18] =dev-ruby/coffee-script-2*[ruby_targets_ruby18] =dev-ruby/execjs-1*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] =dev-ruby/coffee-script-2*[ruby_targets_ruby19] =dev-ruby/execjs-1*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/json[ruby_targets_ree18] dev-ruby/rack-test[ruby_targets_ree18] =dev-ruby/coffee-script-2*[ruby_targets_ree18] =dev-ruby/execjs-1*[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( =dev-ruby/hike-1*[ruby_targets_ruby18] >=dev-ruby/hike-1.2[ruby_targets_ruby18] =dev-ruby/rack-1*[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/hike-1*[ruby_targets_ree18] >=dev-ruby/hike-1.2[ruby_targets_ree18] =dev-ruby/rack-1*[ruby_targets_ree18] >=dev-ruby/tilt-1.3.1[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+2.1
+https://github.com/sstephenson/sprockets/tarball/v2.1.3 -> sprockets-2.1.3.tgz
+
+https://github.com/sstephenson/sprockets
+MIT
+Ruby library for compiling and serving web assets.
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-util/a8-0.9 b/metadata/cache/dev-util/a8-0.9
new file mode 100644
index 000000000000..0f1d7e4ae8b4
--- /dev/null
+++ b/metadata/cache/dev-util/a8-0.9
@@ -0,0 +1,22 @@
+dev-python/argparse >=dev-python/dbus-python-1 dev-python/logbook dev-python/psutil dev-python/pyyaml >=dev-python/pygtk-2.22 >=dev-python/pygtkhelpers-0.4.3 x11-libs/vte:0[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) >=sys-apps/sed-4
+dev-python/argparse >=dev-python/dbus-python-1 dev-python/logbook dev-python/psutil dev-python/pyyaml >=dev-python/pygtk-2.22 >=dev-python/pygtkhelpers-0.4.3 x11-libs/vte:0[python] app-editors/gvim || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+mirror://pypi/a/a8/a8-0.9.tar.gz
+
+http://code.google.com/p/abominade/
+GPL-3
+An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and a file browser
+~amd64 ~x86
+distutils eutils gnome2-utils multilib python toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-util/build-0.3.9 b/metadata/cache/dev-util/build-0.3.9
new file mode 100644
index 000000000000..d8e5b9869a78
--- /dev/null
+++ b/metadata/cache/dev-util/build-0.3.9
@@ -0,0 +1,22 @@
+
+
+0.3
+http://www.codesynthesis.com/download/build/0.3/build-0.3.9.tar.bz2
+
+http://kolpackov.net/projects/build/
+GPL-2
+A massively-parallel software build system implemented on top of GNU make.
+~amd64 ~x86
+eutils multilib toolchain-funcs user versionator
+examples
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/games-fps/xonotic-0.6.0 b/metadata/cache/games-fps/xonotic-0.6.0
index 05fe98c4a713..b5dd7137d415 100644
--- a/metadata/cache/games-fps/xonotic-0.6.0
+++ b/metadata/cache/games-fps/xonotic-0.6.0
@@ -6,7 +6,7 @@ http://dl.xonotic.org/xonotic-0.6.0.zip
 http://www.xonotic.org/
 GPL-2
 Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine
-amd64 ~x86
+amd64 x86
 base check-reqs eutils games multilib toolchain-funcs user
 alsa debug dedicated doc sdl
 
diff --git a/metadata/cache/games-strategy/freecol-0.10.5 b/metadata/cache/games-strategy/freecol-0.10.5
index b20a49741417..5661ef71ed6e 100644
--- a/metadata/cache/games-strategy/freecol-0.10.5
+++ b/metadata/cache/games-strategy/freecol-0.10.5
@@ -6,7 +6,7 @@ mirror://sourceforge/freecol/freecol-0.10.5-src.zip
 http://www.freecol.org/
 GPL-2
 An open source clone of the game Colonization
-amd64 ~x86
+amd64 x86
 base eutils games java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/media-gfx/drqueue-9999 b/metadata/cache/media-gfx/drqueue-9999
index 5f98bef224e5..d905aa762ca6 100644
--- a/metadata/cache/media-gfx/drqueue-9999
+++ b/metadata/cache/media-gfx/drqueue-9999
@@ -7,7 +7,7 @@ http://www.drqueue.org/
 GPL-2
 Render farm managing software
 
-distutils eutils git-2 multilib python toolchain-funcs user
+distutils git-2 multilib python toolchain-funcs user
 X python ruby
 
 
diff --git a/metadata/cache/media-libs/libextractor-0.6.3-r1 b/metadata/cache/media-libs/libextractor-0.6.3-r1
new file mode 100644
index 000000000000..3f7d3eca4b3c
--- /dev/null
+++ b/metadata/cache/media-libs/libextractor-0.6.3-r1
@@ -0,0 +1,22 @@
+app-arch/bzip2 app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2 media-libs/flac media-libs/libmpeg2 media-libs/libogg media-libs/libvorbis >=sys-devel/libtool-2.2.6b sys-libs/zlib virtual/libintl ffmpeg? ( >=virtual/ffmpeg-0.10 ) gsf? ( >=gnome-extra/libgsf-1.14.21 ) gtk? ( x11-libs/gtk+:2 ) pdf? ( app-text/poppler[cairo] ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) virtual/pkgconfig sys-devel/gettext
+app-arch/bzip2 app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2 media-libs/flac media-libs/libmpeg2 media-libs/libogg media-libs/libvorbis >=sys-devel/libtool-2.2.6b sys-libs/zlib virtual/libintl ffmpeg? ( >=virtual/ffmpeg-0.10 ) gsf? ( >=gnome-extra/libgsf-1.14.21 ) gtk? ( x11-libs/gtk+:2 ) pdf? ( app-text/poppler[cairo] ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
+0
+mirror://gnu/libextractor/libextractor-0.6.3.tar.gz
+test
+http://www.gnu.org/software/libextractor/
+GPL-2
+A library used to extract metadata from files of arbitrary type
+~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib toolchain-funcs user
+ffmpeg gsf gtk pdf qt4
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/media-sound/pulseaudio-0.9.23-r1 b/metadata/cache/media-sound/pulseaudio-0.9.23-r1
index da0491bb661b..d40b0efc7f48 100644
--- a/metadata/cache/media-sound/pulseaudio-0.9.23-r1
+++ b/metadata/cache/media-sound/pulseaudio-0.9.23-r1
@@ -7,7 +7,7 @@ http://www.pulseaudio.org/
 LGPL-2 GPL-2
 A networked sound server with an advanced plugin system
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-eutils flag-o-matic libtool multilib toolchain-funcs user versionator
+eutils flag-o-matic multilib toolchain-funcs user versionator
 +alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime ssl
 
 
diff --git a/metadata/cache/media-sound/pulseaudio-1.1 b/metadata/cache/media-sound/pulseaudio-1.1
index 16cac1550c0c..287ef0dec669 100644
--- a/metadata/cache/media-sound/pulseaudio-1.1
+++ b/metadata/cache/media-sound/pulseaudio-1.1
@@ -7,7 +7,7 @@ http://www.pulseaudio.org/
 LGPL-2 GPL-2
 A networked sound server with an advanced plugin system
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-eutils flag-o-matic libtool multilib toolchain-funcs user versionator
+eutils flag-o-matic multilib toolchain-funcs user versionator
 +alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc
 
 
diff --git a/metadata/cache/media-sound/pulseaudio-2.0 b/metadata/cache/media-sound/pulseaudio-2.0
index 1b9f8e7c0f7d..64b3fd811e71 100644
--- a/metadata/cache/media-sound/pulseaudio-2.0
+++ b/metadata/cache/media-sound/pulseaudio-2.0
@@ -7,7 +7,7 @@ http://www.pulseaudio.org/
 !gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 A networked sound server with an advanced plugin system
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-eutils flag-o-matic libtool multilib toolchain-funcs user versionator
+eutils flag-o-matic multilib toolchain-funcs user versionator
 +alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec
 bluetooth? ( dbus )
 alsa? ( media-plugins/alsa-plugins[pulseaudio] )
diff --git a/metadata/cache/net-im/leechcraft-azoth-0.5.70 b/metadata/cache/net-im/leechcraft-azoth-0.5.70
new file mode 100644
index 000000000000..1cd02f6813f6
--- /dev/null
+++ b/metadata/cache/net-im/leechcraft-azoth-0.5.70
@@ -0,0 +1,22 @@
+~net-misc/leechcraft-core-0.5.70 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils
+~net-misc/leechcraft-core-0.5.70 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
+0
+mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
+
+http://leechcraft.org/
+GPL-3
+Azoth, the modular IM client for LeechCraft.
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic leechcraft multilib toolchain-funcs user versionator
+debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts media +modnok +nativeemoticons +otroid +p100q +rosenthal +standardstyles +xoox +xtazy +zheet
+
+
+
+4
+
+compile configure install postinst prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-im/leechcraft-azoth-9999 b/metadata/cache/net-im/leechcraft-azoth-9999
index 4e741b260038..380f273d9673 100644
--- a/metadata/cache/net-im/leechcraft-azoth-9999
+++ b/metadata/cache/net-im/leechcraft-azoth-9999
@@ -1,5 +1,5 @@
-~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
-~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
+~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 0
 
 
@@ -8,7 +8,7 @@ GPL-3
 Azoth, the modular IM client for LeechCraft.
 
 base cmake-utils eutils flag-o-matic git-2 leechcraft multilib toolchain-funcs user versionator
-debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts +modnok +nativeemoticons +otroid +p100q +rosenthal +standardstyles +xoox +xtazy +zheet
+debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts media +modnok +nativeemoticons +otroid +p100q +rosenthal +standardstyles +xoox +xtazy +zheet
 
 
 
diff --git a/metadata/cache/net-misc/gsutil-2011.21.11-r1 b/metadata/cache/net-misc/gsutil-2011.21.11-r1
deleted file mode 100644
index a94d6db622fa..000000000000
--- a/metadata/cache/net-misc/gsutil-2011.21.11-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=dev-python/boto-2.1.1
-0
-http://gsutil.googlecode.com/files/gsutil_11-21-2011.tar.gz
-
-http://code.google.com/p/gsutil/
-Apache-2.0
-command line tool for interacting with cloud storage services
-~amd64 ~x86
-eutils multilib python toolchain-funcs user versionator
-examples
-
-
-
-3
-
-install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/net-nds/portmap-9999 b/metadata/cache/net-nds/portmap-9999
index dafc0a1a2ebb..5ac32750bf2f 100644
--- a/metadata/cache/net-nds/portmap-9999
+++ b/metadata/cache/net-nds/portmap-9999
@@ -7,7 +7,7 @@ ftp://ftp.porcupine.org/pub/security/index.html
 as-is
 Netkit - portmapper
 
-eutils git-2 multilib toolchain-funcs user
+git-2 multilib toolchain-funcs user
 selinux tcpd
 
 
diff --git a/metadata/cache/www-apps/cgit-0.8.3.5 b/metadata/cache/www-apps/cgit-0.8.3.5
index c55e42b3f387..4d87df4b0fd9 100644
--- a/metadata/cache/www-apps/cgit-0.8.3.5
+++ b/metadata/cache/www-apps/cgit-0.8.3.5
@@ -7,7 +7,7 @@ http://hjemli.net/git/cgit/about/
 GPL-2
 a fast web-interface for git repositories
 ~amd64 ~x86
-eutils multilib toolchain-funcs user webapp
+multilib toolchain-funcs user webapp
 doc highlight vhosts
 
 
diff --git a/metadata/cache/www-apps/cgit-9999 b/metadata/cache/www-apps/cgit-9999
index f0bf7035b10a..60291e24d863 100644
--- a/metadata/cache/www-apps/cgit-9999
+++ b/metadata/cache/www-apps/cgit-9999
@@ -7,7 +7,7 @@ http://hjemli.net/git/cgit/about/
 GPL-2
 a fast web-interface for git repositories
 
-eutils git-2 multilib toolchain-funcs user webapp
+git-2 multilib toolchain-funcs user webapp
 doc highlight vhosts
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9c565c01cc17..c3ed26f30c4d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Jun 2012 02:37:15 +0000
+Fri, 01 Jun 2012 07:37:25 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9c565c01cc17..c3ed26f30c4d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Jun 2012 02:37:15 +0000
+Fri, 01 Jun 2012 07:37:25 +0000
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-3.5.4 b/metadata/md5-cache/app-office/libreoffice-l10n-3.5.4
index eba12f59e75a..fb4fad85bf37 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-3.5.4
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-3.5.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm unpack
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Translations for the Libreoffice suite.
 EAPI=4
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.libreoffice.org
 IUSE=offlinehelp linguas_bg linguas_bn linguas_bo linguas_bs linguas_ca_XV linguas_ca linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_en_GB linguas_en linguas_en_ZA linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_ko linguas_lb linguas_mk linguas_nb linguas_ne linguas_nl linguas_nn linguas_om linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv linguas_tg linguas_tr linguas_ug linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_af linguas_ar linguas_as linguas_ast linguas_be linguas_br linguas_brx linguas_cy linguas_dgo linguas_fa linguas_ga linguas_gd linguas_kk linguas_kn linguas_kok linguas_ks linguas_ku linguas_lo linguas_lt linguas_lv linguas_mai linguas_ml linguas_mn linguas_mni linguas_mr linguas_my linguas_nr linguas_nso linguas_oc linguas_or linguas_pa_IN linguas_ro linguas_rw linguas_sa_IN linguas_sat linguas_sd linguas_sh linguas_sr linguas_ss linguas_st linguas_sw_TZ linguas_ta linguas_te linguas_th linguas_tn linguas_ts linguas_tt linguas_uz linguas_ve linguas_xh linguas_zu
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=linguas_af? ( app-dicts/myspell-af ) linguas_bg? ( app-dicts/myspell-bg ) linguas_ca? ( app-dicts/myspell-ca ) linguas_cs? ( app-dicts/myspell-cs ) linguas_cy? ( app-dicts/myspell-cy ) linguas_da? ( app-dicts/myspell-da ) linguas_de? ( app-dicts/myspell-de ) linguas_el? ( app-dicts/myspell-el ) linguas_en? ( app-dicts/myspell-en ) linguas_eo? ( app-dicts/myspell-eo ) linguas_es? ( app-dicts/myspell-es ) linguas_et? ( app-dicts/myspell-et ) linguas_fr? ( app-dicts/myspell-fr ) linguas_ga? ( app-dicts/myspell-ga ) linguas_gl? ( app-dicts/myspell-gl ) linguas_he? ( app-dicts/myspell-he ) linguas_hr? ( app-dicts/myspell-hr ) linguas_hu? ( app-dicts/myspell-hu ) linguas_it? ( app-dicts/myspell-it ) linguas_ku? ( app-dicts/myspell-ku ) linguas_lt? ( app-dicts/myspell-lt ) linguas_mk? ( app-dicts/myspell-mk ) linguas_nb? ( app-dicts/myspell-nb ) linguas_nl? ( app-dicts/myspell-nl ) linguas_nn? ( app-dicts/myspell-nn ) linguas_pl? ( app-dicts/myspell-pl ) linguas_pt? ( app-dicts/myspell-pt ) linguas_ru? ( app-dicts/myspell-ru ) linguas_sk? ( app-dicts/myspell-sk ) linguas_sl? ( app-dicts/myspell-sl ) linguas_sv? ( app-dicts/myspell-sv ) linguas_tn? ( app-dicts/myspell-tn ) linguas_zu? ( app-dicts/myspell-zu ) !=app-office/libreoffice-3.4.9999-r1 !=app-office/libreoffice-9999-r1 || ( >=app-office/libreoffice-3.4.4.2-r1 >=app-office/libreoffice-bin-3.4.4.2-r1 )
+RDEPEND=linguas_af? ( app-dicts/myspell-af ) linguas_bg? ( app-dicts/myspell-bg ) linguas_ca? ( app-dicts/myspell-ca ) linguas_cs? ( app-dicts/myspell-cs ) linguas_cy? ( app-dicts/myspell-cy ) linguas_da? ( app-dicts/myspell-da ) linguas_de? ( app-dicts/myspell-de ) linguas_el? ( app-dicts/myspell-el ) linguas_en? ( app-dicts/myspell-en ) linguas_eo? ( app-dicts/myspell-eo ) linguas_es? ( app-dicts/myspell-es ) linguas_et? ( app-dicts/myspell-et ) linguas_fr? ( app-dicts/myspell-fr ) linguas_ga? ( app-dicts/myspell-ga ) linguas_gl? ( app-dicts/myspell-gl ) linguas_he? ( app-dicts/myspell-he ) linguas_hr? ( app-dicts/myspell-hr ) linguas_hu? ( app-dicts/myspell-hu ) linguas_it? ( app-dicts/myspell-it ) linguas_ku? ( app-dicts/myspell-ku ) linguas_lt? ( app-dicts/myspell-lt ) linguas_mk? ( app-dicts/myspell-mk ) linguas_nb? ( app-dicts/myspell-nb ) linguas_nl? ( app-dicts/myspell-nl ) linguas_nn? ( app-dicts/myspell-nn ) linguas_pl? ( app-dicts/myspell-pl ) linguas_pt? ( app-dicts/myspell-pt ) linguas_ru? ( app-dicts/myspell-ru ) linguas_sk? ( app-dicts/myspell-sk ) linguas_sl? ( app-dicts/myspell-sl ) linguas_sv? ( app-dicts/myspell-sv ) linguas_tn? ( app-dicts/myspell-tn ) linguas_zu? ( app-dicts/myspell-zu ) || ( >=app-office/libreoffice-3.5 >=app-office/libreoffice-bin-3.5 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=linguas_bg? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bg.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bg.tar.gz ) ) linguas_bn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bn.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bn.tar.gz ) ) linguas_bo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bo.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bo.tar.gz ) ) linguas_bs? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_bs.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_bs.tar.gz ) ) linguas_ca_XV? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ca-XV.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ca-XV.tar.gz ) ) linguas_ca? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ca.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ca.tar.gz ) ) linguas_cs? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_cs.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_cs.tar.gz ) ) linguas_da? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_da.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_da.tar.gz ) ) linguas_de? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_de.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_de.tar.gz ) ) linguas_dz? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_dz.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_dz.tar.gz ) ) linguas_el? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_el.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_el.tar.gz ) ) linguas_en_GB? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_en-GB.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_en-GB.tar.gz ) ) linguas_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_en-US.tar.gz ) ) linguas_en_ZA? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_en-ZA.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_en-ZA.tar.gz ) ) linguas_eo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_eo.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_eo.tar.gz ) ) linguas_es? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_es.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_es.tar.gz ) ) linguas_et? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_et.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_et.tar.gz ) ) linguas_eu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_eu.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_eu.tar.gz ) ) linguas_fi? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_fi.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_fi.tar.gz ) ) linguas_fr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_fr.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_fr.tar.gz ) ) linguas_gl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_gl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_gl.tar.gz ) ) linguas_gu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_gu.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_gu.tar.gz ) ) linguas_he? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_he.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_he.tar.gz ) ) linguas_hi? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_hi.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_hi.tar.gz ) ) linguas_hr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_hr.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_hr.tar.gz ) ) linguas_hu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_hu.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_hu.tar.gz ) ) linguas_id? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_id.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_id.tar.gz ) ) linguas_is? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_is.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_is.tar.gz ) ) linguas_it? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_it.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_it.tar.gz ) ) linguas_ja? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ja.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ja.tar.gz ) ) linguas_ka? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ka.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ka.tar.gz ) ) linguas_km? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_km.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_km.tar.gz ) ) linguas_ko? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ko.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ko.tar.gz ) ) linguas_lb? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lb.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_lb.tar.gz ) ) linguas_mk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mk.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_mk.tar.gz ) ) linguas_nb? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nb.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_nb.tar.gz ) ) linguas_ne? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ne.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ne.tar.gz ) ) linguas_nl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_nl.tar.gz ) ) linguas_nn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nn.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_nn.tar.gz ) ) linguas_om? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_om.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_om.tar.gz ) ) linguas_pl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_pl.tar.gz ) ) linguas_pt_BR? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pt-BR.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_pt-BR.tar.gz ) ) linguas_pt? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pt.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_pt.tar.gz ) ) linguas_ru? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ru.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ru.tar.gz ) ) linguas_si? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_si.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_si.tar.gz ) ) linguas_sk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sk.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sk.tar.gz ) ) linguas_sl? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sl.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sl.tar.gz ) ) linguas_sq? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sq.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sq.tar.gz ) ) linguas_sv? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sv.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_sv.tar.gz ) ) linguas_tg? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tg.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_tg.tar.gz ) ) linguas_tr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tr.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_tr.tar.gz ) ) linguas_ug? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ug.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_ug.tar.gz ) ) linguas_uk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_uk.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_uk.tar.gz ) ) linguas_vi? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_vi.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_vi.tar.gz ) ) linguas_zh_CN? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_zh-CN.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_zh-CN.tar.gz ) ) linguas_zh_TW? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_zh-TW.tar.gz offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_helppack-rpm_zh-TW.tar.gz ) ) linguas_af? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_af.tar.gz ) linguas_ar? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ar.tar.gz ) linguas_as? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_as.tar.gz ) linguas_ast? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ast.tar.gz ) linguas_be? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_be.tar.gz ) linguas_br? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_br.tar.gz ) linguas_brx? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_brx.tar.gz ) linguas_cy? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_cy.tar.gz ) linguas_dgo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_dgo.tar.gz ) linguas_fa? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_fa.tar.gz ) linguas_ga? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ga.tar.gz ) linguas_gd? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_gd.tar.gz ) linguas_kk? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_kk.tar.gz ) linguas_kn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_kn.tar.gz ) linguas_kok? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_kok.tar.gz ) linguas_ks? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ks.tar.gz ) linguas_ku? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ku.tar.gz ) linguas_lo? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lo.tar.gz ) linguas_lt? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lt.tar.gz ) linguas_lv? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_lv.tar.gz ) linguas_mai? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mai.tar.gz ) linguas_ml? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ml.tar.gz ) linguas_mn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mn.tar.gz ) linguas_mni? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mni.tar.gz ) linguas_mr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_mr.tar.gz ) linguas_my? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_my.tar.gz ) linguas_nr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nr.tar.gz ) linguas_nso? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_nso.tar.gz ) linguas_oc? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_oc.tar.gz ) linguas_or? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_or.tar.gz ) linguas_pa_IN? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_pa-IN.tar.gz ) linguas_ro? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ro.tar.gz ) linguas_rw? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_rw.tar.gz ) linguas_sa_IN? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sa-IN.tar.gz ) linguas_sat? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sat.tar.gz ) linguas_sd? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sd.tar.gz ) linguas_sh? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sh.tar.gz ) linguas_sr? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sr.tar.gz ) linguas_ss? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ss.tar.gz ) linguas_st? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_st.tar.gz ) linguas_sw_TZ? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_sw-TZ.tar.gz ) linguas_ta? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ta.tar.gz ) linguas_te? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_te.tar.gz ) linguas_th? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_th.tar.gz ) linguas_tn? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tn.tar.gz ) linguas_ts? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ts.tar.gz ) linguas_tt? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_tt.tar.gz ) linguas_uz? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_uz.tar.gz ) linguas_ve? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_ve.tar.gz ) linguas_xh? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_xh.tar.gz ) linguas_zu? ( http://download.documentfoundation.org/libreoffice/stable/3.5.4/rpm/x86/LibO_3.5.4_Linux_x86_langpack-rpm_zu.tar.gz )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=69f31741ca19f1ddf6a747b01f77088e
+_md5_=04252c35b12f97a062d804567da1b44e
diff --git a/metadata/md5-cache/app-shells/sash-3.7-r3 b/metadata/md5-cache/app-shells/sash-3.7-r3
index 73437cbfe641..40054fe924e6 100644
--- a/metadata/md5-cache/app-shells/sash-3.7-r3
+++ b/metadata/md5-cache/app-shells/sash-3.7-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A small (static) UNIX Shell
 EAPI=4
 HOMEPAGE=http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=freedist
 RDEPEND=!static? ( static? ( sys-libs/zlib[static-libs] ) !static? ( >=sys-libs/zlib-1.2.3 ) )
 SLOT=0
 SRC_URI=http://www.canb.auug.org.au/~dbell/programs/sash-3.7.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=08776b4a2a3cecd97878c0fa8c7cb4b0
+_md5_=0641e123c76e34ed1b754eb5698290e3
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0 b/metadata/md5-cache/dev-java/miglayout-4.0
index 4cf3446ef768..671bd8b2938f 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0
+++ b/metadata/md5-cache/dev-java/miglayout-4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Easy to use yet very powerful Java Swing layout manager
 EAPI=4
 HOMEPAGE=http://www.miglayout.com/
 IUSE=swt elibc_FreeBSD doc examples source
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=16988561eeb3597e936a4997b4acd9d4
+_md5_=5db9a24a5c95e4866902fd211442af37
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2 b/metadata/md5-cache/dev-java/swt-3.7.2
index b9c9ae4cf5e5..51ad66589318 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2
+++ b/metadata/md5-cache/dev-java/swt-3.7.2
@@ -4,10 +4,10 @@ DESCRIPTION=GTK based SWT Library
 EAPI=4
 HOMEPAGE=http://www.eclipse.org/
 IUSE=cairo gnome opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.1.9-r1
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7c405eb3cb463d758fbf4b90938c9136
+_md5_=ce1e11f628304a936bac75c215cc3ad4
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.0.10 b/metadata/md5-cache/dev-ruby/actionmailer-3.0.10
deleted file mode 100644
index f989e11b90b2..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/actionmailer/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c8d1768a921d04ecb407d382e87095a2
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.0.11 b/metadata/md5-cache/dev-ruby/actionmailer-3.0.11
deleted file mode 100644
index 5a78b76ae52f..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/actionmailer/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0a0d324bf89463493ac154695040cb36
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.0.11-r2 b/metadata/md5-cache/dev-ruby/actionmailer-3.0.11-r2
deleted file mode 100644
index b303f9d93876..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-3.0.11-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/actionmailer/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=514eaa30362a92db82d52cdc925af378
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.2.5 b/metadata/md5-cache/dev-ruby/actionmailer-3.2.5
new file mode 100644
index 000000000000..43a864d73b3c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/mail-2.4.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/mail-2.4.4[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/mail-2.4.4[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=4
+HOMEPAGE=http://rubyforge.org/projects/actionmailer/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/mail-2.4.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/mail-2.4.4[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/mail-2.4.4[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3f8c0aa916e3b30ef5a762d75051efc0
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.0.10 b/metadata/md5-cache/dev-ruby/actionpack-3.0.10
deleted file mode 100644
index 3b02eb77a68b..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/activerecord-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.0.10[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/activerecord-3.0.10[ruby_targets_ree18] ~dev-ruby/actionmailer-3.0.10[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Eases web-request routing, handling, and response.
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/actionpack/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5e4bccc3eec30d5223c3d3e34425836a
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.0.11 b/metadata/md5-cache/dev-ruby/actionpack-3.0.11
deleted file mode 100644
index 982c7c41d215..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/activerecord-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.0.11[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/activerecord-3.0.11[ruby_targets_ree18] ~dev-ruby/actionmailer-3.0.11[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Eases web-request routing, handling, and response.
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/actionpack/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ruby18] >=dev-ruby/erubis-2.6.6[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ruby18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ruby18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2:0[ruby_targets_ree18] >=dev-ruby/erubis-2.6.6[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] >=dev-ruby/rack-1.2.1:1.2[ruby_targets_ree18] >=dev-ruby/rack-mount-0.6.14:0.6[ruby_targets_ree18] >=dev-ruby/rack-test-0.5.7:0.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0c50d02f0b918024cea672c9be9b8798
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.2.5 b/metadata/md5-cache/dev-ruby/actionpack-3.2.5
new file mode 100644
index 000000000000..3bb55b1d0550
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby19] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/rack-cache-1.2[ruby_targets_ree18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ree18] >=dev-ruby/erubis-2.7.0[ruby_targets_ree18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ree18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ree18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ree18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ree18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bundler[ruby_targets_ree18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ree18] ~dev-ruby/actionmailer-3.2.5[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ree18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Eases web-request routing, handling, and response.
+EAPI=4
+HOMEPAGE=http://rubyforge.org/projects/actionpack/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby19] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/rack-cache-1.2[ruby_targets_ree18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ree18] >=dev-ruby/erubis-2.7.0[ruby_targets_ree18] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ree18] >=dev-ruby/rack-1.4.0:1.4[ruby_targets_ree18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ree18] >=dev-ruby/journey-1.0.1:1.0[ruby_targets_ree18] >=dev-ruby/sprockets-2.1.3:2.1[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=629cb0eee51d1af90ebd8a96e123d72f
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.0.10 b/metadata/md5-cache/dev-ruby/activemodel-3.0.10
deleted file mode 100644
index 2fef422b2063..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=A toolkit for building modeling frameworks like Active Record and Active Resource.
-EAPI=4
-HOMEPAGE=http://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=aff1b31ba32cb8cefe736357526233da
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.0.11 b/metadata/md5-cache/dev-ruby/activemodel-3.0.11
deleted file mode 100644
index 5605c26ddabf..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/ruby-debug[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=A toolkit for building modeling frameworks like Active Record and Active Resource.
-EAPI=4
-HOMEPAGE=http://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/i18n-0.5.0:0.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e2913e2a907d59fd74817670520ee637
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.2.5 b/metadata/md5-cache/dev-ruby/activemodel-3.2.5
new file mode 100644
index 000000000000..28c429149d73
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/builder-3.0.0[ruby_targets_ree18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=A toolkit for building modeling frameworks like Active Record and Active Resource.
+EAPI=4
+HOMEPAGE=http://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] >=dev-ruby/builder-3.0.0[ruby_targets_ree18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0f80c3b92766a305feda600998f83500
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.0.10 b/metadata/md5-cache/dev-ruby/activerecord-3.0.10
deleted file mode 100644
index af56f0eb0092..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activerecord/
-IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dc1a6cff8dbcce0e3bea2305776e3d33
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.0.11 b/metadata/md5-cache/dev-ruby/activerecord-3.0.11
deleted file mode 100644
index f92961c141d2..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( test? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activerecord/
-IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ruby18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ruby18] ) postgres? ( dev-ruby/pg[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] >=dev-ruby/arel-2.0.10-r1:2.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.23[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3[ruby_targets_ree18] ) mysql? ( dev-ruby/mysql2:0.2[ruby_targets_ree18] ) postgres? ( dev-ruby/pg[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4ffe29e1d765e66ee9ad89dfa20c768d
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.2.5 b/metadata/md5-cache/dev-ruby/activerecord-3.2.5
new file mode 100644
index 000000000000..773fa7449802
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ree18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ree18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby18] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby19] >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bundler[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ree18] >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=4
+HOMEPAGE=http://rubyforge.org/projects/activerecord/
+IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ree18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ree18] sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5[ruby_targets_ree18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ree18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=03846018f2aa129a05e82c52ceca4569
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.0.10 b/metadata/md5-cache/dev-ruby/activeresource-3.0.10
deleted file mode 100644
index 1a159546f8d3..000000000000
--- a/metadata/md5-cache/dev-ruby/activeresource-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Think Active Record for web resources..
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activeresource/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.10[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5e7349a449b7404259be405f96ed0cfd
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.0.11 b/metadata/md5-cache/dev-ruby/activeresource-3.0.11
deleted file mode 100644
index e48f5fad8d87..000000000000
--- a/metadata/md5-cache/dev-ruby/activeresource-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Think Active Record for web resources..
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activeresource/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/activemodel-3.0.11[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e0763ce64fb4aafca58f03346637d483
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.2.5 b/metadata/md5-cache/dev-ruby/activeresource-3.2.5
new file mode 100644
index 000000000000..da702ce32b5a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activeresource-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Think Active Record for web resources..
+EAPI=4
+HOMEPAGE=http://rubyforge.org/projects/activeresource/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.5[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/activemodel-3.2.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b8c22586a17835e22078cc0dee5157a1
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.0.10 b/metadata/md5-cache/dev-ruby/activesupport-3.0.10
deleted file mode 100644
index 27e166b7f29c..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activesupport/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=https://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=db88819e87623ec5b01a5177e2cf7594
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.0.11 b/metadata/md5-cache/dev-ruby/activesupport-3.0.11
deleted file mode 100644
index 99d93cec7738..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-3.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activesupport/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=https://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c550ca83b79987e46fb3d45916327a99
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.0.11-r1 b/metadata/md5-cache/dev-ruby/activesupport-3.0.11-r1
deleted file mode 100644
index 6e876ac3eaef..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-3.0.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=4
-HOMEPAGE=http://rubyforge.org/projects/activesupport/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=3.0
-SRC_URI=https://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cb6b82f36b12b4179074864ea09d8d85
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.2.5 b/metadata/md5-cache/dev-ruby/activesupport-3.2.5
new file mode 100644
index 000000000000..b85a591b79b3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] >=dev-ruby/multi_json-1.0[ruby_targets_ree18] dev-ruby/i18n:0.6[ruby_targets_ree18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/builder:0[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] >=dev-ruby/libxml-2.0.0[ruby_targets_ree18] dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/builder:0[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/builder:0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=4
+HOMEPAGE=http://rubyforge.org/projects/activesupport/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ree18] >=dev-ruby/multi_json-1.0[ruby_targets_ree18] dev-ruby/i18n:0.6[ruby_targets_ree18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=https://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1c6a816d240f63caa47cd7a5f4209987
diff --git a/metadata/md5-cache/dev-ruby/rails-3.0.10 b/metadata/md5-cache/dev-ruby/rails-3.0.10
deleted file mode 100644
index 683719ccf24d..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-3.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.10[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=2
-HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=app-admin/eselect-rails-0.16 ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.10[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.10[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.10[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.10[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-SLOT=3.0
-SRC_URI=mirror://rubygems/rails-3.0.10.gem
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bfd633d89edb03f4857331800ab81cc6
diff --git a/metadata/md5-cache/dev-ruby/rails-3.0.11 b/metadata/md5-cache/dev-ruby/rails-3.0.11
deleted file mode 100644
index e192ba214fc0..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-3.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.11[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=2
-HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=app-admin/eselect-rails-0.16 ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ruby18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ruby18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] =dev-ruby/bundler-1.0*[ruby_targets_ruby18] ~dev-ruby/railties-3.0.11[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] ~dev-ruby/activerecord-3.0.11[ruby_targets_ree18] ~dev-ruby/activeresource-3.0.11[ruby_targets_ree18] ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] =dev-ruby/bundler-1.0*[ruby_targets_ree18] ~dev-ruby/railties-3.0.11[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-SLOT=3.0
-SRC_URI=mirror://rubygems/rails-3.0.11.gem
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=50f15ed6098c60f9d4f61a9a7061c79a
diff --git a/metadata/md5-cache/dev-ruby/rails-3.1.3-r1 b/metadata/md5-cache/dev-ruby/rails-3.1.3-r1
deleted file mode 100644
index 8273da6e22c0..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-3.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.1.3[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby18] dev-ruby/sass-rails[ruby_targets_ruby18] dev-ruby/uglifier[ruby_targets_ruby18] dev-ruby/coffee-rails[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby19] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby19] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby19] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby19] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.1.3[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby19] dev-ruby/sass-rails[ruby_targets_ruby19] dev-ruby/uglifier[ruby_targets_ruby19] dev-ruby/coffee-rails[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ree18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ree18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ree18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ree18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.1.3[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ree18] dev-ruby/sass-rails[ruby_targets_ree18] dev-ruby/uglifier[ruby_targets_ree18] dev-ruby/coffee-rails[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=4
-HOMEPAGE=http://www.rubyonrails.org
-IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test
-KEYWORDS=~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=app-admin/eselect-rails-0.18 ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.1.3[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby18] dev-ruby/sass-rails[ruby_targets_ruby18] dev-ruby/uglifier[ruby_targets_ruby18] dev-ruby/coffee-rails[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ruby19] ~dev-ruby/actionpack-3.1.3[ruby_targets_ruby19] ~dev-ruby/activerecord-3.1.3[ruby_targets_ruby19] ~dev-ruby/activeresource-3.1.3[ruby_targets_ruby19] ~dev-ruby/activesupport-3.1.3[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.1.3[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ruby19] dev-ruby/sass-rails[ruby_targets_ruby19] dev-ruby/uglifier[ruby_targets_ruby19] dev-ruby/coffee-rails[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.1.3[ruby_targets_ree18] ~dev-ruby/actionpack-3.1.3[ruby_targets_ree18] ~dev-ruby/activerecord-3.1.3[ruby_targets_ree18] ~dev-ruby/activeresource-3.1.3[ruby_targets_ree18] ~dev-ruby/activesupport-3.1.3[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.1.3[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails:0[ruby_targets_ree18] dev-ruby/sass-rails[ruby_targets_ree18] dev-ruby/uglifier[ruby_targets_ree18] dev-ruby/coffee-rails[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
-SLOT=3.1
-SRC_URI=mirror://rubygems/rails-3.1.3.gem
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d2817f43161b7b96e7eafacd1c5f439c
diff --git a/metadata/md5-cache/dev-ruby/rails-3.2.5 b/metadata/md5-cache/dev-ruby/rails-3.2.5
new file mode 100644
index 000000000000..ffc344c3a887
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-3.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.2.5[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby19] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.2.5[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ree18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.2.5[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ree18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ree18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ree18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=4
+HOMEPAGE=http://www.rubyonrails.org
+IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.2.5[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.5[ruby_targets_ruby19] ~dev-ruby/activeresource-3.2.5[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.2.5[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( ~dev-ruby/actionmailer-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] ~dev-ruby/activerecord-3.2.5[ruby_targets_ree18] ~dev-ruby/activeresource-3.2.5[ruby_targets_ree18] ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] =dev-ruby/bundler-1*[ruby_targets_ree18] ~dev-ruby/railties-3.2.5[ruby_targets_ree18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ree18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ree18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ree18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=3.2
+SRC_URI=mirror://rubygems/rails-3.2.5.gem
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=eec6efcd46ccc75ef637b87ca7d6fa84
diff --git a/metadata/md5-cache/dev-ruby/railties-3.0.10 b/metadata/md5-cache/dev-ruby/railties-3.0.10
deleted file mode 100644
index cce448614b9b..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-3.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Tools for creating, working with, and running Rails applications.
-EAPI=4
-HOMEPAGE=http://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.10[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.10[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-RESTRICT=test
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.10 -> rails-3.0.10.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c33763681ee310421547843333078a23
diff --git a/metadata/md5-cache/dev-ruby/railties-3.0.11 b/metadata/md5-cache/dev-ruby/railties-3.0.11
deleted file mode 100644
index b70750e8a1b0..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-3.0.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Tools for creating, working with, and running Rails applications.
-EAPI=4
-HOMEPAGE=http://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ruby18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.4[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.0.11[ruby_targets_ree18] ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.4[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-RESTRICT=test
-SLOT=3.0
-SRC_URI=http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d779a6d53b46a7456f43ed4ef6f408ab
diff --git a/metadata/md5-cache/dev-ruby/railties-3.2.5 b/metadata/md5-cache/dev-ruby/railties-3.2.5
new file mode 100644
index 000000000000..023d4372a2b6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-3.2.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.6[ruby_targets_ruby18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/rdoc-3.4[ruby_targets_ruby19] >=dev-ruby/thor-0.14.6[ruby_targets_ruby19] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.6[ruby_targets_ree18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Tools for creating, working with, and running Rails applications.
+EAPI=4
+HOMEPAGE=http://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc doc test test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=app-admin/eselect-rails-0.18 ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.6[ruby_targets_ruby18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.5[ruby_targets_ruby19] >=dev-ruby/rdoc-3.4[ruby_targets_ruby19] >=dev-ruby/thor-0.14.6[ruby_targets_ruby19] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ree18? ( ~dev-ruby/activesupport-3.2.5[ruby_targets_ree18] ~dev-ruby/actionpack-3.2.5[ruby_targets_ree18] >=dev-ruby/rdoc-3.4[ruby_targets_ree18] >=dev-ruby/thor-0.14.6[ruby_targets_ree18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ree18] >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+RESTRICT=test
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/tarball/v3.2.5 -> rails-3.2.5.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f4490cad38d8930f079b78460d07fef3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.1.3 b/metadata/md5-cache/dev-ruby/sprockets-2.1.3
new file mode 100644
index 000000000000..3e854b75de58
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( =dev-ruby/hike-1*[ruby_targets_ruby18] >=dev-ruby/hike-1.2[ruby_targets_ruby18] =dev-ruby/rack-1*[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/hike-1*[ruby_targets_ree18] >=dev-ruby/hike-1.2[ruby_targets_ree18] =dev-ruby/rack-1*[ruby_targets_ree18] >=dev-ruby/tilt-1.3.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/json[ruby_targets_ruby18] dev-ruby/rack-test[ruby_targets_ruby18] =dev-ruby/coffee-script-2*[ruby_targets_ruby18] =dev-ruby/execjs-1*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] =dev-ruby/coffee-script-2*[ruby_targets_ruby19] =dev-ruby/execjs-1*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/json[ruby_targets_ree18] dev-ruby/rack-test[ruby_targets_ree18] =dev-ruby/coffee-script-2*[ruby_targets_ree18] =dev-ruby/execjs-1*[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Ruby library for compiling and serving web assets.
+EAPI=4
+HOMEPAGE=https://github.com/sstephenson/sprockets
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( =dev-ruby/hike-1*[ruby_targets_ruby18] >=dev-ruby/hike-1.2[ruby_targets_ruby18] =dev-ruby/rack-1*[ruby_targets_ruby18] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby/hike-1.2[ruby_targets_ruby19] =dev-ruby/rack-1*[ruby_targets_ruby19] >=dev-ruby/tilt-1.3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/hike-1*[ruby_targets_ree18] >=dev-ruby/hike-1.2[ruby_targets_ree18] =dev-ruby/rack-1*[ruby_targets_ree18] >=dev-ruby/tilt-1.3.1[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=2.1
+SRC_URI=https://github.com/sstephenson/sprockets/tarball/v2.1.3 -> sprockets-2.1.3.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1b8b282bc3aaa4e1ec82c94cffd8bc1e
diff --git a/metadata/md5-cache/dev-util/a8-0.9 b/metadata/md5-cache/dev-util/a8-0.9
new file mode 100644
index 000000000000..443fa1441c6a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/a8-0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-python/argparse >=dev-python/dbus-python-1 dev-python/logbook dev-python/psutil dev-python/pyyaml >=dev-python/pygtk-2.22 >=dev-python/pygtkhelpers-0.4.3 x11-libs/vte:0[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) >=sys-apps/sed-4
+DESCRIPTION=An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and a file browser
+EAPI=4
+HOMEPAGE=http://code.google.com/p/abominade/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/argparse >=dev-python/dbus-python-1 dev-python/logbook dev-python/psutil dev-python/pyyaml >=dev-python/pygtk-2.22 >=dev-python/pygtkhelpers-0.4.3 x11-libs/vte:0[python] app-editors/gvim || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=mirror://pypi/a/a8/a8-0.9.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=0636b619ab3c9d882535793006b96fe6
diff --git a/metadata/md5-cache/dev-util/build-0.3.9 b/metadata/md5-cache/dev-util/build-0.3.9
new file mode 100644
index 000000000000..616003b06961
--- /dev/null
+++ b/metadata/md5-cache/dev-util/build-0.3.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A massively-parallel software build system implemented on top of GNU make.
+EAPI=4
+HOMEPAGE=http://kolpackov.net/projects/build/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0.3
+SRC_URI=http://www.codesynthesis.com/download/build/0.3/build-0.3.9.tar.bz2
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=76af9320cdfe638d0e72a9c9f66cf2ac
diff --git a/metadata/md5-cache/games-fps/xonotic-0.6.0 b/metadata/md5-cache/games-fps/xonotic-0.6.0
index 23e9317b63c8..f07c64265b0f 100644
--- a/metadata/md5-cache/games-fps/xonotic-0.6.0
+++ b/metadata/md5-cache/games-fps/xonotic-0.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quak
 EAPI=3
 HOMEPAGE=http://www.xonotic.org/
 IUSE=alsa debug dedicated doc sdl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg media-libs/libpng net-misc/curl ~dev-libs/d0_blind_id-0.5 !dedicated? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/libmodplug x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] ) )
 SLOT=0
 SRC_URI=http://dl.xonotic.org/xonotic-0.6.0.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5b0e1bc5c3387cbcd01b7664beb1b859
+_md5_=62db662c32966ad0c040c4bbbc6e0df5
diff --git a/metadata/md5-cache/games-strategy/freecol-0.10.5 b/metadata/md5-cache/games-strategy/freecol-0.10.5
index 4180fc85e1e8..4c7c7803b19f 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.10.5
+++ b/metadata/md5-cache/games-strategy/freecol-0.10.5
@@ -4,10 +4,10 @@ DESCRIPTION=An open source clone of the game Colonization
 EAPI=2
 HOMEPAGE=http://www.freecol.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.10.5-src.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bcc3b9af73560127f3e10977e20826c1
+_md5_=4bacfa655324105078a0259ef1859c8b
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.43_rc2_pre955 b/metadata/md5-cache/mail-mta/qpsmtpd-0.43_rc2_pre955
index e25d88effbf6..3ad510df8f0e 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.43_rc2_pre955
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.43_rc2_pre955
@@ -7,4 +7,4 @@ LICENSE=as-is
 RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl/MailTools async? ( dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ) ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd
 SLOT=0
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8da135004d494b67a266346abe44429d
+_md5_=186d86c9cf8158eb0cad34171cf65c5e
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.81 b/metadata/md5-cache/mail-mta/qpsmtpd-0.81
index b3c3565c4e57..27c3ebff36ba 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.81
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.81
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.81.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8f2156c23bd56b454734711d32fab589
+_md5_=c1174411856613f399b0c85c209f1f75
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.82 b/metadata/md5-cache/mail-mta/qpsmtpd-0.82
index 41df3c4fbfd2..f0c19c6d8c58 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.82
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.82
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.82.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8f89d7451d26823d90b5c790537c5c8b
+_md5_=40f6b6461b9fcdb0b76e6a965a608fad
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.83 b/metadata/md5-cache/mail-mta/qpsmtpd-0.83
index 547ea9e791ae..ad540e0f34cc 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.83
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.83
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.83.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d685d90a20427c0ae04b6c4cffbf5056
+_md5_=77fa777f7241f4332b90fd963965542e
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.83-r1 b/metadata/md5-cache/mail-mta/qpsmtpd-0.83-r1
index 6dde90fe1329..5bb6536d0185 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.83-r1
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.83-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.83.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5ed429a009c0deb0b06d25dfe624f027
+_md5_=6c2acdc3bfc9ad359ba320d052450d92
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84
index 7e7d06197555..ac51e35c027e 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.84
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ba9a85f64bb7361bf9abc861bc1a2567
+_md5_=ce7c819af48295e8c9dd8cbb6536c252
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index 80036d00f081..fa25f75f8d85 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -8,4 +8,4 @@ LICENSE=as-is
 RDEPEND=>=dev-lang/perl-5.8.0 dev-perl/Net-DNS virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build]
 SLOT=0
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3eea31c569abe5403b219285bab0e740
+_md5_=200fd1add28e06f6c4d588599cdce1b3
diff --git a/metadata/md5-cache/media-gfx/drqueue-0.64.3-r1 b/metadata/md5-cache/media-gfx/drqueue-0.64.3-r1
index 6fbae7d12a01..ea189efa8981 100644
--- a/metadata/md5-cache/media-gfx/drqueue-0.64.3-r1
+++ b/metadata/md5-cache/media-gfx/drqueue-0.64.3-r1
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/gtk+:2 ) ruby? ( dev-lang/ruby ) app-shells/tcsh python? (
 SLOT=0
 SRC_URI=http://drqueue.org/files/1-Sources_all_platforms/drqueue.0.64.3.tgz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d973d99a0bdeb2e4f9aa6320bdc4970c
+_md5_=8552a46b5c93ea60bc36e33cb4042b49
diff --git a/metadata/md5-cache/media-gfx/drqueue-9999 b/metadata/md5-cache/media-gfx/drqueue-9999
index 70334752c9f9..7523ca0a1e56 100644
--- a/metadata/md5-cache/media-gfx/drqueue-9999
+++ b/metadata/md5-cache/media-gfx/drqueue-9999
@@ -7,5 +7,5 @@ IUSE=X python ruby
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/gtk+:2 ) ruby? ( dev-lang/ruby ) app-shells/tcsh python? ( =dev-lang/python-2* )
 SLOT=0
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c50abbefd980e821ae2160f98da705cd
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=5c60bd378fe31e6cbd9e56dadc9fe75b
diff --git a/metadata/md5-cache/media-libs/libextractor-0.6.3-r1 b/metadata/md5-cache/media-libs/libextractor-0.6.3-r1
new file mode 100644
index 000000000000..500362bd34d4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libextractor-0.6.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-arch/bzip2 app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2 media-libs/flac media-libs/libmpeg2 media-libs/libogg media-libs/libvorbis >=sys-devel/libtool-2.2.6b sys-libs/zlib virtual/libintl ffmpeg? ( >=virtual/ffmpeg-0.10 ) gsf? ( >=gnome-extra/libgsf-1.14.21 ) gtk? ( x11-libs/gtk+:2 ) pdf? ( app-text/poppler[cairo] ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) virtual/pkgconfig sys-devel/gettext
+DESCRIPTION=A library used to extract metadata from files of arbitrary type
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/libextractor/
+IUSE=ffmpeg gsf gtk pdf qt4
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2 media-libs/flac media-libs/libmpeg2 media-libs/libogg media-libs/libvorbis >=sys-devel/libtool-2.2.6b sys-libs/zlib virtual/libintl ffmpeg? ( >=virtual/ffmpeg-0.10 ) gsf? ( >=gnome-extra/libgsf-1.14.21 ) gtk? ( x11-libs/gtk+:2 ) pdf? ( app-text/poppler[cairo] ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/libextractor/libextractor-0.6.3.tar.gz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=57cceef0ddb17930d74f933fa9b56971
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1 b/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
index aa808ff6ab0d..4081935817d1 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.1.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=52e5b22c7f7bf66cee3f6092e24d6795
+_md5_=fac6aa11d11aba7535a125dadba0ccb4
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 956dba63a281..f6bf1d880428 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib || ( media-vi
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mercurial	add64e64d758a9618d46a08a95f77483	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dfb5bf79a4190a26d9a28c08d6dc9e2f
+_md5_=d04be3926fe2d195023fc905fc8bd27e
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.2 b/metadata/md5-cache/media-sound/mpd-0.16.2
index 7ccb0f12a8cd..0d9bce44a034 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.2
+++ b/metadata/md5-cache/media-sound/mpd-0.16.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aa
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.2.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=96f26f48b660613d146675ba6308e67b
+_md5_=e7eca70cd776f07f16be3fe2283e0603
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.5 b/metadata/md5-cache/media-sound/mpd-0.16.5
index 2038ab315107..e4ffd5c52f19 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.5
+++ b/metadata/md5-cache/media-sound/mpd-0.16.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aa
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.5.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=163bf7e4211cfe0e84c5edac78f8e36b
+_md5_=8fe8221c36845c1e6f340f89d24835f3
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.6 b/metadata/md5-cache/media-sound/mpd-0.16.6
index 77227889e87b..0a2ba9c8711a 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.6
+++ b/metadata/md5-cache/media-sound/mpd-0.16.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aa
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.6.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=692e901f8e57478881af46d2d58df312
+_md5_=5fdb2dc0ae4c4cb877e0b738cbb09fda
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.7 b/metadata/md5-cache/media-sound/mpd-0.16.7
index 19ffa76b0fc8..3cbb99edabc3 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.7
+++ b/metadata/md5-cache/media-sound/mpd-0.16.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aa
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.7.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3c415bf653b472e42e42c1df8e5bb8e7
+_md5_=7efac3b18323eee3e08cab7043a19e83
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.8 b/metadata/md5-cache/media-sound/mpd-0.16.8
index 43959b763a9b..f6ba4c8ae3fe 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.8
+++ b/metadata/md5-cache/media-sound/mpd-0.16.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aa
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.8.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9c593b899ca70e3126eef7b43b9e35cf
+_md5_=738f0db0c3222afdd94fcab7f6e44e39
diff --git a/metadata/md5-cache/media-sound/mpd-9999 b/metadata/md5-cache/media-sound/mpd-9999
index 0519341e3954..0bde316f0946 100644
--- a/metadata/md5-cache/media-sound/mpd-9999
+++ b/metadata/md5-cache/media-sound/mpd-9999
@@ -9,4 +9,4 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) a
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5257736bd169adb9677e68fab266a00f
+_md5_=89c9e2d59d89d332f00dc181d7c3b3f4
diff --git a/metadata/md5-cache/media-sound/pulseaudio-0.9.22 b/metadata/md5-cache/media-sound/pulseaudio-0.9.22
index 8707e9b5bd69..9116366a6ef4 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-0.9.22
+++ b/metadata/md5-cache/media-sound/pulseaudio-0.9.22
@@ -10,4 +10,4 @@ RDEPEND=app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.22.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4b872348efdf02b5ca2116acd8246098
+_md5_=0019695f18aa426e8c6644e1a3bdee87
diff --git a/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2 b/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2
index a9e5d709aae7..bc001587c854 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2
+++ b/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2
@@ -10,4 +10,4 @@ RDEPEND=app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.22.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=443520b743a3cc9a1f954c920f1e9af9
+_md5_=91993bd68d7049a3860899867d3eacb6
diff --git a/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1 b/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1
index 01b5aa1f9be4..145983f153cb 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-0.9.23.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=452b7c8f1ec7cf13693785672cfd666b
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d6b5b9d755f35f3507f9fc1824d1057e
diff --git a/metadata/md5-cache/media-sound/pulseaudio-1.1 b/metadata/md5-cache/media-sound/pulseaudio-1.1
index 22bf88f54a5b..6ed725c03b06 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-1.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 sys-libs/gdbm dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b48071540135cc14c5c0ec846fa68074
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b657e07b727d72f18d5c4270b02370ed
diff --git a/metadata/md5-cache/media-sound/pulseaudio-1.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
index d6cc69ed5b0c..113d8c6108c2 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d1a22cf4659efe4cb3b4bcbadb8d744e
+_md5_=5b6653628029dda0d545b0c633a386f2
diff --git a/metadata/md5-cache/media-sound/pulseaudio-2.0 b/metadata/md5-cache/media-sound/pulseaudio-2.0
index 1d6cdee9f8b8..67255f6c832b 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-2.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/l
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.0.tar.xz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ae879b3cd085902aa98c1b633fb1c75c
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=79f4c9a9c5d8b4883ff472d207b3ed51
diff --git a/metadata/md5-cache/media-sound/pulseaudio-9999 b/metadata/md5-cache/media-sound/pulseaudio-9999
index 247cd7506620..147fd86ffae4 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-9999
+++ b/metadata/md5-cache/media-sound/pulseaudio-9999
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/l
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e7d5047eb1b992fbf0993ed52cd9b6b8
+_md5_=b8d48516988a6992c0c1f81833fd808d
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70 b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70
new file mode 100644
index 000000000000..f8bded4d37d7
--- /dev/null
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils
+DESCRIPTION=Azoth, the modular IM client for LeechCraft.
+EAPI=4
+HOMEPAGE=http://leechcraft.org/
+IUSE=debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts media +modnok +nativeemoticons +otroid +p100q +rosenthal +standardstyles +xoox +xtazy +zheet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
+SLOT=0
+SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c8d0c7f5330303b5081df8dfc484ea29
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-9999 b/metadata/md5-cache/net-im/leechcraft-azoth-9999
index 5c0163ee2e0c..4eb33bf39e25 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-9999
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
 DESCRIPTION=Azoth, the modular IM client for LeechCraft.
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
-IUSE=debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts +modnok +nativeemoticons +otroid +p100q +rosenthal +standardstyles +xoox +xtazy +zheet
+IUSE=debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts media +modnok +nativeemoticons +otroid +p100q +rosenthal +standardstyles +xoox +xtazy +zheet
 LICENSE=GPL-3
-RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
+RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ca48fa8e6cfe574446453c3091a75075
+_md5_=8e77dabd9c1c9232af327a967ac06d75
diff --git a/metadata/md5-cache/net-irc/kvirc-4.2_pre6066 b/metadata/md5-cache/net-irc/kvirc-4.2_pre6066
index b5617ed28e75..5e261df391d8 100644
--- a/metadata/md5-cache/net-irc/kvirc-4.2_pre6066
+++ b/metadata/md5-cache/net-irc/kvirc-4.2_pre6066
@@ -11,4 +11,4 @@ REQUIRED_USE=audiofile? ( oss ) theora? ( dcc_video )
 SLOT=4
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/kvirc-4.2_pre6066.tar.xz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dd4a359472d4c66bda9ed40f357b151a
+_md5_=c49ed9c8d7076ce411d940c27be9416c
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index 4d388db09a19..6a22aaf1233e 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib x11-libs/libX11 >=x11-libs/qt-core-4.6 >=x11-libs/qt-gui-4
 REQUIRED_USE=audiofile? ( oss ) theora? ( dcc_video )
 SLOT=4
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d0347a4e27cab9197f6498b087e0802a
+_md5_=aa67185e64f4c7e04bcc463ec495e9be
diff --git a/metadata/md5-cache/net-irc/quassel-0.8.0 b/metadata/md5-cache/net-irc/quassel-0.8.0
index 70ab5c90ce08..5cd8ebd3702e 100644
--- a/metadata/md5-cache/net-irc/quassel-0.8.0
+++ b/metadata/md5-cache/net-irc/quassel-0.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) post
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.8.0.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b8431b7ce5394431a5923a2353cc325f
+_md5_=c3814b6ca6aa6c6e5206c2450dbc5a7e
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index 2948245c9c83..2497b841415a 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -9,4 +9,4 @@ RDEPEND=>=x11-libs/qt-core-4.6.0:4[ssl?] monolithic? ( >=x11-libs/qt-script-4.6.
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) syslog? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) phonon? ( || ( X monolithic ) ) dbus? ( || ( X monolithic ) ) ayatana? ( || ( X monolithic ) ) webkit? ( || ( X monolithic ) )
 SLOT=0
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=09ba943a8ebea017c8f0ac5bb6d6b0c4
+_md5_=156a8097d047ccc62a2dedcb09273b14
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15 b/metadata/md5-cache/net-irc/rbot-0.9.15
index f716811f2787..7ae2852b369d 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15
@@ -10,4 +10,4 @@ RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) fi
 SLOT=0
 SRC_URI=http://ruby-rbot.org/download/rbot-0.9.15.tgz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=df9f1bebb321c069dba8076dca65b481
+_md5_=5946b163f5a0e87103a365e8cf2764ea
diff --git a/metadata/md5-cache/net-irc/rbot-9999-r10 b/metadata/md5-cache/net-irc/rbot-9999-r10
index adc1a3368cc7..3d005ddc7d0c 100644
--- a/metadata/md5-cache/net-irc/rbot-9999-r10
+++ b/metadata/md5-cache/net-irc/rbot-9999-r10
@@ -7,4 +7,4 @@ LICENSE=GPL-2 as-is
 RDEPEND=>=dev-lang/ruby-1.8 dev-ruby/ruby-bdb timezone? ( dev-ruby/tzinfo ) spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) translator? ( dev-ruby/mechanize ) shorturl? ( dev-ruby/shorturl ) nls? ( dev-ruby/ruby-gettext ) dict? ( dev-ruby/ruby-dict ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) =dev-lang/ruby-1.8*
 SLOT=0
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=10b75708f6c66797e48ee4d84782c533
+_md5_=fbf95737d3b0624ccea59a28ff154945
diff --git a/metadata/md5-cache/net-misc/gsutil-2011.21.11-r1 b/metadata/md5-cache/net-misc/gsutil-2011.21.11-r1
deleted file mode 100644
index e415a80177c3..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-2011.21.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=3
-HOMEPAGE=http://code.google.com/p/gsutil/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/boto-2.1.1
-SLOT=0
-SRC_URI=http://gsutil.googlecode.com/files/gsutil_11-21-2011.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=14f11929a8b062c71c29fa784413d846
diff --git a/metadata/md5-cache/net-misc/openvpn-2.1.4 b/metadata/md5-cache/net-misc/openvpn-2.1.4
index 7626b5c987da..81333e714717 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.1.4
+++ b/metadata/md5-cache/net-misc/openvpn-2.1.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minim
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.1.4.tar.gz ipv6? ( mirror://github/jjo/openvpn-ipv6/openvpn-2.1.1-ipv6-0.4.11.patch.gz ) eurephia? ( mirror://sourceforge/eurephia/openvpn-2.1.0_eurephia.patch )
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e23afbf2e2a3e747c07a057c3444d37c
+_md5_=db7fd22a5572fafe9099a62709cdecd2
diff --git a/metadata/md5-cache/net-misc/openvpn-2.2.2 b/metadata/md5-cache/net-misc/openvpn-2.2.2
index ecc82120fe1b..d03dbf795b0a 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.2.2
+++ b/metadata/md5-cache/net-misc/openvpn-2.2.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minim
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.2.2.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9f3d8d0b585fe454577a1b9584d3b9d3
+_md5_=b11a911f9d77384817e3594e1c58a821
diff --git a/metadata/md5-cache/net-misc/openvpn-9999 b/metadata/md5-cache/net-misc/openvpn-9999
index 75a2257d44c2..56b846b221bc 100644
--- a/metadata/md5-cache/net-misc/openvpn-9999
+++ b/metadata/md5-cache/net-misc/openvpn-9999
@@ -9,4 +9,4 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( s
 REQUIRED_USE=static? ( minimal )
 SLOT=0
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=daa3f2a09fb08020d6275f7a18f273f8
+_md5_=0817e005d9f0d8ceb96e2149d1e8f271
diff --git a/metadata/md5-cache/net-nds/portmap-6.0 b/metadata/md5-cache/net-nds/portmap-6.0
index 7379cf4185cc..06232a3a3372 100644
--- a/metadata/md5-cache/net-nds/portmap-6.0
+++ b/metadata/md5-cache/net-nds/portmap-6.0
@@ -9,4 +9,4 @@ RDEPEND=selinux? ( sec-policy/selinux-portmap ) tcpd? ( >=sys-apps/tcp-wrappers-
 SLOT=0
 SRC_URI=http://neil.brown.name/portmap/portmap-6.0.tgz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ee43ac5a960cc46efbad0e51bfe05f25
+_md5_=3c0134e3be1552080487afa4f028efb1
diff --git a/metadata/md5-cache/net-nds/portmap-9999 b/metadata/md5-cache/net-nds/portmap-9999
index 9819f3a779ba..d422e70fac33 100644
--- a/metadata/md5-cache/net-nds/portmap-9999
+++ b/metadata/md5-cache/net-nds/portmap-9999
@@ -6,5 +6,5 @@ IUSE=selinux tcpd
 LICENSE=as-is
 RDEPEND=selinux? ( sec-policy/selinux-portmap ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=be1c9bc569863a23721356a221abfa30
+_eclasses_=git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=0568030bdbc6e02d78e9118772bc5cbb
diff --git a/metadata/md5-cache/net-p2p/transmission-2.51 b/metadata/md5-cache/net-p2p/transmission-2.51
index d63758f5a100..b68682999d24 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.51
+++ b/metadata/md5-cache/net-p2p/transmission-2.51
@@ -11,4 +11,4 @@ REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.51.tar.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8efae7bf25593963d0421816c70c0531
+_md5_=915760e24953651297ad517fc5d3f537
diff --git a/metadata/md5-cache/net-p2p/transmission-2.52 b/metadata/md5-cache/net-p2p/transmission-2.52
index b8abaff9a24f..70eae5fc42b0 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.52
+++ b/metadata/md5-cache/net-p2p/transmission-2.52
@@ -11,4 +11,4 @@ REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.52.tar.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f8a8b8bf91b6971e6f416a19fef012fe
+_md5_=fde8d64603c0c2f6e69b906464e6225a
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 36815c07e73c..30d6968f3b00 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-l
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=08e4bfcbfd638cd9ef2dcb83406c578e
+_md5_=c9c1b4ff5827005fc07a243e9cdc2aeb
diff --git a/metadata/md5-cache/net-print/cups-1.4.8-r1 b/metadata/md5-cache/net-print/cups-1.4.8-r1
index 25d9a2838164..152cc3ff360f 100644
--- a/metadata/md5-cache/net-print/cups-1.4.8-r1
+++ b/metadata/md5-cache/net-print/cups-1.4.8-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.4.8/cups-1.4.8-source.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c41c13e5a6df5f2646c2338bfdc405a7
+_md5_=ff10f9a87c390dc0ea6a191150da36d4
diff --git a/metadata/md5-cache/net-print/cups-1.4.8-r23 b/metadata/md5-cache/net-print/cups-1.4.8-r23
index 7ee48e54b349..d234d7d9fe96 100644
--- a/metadata/md5-cache/net-print/cups-1.4.8-r23
+++ b/metadata/md5-cache/net-print/cups-1.4.8-r23
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.4.8/cups-1.4.8-source.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=44618b129f872c45cda25fc23d9406cb
+_md5_=f3f400b0e1268b48bf0a09ca4760560c
diff --git a/metadata/md5-cache/net-print/cups-1.5.2-r21 b/metadata/md5-cache/net-print/cups-1.5.2-r21
index 2e66c751f421..b562170c689d 100644
--- a/metadata/md5-cache/net-print/cups-1.5.2-r21
+++ b/metadata/md5-cache/net-print/cups-1.5.2-r21
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-locales.patch.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=71c16c525762c9bb2bb9e18dd9226ab4
+_md5_=5af43b5f7c6aff3f3ab8350ba0bb0d77
diff --git a/metadata/md5-cache/net-print/cups-1.5.2-r4 b/metadata/md5-cache/net-print/cups-1.5.2-r4
index f33932e61d8e..4c254b573369 100644
--- a/metadata/md5-cache/net-print/cups-1.5.2-r4
+++ b/metadata/md5-cache/net-print/cups-1.5.2-r4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c3a970153c658f86a35f3b66a28ff40c
+_md5_=bebaf84c9a01dd8a9c976f97c23af8a2
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index b18a6ca1bc7e..20d27cc6c2f6 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	36d7e2b7aa4dce62364c72eec96610cf	subversion	b1dabda0045f060f19070d67a57c1a21	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=21c740ca7b4ca093d6024b71e6a5c275
+_md5_=c9bf03d0226ff00016302209a6889b22
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.29.1-r1 b/metadata/md5-cache/sys-apps/iproute2-2.6.29.1-r1
index 1cad52b6a00f..72c663db1e60 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.29.1-r1
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.29.1-r1
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/l
 SLOT=0
 SRC_URI=http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.29-1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b5407bdd53a24300cbbfc135c2432900
+_md5_=f3329f3049eacb70dfb274550da9a303
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2 b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2
index ee4d7bd25273..2916d1879176 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/l
 SLOT=0
 SRC_URI=http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.35.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ad0f3fd5306b86ada0db2c3106ad6828
+_md5_=c8a992d5d2401ab3f8c38099c7a6601d
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3 b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3
index cbdaa3e48534..614aba9a11ab 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( b
 SLOT=0
 SRC_URI=http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.35.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=08e9956099a3f6eff0ee48a1b1241451
+_md5_=7c97c8557c8e7b4230826378fb1a9506
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.38 b/metadata/md5-cache/sys-apps/iproute2-2.6.38
index 79f96d8d2fda..19a5e0cdb0de 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.38
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.38
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/l
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-2.6.38.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c383c5f07cfa8f5da645d0d3b881f7a3
+_md5_=0ef80396066d0d7cc9d11a30eea2e270
diff --git a/metadata/md5-cache/sys-apps/iproute2-3.1.0 b/metadata/md5-cache/sys-apps/iproute2-3.1.0
index 08f1aa986bb7..b8754a38e857 100644
--- a/metadata/md5-cache/sys-apps/iproute2-3.1.0
+++ b/metadata/md5-cache/sys-apps/iproute2-3.1.0
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( b
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.1.0.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9d985a2ef68da38cc81c55f34bd5258f
+_md5_=c6e35dd9ff746a53dcb1a372d02ef9ff
diff --git a/metadata/md5-cache/sys-apps/iproute2-9999 b/metadata/md5-cache/sys-apps/iproute2-9999
index 24d790a123e1..0f2e0d3940c9 100644
--- a/metadata/md5-cache/sys-apps/iproute2-9999
+++ b/metadata/md5-cache/sys-apps/iproute2-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8c44c527da97c6fc1bfb4a999e9a8862
+_md5_=c1b199b8ebc50ee0013185887f2ddcd1
diff --git a/metadata/md5-cache/sys-libs/glibc-2.14.1-r2 b/metadata/md5-cache/sys-libs/glibc-2.14.1-r2
index b8f355b2d843..416cf3f1b4b2 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.14.1-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.14.1-r2
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-5.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-5.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-5.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6647bc8ee2de795bd042e3e462d5c48a
+_md5_=ee9a75be683d935b1a8868ba74fd089e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.14.1-r3 b/metadata/md5-cache/sys-libs/glibc-2.14.1-r3
index a711132219ff..34e246915d97 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.14.1-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.14.1-r3
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-10.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-10.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-10.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0fe1eb6f47ace89274fd713d9f49d8dc
+_md5_=a489ae7c75ec67b1a9d5798678c0b48b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r1 b/metadata/md5-cache/sys-libs/glibc-2.15-r1
index abd5ab1e9975..b7ff846a03cc 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r1
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-13.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-13.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-13.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d7d81370c78acb6986047ed96a1d327a
+_md5_=6f25cd2fd7a7320e4a053cc38f92882a
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r2 b/metadata/md5-cache/sys-libs/glibc-2.15-r2
index d85dece7ce88..87ea9b67542a 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r2
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-14.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-14.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-14.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a317ebe66a6809915d05a28c11d16aa1
+_md5_=5f66c57352f6bbccbdf085e2b8400ca8
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1
index 8e3ca96d0b43..ca26a8030839 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1
@@ -8,4 +8,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.1.tar.bz2 mirror://gentoo/uClibc-0.9.33.1-patches-1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=542b980608262e5231b91ce102b68c35
+_md5_=7a8acb6fbb208c13673f9f80c8e9bcd0
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1
index 9c8f35fb05fe..74ef23fb5576 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1
@@ -8,4 +8,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.1.tar.bz2 mirror://gentoo/uClibc-0.9.33.1-patches-2.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=cc2c0424d1953f32e31f8c5eda199373
+_md5_=86d2a47cbf09569188e5a0c1a8bcb2af
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2
index 1eca85e30624..d1bbf34fb776 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2
@@ -8,4 +8,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2 mirror://gentoo/uClibc-0.9.33.2-patches-1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=be7d6abfb45433c9fb8b91d1d97ea6ba
+_md5_=3712611c7d904bcf022942b02834bc51
diff --git a/metadata/md5-cache/sys-libs/uclibc-9999 b/metadata/md5-cache/sys-libs/uclibc-9999
index ccdea840c3ba..a4522c3432bb 100644
--- a/metadata/md5-cache/sys-libs/uclibc-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-9999
@@ -7,4 +7,4 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=0
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6d3547401c700beb2dbca97e8a6673ae
+_md5_=a063cdae77b5864a498cf663ae28097b
diff --git a/metadata/md5-cache/www-apps/cgit-0.8.3.5 b/metadata/md5-cache/www-apps/cgit-0.8.3.5
index 2535d387b87d..5bc635b6cb95 100644
--- a/metadata/md5-cache/www-apps/cgit-0.8.3.5
+++ b/metadata/md5-cache/www-apps/cgit-0.8.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl virtual/httpd-cgi highlight? ( app-text/highlight ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.7.3.tar.bz2 http://hjemli.net/git/cgit/snapshot/cgit-0.8.3.5.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=d377f16dec96bebd7715a39656b7deb6
+_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=94e24e76b97464910fe76f046db86723
diff --git a/metadata/md5-cache/www-apps/cgit-0.9.0.2-r1 b/metadata/md5-cache/www-apps/cgit-0.9.0.2-r1
index 8173e4df59eb..aca7d26325c7 100644
--- a/metadata/md5-cache/www-apps/cgit-0.9.0.2-r1
+++ b/metadata/md5-cache/www-apps/cgit-0.9.0.2-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl virtual/httpd-cgi highlight?
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.7.4.tar.bz2 http://hjemli.net/git/cgit/snapshot/cgit-0.9.0.2.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=4276438c82b93ae3253c48e8d85c15ed
+_md5_=ff9a540b82778dd11722854b8b8c7270
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
index 477a70207efd..7173dc49c48c 100644
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ b/metadata/md5-cache/www-apps/cgit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl virtual/httpd-cgi highlight? ( app-text/highlight ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.7.4.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=95deb314b5b58351d28b4fd04999667c
+_eclasses_=git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=735a1c7df8ae5472a6505c2e6a3a649b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a9058d0285cf..d840b65bf495 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Jun 2012 02:37:17 +0000
+Fri, 01 Jun 2012 07:37:27 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bc84b131f5ef..5e0ef8a99942 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun  1 02:37:15 UTC 2012
+Fri Jun  1 07:37:25 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 11bf87a06943..130aa8279d13 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Jun 2012 03:00:01 +0000
+Fri, 01 Jun 2012 08:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8da10ae21fea..598b74d45c13 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1338518101 Fri Jun  1 02:35:01 2012 UTC
+1338536101 Fri Jun  1 07:35:01 2012 UTC
diff --git a/net-im/leechcraft-azoth/Manifest b/net-im/leechcraft-azoth/Manifest
index ff63cf72a9e2..7f5f771220a0 100644
--- a/net-im/leechcraft-azoth/Manifest
+++ b/net-im/leechcraft-azoth/Manifest
@@ -2,3 +2,4 @@ DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2dd
 DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
 DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
 DIST leechcraft-0.5.65.tar.xz 4817008 RMD160 0ad33f984b9beade23ca81aadeb64f8a23e3400c SHA1 77cedc3ddadefa02e6be7ff50210e53e045880be SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
+DIST leechcraft-0.5.70.tar.xz 4793076 RMD160 0b6d5495dc84c26f2fd9b0d8bd5a97eec9c4bf2b SHA1 defa9d92338a3047daffda0dc7601c3d431db7c2 SHA256 f9b6ff57005a4883042256b699451382ae5d3325e43f44097fbde3fdd77b859f
diff --git a/net-im/leechcraft-azoth/leechcraft-azoth-0.5.70.ebuild b/net-im/leechcraft-azoth/leechcraft-azoth-0.5.70.ebuild
new file mode 100644
index 000000000000..acb00f6b79cd
--- /dev/null
+++ b/net-im/leechcraft-azoth/leechcraft-azoth-0.5.70.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/leechcraft-azoth-0.5.70.ebuild,v 1.1 2012/06/01 05:12:50 maksbotan Exp $
+
+EAPI="4"
+
+inherit leechcraft
+
+DESCRIPTION="Azoth, the modular IM client for LeechCraft."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt
+		+depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen
+		+metacontacts media +modnok +nativeemoticons +otroid +p100q +rosenthal
+		+standardstyles +xoox +xtazy +zheet"
+
+DEPEND="~net-misc/leechcraft-core-${PV}
+		x11-libs/qt-webkit
+		x11-libs/qt-multimedia
+		autoidler? ( x11-libs/libXScrnSaver )
+		astrality? ( net-libs/telepathy-qt )
+		otroid? ( net-libs/libotr )
+		media? ( x11-libs/qt-multimedia )
+		rosenthal? ( app-text/hunspell )
+		xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex )
+		xtazy? ( x11-libs/qt-dbus )
+		crypt? ( app-crypt/qca app-crypt/qca-gnupg )
+		zheet? ( net-libs/libmsn )"
+RDEPEND="${DEPEND}
+	astrality? (
+		net-im/telepathy-mission-control
+		net-voip/telepathy-haze
+	)
+	modnok? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)"
+
+src_configure() {
+	local mycmakeargs="
+		$(cmake-utils_use_enable crypt CRYPT)
+		$(cmake-utils_use_enable acetamide AZOTH_ACETAMIDE)
+		$(cmake-utils_use_enable adiumstyles AZOTH_ADIUMSTYLES)
+		$(cmake-utils_use_enable astrality AZOTH_ASTRALITY)
+		$(cmake-utils_use_enable autoidler AZOTH_AUTOIDLER)
+		$(cmake-utils_use_enable autopaste AZOTH_AUTOPASTE)
+		$(cmake-utils_use_enable chathistory AZOTH_CHATHISTORY)
+		$(cmake-utils_use_enable depester AZOTH_DEPESTER)
+		$(cmake-utils_use_enable embedmedia AZOTH_EMBEDMEDIA)
+		$(cmake-utils_use_enable herbicide AZOTH_HERBICIDE)
+		$(cmake-utils_use_enable hili AZOTH_HILI)
+		$(cmake-utils_use_enable isterique AZOTH_ISTERIQUE)
+		$(cmake-utils_use_enable juick AZOTH_JUICK)
+		$(cmake-utils_use_enable keeso AZOTH_KEESO)
+		$(cmake-utils_use_enable lastseen AZOTH_LASTSEEN)
+		$(cmake-utils_use_enable metacontacts AZOTH_LASTSEEN)
+		$(cmake-utils_use_enable media MEDIACALLS)
+		$(cmake-utils_use_enable modnok AZOTH_MODNOK)
+		$(cmake-utils_use_enable nativeemoticons AZOTH_NATIVEEMOTICONS)
+		$(cmake-utils_use_enable otroid AZOTH_OTROID)
+		$(cmake-utils_use_enable p100q AZOTH_P100Q)
+		$(cmake-utils_use_enable rosenthal AZOTH_ROSENTHAL)
+		$(cmake-utils_use_enable standardstyles AZOTH_STANDARDSTYLES)
+		$(cmake-utils_use_enable xoox AZOTH_XOOX)
+		$(cmake-utils_use_enable xtazy AZOTH_XTAZY)
+		$(cmake-utils_use_enable zheet AZOTH_ZHEET)"
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if use rosenthal; then
+		elog "You have enabled the Azoth Rosenthal plugin for"
+		elog "spellchecking. It uses Hunspell/Myspell dictionaries,"
+		elog "so install the ones for languages you use to enable"
+		elog "spellchecking."
+	fi
+}
diff --git a/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild b/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild
index 0b40045df221..9f9f77e83be8 100644
--- a/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild
+++ b/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild,v 1.11 2012/05/23 19:02:17 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild,v 1.12 2012/06/01 05:12:50 maksbotan Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt
 		+depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen
-		+metacontacts +modnok +nativeemoticons +otroid +p100q +rosenthal
+		+metacontacts media +modnok +nativeemoticons +otroid +p100q +rosenthal
 		+standardstyles +xoox +xtazy +zheet"
 
 DEPEND="~net-misc/leechcraft-core-${PV}
@@ -21,6 +21,7 @@ DEPEND="~net-misc/leechcraft-core-${PV}
 		autoidler? ( x11-libs/libXScrnSaver )
 		astrality? ( net-libs/telepathy-qt )
 		otroid? ( net-libs/libotr )
+		media? ( x11-libs/qt-multimedia )
 		rosenthal? ( app-text/hunspell )
 		xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex )
 		xtazy? ( x11-libs/qt-dbus )
@@ -57,6 +58,7 @@ src_configure() {
 		$(cmake-utils_use_enable keeso AZOTH_KEESO)
 		$(cmake-utils_use_enable lastseen AZOTH_LASTSEEN)
 		$(cmake-utils_use_enable metacontacts AZOTH_LASTSEEN)
+		$(cmake-utils_use_enable media MEDIACALLS)
 		$(cmake-utils_use_enable modnok AZOTH_MODNOK)
 		$(cmake-utils_use_enable nativeemoticons AZOTH_NATIVEEMOTICONS)
 		$(cmake-utils_use_enable otroid AZOTH_OTROID)
diff --git a/net-im/leechcraft-azoth/metadata.xml b/net-im/leechcraft-azoth/metadata.xml
index c15c6cec2f7e..b5dc02712358 100644
--- a/net-im/leechcraft-azoth/metadata.xml
+++ b/net-im/leechcraft-azoth/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name="keeso">Build plugin for changing text into SoMEtHInG lIKe THiS</flag>
 	<flag name="lastseen">Build plugin for client-side recording of the last online/available time</flag>
 	<flag name="metacontacts">Build plugin for metacontacts support</flag>
+	<flag name="media">Enable media calls</flag>
 	<flag name="modnok">Build Modnok for in-chat LaTeX formulae rendering</flag>
 	<flag name="nativeemoticons">Build support for native Azoth's emoticons packs</flag>
 	<flag name="otroid">Build OTRoid, plugin for the Off-the-Record deniable encryption system</flag>
diff --git a/net-irc/kvirc/kvirc-4.2_pre6066.ebuild b/net-irc/kvirc/kvirc-4.2_pre6066.ebuild
index f4f0bd1f2c4c..a59df380c0e6 100644
--- a/net-irc/kvirc/kvirc-4.2_pre6066.ebuild
+++ b/net-irc/kvirc/kvirc-4.2_pre6066.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre6066.ebuild,v 1.6 2012/05/26 01:00:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre6066.ebuild,v 1.7 2012/06/01 03:56:38 zmedico Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
 
-inherit cmake-utils multilib python
+inherit cmake-utils flag-o-matic multilib python
 
 DESCRIPTION="Advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index ae03b2ccb869..404be06f6d4d 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.34 2012/05/26 01:00:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.35 2012/06/01 03:56:38 zmedico Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
 
-inherit cmake-utils multilib python subversion
+inherit cmake-utils flag-o-matic multilib python subversion
 
 DESCRIPTION="Advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
diff --git a/net-irc/quassel/quassel-0.8.0.ebuild b/net-irc/quassel/quassel-0.8.0.ebuild
index 55b8d58fe407..1da2926bda8e 100644
--- a/net-irc/quassel/quassel-0.8.0.ebuild
+++ b/net-irc/quassel/quassel-0.8.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.8.0.ebuild,v 1.3 2012/05/17 07:14:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.8.0.ebuild,v 1.4 2012/06/01 03:51:56 zmedico Exp $
 
 EAPI=4
 
+inherit cmake-utils eutils pax-utils user versionator
+
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && GIT_ECLASS="git-2"
+[[ "${PV}" == "9999" ]] && inherit git-2
 
 QT_MINIMAL="4.6.0"
 KDE_MINIMAL="4.4"
 
-inherit cmake-utils eutils pax-utils versionator ${GIT_ECLASS}
-
 DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 5bf07a88cc6b..af082679ec24 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.62 2012/03/31 11:20:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.63 2012/06/01 03:51:56 zmedico Exp $
 
 EAPI=4
 
+inherit cmake-utils eutils pax-utils user versionator
+
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && GIT_ECLASS="git-2"
+[[ "${PV}" == "9999" ]] && inherit git-2
 
 QT_MINIMAL="4.6.0"
 KDE_MINIMAL="4.4"
 
-inherit cmake-utils eutils pax-utils versionator ${GIT_ECLASS}
-
 DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
diff --git a/net-irc/rbot/rbot-0.9.15.ebuild b/net-irc/rbot/rbot-0.9.15.ebuild
index a4dbbb1d505d..d3a610e041c7 100644
--- a/net-irc/rbot/rbot-0.9.15.ebuild
+++ b/net-irc/rbot/rbot-0.9.15.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15.ebuild,v 1.6 2012/04/24 13:35:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15.ebuild,v 1.7 2012/06/01 03:58:21 zmedico Exp $
 
 EAPI="2"
 # ruby19 needs ruby-gettext on 19 first
 USE_RUBY="ruby18"
 
-inherit ruby-ng eutils
+inherit ruby-ng eutils user
 
 DESCRIPTION="rbot is a ruby IRC bot"
 HOMEPAGE="http://ruby-rbot.org/"
diff --git a/net-irc/rbot/rbot-9999-r10.ebuild b/net-irc/rbot/rbot-9999-r10.ebuild
index 373e78ac7c96..ca9d93ac714a 100644
--- a/net-irc/rbot/rbot-9999-r10.ebuild
+++ b/net-irc/rbot/rbot-9999-r10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.7 2012/04/24 13:35:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-9999-r10.ebuild,v 1.8 2012/06/01 03:58:21 zmedico Exp $
 
-inherit ruby eutils
+inherit ruby eutils user
 
 [[ ${PV} == *"9999" ]] && inherit git-2
 
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index e874481b0f5d..26af45461b5e 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,2 +1 @@
-DIST gsutil_11-21-2011.tar.gz 492520 RMD160 3a549598d873004a6492bc3b50c6d1630955d812 SHA1 226e653663eac7233721e0e6c2a02ef492cf826e SHA256 3db6dfb5493e52de8157a57c43ac23db8f97fd0399cf37a088953df3a5b33529
 DIST gsutil_3.7.tar.gz 673203 RMD160 dc9cb56565b5a9f05d969799b0433a8b13b99c04 SHA1 3a386505ddc75894b0db6906ede92dfdc56f6075 SHA256 77907865287e57a8ce713e97155191bd44448d6888861a45345d9b035a3b3b87
diff --git a/net-misc/gsutil/gsutil-2011.21.11-r1.ebuild b/net-misc/gsutil/gsutil-2011.21.11-r1.ebuild
deleted file mode 100644
index 2b038bd2b486..000000000000
--- a/net-misc/gsutil/gsutil-2011.21.11-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsutil/gsutil-2011.21.11-r1.ebuild,v 1.1 2011/12/13 19:55:27 vapier Exp $
-
-EAPI="3"
-
-inherit versionator eutils python multilib
-
-MY_P=$(version_format_string '${PN}_$3-$2-$1')
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="http://code.google.com/p/gsutil/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/boto-2.1.1"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# use system boto
-	rm -rf boto
-	epatch "${FILESDIR}"/${PN}-system-boto.patch
-
-	# use the custom internal path to avoid polluting python system
-	sed -i \
-		-e "/^gsutil_bin_dir =/s:=.*:= '/usr/$(get_libdir)/${PN}';sys.path.insert(0, gsutil_bin_dir);:" \
-		gsutil || die
-
-	# trim some cruft
-	find gslib third_party -name README -delete
-}
-
-src_install() {
-	dobin gsutil || die
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r gslib oauth2_plugin third_party VERSION || die
-
-	dodoc README
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r cloud{auth,reader}
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/net-misc/openvpn/openvpn-2.1.4.ebuild b/net-misc/openvpn/openvpn-2.1.4.ebuild
index 1b7b9ff418b7..1466f47ec33c 100644
--- a/net-misc/openvpn/openvpn-2.1.4.ebuild
+++ b/net-misc/openvpn/openvpn-2.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.4.ebuild,v 1.9 2012/02/16 10:50:02 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.4.ebuild,v 1.10 2012/06/01 04:02:16 zmedico Exp $
 
 EAPI=2
 
-inherit eutils multilib toolchain-funcs autotools flag-o-matic
+inherit eutils multilib toolchain-funcs autotools flag-o-matic user
 
 IPV6_VERSION="0.4.11"
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index 3dc04f61faa7..cad8c4285255 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.10 2012/05/27 12:50:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.11 2012/06/01 04:02:16 zmedico Exp $
 
 EAPI=4
 
-inherit eutils multilib toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic user
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
 SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index 97b52deea387..d689f204eaa4 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.3 2012/05/14 08:23:50 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.4 2012/06/01 04:02:16 zmedico Exp $
 
 EAPI=4
 
-inherit eutils multilib toolchain-funcs autotools flag-o-matic git-2
+inherit multilib toolchain-funcs autotools flag-o-matic user git-2
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
 EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
diff --git a/net-nds/portmap/portmap-6.0.ebuild b/net-nds/portmap/portmap-6.0.ebuild
index 2073e132e5fd..c22774bb854b 100644
--- a/net-nds/portmap/portmap-6.0.ebuild
+++ b/net-nds/portmap/portmap-6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-6.0.ebuild,v 1.15 2011/02/06 10:26:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-6.0.ebuild,v 1.16 2012/06/01 04:05:38 zmedico Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs user
 
 DESCRIPTION="daemon for implementing remote procedure calls between computer programs"
 HOMEPAGE="http://neil.brown.name/portmap/"
diff --git a/net-nds/portmap/portmap-9999.ebuild b/net-nds/portmap/portmap-9999.ebuild
index 377b15474b93..ec7788b30388 100644
--- a/net-nds/portmap/portmap-9999.ebuild
+++ b/net-nds/portmap/portmap-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-9999.ebuild,v 1.3 2011/09/21 08:19:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-9999.ebuild,v 1.4 2012/06/01 04:05:38 zmedico Exp $
 
 EGIT_REPO_URI="git://neil.brown.name/portmap"
-inherit eutils toolchain-funcs git-2
+inherit toolchain-funcs user git-2
 
 DESCRIPTION="Netkit - portmapper"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
diff --git a/net-p2p/transmission/transmission-2.51.ebuild b/net-p2p/transmission/transmission-2.51.ebuild
index 9b967688df53..09d885f2e030 100644
--- a/net-p2p/transmission/transmission-2.51.ebuild
+++ b/net-p2p/transmission/transmission-2.51.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.51.ebuild,v 1.5 2012/05/20 21:06:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.51.ebuild,v 1.6 2012/06/01 04:12:06 zmedico Exp $
 
 EAPI=4
 LANGS="en es kk lt pt_BR ru"
 
-unset _live_inherits
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 user
 
 if [[ ${PV} == *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
-	_live_inherits=subversion
+	inherit subversion
 else
 	SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 fi
 
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2 ${_live_inherits}
-
 DESCRIPTION="A Fast, Easy and Free BitTorrent client"
 HOMEPAGE="http://www.transmissionbt.com/"
 
diff --git a/net-p2p/transmission/transmission-2.52.ebuild b/net-p2p/transmission/transmission-2.52.ebuild
index 35499ed1694d..31aa1c61c9e4 100644
--- a/net-p2p/transmission/transmission-2.52.ebuild
+++ b/net-p2p/transmission/transmission-2.52.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.52.ebuild,v 1.1 2012/05/24 01:55:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.52.ebuild,v 1.2 2012/06/01 04:12:06 zmedico Exp $
 
 EAPI=4
 LANGS="en es kk lt pt_BR ru"
 
-unset _live_inherits
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 user
 
 if [[ ${PV} == *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
-	_live_inherits=subversion
+	inherit subversion
 else
 	SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2 ${_live_inherits}
-
 DESCRIPTION="A Fast, Easy and Free BitTorrent client"
 HOMEPAGE="http://www.transmissionbt.com/"
 
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 3d8aaa747483..cc0a2d59a5f9 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.7 2012/05/24 01:55:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.8 2012/06/01 04:12:06 zmedico Exp $
 
 EAPI=4
 LANGS="en es kk lt pt_BR ru"
 
-unset _live_inherits
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 user
 
 if [[ ${PV} == *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
-	_live_inherits=subversion
+	inherit subversion
 else
 	SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2 ${_live_inherits}
-
 DESCRIPTION="A Fast, Easy and Free BitTorrent client"
 HOMEPAGE="http://www.transmissionbt.com/"
 
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 67d3e4f97db4..ea7b850b61d2 100644
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.12 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator user java-pkg-opt-2
 
 MY_P=${P/_}
 
diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index 1c46edb2581f..f09c2e99b849 100644
--- a/net-print/cups/cups-1.4.8-r23.ebuild
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.6 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
diff --git a/net-print/cups/cups-1.5.2-r21.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild
index f54753b789cb..06d69fb8c515 100644
--- a/net-print/cups/cups-1.5.2-r21.ebuild
+++ b/net-print/cups/cups-1.5.2-r21.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.4 2012/05/21 22:25:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.5 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
+
 MY_P=${P/_}
 MY_PV=${PV/_}
 
 if [[ "${PV}" != "9999" ]]; then
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
@@ -18,7 +19,7 @@ if [[ "${PV}" != "9999" ]]; then
 	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 else
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd subversion
+	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
 	KEYWORDS=""
 fi
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index b6e081a37fb6..151d6a6d64e2 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.12 2012/05/24 21:37:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
 MY_P=${P/_}
 MY_PV=${PV/_}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index d8cb97306775..df688ec4fdc2 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.6 2012/05/21 22:25:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+
 MY_P=${P/_}
 MY_PV=${PV/_}
 
 if [[ "${PV}" != "9999" ]]; then
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
 else
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd subversion
+	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
 	KEYWORDS=""
 fi
diff --git a/profiles/use.desc b/profiles/use.desc
index 3e2acb350f94..9f1ef2f6e0f1 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.484 2012/05/19 02:13:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.485 2012/06/01 05:34:13 vapier Exp $
 
 # Keep them sorted
 
@@ -204,7 +204,7 @@ mmap - Adds mmap (memory map) support
 mms - Support for Microsoft Media Server (MMS) streams
 mmx - Adds support for optimizations for Pentium MMX and Athlon class processors
 mng - Adds support for libmng (MNG images)
-modplug - Adds libmodplug support
+modplug - Adds libmodplug support for playing SoundTracker-style music files
 modules - Build the kernel modules
 mono - Build Mono bindings to support dotnet type stuff
 motif - Adds support for the Motif toolkit
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4547b774b3cf..bb6d10f8f9f0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3726,6 +3726,7 @@ net-im/leechcraft-azoth:isterique - Build Isterique plugin for neutralizing exce
 net-im/leechcraft-azoth:juick - Build plugin for the Juick.com microblogging service
 net-im/leechcraft-azoth:keeso - Build plugin for changing text into SoMEtHInG lIKe THiS
 net-im/leechcraft-azoth:lastseen - Build plugin for client-side recording of the last online/available time
+net-im/leechcraft-azoth:media - Enable media calls
 net-im/leechcraft-azoth:metacontacts - Build plugin for metacontacts support
 net-im/leechcraft-azoth:modnok - Build Modnok for in-chat LaTeX formulae rendering
 net-im/leechcraft-azoth:nativeemoticons - Build support for native Azoth's emoticons packs
diff --git a/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild
index ebf3338fc876..3d69a1ea6959 100644
--- a/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild,v 1.15 2011/07/31 18:33:22 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild,v 1.16 2012/06/01 04:26:02 zmedico Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
diff --git a/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild b/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild
index 66fffc44146a..119eaa5c2233 100644
--- a/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild,v 1.10 2011/07/31 18:33:22 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild,v 1.11 2012/06/01 04:26:02 zmedico Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
diff --git a/sys-apps/iproute2/iproute2-2.6.35-r3.ebuild b/sys-apps/iproute2/iproute2-2.6.35-r3.ebuild
index 043246baf1bc..51ce50728ca4 100644
--- a/sys-apps/iproute2/iproute2-2.6.35-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.35-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r3.ebuild,v 1.4 2012/05/04 09:17:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r3.ebuild,v 1.5 2012/06/01 04:26:02 zmedico Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
diff --git a/sys-apps/iproute2/iproute2-2.6.38.ebuild b/sys-apps/iproute2/iproute2-2.6.38.ebuild
index 9c8ba1092bc1..c677e7a55cac 100644
--- a/sys-apps/iproute2/iproute2-2.6.38.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.38.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.11 2012/02/02 15:28:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.12 2012/06/01 04:26:02 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
diff --git a/sys-apps/iproute2/iproute2-3.1.0.ebuild b/sys-apps/iproute2/iproute2-3.1.0.ebuild
index 00303235df68..a215c71dbf30 100644
--- a/sys-apps/iproute2/iproute2-3.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.1.0.ebuild,v 1.5 2012/05/05 05:12:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.1.0.ebuild,v 1.6 2012/06/01 04:26:02 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 20bae9b62107..880d71b6a100 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.21 2012/05/05 05:12:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.22 2012/06/01 04:26:02 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
diff --git a/sys-fs/dfc/dfc-3.0.0.ebuild b/sys-fs/dfc/dfc-3.0.0.ebuild
new file mode 100644
index 000000000000..42a3d13b5c47
--- /dev/null
+++ b/sys-fs/dfc/dfc-3.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dfc/dfc-3.0.0.ebuild,v 1.1 2012/06/01 07:19:05 iksaif Exp $
+
+EAPI=4
+inherit cmake-utils
+
+DESCRIPTION="A simple CLI tool that display file system usage, with colors"
+HOMEPAGE="http://projects.gw-computing.net/projects/dfc"
+SRC_URI="http://projects.gw-computing.net/attachments/download/63/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		# avoid installing xdg config in /usr
+		-DXDG_CONFIG_DIR="${EPREFIX}"/etc/xdg
+		# use the standard Gentoo doc path
+		-DDFC_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		# disable automagic dependency
+		$(cmake-utils_use nls NLS_ENABLED)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sys-fs/dfc/metadata.xml b/sys-fs/dfc/metadata.xml
new file mode 100644
index 000000000000..8ab50af0e095
--- /dev/null
+++ b/sys-fs/dfc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>iksaif@gentoo.org</email>
+		<name>Corentin Chary</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index 1631e59f7596..e908fea3b308 100644
--- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.7 2012/04/21 15:54:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.8 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -205,8 +205,7 @@ pkg_setup() {
 }
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.14.1-r3.ebuild b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
index 09df2efb05a9..9fd710da4f39 100644
--- a/sys-libs/glibc/glibc-2.14.1-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.15 2012/05/31 04:49:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.16 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -205,8 +205,7 @@ pkg_setup() {
 }
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
index fdd162198d5a..0e7867d9e52d 100644
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.6 2012/05/09 23:37:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.7 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -192,8 +192,7 @@ for x in setup {pre,post}inst ; do
 done
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index e1900eff92aa..099a54df93d9 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.1 2012/05/18 05:04:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.2 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -188,8 +188,7 @@ for x in setup {pre,post}inst ; do
 done
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild
index 52150cff4940..aae39ff30366 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild,v 1.1 2012/04/24 02:57:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
 
-inherit eutils flag-o-matic toolchain-funcs savedconfig
+inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.busybox.net/uClibc"
 	inherit git-2
diff --git a/sys-libs/uclibc/uclibc-0.9.33.1.ebuild b/sys-libs/uclibc/uclibc-0.9.33.1.ebuild
index 5b35706b505b..d60e1f65bcda 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1.ebuild,v 1.1 2012/04/22 22:22:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
 
-inherit eutils flag-o-matic toolchain-funcs savedconfig
+inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.busybox.net/uClibc"
 	inherit git-2
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
index 22125cfea8bd..585a9b2d8179 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2.ebuild,v 1.1 2012/05/16 03:38:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
 
-inherit eutils flag-o-matic toolchain-funcs savedconfig
+inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.busybox.net/uClibc"
 	inherit git-2
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index b34d28f17ed7..b210ce20004d 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.1 2012/04/22 22:24:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
 
-inherit eutils flag-o-matic toolchain-funcs savedconfig
+inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.busybox.net/uClibc"
 	inherit git-2
diff --git a/www-apps/cgit/cgit-0.8.3.5.ebuild b/www-apps/cgit/cgit-0.8.3.5.ebuild
index 756eae3f66fc..9720c9c22862 100644
--- a/www-apps/cgit/cgit-0.8.3.5.ebuild
+++ b/www-apps/cgit/cgit-0.8.3.5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.8.3.5.ebuild,v 1.1 2011/04/29 19:02:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.8.3.5.ebuild,v 1.2 2012/06/01 04:30:38 zmedico Exp $
 
 EAPI="2"
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib
+inherit webapp multilib user
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
diff --git a/www-apps/cgit/cgit-0.9.0.2-r1.ebuild b/www-apps/cgit/cgit-0.9.0.2-r1.ebuild
index 71a51be9a6f4..7f4908383c8a 100644
--- a/www-apps/cgit/cgit-0.9.0.2-r1.ebuild
+++ b/www-apps/cgit/cgit-0.9.0.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.0.2-r1.ebuild,v 1.2 2011/09/16 08:25:02 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.0.2-r1.ebuild,v 1.3 2012/06/01 04:30:38 zmedico Exp $
 
 EAPI="4"
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib
+inherit webapp eutils multilib user
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index 2ff6dcc20118..7f2d474dbcef 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.4 2011/09/16 08:25:02 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.5 2012/06/01 04:30:38 zmedico Exp $
 
 EAPI="4"
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib git-2
+inherit webapp multilib user git-2
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"