Drop dependency on broken and deprecated heckle.

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

3 files changed, 14 insertions, 11 deletions

diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index 27a50eab37bd..afc9533c12a2 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/rspec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.153 2013/08/11 07:50:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.154 2013/09/22 17:55:03 graaff Exp $
+
+  22 Sep 2013; Hans de Graaff <graaff@gentoo.org> rspec-1.3.2.ebuild:
+  Drop dependency on broken and deprecated heckle.
 
   11 Aug 2013; Hans de Graaff <graaff@gentoo.org> -rspec-1.3.1-r1.ebuild:
   Cleanup.
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index b152a055030d..8d962dcd12d1 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -5,16 +5,16 @@ DIST rspec-1.3.2.gem 214016 SHA256 cced85c55b92477272d157ea92b925676db76c373f804
 DIST rspec-2.12.0.gem 4608 SHA256 410869aeb2fe2ad6d8a1897e8ca941d589a47a7a62960df96266b61dec8ff657 SHA512 e7ee5411872bd469e66f33082927a482c79eb58ed96bbf3be43e6d8b1c24aac24cdacb7e31de1f2d85daeeb0a17c038db3778d28f5f902ef2c65c982db41eeac WHIRLPOOL 91e4c9d042eb69b665ad30fa37ade2f11177181393db418de9cdcaec1e3e0e32c310b311aacce055ee3f6d9b6a4c0ac09389769020d4f0cdf05362670509e295
 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
-EBUILD rspec-1.3.2.ebuild 2634 SHA256 c4395509f4bd242d903227d6928a4943150f4c0ef6e494b4f754b84ee23c67ef SHA512 2ea44a2ddd96cd2760752265d242449f210bf467109a190b21a10ee7ea0ef3a27a4bb8172faf8b72632a0c662fb737d15cf0f41a69ffdd0528af7136aea30b6f WHIRLPOOL 0fe4620d28a16249420cbc4381155166f06a88ea98ceeb80c706518c306af9b91bc2cbe3d9b863dae3f2c15a24888ba295e095577ce9a6ab2ffbdf5bb0839f70
+EBUILD rspec-1.3.2.ebuild 2664 SHA256 f504e42bceb3609d1c1472c26324d2d8dbcc51a3983446521c1d7297a1844e1b SHA512 5d4d11686fba3dd2e8db5589f45623187468844e3a633090304451e22519b780e3cefe844bd9d2a9c15e2f464659385ccb47946c80996a90479125ee2d30ae39 WHIRLPOOL 36a1a5514e4d6c8f18161adbfda5d9ce8d75489684d5164e91c7d5a8a87b9f8fc630cb9a01a36c75a3474d44c5ec0935c46e099161d441a90e76613668a2696f
 EBUILD rspec-2.12.0.ebuild 895 SHA256 0d7ce809b910440d683349ce0a26451102ea00b17a7c1728b64368d13872593d SHA512 65bcd2545cb819548203363e272b13171983cd5aa3299284c65f80e80af2ea802be81ec3774ed1fc36534dabd3ff302b7d614a218abbe2afadf8b9fa4424bafc WHIRLPOOL ba24a4816694440941ee54587bc665de62de78eb3d7293b81d6ccdf902cbca0368b56b672e3d3330182ad7657a88ccb88f25ed69a9692eef7154a8da4e681f9a
 EBUILD rspec-2.13.0.ebuild 905 SHA256 b5c895b6b2255b0325fad2be7b5a3a3db57f20ceab1c8aab325c864e6981ea29 SHA512 eb5aea9d441d81c9c41b1440ee867cadfdfeaa86f83a1df5f854c94c03fae7a144c106dc123d370c6706c701bcc4ebb1c9cbf03b1902f1ca7d16c29f59ee6796 WHIRLPOOL 35b4e3646bc15c8f908cbb6bf9ad6aa2aa96980a26e5f7f96afe9a75827dadbb4774b7be960b2d9167cd10b6b1ae2e2c1f5827298630325a1bd5a86230373e1a
 EBUILD rspec-2.14.1.ebuild 899 SHA256 957cdcf17f7fb04e56ff1e41116df8df33f6dd24dce5d6c21c3303c9a88334da SHA512 a78f1ee54ebb22fff98125f949532fd237de2b31d5961ca2942e57febec4b67e5387492b8c86f2ed613735544c4c462ff13f26320ae41b76eb44ef58b2abfaed WHIRLPOOL 93e99d31e63d0f6b57c70b04a440d671facbe7eae46af8e535108647d3bbffd1f19d94b52772d3f08a891fcd4576e3fa0d5a66551d3e7ce6b1c1cff29dd835ed
