Add ruby20, ruby21. Drop sparc keyword, bug 465948.

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

3 files changed, 106 insertions, 5 deletions

diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index affabe0bad36..5457b2494726 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rspec
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.166 2014/06/16 15:41:50 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.167 2014/07/10 09:53:46 graaff Exp $
+
+*rspec-1.3.2-r1 (10 Jul 2014)
+
+  10 Jul 2014; Hans de Graaff <graaff@gentoo.org> +rspec-1.3.2-r1.ebuild:
+  Add ruby20, ruby21. Drop sparc keyword, bug 465948.
 
   16 Jun 2014; Tobias Klausmann <klausman@gentoo.org> rspec-2.14.1-r1.ebuild:
   Keyworded on alpha, bug #465948
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index af58c97182d0..693f7795223c 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -6,18 +6,19 @@ DIST rspec-2.12.0.gem 4608 SHA256 410869aeb2fe2ad6d8a1897e8ca941d589a47a7a62960d
 DIST rspec-2.13.0.gem 4608 SHA256 eb51e41c9093f86dae3aea621496f3762e5588f707d56b4111e12270519309cb SHA512 31e68466c651069a3292d5bcaa3c4542ad6ee94b660c6dc37d368326eaa287c57187f48b5c49ef0679c95d976899d0650d13c79361981a70b1686a14f4cc12d4 WHIRLPOOL 05dc768b26dea01c6dd8af67edd79da7543ca0dd2ac8b1e9eefbf5939d126343ac791f50022eee34ceb4eb7c36f1cc518ed2235c8034fd9cad1e192bf3eb511b
 DIST rspec-2.14.1.gem 4608 SHA256 4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c SHA512 cb5f7b720860c7a0f9f3aabf08b2b6ebf0a6cd220fb019c4b9a03368b9fd5b8049c3a374dff1251d261f6d0046f120e574f59b16f3775a478c04bb691785f720 WHIRLPOOL 760e9cf6e61ab097f797d0900bcf4341749a6502d620de2ec3d7bde228e417f4b72a7bdd9f622445314b0890af06307e5545949bebfb6c783aa9cea463158ee5
 DIST rspec-2.99.0.gem 5632 SHA256 432b31d528aac0dd192b3fa7c83f6cc22dec4a0385fb4020d293cc6777870393 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8 WHIRLPOOL 7c71c569e3dd2a94f4564298c7af1069d29c0a1ca8b6045cd5b8ba0ae6833fa2e948b572d048397adc2aae90578e2cdf1f98e3fb0197697927538e925bef7b1c
