Bump to EAPI 4; use RUBY_PATCHES to add the patches; use the ruby-ng helpers for rspec and testrb-2.

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

3 files changed, 41 insertions, 15 deletions

diff --git a/dev-ruby/fakefs/ChangeLog b/dev-ruby/fakefs/ChangeLog
index 4e8ffa41d642..bccf6f71740b 100644
--- a/dev-ruby/fakefs/ChangeLog
+++ b/dev-ruby/fakefs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/fakefs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/ChangeLog,v 1.23 2012/05/20 18:28:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/ChangeLog,v 1.24 2012/08/14 03:35:45 flameeyes Exp $
+
+  14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> fakefs-0.4.0-r1.ebuild:
+  Bump to EAPI 4; use RUBY_PATCHES to add the patches; use the ruby-ng helpers
+  for rspec and testrb-2.
 
   20 May 2012; Hans de Graaff <graaff@gentoo.org> fakefs-0.4.0-r1.ebuild:
   Add jruby but ignore some tests similar to upstream. Needed for newer rspec:2
@@ -86,4 +90,3 @@
   12 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   +fakefs-0.2.1.ebuild, +files/fakefs-0.2.1-ruby19.patch, +metadata.xml:
   Initial import of fakefs as needed by rspec testsuite.
-
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 51abc347f681..ff0cec2a445b 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fakefs-0.2.1-ruby19.patch 707 SHA256 1c63a39d47c862a3a925efd848330898d33572b128355ded235b9e6c16691211 SHA512 d7111d60bd1698544c24ad30bd4dbaaf3f10b0c2b5451c1d08d835cf68d9acf51641641d9cbe49d9d63d86fc0027ebc9b97107ad767261d8064abcfc8354dccb WHIRLPOOL 0c722d873b2acc66fc4e51a2ad8077784e0bd8f4a25a5da6bccbb10bb2ede526f8f43d62f971f6f7dae458e5813ab5ae0fcaf629cb74865eab25d69dce20e809
 AUX fakefs-0.4.0-ruby193-advise.patch 1023 SHA256 c84b2a675e269f2f4bc562357d7ef8ab4d6be0350b1fb6ba35af8dbcc3ace5d5 SHA512 bf883a58fe6c2c69350978c391f957167f308b1e9ca37d72ad2ff9aca7f6a5dd42071fb38c9a86a6d25935336ae38e3425d2d7b635b4f4aacfda71c331eb51d5 WHIRLPOOL 9ae789c561f0ab5c4de5eb5a23e802682b5b77bbfd291f12c8124b78b5099b257753fc5891bd9fcd721fd9dc275371702441fe58b86cb5ce26773ccacb8561be
 AUX fakefs-0.4.0-ruby193-pathname.patch 1751 SHA256 5d3dc1233d3d296c8e89ff8aa933749284f5b641cd550a86a5e02b36c3ab7f98 SHA512 feca2c045da96f8d4c87d5474e34fb145f4b9cb955653f62974b0f40e3b8bf1983e96807a2b695eeccc00522c7e86b4dc25a99d8eac30ab4a466546af24e99b1 WHIRLPOOL 0e2c75d754717f2ff61b75cf1443873df83ce134809a021706e26b149b871a2c272364c51a10b0b0bcdf774cb2d4020bb8f83596149aeeaa7dc0d8ea8db07746
@@ -7,6 +10,17 @@ DIST fakefs-0.2.1.gem 17408 SHA256 1acb4fb80abee462b4c58679bf8d528a9094f79a81ece
 DIST fakefs-0.4.0.gem 24064 SHA256 d5e26fc81facfdcdb5b31732358c6b3d86c8b53c91e2359b9d5b1cc68665b00a SHA512 f98867e2fbcf70316b1aa3c442f2dfb717e1c13ed8c8f5b5288639354f2da166709fa9af771f458300315fa016feb3ee36f04bc3ce2e26fda7d826712a19db81 WHIRLPOOL f5a6c3a4a89507b9ea48173322e0424e05a58f25037cc6412a8e66a8f935caad602b19fac9a3ff0159a80a91e9692ed23ce70f858bba0b434925aa4bd1bc78d2
 EBUILD fakefs-0.2.1-r1.ebuild 824 SHA256 d6381365fbc975e63b2d8bbee700168d2db6cd9a18fc44b05baf62ec5123011a SHA512 7077611413f977fff8a18c5363b573edbbcf4d00e9768865c2c043e62383d1b9ab766238da33eb44c163cefec83f12178e0cb8cbb63167f1c01b9f320a1ae4f8 WHIRLPOOL 32100a85fd87b4820a16f621cdead9547f720fe2f75f9082f67f83971bad4be0da72cd2d3ca81b81bfc349d5e6f1b391ee5e4926a8c9eae66a17f16218cd8145
 EBUILD fakefs-0.2.1.ebuild 713 SHA256 f282dde87205847b92def2b4e274ee7554a54740e09ae684af694d74259bddaf SHA512 838ddfc22c139727e8d97ca9021c00d5be51275fbf3e4f9d8cd24486a419d5dd52ffd613c399eed6e2b76229f8c663fe720c4fece37b14db86149b723a24ad91 WHIRLPOOL 0eb7c5d2a5748f4c542080d4e3a619c3d1e122ae80406283f2f05044313a827b9cfdbfeb83a0fb4416b9087cecf91c91ca03dce8e2caf7b0bfb179a7f1bab9bb
