Cleanup.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

13 files changed, 34 insertions, 389 deletions

diff --git a/dev-ruby/rspec-core/ChangeLog b/dev-ruby/rspec-core/ChangeLog
index 44bdc0c6209a..7aa52cc84314 100644
--- a/dev-ruby/rspec-core/ChangeLog
+++ b/dev-ruby/rspec-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.99 2015/07/31 06:26:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.100 2015/07/31 06:37:59 graaff Exp $
+
+  31 Jul 2015; Hans de Graaff <graaff@gentoo.org> -rspec-core-3.2.0.ebuild,
+  -rspec-core-3.2.1.ebuild:
+  Cleanup.
 
   31 Jul 2015; Hans de Graaff <graaff@gentoo.org> -rspec-core-3.1.7.ebuild:
   Cleanup.
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index d69aad74a954..a7f93dd5f73f 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -3,25 +3,21 @@ Hash: SHA256
 
 DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
 DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
-DIST rspec-core-3.2.0-git.tgz 275656 SHA256 a4b4400f08b9afbad1d9956a2ce54d380d552fb513bd6db91eeccbf90b46f95b SHA512 ce20a12c5b44cb1f62c119fe466eea03d9772b4a3127a00f60aa49daededb68d588ad791ff3b097bcdb854fce00c41a1cc054b8a5babdb4ca1f2fc0f2306549f WHIRLPOOL 99cf1286075f37c30112514ce41c34cfef5bfa2549bd6fd3e3bc6a5a70c366181f06044b8655136c43dee54218cc946a6579c4e5577f07feaedadc65d6ef3a44
-DIST rspec-core-3.2.1-git.tgz 275760 SHA256 881136de98c27876f4b10c0857b2eb506c4a70249c60ebc9268766d885c75659 SHA512 dd323ad399d037032326a403e33786c62a7bd4fe3f98796aa60781c625632ab3e511f3a86cbe3bf897ec4558cf0c20296016cc317c8401cf7f99fc5b6cf3d44a WHIRLPOOL 607c6855c8b7a8ab4c44bb47c600c1e46521c68c12fd87fd3b04caedc74cc7a4820e48f6f76e833a9bb5add392ae3bc080e521261db220e84bbfa8f9edb9fc78
 DIST rspec-core-3.2.3-git.tgz 276647 SHA256 7122fe372cdf0d4ff60aef42768fc9cc0350bd1943f5c1fa6189153829519ab2 SHA512 a5eb294c4770275662205b4edde2426c7d7ab7f9fb3cea6fc1171071b941a94b6d6386348fd83ba9e76a35512ea56be0b657ba2d8e210fe73c8564e76ebea7ae WHIRLPOOL 895d5fab418ddc5adc9a33078499f59b2865b636516110f0042bd08b4d9ecdb304f135655c0b05102f47725b94da831c986889b8a76eed3e8aa2c693f2d29d63
 DIST rspec-core-3.3.1-git.tgz 332355 SHA256 9dc839186e72fe5d4b4f15500bc2a976d08dc4af859be2b69778b1c4f84d321b SHA512 cddbfc1dae98de2db31a5f9c5a60cf1cdd4995f35bcd1bea525f18fc8b3649d7c8a2e23169873874be22b4f75b14b89d086e2372ed1dd93a157ae03c5989a760 WHIRLPOOL a3e5fa2264b40313c1fcf1890087f218a5a9f442f82528f4422a315858a036ff36cdc671dbb7e1f4d937385e6568cb7950c43ab7249c78b834ba07e5dae671d6
 DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
 EBUILD rspec-core-2.14.8-r2.ebuild 2748 SHA256 001d27479f30b88f009ad4bc13a8a14aefdd72980f7f88944e5c72521fa0f67b SHA512 f24a5bd0aa20578dbcd32b9a68f973f4352546872849590b84b733da7cc2dfd5e04fc9e10eb5196aa167cb143cd8ba6f1c2c939f82d23e5ea7d745e267ae23f2 WHIRLPOOL 9b9b4147a4872b1bf3bed3cd375b094843f0a7a638f1d1a65bc0ee9569565a270cc37fc46ee1fe4ab23d17340032985ffaf4687b957de6e447774b0f603f5a9a
 EBUILD rspec-core-2.14.8-r4.ebuild 2789 SHA256 05cbdd3bec71118cfe7159ec6115c08b5dd534fc9ad4b95b4e77acfe584adee4 SHA512 e9686b53d8638b73573df9da5b1ac9eedc0e67f7b28dada684cd917384158ed193f9b622e5bd4f5bab1988833bff9507771f1f59910503f5b32f93919d2cae6e WHIRLPOOL b532e1d92b742c783d7d81809687ef961616e6dce6fced33c579972217a7502409388236ca5c88f9fa04330a6a58937b9ef177231ce05197059d445ae05778c3
 EBUILD rspec-core-2.99.2-r1.ebuild 2506 SHA256 3ef2716af3b5bcd642964f1be78282f0134b0c5d2e493eeb9142ca96cd7f2be1 SHA512 9537c739b931a519005a8dabfc77e815147d326306e582ab5745fea446afad29c8b6ff4124bed4f34be344274c0a9c3c177a02ad536272d89ba38a40a6cd8902 WHIRLPOOL e05d61de7e91e65bbcdf9600c30e1e30cd2d5c58d6aac5b70b268567eb52e99e7883690c1bce3460d9411a4505781121d8cf6575e4f9912b1336eb09145f6698