+EBUILD rspec-1.3.2-r1.ebuild 3086 SHA256 3b4cce40a3c54c819d78909d687e6d9f444a6b0fbf862e8a26c15b8fb30e43be SHA512 6c6b9bcf3fedf897764d92d780beceb7b7fda63e5bd844060cca17adeff29cde368e02d77804aaa9f35e24c962fd7b49e9f16649c2cba7d061d6baf4bb2e6db9 WHIRLPOOL 8ab2f8deb67cfb1854ea713a992811449c83e846e7a52a382a6e553248256bc5776537fc8fad7b6ec15de4de7115bf0b46456725a5c8b06211d30fd128289373
 EBUILD rspec-1.3.2.ebuild 2936 SHA256 ff4da28ebffd8429138acc1dbcd4ce21dd96eaa251d4a98ca5947af9adb1448c SHA512 f3edaa6f6f6108170c630b1a2d7212230a83a1d1440723b24427bd7ce57e78802dcd2b8bc8c4583342fc6d923b03ac0a501fe62fc79b1c5b654bf7a929eb2cc8 WHIRLPOOL 2e26b9ee23726eb138b1ac8dc2a40aebe43d2b525d066ec7a53f976559a5c12c54f082a14c7858af11ffaa2f805c69b97f9f6826a81154ff27a3f60238bb8628
 EBUILD rspec-2.12.0.ebuild 883 SHA256 75206cbbe0a890be2941322350ce248211fc1c92d19074bc1f2da5533490b2ca SHA512 4867c7334302a9be65ec61603cf9e1f18e2effb03a8e46604e95041d43b81532eb8e9e1c535078f2e7528905623d44053bc0458bda3f1d59097e33292d02e3ab WHIRLPOOL 121ad93524fd4a2682d8b4462ea9c2a45bf5c5baef810a9d78bab77a62e35af83f869de881753e168c9ac2870d78e21d3b0cdfe2616c0a9ac9ab8082a31bcaa4
 EBUILD rspec-2.13.0.ebuild 891 SHA256 dba3d23e66b74cfa23a3f74ab96668403baceba389de65bc1f5083a3fc68d0da SHA512 ff0ecf9d3d0bb08943ee0317544fb6d48d14e7e678ad9da7e58ab04f435c9226f2c8b94cd88f3d0a29a92ab7526bdeef45c1947770c530574b7f5a3f11a9953f WHIRLPOOL 2efe6f15fce0ec972b7b6013cf6e609a66238bdc412e2d43cef7b17d2df50814507e98efbaa58a497e9473977eb7cf90f2549afbb26a5dd4fce1b896b0f04dc6
 EBUILD rspec-2.14.1-r1.ebuild 904 SHA256 cfe46555387b60ea41e646b3e5fd40cd37164d28ec1fd6ba2e088662a5563ae5 SHA512 f612f1427a2b9942af1c43918cf9d1ccd6a40763728e0e6f7a2389d6dfb60ac6ab27158d229eb4bb568ed4cd43cd436a66feae37bd8fc1c267f4711dc4414a61 WHIRLPOOL 44f6e00bda4320c51b98d7f0ed48a6165936260bd298ab7364f9ff219d70a513a56cf9e06283a207a8fd6c2d47c219abf6a07a4d4dc5e202d768b7378da42ab5
 EBUILD rspec-2.14.1.ebuild 893 SHA256 65659644ecf2ca23e0198f8e1b9532561b2f477dcdc3f7cdde6ef3ec8d8827d5 SHA512 69fa1e1b8f8f62de76895975d7a8691cf0ef7f6470819092b42e79a9e7fba12a7ab496091513724394e54a495ee72f1cf0fe15c636860a0c66c6b7f3e00e30dc WHIRLPOOL f94b3a91122268ed5d7010b6abf613d7ffe76432b03a3050f838f41d444586a0926bd7fc930995fb1381ed3a575430df3559f0ddd9a546b5e5fbd85db20c2e62
 EBUILD rspec-2.99.0.ebuild 892 SHA256 e66f7e4cfdc3ebb2800d0c49c85d484408c2434fe519ecf5fb507dad74fa4d22 SHA512 fbdbd0504b9bd558e7ee10a311f41effe003ea2f8aa884cfafcc97a4e6f41940e10bb48f8be2e5ecb41ec06876f83cbc5f4a0766f2ebcf5f28c7083a9872a0e3 WHIRLPOOL ffe42897387ec7820e8c706fad54b43b73c00ae4ffef0880882987b17fa1c6826fa6899a78df6e4b53d6f54abce8b1125be8d3489a6de996eb4be725f00939b5
