Bump to EAPI 4, drop requirement of rspec:0 and insetad use the new rspec recipe for testing.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 28 insertions, 10 deletions

diff --git a/dev-ruby/tidy-ext/ChangeLog b/dev-ruby/tidy-ext/ChangeLog
index 3f0bc5e9d1cb..4949045a2e77 100644
--- a/dev-ruby/tidy-ext/ChangeLog
+++ b/dev-ruby/tidy-ext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/tidy-ext
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/ChangeLog,v 1.10 2012/05/01 18:24:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/ChangeLog,v 1.11 2012/08/13 17:49:24 flameeyes Exp $
+
+  13 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> tidy-ext-0.1.12.ebuild:
+  Bump to EAPI 4, drop requirement of rspec:0 and insetad use the new rspec
+  recipe for testing.
 
   01 May 2012; Raúl Porcel <armin76@gentoo.org> tidy-ext-0.1.11.ebuild,
   tidy-ext-0.1.12.ebuild:
@@ -44,4 +48,3 @@
   +metadata.xml:
   Initial import. New dependency for forthcoming dev-ruby/bluecloth
   versions.
-
diff --git a/dev-ruby/tidy-ext/Manifest b/dev-ruby/tidy-ext/Manifest
index e7db020852bb..0bb91595b7bd 100644
--- a/dev-ruby/tidy-ext/Manifest
+++ b/dev-ruby/tidy-ext/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST tidy-ext-0.1.11.gem 259584 SHA256 2c24ae795a4008316226571e194ac883818336cb8a181ad777e3bca2b22a0f37 SHA512 b407487fea7a1c73910ee44310d1aca4629b39fa5409f5f07a382080be2726014e63c4b811c6e0382349a1c3eaa7454c7064e09bfafec44373f4d098d09f63a8 WHIRLPOOL c4a8def540185cc78dbe8b6615c861931d0b373028b799d859f4487804166c8cfb34939f285983b6967afe90ff3f64e7582a8346db4f9fcfa1466123a7d753df
 DIST tidy-ext-0.1.12.gem 259584 SHA256 eda87c06355054b48b6d5d7d699a747490d5d4cb15bd86e8758377b259541eb0 SHA512 2a7a304e81f49281be1c36b98b5aee5922d1fed2f06a6b5a480b305d124c056a8f26f51c26e94faaeb9114e38041b9db65a018cff56b821d12a9564a7bbcfd00 WHIRLPOOL b55b484c784223770e5620bfd0dd2ca11b25c4113a79aa16e4b1d0a442bc73da8346e3eee61e97165d36fea6cf87341d9c5e2b499a32bd48a81ade73705fdcc2
 EBUILD tidy-ext-0.1.11.ebuild 849 SHA256 8abefd2e73cf19828e0ac36f4f650861436c5cb85fb332c6f392ad883e2f66d8 SHA512 39dbd864d572d4a58313856b9b6bc9181e1b390528ac34e7c709cb540473d53997b2836869cb974e31a03c25ad3ce6e54a2fdee83d9d5671de05ee85e580c18c WHIRLPOOL b348897fbea729d0360a82b02576ca1be23c6515d92602dc641c785793f6fd2efd5eb8016f86f46defcfecebf5f15862fff42337f0d1b49900a552876864a7b2
-EBUILD tidy-ext-0.1.12.ebuild 849 SHA256 9a70e5ae350e699dc33991d34780c93d6ed95e0ee41f1deae985a9e11a0becfa SHA512 9ca49d7a27a4a7b2483b1bc3e8710fc0134114a3d4226842b1ae2794d6843967d10c46d77f701760cf8f2cfb170d90febf119db5cef38c1a059ed60358737365 WHIRLPOOL 6528788c6c26ef9b600516cf216ac2c046968d9bc18ac48cba7602e25570258f67cb3ef7479445ab4f482f6f93553789cfef51145544ec47e7e3f6f87f890ab0
-MISC ChangeLog 1628 SHA256 6b6aca6ef26d69cf3cad1e53a10e79b39a737d825ea66cff53ac9a377dd67905 SHA512 8ce8c0e5fd1441b623867c1dc7a5b6d130078882dd32041ccf2ec00bb77724ec66e3d73cf026fda27c2737386dda3af228eeeab0c63f80f7fb3db5627743bb43 WHIRLPOOL cdb2cd10b8826f17a73fa375783361e47661c6c844ab9cb03479685ed6df10d0ea7388821a86ace0d96385dd1d0f5554a477c487d66db1a5edda97726e6fc9ec
+EBUILD tidy-ext-0.1.12.ebuild 886 SHA256 236f5137180594feafbe0dbc3dcfcdfe9286e539285fd3952ae259c10c97440b SHA512 b2cdcb6537cc3bb6b12e028d1018854a6f933b1174e2223a25aefa910fc37a11abc2ae4bd54d7321c64af6a43c358075318f412141ef936f3c19849f1056ecfb WHIRLPOOL a94c70930040731692cb2d83981f066204ad0e80224a54084491d3909456021236736ba4788fc46663ab20dc5c511a7d110ac7777c2c5d4519e2c84346690d42
+MISC ChangeLog 1808 SHA256 9c1c5c26b3cd1b1e79837899b69f78530336c77f15c0ad7954cd335515b523ce SHA512 50aa744383a497c51317c2779b3b4c0568877596304fb9cff7e58f2ce3b107ce497edd492fc71031da722ee9221989e8cfdf633c1a98b004072ca736719d7b8d WHIRLPOOL 6137fa2ce0824afe4b148a5d6238b4a807ae4985c3e7422fd5540a1802e67f3983b2e6fb8b158561c3c071401798eb1d47f9e56e6c294d0e8d6d69c7cbbbe7c8
 MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQKT7TAAoJEBzRPIrUMBNCldsIAJJfT+kQ+x/p97OibG1ZqtRj
+f5fEVqQQqdvZvcEDniBJguinHc0W15HTxUllTmjnw6JCG6mFJ6opssR77tXDt+dD
+2ntdrEXM4naFg2dJWsssxLZA834H+RknEqiUlzC0+dclwImhAZX+sUFyllRLft22
++QyFTESo3CqQYeSvxXIAR4uXKT6ATM6r6ys1d8mobZn2o15Y1jwjx8Krqpkzba7N
+vHsjbLqXS9P17gx1WZBEabrIPf+zyXlfwJTencMq72HddvUq5Qjgm0tEdjVmRUUf
+NtmzWHf8qbpMp/Q+Ikcb+vCcDsviPA/nPkutdMO5sWXmXlyARtcX4z0ex3+sbUY=
+=uUZP
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.12.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.12.ebuild
index 074c6fe5dd3e..c2cb31e9efaf 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.12.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.12.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.12.ebuild,v 1.2 2012/05/01 18:24:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.12.ebuild,v 1.3 2012/08/13 17:49:24 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_DOCDIR="rdoc"
 
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
 inherit ruby-fakegem eutils
 
@@ -19,10 +19,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:0 )"
-
-each_ruby_prepare() {
+all_ruby_prepare() {
 	mkdir lib || die
+
+	# Remove reference to rspec 1
+	sed -i -e '/spec/d' spec/spec_helper.rb || die
 }
 
 each_ruby_configure() {