-EBUILD rspec-core-3.2.0.ebuild 2964 SHA256 e9b638c70892208f55b6c88311efec95749c6f308ac560e43066542159ba38ca SHA512 5709e799bb6f2ffb6ebf7904f896a0e47d1ed148208c9b57ac5f8cd62d0e3180c57e55e1bb297c60dcde2cedb1561f80c0b0da40cb3978a192f13b418a67a76e WHIRLPOOL 678e7926297a7f9878c5af62ff5a9998505dd10597bfb4510d000ec890b478cc66d99e01be3ad6ed30c2381b94f72245b7162f5c761d93160c917887055a3455
-EBUILD rspec-core-3.2.1.ebuild 2965 SHA256 90bb01a26dcc32d630995b8d4aba1bfa130a5e451bae8d2b253b08600d1e1f21 SHA512 8b5d5e0640042bc9e53d04865f52ebaa4646059e93b24911ff942a1578a30a18c14c67b242767ba04be75aa8318194c6493d61b7c13f03218d6541efbf2d0a68 WHIRLPOOL f43a1d99d85735fcbb6f84805de23c5bbab86425a093906cbdb6aa1f461ab2dd6bc31ac21d7fe5f47b196064043065f7bd67a258f1d816e1f103e2bebfe55237
 EBUILD rspec-core-3.2.3.ebuild 2965 SHA256 5b5122b5f876f29b4b1659ca8932fa4a5587e5b7963aaecd970114eb694ae437 SHA512 11f97da500b513c9a393cd002f6ac381a680c8241fefd8487a175a9386266c429ec4f17c3b26c28729e74c862d83e802a5787ebe663bd2dd65e10e14a6b584ec WHIRLPOOL 549f12e00970c1a256f32438d526d531d79733eea5893d5c96345cd48c494a3f577ed2046cdb3418abef6b686705954372c97ecf9cbcafc554d800cf5405f301
 EBUILD rspec-core-3.3.1.ebuild 3169 SHA256 3ed9abebb81c2f780e38ddcbfb90678cc82f1e110fdbf2e14a4595a000ccee63 SHA512 91ccc959cf7d8b6e0f679fd84dca0da69a5af918a6f3718b6a5482487ec7b99790a112c316ee5f683e14e5d2e6aa92c43fafb84f2720c9078b281b1541fc06c8 WHIRLPOOL 0a31bbc2c3f944f12d0dc1934336d388514b7050211980b84128f0ff30766aaa89f7eac126e1c3fb992a5e181fe808845300804e3327d827afffad18d76b1d44
 EBUILD rspec-core-3.3.2.ebuild 3169 SHA256 129967e25e57706e3f5a645c54da85f53e2ed27cdc45e4230616110b61712190 SHA512 599be32b7c22b65548ebfecba6d6d86350819712716db1a191421e1488c8c923b3a58d730ec96cea916597a720870a901aa8f454c0d1f6ad9786b1736bc185cd WHIRLPOOL 085110030480532fc314614ce138c30eb7e5d181ce5f264e6ca771f57872e620aee11142f0a3fc7a20062b987c0efb6cbc03934b633ab4deac6b205fa8cedd4a
-MISC ChangeLog 12970 SHA256 aa5aacbffe4c66091cfa36a6bd74a4e9bfb8b1769f016f4c699c637316753e7a SHA512 ee37e96fa723c96706d6fde8b3837b78fa73cd66c471c1168c3b31f24231262f894be007b6af0fc7bf488d6134cdcd02176d8082aa141d35140f046fc2c09a32 WHIRLPOOL c83bb1d3b18f6cd4fabf6961303be0dad108c3bc7416aa91772c5e8b2c2d4b5563bec54e10c7e6817ba402f5f166948908a9dcd6a822323029e62fcbfce4bc3d
+MISC ChangeLog 13087 SHA256 29717dc635fd6c3bbf8a9e309630221cea35a2d7fbcee3efc79e8b1e053b02a9 SHA512 2c23b98cb5e78d0f336ed3a9680443014d18dc28dac1e7243e9418d140160889138100f9743ae3d0d7cd7295102a8af22507c0b13c9deed3ddaafef251e8ae95 WHIRLPOOL 8ff2d40969901e6f5aecad6fc692f6314a4f20ac106fa26d0795d8de22f5df7da92fb29618256408c9b2a073cb47181e3f38c1255d3c2e8165071b1c58ff7903
 MISC metadata.xml 367 SHA256 bf25407613918843f08446cadfc38569c3c6d1057a466ee4ee330b408b80aa70 SHA512 0f3abfdc71039430b9bad031c4deee33cfdea195f775cd503e16c4793df4189f2dd4b4e99f865d87f599eb34a6b7ffc71a45684321f085e7e37e176fcc5d57c5 WHIRLPOOL 41a1ea721666dabf0cd6ba98ac7f202c3aa75c7edf56a47dbd5aee5f7da9a48dd2912c90495a9ed35ca920758f59d3b58b76bb052cbe12b6348f39816f44b451
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlW7FSgACgkQiIP6VqMIqNdqzwD/W2087FRgaD7eJSVvRWMIhj/H
-3ZrOH/Ju5TLuEAo3+MQA/iec9ijT+Ms4b0iQdcq0kzk5gZ9budCaqXIq/5zHU3tD
-=ibXn
+iF4EAREIAAYFAlW7F8gACgkQiIP6VqMIqNfI6AD/YiP5UF5o+/hfImgFrHUtBMuM
+H5lYQRtR8+SZf3EJ20gA/RlC+D2/j1RgYB14mDpe+bB0jNx2RidQpRzH95O7rgZS
+=i+Ec
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild
deleted file mode 100644
index 4083458eeee6..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild,v 1.2 2015/02/21 09:37:16 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.0.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	case ${RUBY} in
-		*ruby22)
-			# The rubygems version bundled with ruby 2.2 causes warnings.
-			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.2.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.1.ebuild
deleted file mode 100644
index d612ccfcb748..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.2.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.1.ebuild,v 1.1 2015/02/27 06:56:52 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.0.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	case ${RUBY} in
-		*ruby22)
-			# The rubygems version bundled with ruby 2.2 causes warnings.
-			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-expectations/ChangeLog b/dev-ruby/rspec-expectations/ChangeLog
index e84883cae477..cffc4edfd289 100644
--- a/dev-ruby/rspec-expectations/ChangeLog
+++ b/dev-ruby/rspec-expectations/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-expectations
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/ChangeLog,v 1.92 2015/07/31 06:27:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/ChangeLog,v 1.93 2015/07/31 06:39:04 graaff Exp $
+
+  31 Jul 2015; Hans de Graaff <graaff@gentoo.org>
+  -rspec-expectations-3.2.0.ebuild:
+  Cleanup.
 
   31 Jul 2015; Hans de Graaff <graaff@gentoo.org>
   -rspec-expectations-3.1.2.ebuild:
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 160a1f8ec4c1..2309e718200b 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,23 +3,21 @@ Hash: SHA256
 
 DIST rspec-expectations-2.14.5-git.tgz 93680 SHA256 ceba7a62ad87285f1ea01db4798efbbde4020b82a109cc260ec358061367e5b9 SHA512 237ed56cd185bc5d0d60ed14e20ded1840ef10711693c43ffaa20ec65cdd6b891aba3a6f1f38bb6962c31d51364758d1898e3bcba14a95c4abc73dff4dac1b65 WHIRLPOOL b9860d7bbd7e33143de655d3bcae6925a91ae5992f47b75ae9c61203c9cddcfb5a2ad0d8d3152a725ff4174359bdf56c5d8dbe24b4b1bb56e3aab292ddfc7a5d
 DIST rspec-expectations-2.99.2-git.tgz 106884 SHA256 4c1b38198d214ab2d4e297fdfbd89d3c3ae20c6b144882e53e935cfbc9878f68 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a WHIRLPOOL 4a390f55bac3180a876bd59f58ce7c2ed87611b94c9610c950dc138ef14c8966e62d79aa4f63771c373760d0b9f4f51a9aaa6cbc4fc600573c6cb12ddc0e278d