-EBUILD fakefs-0.4.0-r1.ebuild 1294 SHA256 633d6e8acdfe3a512df7096f9592dec1c16ca620e2fc16f86067d06ea2a3c92e SHA512 059a20c66c16bca006be2c613f9c61d6552540a57773fcecbb2119aeda56c3ed36a66328f4754f42a335778ed3f77ad02b5eac84eddabc4d84cbd8f57a1fd0da WHIRLPOOL f971f67d5a65ba15cdcb82fb0f137aa21034e2b180cd71ed2bf2462dc04d07bc3e231ad038379c82705c9fe1c4afe0e901332953e5326b10bd2ce521311b699e
-MISC ChangeLog 3145 SHA256 b50b67ac1b4bb7a24a3049ac22a9aaa935639e414835528725ee89d4f6af7957 SHA512 861d945410d7debe96636c513fe479698c7b9633a6d95b652c6dd00a2c9280f49b6153095ac44b8077b84a2d806aba9bb3df09cfed36314d6fdd3ca113641c6f WHIRLPOOL 980056586c36fa807c445627b1e3f9227a3e13142663a3f994200c4f2f0d8a8f13cf7e0c878729bb08bbc839ab204d4f67e2be6e204dcfa19386524cd712f13f
+EBUILD fakefs-0.4.0-r1.ebuild 1269 SHA256 20ede08d158112d87e440259a12f0adff6001ea2202cad19e27ed4558aba6f39 SHA512 b3aac7288e41ef2ead914e45ebc7eb31daa3297087f4063fb20b7bfde27ea221c0f888ab3c3dd6590f548877cd1d6eb9e71695043b4314439c057613b66b5f98 WHIRLPOOL e202e00457c236c530303a6152ecda1a7566c8767d05b92a86b3239d9eaa991f7f3b6166e2d4dd0058e0b819547eb400b3e329d9b19033971b6c854d26c884f2
+MISC ChangeLog 3333 SHA256 c8ed3623d54c21a9d3e40f727669fda07b61bdd9782b6462ca67a10942b77a71 SHA512 a3797f635f168d1c00d8c75799b242b63b5bd8eef6b5a31578d75bad31efca7e1c26011f398b3ee8cafb7124efc41ad6a4289c3ac7f72b083a24a14418006d27 WHIRLPOOL 882869d5f807909d190635d42b40231a8b17a19eb462625d344937456c7c29cd5f2138cdc024e1edcb33c9cbb49bdbdf2464e412ca7d5b6d0c88fe95fcdb33ce
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQKcebAAoJEBzRPIrUMBNCKUUIAInv3ROg91WgFZaOVUGWwTFE
+b7MOKdI5YePlnPLFeVGn+B57ioDecOO7tDegDXcH5PqXH3NxD+rUHuC0ezn8/PMP
+HvWsdpZwk9WovVR2+aOtsyGGIAefUDlmfEJbkrdGP5AKusLG16xnEMHjST6V0NGy
+S39uckGF/CX+ZKyOmv34ISGLmDUBomu/+EX6mCyX+sZoMXYwayIUyTHf0g452s9x
+/lY1SxQaLHyAiboUHOw8bl3e5TfWvHypalcd5rcO7OyPhrT3MFLYXMh+MjAaAP+1
+XnEacmp4k8oQnjVO5zIbGNWAcElUjawojxpEeLaZeQPv1mnLzqjLh0SCrM2gtik=
+=f9C7
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/fakefs/fakefs-0.4.0-r1.ebuild b/dev-ruby/fakefs/fakefs-0.4.0-r1.ebuild
index 48085205f663..df21187af882 100644
--- a/dev-ruby/fakefs/fakefs-0.4.0-r1.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.4.0-r1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.4.0-r1.ebuild,v 1.2 2012/05/20 18:28:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.4.0-r1.ebuild,v 1.3 2012/08/14 03:35:45 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
-# jruby → Marshal/DeMarshal to clone directories fail; tests fail in
-# release 0.2.1
 USE_RUBY="ruby18 ree18 ruby19 jruby"
 
-RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_RECIPE_TEST="none"
 
 # requires sdoc
 RUBY_FAKEGEM_TASK_DOC=""
@@ -25,16 +23,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:2
+		>=dev-ruby/test-unit-2.5.1-r1
+	)"
+
+RUBY_PATCHES=(
+	"${P}-ruby193.patch"
+	"${P}-ruby193-advise.patch"
+	"${P}-ruby193-pathname.patch"
+	"${P}-ruby193-ruby-pathname.patch"
+)
 
 all_ruby_prepare() {
 	# Remove bundler
 	rm Gemfile || die
-
-	epatch "${FILESDIR}/${P}-ruby193.patch"
-	epatch "${FILESDIR}/${P}-ruby193-advise.patch"
-	epatch "${FILESDIR}/${P}-ruby193-pathname.patch"
-	epatch "${FILESDIR}/${P}-ruby193-ruby-pathname.patch"
 }
 
 each_ruby_prepare() {
@@ -48,3 +52,8 @@ each_ruby_prepare() {
 			;;
 	esac
 }
+
+each_ruby_test() {
+	ruby-ng_rspec
+	ruby-ng_testrb-2 -Ilib:test test/**/*_test.rb
+}