-MISC ChangeLog 19293 SHA256 199343fa7af1258cb8bd619320a7cb18bc83264e827fc36a698178a0a65aa694 SHA512 9c3ea91422d0806465195ba53b8c555b5d2be945f3b368e67b12690fc9a2b86a778a56309eb1ccfaa4e9faf7772509d2a3c42b7ded98f1f90654abd75e0f6d0c WHIRLPOOL 980e0fd9f54c6723dd1ae515767c42141cd9188362ae5491faa3b85eabef52124b5192e55c9b226b89a35bfa87a022540ecc1efc95e8b0ec155bc64e810eb983
+MISC ChangeLog 19415 SHA256 3d674638af3edb4b92198ac9dea7e2adf75fecfc7c76698fe37e24551ba2a466 SHA512 f17032d013a58d90dc61306a6a00ce6198b2569962f85463ac0818410e6e98fbfe0b8c91d441e9a2329e45a30095a500b5f8179ce2a53c727dbd9a3d61c479e8 WHIRLPOOL 0eae0440c9f736ebec03d0fc573a23c187cd929580db8c751a2a7d6e3094839d8be7bff1facfa81d7a1ab230d321936d0cbf36556d89e69048c8077c7c8c4c63
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIHQlgACgkQiIP6VqMIqNe0ywD+PMW+VWOF/g+Dv+GAYKratZ8s
-h5vikQzukF/AAK7CNG4A/iBas6XtQnqsu1e1j0iUZP7msc97pIYzcHPCttsZ1nia
-=ksDM
+iF4EAREIAAYFAlI/Lv8ACgkQiIP6VqMIqNeiFwD+KN3OLProg3c/p5M/oKWIog2/
+rmyjdk7qmozK096q7k8BAIhPYlO7PIYDIxJpyLF6HNrZEQX/KpQCSzdYf0GWu8HZ
+=yw0W
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec/rspec-1.3.2.ebuild b/dev-ruby/rspec/rspec-1.3.2.ebuild
index acdf245972bf..cbab5baba27b 100644
--- a/dev-ruby/rspec/rspec-1.3.2.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.14 2013/08/03 07:40:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2.ebuild,v 1.15 2013/09/22 17:55:03 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -44,10 +44,6 @@ USE_RUBY="ruby18 ree18 ruby19" \
 		>=dev-ruby/fakefs-0.2.1 )"
 USE_RUBY="ruby19" ruby_add_bdepend "test? ( =dev-ruby/test-unit-1.2.3 )"
 
-# the testsuite skips over heckle for Ruby 1.9 so we only request it for 1.8
-USE_RUBY="ruby18 ree18" \
-	ruby_add_bdepend "test? ( >=dev-ruby/heckle-1.4.3 )"
-
 all_ruby_prepare() {
 	# Avoid dependency on git.
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -64,6 +60,10 @@ all_ruby_prepare() {
 	# Support ruby 1.9.3
 	cp spec/spec/runner/formatter/html_formatted-1.9.2.html spec/spec/runner/formatter/html_formatted-1.9.3.html || die
 	cp spec/spec/runner/formatter/text_mate_formatted-1.9.2.html spec/spec/runner/formatter/text_mate_formatted-1.9.3.html || 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
 }
 
 src_test() {