-DIST rspec-expectations-3.2.0-git.tgz 157134 SHA256 a7196fad1cd851ed84a4725c90335c211b282e312ac4983fdc9ea62bbc0fa09b SHA512 de3111ded0b4138527e1cff170d059dd4725b10cc770019c84efc7583332a76c8ef115fdb675cab5ae7068a73f55e9583db3b05b70565760e80bdf8b9645afe6 WHIRLPOOL 3cb43ee930bce097d2c43eabf2d1939a35a8a593a9f5e271a137d14a3f2bfdbb096c89b4f1327b1242920eac62da23537b194c35fac297ad79679b62e5853bb1
 DIST rspec-expectations-3.2.1-git.tgz 157533 SHA256 fd3813bb56818fcea59a71aec649546c33c3d10ad1473deb4b051ab8f2bd1940 SHA512 144609a9b148daeb95e23e421bdd00ba3571f6e751915ba699089d52567f9cd7a35a51be37772947d7fe59945281bf8c5afea6a68b6d0e87007266333342b773 WHIRLPOOL 5046afddb29a42b3456b25077d3f1f2be83e5db6a8e69c02e93711725466ecbe792c4670cd8bbd371e405b0706a1eaadb7c7d7b81df50c7c88732e98d1e32cf4
 DIST rspec-expectations-3.3.0-git.tgz 170643 SHA256 1bf5062cd45c12cfa048deb73caa572372767513fffe9f12328ffaf8970a0891 SHA512 edbe9ec9482fb93ba4834b023b3574f6771936a17df7b0f049b090b10077bb2d336a30a2bf734fa2d2f207b04bcb63be9a4e1a33c905d3614c93bec1a23be51c WHIRLPOOL 2a396b888261094efce98cea6d2359ce1b604801de20884b69f2b6f0c6ea16d0546ce9a5c101a10ad19ae225c498e6e80068958aef2ee12e350c31a228fcb0ef
 DIST rspec-expectations-3.3.1-git.tgz 171117 SHA256 a40feb73c5c54fd6464ca262af4be50ef9d5e4a785b5ae7862946da42837e112 SHA512 fe0e5fc4e00c8d51866bc9699bc25b1e702c765c5443abbebe2f016833c6f09f9f8f35d86520b59d51ad0a196551f68c39a5ec707658826af838ed274f4986ff WHIRLPOOL 5dc55d62ec1df5add711c07470d2d7020b875bf43a57788ceb84b05807ec9d3b2e395fde16f14c06d265e8c36b44e9a9c9da306c049a019289a1bc3d265e18e1
 EBUILD rspec-expectations-2.14.5-r1.ebuild 1442 SHA256 98d3b08651bd7b5d98c90b2747639c4cb5e9463ed3d035f81c9e8f78d06b4d97 SHA512 7676fb8d067dda71aefe897d6eb78602fbd000fc9a1b76cac4dc03a898753bee14607005a0a4ff462857bdae7d42f1f4e62108ce85ae62febe2f54efd11ec905 WHIRLPOOL 6ce834874fe42d961fc62c9e2ba2c95027f2f4debd9c094c8ff6ca09d34787bc8f28ee5884e2a54f4c58c7cfd7f7e4574d377c4b7e934f9dea631ee188242258
 EBUILD rspec-expectations-2.14.5.ebuild 1424 SHA256 c5f3b4f9ec663dcc231ebc0d2ae7269c71713b8e3b960e0f9ce2a05712ee73ec SHA512 e55c543c088fd62432080f02440307d50c90c3772710ad379a10f76f603aef3514b04bd39d6a3fbc9bdd452f90b1f47d3c9e250ff5f6fc65f63f9752b183a82c WHIRLPOOL 688707446c09f232466986b9ffffd173e2c185804501683c835d169df9406031286595d89a21f4872306b7c1352c22a4de2ae409066e2b9a99cbbe313904e326
 EBUILD rspec-expectations-2.99.2.ebuild 1620 SHA256 e5515142825e6225078ba1cefb86c4043b559e8bc0837485e3d89795d6306e64 SHA512 731337cb81aff56572ce941f74deac626732632983dc823cc1ed8c3da6205d9dc6007031923001d2253638d6c54443219f6e5067445c290eba3aab1fd31f28ba WHIRLPOOL 5575f54049c7bf6e479642301f5f89e1c0e8cc0c16564eacf5b6f85e8aca3af7fcc4d27890ae11b53caeadba8231df86eb6cd0229c6d5434ae99ad0a5b13d0ea