-MISC ChangeLog 20840 SHA256 7495657e4cf16b0d37507bdb2f69c6f5ac5acb1e0bfe9ad5948d555710523332 SHA512 be7cdb92ce0509425cb5286daf97091a9ba746db52d18ea43ce141acaa1611cef7cd9496129b1398a736d96f36ae32bbb4633fc892356421a36d8611115c2c95 WHIRLPOOL e2c78f652f4b8f4e4ac44b6faae89f9783c0fe8674c5b38f7110ff3ed9053e787689eb2291d12abb78daeb1bdc354e0d41e7913d6a09b001b99a5289520fc31a
+MISC ChangeLog 20998 SHA256 d6ba845ae39af04ba2feb3b92b60e24a9134c542c633aa160ea7e24d8ef72f04 SHA512 cf9266cad5ef9549c925de31664b473df994ed583efcdb781d859215724ee468384122b90be7f4b1b54b7282b7a5c43b8840b0f9eb7e87eff29d2658ef2228a1 WHIRLPOOL ec2e2f1d97b5af6530f01285c5990549b5586679a0521376c9a4350b5f3d6973a17172e7d09a510038a17b701345a7daeda5f85381cfbf736d8a1ec330da3638
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlOfED8ACgkQA+4Doc5dVOi6BgCglzy6pcy/deS0L9NlPakcr8ZX
-v7cAnjtq/ZXnfISVKKbB89l7TPRHLPxO
-=6MB/
+iF4EAREIAAYFAlO+YsEACgkQiIP6VqMIqNfYYQEAi12lm/xif33VS3vOWouyTgal
+iHODfPSb4PABVQyBVOwBAJdZDbmdQGqBksoSACu4S0YocldqS6JI32e5vLsuWUWa
+=QkCZ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec/rspec-1.3.2-r1.ebuild b/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..0ad838f3207b
--- /dev/null
+++ b/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2-r1.ebuild,v 1.1 2014/07/10 09:53:46 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc TODO.txt Ruby1.9.rdoc Upgrade.rdoc"
+
+RUBY_FAKEGEM_BINWRAP="spec"
+
+RUBY_FAKEGEM_GEMSPEC="rspec.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="http://rspec.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+# it's actually optional, but tests fail if it's not installed and
+# some other package might fail tests, so require it anyway.
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.2"
+
+RDEPEND="!<dev-ruby/rspec-rails-${PV}"
+
+# don't require test dependencies for jruby since we cannot run them
+# for now (fakefs doesn't work).
+#
+# We should add nokogiri here to make sure that we test as much as
+# possible, but since it's yet unported to 1.9 and the nokogiri-due
+# tests fail for sure, we'll be waiting on it.
+USE_RUBY="ruby19" \
+	ruby_add_bdepend "test? (
+		>=dev-ruby/hoe-2.0.0
+		dev-ruby/zentest
+		>=dev-ruby/syntax-1.0
+		>=dev-ruby/fakefs-0.2.1 )"
+USE_RUBY="ruby19" ruby_add_bdepend "test? ( =dev-ruby/test-unit-1.2.3 )"
+
+all_ruby_prepare() {
+	# Avoid dependency on git.
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Replace reference to /tmp to our temporary directory to avoid
+	# sandbox-related failure.
+	sed -i \
+		-e "s:/tmp:${T}:" \
+		spec/spec/runner/command_line_spec.rb || die
+
+	# Avoid unneeded dependency on bundler
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Avoid the formatter specs since they require output files for each
+	# ruby version and these are not present for any current ruby
+	# version.
+	rm spec/spec/runner/formatter/{html,text_mate}_formatter_spec.rb || die
+
+	# Drop heckle dependency.
+	rm spec/spec/runner/heckler_spec.rb spec/spec/runner/heckle_runner_spec.rb || die
+	sed -i -e '381,398 s:^:#:' spec/spec/runner/option_parser_spec.rb || die
+
+	# Avoid a spec that may fail on unimportant whitespace differences.
+	sed -e '/Diff in context format/,/^end/ s:^:#:' \
+		-i spec/spec/expectations/differs/default_spec.rb || die
+
+	# Remove broken spec.opts related tests. These were always broken
+	# because they don't set up state properly, but only with
+	# >=fakefs-0.4.2 this started throwing exceptions, bug 340385.
+	sed -i -e '/implicitly loading spec/,/^  end/ s:^:#:' spec/spec/runner/option_parser_spec.rb || die
+
+}
+
+src_test() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+	ruby-ng_src_test
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			ewarn "Tests for JRuby are disabled because dev-ruby/fakefs does not currently support"
+			ewarn "JRuby properly and it's needed to run the tests."
+			;;
+		*)
+			each_fakegem_test
+			;;
+	esac
+}