-EBUILD rspec-expectations-3.2.0.ebuild 1936 SHA256 347af159c51c2293562f531c4f72e4482ed39ad7c77d8d12a239dfc3306b420b SHA512 e2532c2567a7db4baff3cf08fdc7807955c3a4ab7a4e35215fed34e880edede166e99d73303be042fda75297148c911b624365272cfea0679c191c7f5e39a4d1 WHIRLPOOL 08a1f1e754c5ca2273324b35a1b3cedc80c29250c3305cd0ad1ed7065b6c6633562e62c018c945fa621f5399362cdb270b4c8a422a6b50efbbd38c74a05e7a90
 EBUILD rspec-expectations-3.2.1.ebuild 1936 SHA256 4ac11db82a18066c238e1adb28aa2dddf40c5e2d2b236c333497e2310729c7ec SHA512 11350f6c76d0d207a566d7fdda7a790574cb90416fab2465cce03062a9978daab77f44ac86111cb17a619a1a64fdf6f373fd3b0e9c7eefad9fae07ca622595e0 WHIRLPOOL 35e61dbd0c5b18c76f6b16b9195c7dbc873149b1febf2fc7d60a2851dc2939a52a13bb2c8d9b65a07e93c454443e358dad42fb179771998fc475fc0b743a8ac0
 EBUILD rspec-expectations-3.3.0.ebuild 1952 SHA256 2e4a9341e446fcb670b42eee8b25745dccb36e42da94adf1e3e561266f9b880e SHA512 e2e1384b2779c4228228da21a40e74b8873f58554d9406c36f0bd7ba194e8f791c8125efc7dfd90d46897f403af0a9db96b27e3587da8e268aa7b5047e5523e3 WHIRLPOOL f014456ef6ad7d373d5c702b4cf75897e8f7406e62e8e0a29549f2e7e71f2aa0ac657205166aaba300741a341f7016071719b0893589ded80c1167453810ff54
 EBUILD rspec-expectations-3.3.1.ebuild 1952 SHA256 9cff67de524f733dc876e66ab3edae1a4876ce7b0b7e0b7c4054f74e33d5c3d5 SHA512 43e96a21ff0c74cc8f635aafbbeafb97e8a818b6a8a4f5e2020bb8eb093653db4344307bde1643d2a10ce83c6049f58cf1ce76b5f2fb80f10da5e4a3ebe5ee74 WHIRLPOOL cf286235f5b9c4a543f86567620d97db98a6d9388f0c53d6b6bbc58780b813dc4ff8478cb9d8ac4a202c86bdbae59fc7e2274a3da9890c1e84c9540aa4b55b30
-MISC ChangeLog 12961 SHA256 c148f26f3d7dc8bbf11839ebb76663da68eb1b53adaac889afd6a99ecefc492f SHA512 db3dd0a50a1cd67dde45f4b56a203704a230b1273908425ba7b4435f3acb01158672e58003c1ac60902f5c211f93317e3bbe924b0963c2f4958e040c5fd28e94 WHIRLPOOL b7353cd22ad2e936504477ab727c2fb0c88382435f74c874b4a2241a627fafd7c7e0b2700efe4b1724676a8d01b24b75036df858e3cc78ee7bb412f9ab8c309c
+MISC ChangeLog 13059 SHA256 aa9953f663e0e61474646f72027807995d66c1b414c56c17a4e82a2db4061b66 SHA512 12d82b71fcbb498ace3151fe54e05397793866f1b009a8c70c3d78f32a3d87c97318f7ca266c96b003e0cdbd37f315dcfeed4a6833f00ba0a07eb580fc2ba0eb WHIRLPOOL eac45a0507df35b4c44c5999757649de091493079c3fd18867340aea011a2c471c6607b581ca23abb71797a29ac767723e4b24e9388772ab52e68dabd97aae3a
 MISC metadata.xml 252 SHA256 44aaad1b06c9694dfadd0c4e435fe08743b607bb9f7bf9f11e8abf91e59795bd SHA512 c76364b3d8986f6161e8be53ed25263c76e1f1a32197642cabb649cdf346b4808aa30fcb35bef7459dd6ab81d8393cd7cd992cb044c49ddc39721286ec026816 WHIRLPOOL 4d54682f3af621981117ebc9443f851e0debfe51cbf275690774454e540be445d63a3c79f5a9287f1bc0338a761bd454bd4ccf23a50b42712a0e9ef8a6fcde32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlW7FVEACgkQiIP6VqMIqNfqgAD/edPq9x0hxKVMVxBIfav/4rWv
-hb0yyk9lUB+deb+PGLIBAIXr4fu1uJd2PgKxf8tsuLMPkEgWCpkAWm/HIu2u4n17
-=qgra
+iF4EAREIAAYFAlW7GAkACgkQiIP6VqMIqNfiyAD/aMhJAPzCL5svqNZMLJizaMUT
+1ngdeasaCC8AWzQdXUgA/1EKRzFaYvD3suwuCG5urtFPebgsvg0+tjRCSVB8GShS
+=gfAi
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
deleted file mode 100644
index e8ef0fd52424..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild,v 1.2 2015/02/21 09:37:48 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	#
-	sed -i -e '1irequire "spec_helper"' spec/rspec/expectations/configuration_spec.rb || die
-
-	# Avoid a weird, and failing, test testing already installed code.
-	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby22)
-			# The rubygems version bundled with ruby 2.2 causes warnings.
-			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/expectations_spec.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-mocks/ChangeLog b/dev-ruby/rspec-mocks/ChangeLog
index 9c0e72a1e39e..1f1b71d0ac4c 100644
--- a/dev-ruby/rspec-mocks/ChangeLog
+++ b/dev-ruby/rspec-mocks/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rspec-mocks
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.98 2015/07/31 06:28:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.99 2015/07/31 06:40:01 graaff Exp $
+
+  31 Jul 2015; Hans de Graaff <graaff@gentoo.org> -rspec-mocks-3.2.0.ebuild:
+  Cleanup.
 
   31 Jul 2015; Hans de Graaff <graaff@gentoo.org> -rspec-mocks-3.1.3.ebuild:
   Cleanup.
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 71a48131759f..513d684232cb 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -3,23 +3,21 @@ Hash: SHA256
 
 DIST rspec-mocks-2.14.6-git.tgz 94286 SHA256 2453766688b33a5cd743f4ebc3ffccd4277e3daca069828c7206bd0f12d5fee4 SHA512 a079c0b860c7ca4b4da366fa131617ddcb636918cd0c065ef3d8d585938228f442bb58ab5fcd2cd84b590bf6ab468d637fa7ab0181864a59c131f0a890e46702 WHIRLPOOL d29599bf4465c38433d7ddf70a12c43a523c289fd9857aadeb41610aef4980d8ea43cd1aef48d3d1d736e67a201bba131ea151a0ecb297e887fac51baf35655b
 DIST rspec-mocks-2.99.2-git.tgz 101731 SHA256 fad961e30ef67e014625fb6b4bb62db0f6f101142a897b4cad31e60f8faf8c57 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d WHIRLPOOL 06e8c3dd38fa17fbd82c97fe1c19928450234c761185cf636556955df9a081f4685d002a8fe501690c5457c63014ce8a60c5aca32b7c4bc24eb368368e5e33c3
-DIST rspec-mocks-3.2.0-git.tgz 162966 SHA256 b2781ddb095c804c5520cd47bdf4bf5d03506593bac1e85e9aeb404a2a2476fc SHA512 0f682d644597fdd85dd0aa63ed4ce2bdb85d5fbc05801c612ca8fc326aa19f249d0b981b325f03fcbb2d025d9bb26316610088ded2faba993bbdadba36859797 WHIRLPOOL f09f1eea7361e9e5e2c6f1c62da297ff06c825433e21ea453fd3bb235258fe2848ec1aa3cd7ae8f98fe588b0c85751b966eb31357c1773466df92a543053d6c1
 DIST rspec-mocks-3.2.1-git.tgz 162789 SHA256 4ff4e500cf46a6a90920f64b18f88a41a0c62808183f593f3b6ff616c1d3fdf7 SHA512 005eb4214a98104a9366a8974486813cc098c53352bc877133c2e6efeeac6b14a1ff9bbc8a57227bb42f73727f56dfd244674833505ae1c64d4c21dee70dd9fe WHIRLPOOL bc4559879d7e2c768fddb4e98e02bf17136a7b8759495d9d7d63d257388a95149d4ee32408f0a041593ead8807a5f8c193db22f95df0bae026e7a45f62999422
 DIST rspec-mocks-3.3.1-git.tgz 173312 SHA256 43f7a1de0f3fa2083af889f3a5be13b0629358bf53ee09aac61ddb53865f5914 SHA512 1ae4f6915a136ef238edc6561034bc756673c33cb3ea934253bc3b9718027cb7020cf29d125a2b95bc3dfbe49fa4d06762a2315fd9f62b590f23f5b80ca642c2 WHIRLPOOL 720c04a8bbbfd07573378f118ddafb223825efae39459c6cae09668a52942416794ad5e3514182855858823660d73513c25ad1946b863d5f7552721833b94eca
 DIST rspec-mocks-3.3.2-git.tgz 174849 SHA256 faec1a03eecdda1217238df7989c80f4201cf7613580af3824b2fa3af2c45ec0 SHA512 b03dd81232650d851db51dd62a11c6f34df7e3d47db9ec96168259f7d4045d2497098de903b5ef6865c29a5f4835ee1865ff64a8177f9212e8f699175ec7fe90 WHIRLPOOL 33936705596662c74c31b74b1bc5ac57bb76290b4fda1375edb18b9491c7b1ced0dd545c21ae6b67174275235ff767ddc322b73da97685a0dc6eeff13b9c9b61
 EBUILD rspec-mocks-2.14.6-r1.ebuild 1223 SHA256 0a1a53e1c0e46d4e80b42c1e8df4098ebc1f3352f716cabd7eb9a3fd8d58d91d SHA512 aef456c4f969d7f85162eeb4ddcb1f690bee51b86d387bae5eee94ea2033894532805f861f1af4e8ef2cffc382eddcf4844e23edd2bc430fdf2a96f9eab89c87 WHIRLPOOL 87cf4d47083e969efe9a524ca696933419d8402814c164e0b09c4c51fc5cd0404d5c1a448dcec1469c13e4daec272f6d0da9bd4659125923aee1152be8cc25e2
 EBUILD rspec-mocks-2.14.6.ebuild 1203 SHA256 1ac85372373ce9740616b587f6b613cbadbd9e394d8b1981cabae847bc2757f1 SHA512 6ff99bb2a801e4125c79dd67e3d7321eba6d178c43b08fbb38116af8f27c487f87fc8edc737482020cc5ee659c40bd7d2d61e937bba31338cb23b032efb68604 WHIRLPOOL 8a8413e1d9295951e099d964e20af67bc2ac3ff789c82c85f449986f18745cdb52a229ffc015c449ae1fcd252e6db3fdd5225cfc199b56fadcca55cd6a374bb8
 EBUILD rspec-mocks-2.99.2.ebuild 1588 SHA256 016c7527568382ffe6ce928eb4087c9465cdfbbb876b7704bc2d74763bfa3b0a SHA512 3830e61a182c2ccbf623920e9a458927fbf135040207186531446bb1a61c8dae1f73b4485d435e8abbd1f5441a5c359ff64d27ec62fcb71dc76782d4a5cd4094 WHIRLPOOL 9c98d3828a0cb557da7c453a9efb525f0a56eb01eca10c9802b8b3cfdcd366280cad015f5ba0cb245d57443cdb3bacdcea777388f445cb5e27e919ec39e2da9b
-EBUILD rspec-mocks-3.2.0.ebuild 2047 SHA256 a644fffc16a6dc1114ca0025a6e6c49cd14d8ce19847061aff1cf3504c40d604 SHA512 65cb1bc44e74787f49038302537c3b52a44dcbf9c7f7c0685cd8133eb931837cebc147100b4266b192023b90aab8454b7827dd6755b06bdc3beb32617028d9b6 WHIRLPOOL 893f9b04cf52954364564dc69801a5b4cfa55c152319dc94dfc2aa16a53bcc2ae636e07abceb40244a0b0f03478bb6f7c2b93da3abe6d5178f0f11c995417aef
 EBUILD rspec-mocks-3.2.1.ebuild 2056 SHA256 420fa5d2b7ed5b2afa5da2d14743c452f65ae0ac62f1367d4118063c0ff1e5ba SHA512 9f993a7a1e0d9023800b03c4553a9863525e920f94243b7619c1ebadef908f10765ad670044eebd6bb01304d0d8595c45957b40e666518d31b1cf2a4f7387a2e WHIRLPOOL b08a36e9be7497394a6c9fe68a60676ce7699fa43ae6348db94fb3d34c66337d45a55bd3616e70bfe2241ddf2231c8f1fea8ede6641c0b8bd431230336a5fca2
 EBUILD rspec-mocks-3.3.1.ebuild 2056 SHA256 cdd64545f9adf0b54a94f936a8094b7a1bf340603f9a0fe0ad2447831e71b0d1 SHA512 44d822f1d83538b2d7fb9396d9c40ccc758f9fcb7a0a08565b001486e3ec5519c5e7b8d1208b711c68fceff71c4afba8a72ef378453f766644899a364e478479 WHIRLPOOL 4e5d0ea5b3029915abfe87bc8fdccd74359120a0eaf1646cb44cbde0b06b5e6a81770874588ffa9166c41993d6aac0de9e33fc2b242dcb6bd92a31754a7d7eec
 EBUILD rspec-mocks-3.3.2.ebuild 2056 SHA256 c1b34f83d218e0717b55187f25ce6e083c827fb4a031daca291b07429d4a9b14 SHA512 016f12b56ecc0b03e5a0911a9deb1fe72eda40aafd2053f2ac046a2337fb3f7a192d1caa6d1348e6103ae68e6a255b966da71587346ee86f416f53098e54f771 WHIRLPOOL 2c4eb9801f6096bd2a7c75a347c27f7a685a077d74f32a64ab4fe41af958d611095d68128c0d6250f9830b85cfe709c8688f24e853bb1412cbab9dd15360e4a9
-MISC ChangeLog 12736 SHA256 3456097b05cbed949621698165c019d9e2abc32a7f1ec97f93fdd193a23a4bd4 SHA512 586535b0edebbf07ec67c354191bfab24b9a1cbc90d229db1512a2e6eb708cb2c5aba45d28df3c366010ed83fbb6aa036c4a2fa6b4ecfb03a5abca8847c04f00 WHIRLPOOL 0be82431c36c7cba814294b23fcf6ad73e07dc7f7ce6951e646eabe53763aaebbb703709fb47018bd740c1866b4ae75bc58f53f8fc33214d9d17fb74d9253a91
+MISC ChangeLog 12825 SHA256 5e626d1dd1f0b960f5b7bc32c88d3372e64289dc9cac454591c06d78df936bd2 SHA512 0f589ade5cf3a6554fe86bfc3dad558579141886891f3e84cb963cff9d59513b9389b430cdd417d1588ee2c714853c47ca60feaf4eada75370d1e765cd1a0591 WHIRLPOOL 9f7ba7f9c40f9db844fc320cae6d356e498e27b6cac86e41db3beaa316e9e06fcd6d60207e738151c781add0e4dbd46f8254ca7434e9ca2c02c58456b7056dba
 MISC metadata.xml 245 SHA256 d312c5523653a147fb8efd891e3445c135672a1652d58694683c387be6c7e467 SHA512 9a98d51adc599651a0c37bf6332d49319f816781d7e328a5ca0c8ca6b81b4e149380a58ca220fabd3eafd544e44f24f3525ae1b6bbb5087c96a449f56e9057f9 WHIRLPOOL 2dd9798633bbdbe4b82e439ac2f4474211e9cecde059bd0e41f2db76623bfb776e1db1501b126ee7e36982df7853daee2b4590d01600db375d58f2396b3e09a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlW7FXcACgkQiIP6VqMIqNfzCAD9FIwW/dhoXJtfnLtSqgc6UQk7
-GzVcuhwmkGbEcXNXWswA/ApChnMOFu/T9zrvk4iZp7qmcuxtE+Y3rgmgAAgN/ZAw
-=RxBJ
+iF4EAREIAAYFAlW7GEIACgkQiIP6VqMIqNfr5gD/VQztLCHVoyiKewtqVl3Of+X8
+mfKQk8805BcLMB+ASBcA/i2RIINU+upJArxFIF/QNciKW7KE4bv8C+nZHk8Qjd2z
+=LGHn
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild
deleted file mode 100644
index 63a11ef0610d..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-3.2.0.ebuild,v 1.2 2015/02/21 09:38:20 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.2.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	# Avoid a weird, and failing, test testing already installed code.
-	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/mocks_spec.rb || die
-
-	# Avoid failing specs in yield code. Not clear why verify would not
-	# be defined. We can revisit this later so we can move on with
-	# rspec-3 introduction for now.
-	rm spec/rspec/mocks/and_yield_spec.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby22)
-			# The rubygems version bundled with ruby 2.2 causes warnings.
-			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/mocks_spec.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-rails/ChangeLog b/dev-ruby/rspec-rails/ChangeLog
index 0d91c4b2b184..328b9d779723 100644
--- a/dev-ruby/rspec-rails/ChangeLog
+++ b/dev-ruby/rspec-rails/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rspec-rails
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/ChangeLog,v 1.93 2015/07/31 06:29:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/ChangeLog,v 1.94 2015/07/31 06:40:37 graaff Exp $
+
+  31 Jul 2015; Hans de Graaff <graaff@gentoo.org> -rspec-rails-3.2.1.ebuild:
+  Cleanup.
 
   31 Jul 2015; Hans de Graaff <graaff@gentoo.org> -rspec-rails-3.1.0.ebuild:
   Cleanup.
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 4b86d90017d3..b9f6c8cb1d60 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -3,22 +3,20 @@ Hash: SHA256
 
 DIST rspec-rails-2.14.2.tar.gz 75049 SHA256 c5ec91e3c360033a7ef640d0a08b4f9167032b5d6d5cdee020f4df949f916a24 SHA512 2dcc568c578f3201dbdc6a757c84d0e689c3f221fe7cbd57849524680e40150c972436a2c6fcc1220e99c9d2e6c97c62bb6d4c5c59e9d6890a67caceb94ed5cd WHIRLPOOL d721b1dbec6cf4d35560868981087f5f7950353bb281d277fd17d012d71302986c5645b3d0c28bf61d270a2b90596d324ad072184eb195b642718f33f83ede4e
 DIST rspec-rails-2.99.0.tar.gz 78448 SHA256 81ff54e638432c2b734ebefd5398f646960bcc72b92e381393d2420fc9525882 SHA512 0453450cf5a5435dc4f870ae7a37a299c6b17a4df04de730c14ca3d070808c9a9a70a6f485a1d0c6f4f8ddf3def6e4710ae5842e9e8f0b59c10b2177299670f4 WHIRLPOOL 0a5774bab31786cca0a3146641306cce38d2a809bc94a9728cc2c479be761b66246cb54bdf9185c478519434d95f7808f9d8f7f9ddecac1ffc01251cf9dcd5a6
-DIST rspec-rails-3.2.1.tar.gz 94674 SHA256 e9502682c1e7545b25190f29fd9f8d80e4c149a7904fa57b18523208d60fb1a6 SHA512 f755d22b85e13b43c0c8ab1ebfe2ccc9afc3b75080b6c292a265645aff914def2a113fca49685691ff87bdd12f2b5da33dc0fce6ebbb64f532232db953a39085 WHIRLPOOL e2ccedd526a4ad9bb5389fc9ee701a77bbb9443cef70cb6d6658cc08a8daf8413cdd8c177c02c35ae07b2e2e944927bc77367fba83a6a4a3b658d417ff38fd38
 DIST rspec-rails-3.2.3.tar.gz 97589 SHA256 d70416a471a6e83b10a3b2c18f2dcfcb22897306cc1b238bb47fb4b6ee824ecb SHA512 1efeea5b742c9ded10dfdf432439b05765773bc19bb127a68f5cabd16e35d6bbead79c51343a419de03b5fe36d3ccf3754916ec55e28d6d9bf095508f1233af8 WHIRLPOOL 502d944adc28e9ac5b78db924cc985213067af60d5d238675feacd6e5625c479a9d7870cd43c49c12aac928d11f9361e7f7e85211a25403794a73e6933af69c0
 DIST rspec-rails-3.3.2.tar.gz 102934 SHA256 efdfadb375e0a64b6a306482ab705bdd9f147ff8c6b1acebb1981e50d5043b1c SHA512 59d8c516e3b7b5138c08d6cc2d68e21078dec0b340f9c0f709c9fa9cb7c318718454a8e11737a3ff1f2e940fc7d8db425b36bffda6966ad5f270923ffb9345bc WHIRLPOOL 6501d7b3467dcbec069472e6510a8c48a0a50b5f02ad6be5336b8c0bd2f841e72d865a3a8260bc4ef47744f6fd39eb4554c0c14d47153b2c1dce829d446b3672
 DIST rspec-rails-3.3.3.tar.gz 102963 SHA256 b0edc645a25c929deb39a7334894922cdf67cf7cb895bb728751d0d3a459fac9 SHA512 72c8a027d3ac7c8487c4dec23c91c7014456e6d8ed10f80f72e71c90e7bde0a3c005dd6b57985b1f3e32b32cb6d4610f651f8aa4b81156536a667a266e816603 WHIRLPOOL 78b00968fe75cd632b94bd4b2f244dc6ac50e708b9023baf882bba6ef76b827b681f55dd88be0220988c49d308b9bde4e3344456980db0d9a5654e39f65edd93
 EBUILD rspec-rails-2.14.2.ebuild 1399 SHA256 205295a6449e984f417257548f22af2768d4c285a30e1c8a950179ac940578ab SHA512 99b44ce56230e871ba2c2c476c9b1c5db0a6ace2bc7700445a398982de2b518fea36d98d60a2090f64041e0718096bdb4a521f7ffc0718498ede2ce36e687bec WHIRLPOOL efe4c6a6680bde84f5c27b970a6e09c940066c27da026098871d738bf00b2f63077b21e82283be01ee4a3a316646bfa62e0df6546252d819281c621c271e4ab9
 EBUILD rspec-rails-2.99.0.ebuild 1404 SHA256 238e8e51192060aa6b75e97b83c82b70cc1678b47c7337bcf89e9f6b57b5913c SHA512 ea75b037e5fa29850c3e754063ac75303ecb226f86763d5a38b56cd4edbcb1a9b42ba25b98c0b705e4ba0708b79aa8f986ff0f93456d8f17cb32502a87a05b14 WHIRLPOOL 422053c2aacaf0bab2e59ab64fe7451b1d79a201b322c2b6874eeeafd023ba81f1b7bbc665becfe338c1497c98850f53df56f2775e4de26cba61e2b8f1caa099
-EBUILD rspec-rails-3.2.1.ebuild 1310 SHA256 ef017f158c75aa967333ca4d754927be47843b36e88552622e019047c801b8c5 SHA512 f10d35fdb36d22bcebcbbc0bf52f6f127291a01ed52a3f7d68f4b088a21eaac854febfc4ec7274d39ad5ed2a851867775b579f0904c0af65f3fc43331d94bd87 WHIRLPOOL 83b88001b207830eda9080f056fbccae24e5bcc81cc89f5c64ad52541a7bcfc6f991e08faa7adfb916c59cbcdec2c31272666a4ba84bb273780b9711b66c9272
 EBUILD rspec-rails-3.2.3.ebuild 1316 SHA256 b73b8ef09ca77a9f696790b583d1b7cfc1df03ab6618254ae7deab8f6dba9c71 SHA512 44cd84dde071a94006a4b271146165b9a857a3816814ec87e28a34817bb67edc94a9a4877685cf386598012e789936d2fd9f42cffd0a8c9f7b5b1f7b3de3fdac WHIRLPOOL 69894cca6273a771e4ef63dd0335adaff194a1c02ece3aac57263b32623e331b92e07b72784201d00a2ac01d9a38413694596d70dd7cf7d393e29d9bf4ead917
 EBUILD rspec-rails-3.3.2.ebuild 1416 SHA256 768ad504e43e51ff2e7da5f94c04f8ed43cb5a42950a656e8d8fb1b914477370 SHA512 3fe0fed46b29cbe52fdc134bf763a8f92421d5c143d738b25c78c65237d6f379a163537e24325f1c78ccd25ab4033dc89bd303625647382907f65b2573e3261c WHIRLPOOL e9d565bba1fb85dae89f0d827525dcf84bd93a7da49d32556789630b5e2b37a49c5b32cb34b35cbac078967f9eed61f94df054808d5ba459e34c44b03ed89ae5
 EBUILD rspec-rails-3.3.3.ebuild 1416 SHA256 6caa7463bc00b786f0768ff47c076a8ede1e3a1b1191045587c88f7e4449c74f SHA512 c3a6f2fc30f662f1bb673a3bc684fa1a091ac3fcb152729c74744b59603e42f808a74f7a6718e1e01d9963b6c8dbffd2a45aabe2f4a74ab3c41870a6db163450 WHIRLPOOL 5f96dabf1e57522941339c0df0e10deb9e01bb6cb32429e16746f80ed22be98d1f8bf254c7ffa2b4e3b856e1855fdc5fbbdf868ee60fb9bd58d5df8351054fd8
-MISC ChangeLog 12648 SHA256 a1badcf5b3f218fadf6cbff0f3f8ffb83e86184e051332465d25e37ba39bdfb3 SHA512 8d1f342e2b330969abb36bdd892bea5daa1d054dc3619df32d99dc27e50320b0ca53330e4b11d230ddc34c25947bb6c0b6858a62a352a40cbbb11169fc24dad9 WHIRLPOOL 418b4c3f133e798ad146e0d55bb4980e145b06751e9990bbd4faac6bfeaa91abaee3b57d5b82512f4fa81a3009e113b030de7c891e830e52630ba7a295ab9cdc
+MISC ChangeLog 12737 SHA256 79d31a10a8c8318301c7079a813ac1df230bc88bad2c6fc559473e560e3cc6b1 SHA512 c4124292082a16edc790c5d1d68a66cd4d4c16f5bf8187c3d6c2531ba13e4caaf82f17c27569c6ab9227ba04ea80357c8ebae42d857fd8b74e5505e02b5e0d77 WHIRLPOOL 9a56163c3272600665f0f63cbc39b205bc38ddf9ab68baa636a5772e888642e94f4e48c8c414341825fcef6bacd3084bf60c90ff8c1915bcaf379b8ed447f599
 MISC metadata.xml 245 SHA256 d0206467c6d397a099c96a40cbec986df196faabd4b0a2f4ecfae667f4c9e268 SHA512 f5af48c290e2f65c794ba16976fe1ff2ec7331e179a1c8ffc19751eaadd956ef4a6b825b152968a23bae16228f64335f7a55c2c28b1a1043415de13b51cafe43 WHIRLPOOL c8806bec0acc4da18db9e51199ad3fd213ee0df27dbe0f60a9a1917b9a7c4c3c3ebf76729638f9233758dcc582c85cd5aa256c769f46c741318f2dd696a3f022
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlW7FcIACgkQiIP6VqMIqNclKgD/S040wq8LqQnbkWpZM8mu8yVG
-sHfBdfx6X+M6Y6AKVdoA/2A4kS1FaMWHJH5T9bNGP5Ugkrn3N2RizUVjUjqbORNE
-=p4Vf
+iF4EAREIAAYFAlW7GGYACgkQiIP6VqMIqNcQZAD/Q88IgoDOk43bDR8fBwvO9sZZ
+im8KbHl66BD16utoRaUA/jHDNggv1TLWuHuRjd89PleWSg9vUsuN2i2jnuBuBvvd
+=3U3n
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.2.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.2.1.ebuild
deleted file mode 100644
index fdd5e512946f..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/rspec-rails-3.2.1.ebuild,v 1.1 2015/04/08 06:13:13 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0
-	>=dev-ruby/actionpack-3.0
-	>=dev-ruby/railties-3.0
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10* >=dev-ruby/capybara-2.0.0 >=dev-ruby/ammeter-1.1.2 ~dev-ruby/rspec-rails-${PV} )"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm spec/sanity_check_spec.rb || die
-}