Bump to EAPI 4; use the new rspec recipe for tests (requires a fix, but allows us to get rid of the rspec:0 dependency). Add a note about jruby not working.

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

3 files changed, 24 insertions, 15 deletions

diff --git a/dev-ruby/daemon_controller/ChangeLog b/dev-ruby/daemon_controller/ChangeLog
index 80325a7279bb..28830dca4cc1 100644
--- a/dev-ruby/daemon_controller/ChangeLog
+++ b/dev-ruby/daemon_controller/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/daemon_controller
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemon_controller/ChangeLog,v 1.10 2012/08/05 09:08:43 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemon_controller/ChangeLog,v 1.11 2012/08/13 18:41:15 flameeyes Exp $
+
+  13 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  daemon_controller-1.0.0.ebuild:
+  Bump to EAPI 4; use the new rspec recipe for tests (requires a fix, but allows
+  us to get rid of the rspec:0 dependency). Add a note about jruby not working.
 
   05 Aug 2012; Hans de Graaff <graaff@gentoo.org>
   -daemon_controller-0.2.6-r1.ebuild:
@@ -49,4 +54,3 @@
   25 Oct 2010; Hans de Graaff <graaff@gentoo.org>
   +daemon_controller-0.2.5.ebuild, +metadata.xml:
   Initial import. New dependency for www-apache/passenger.
-
diff --git a/dev-ruby/daemon_controller/Manifest b/dev-ruby/daemon_controller/Manifest
index 3c3bbbd95b9d..0e2a535fb635 100644
--- a/dev-ruby/daemon_controller/Manifest
+++ b/dev-ruby/daemon_controller/Manifest
@@ -4,13 +4,17 @@ Hash: SHA256
 DIST daemon_controller-0.2.6.gem 22016 SHA256 42d403a94e0dbd4cb410ac6fb1c477172ca9ce89e6784e5af30e23a897536aa3 SHA512 f0bb19d218eb7fde1d95307e6ffc2f47e63c8325fee7469f48fe6dce31c239d0ef4c119f26b6628e2b9e79a3d3741b337267d2cbc46951f3f27d454e74022c2b WHIRLPOOL adab246c98ead4156c2079e03b6d3ce3d11a72142e15db650981b7a163a1122a5b0aebd4df7b1b9412f8273e83cdc2308913beb427370a2cab27219aac7d116c
 DIST daemon_controller-1.0.0.gem 23040 SHA256 21e24eb8daf99372090fe9e29dae5637239ec566d29a247a5e05fc112a802a32 SHA512 d9c9f13e984d379417bce5b73930c85ae2ab7f309af52552a1382f1522fe53d2077a43c249fcceee831c2e8436d7d1a446543c598a8c62eda6ab4dc895cef61d WHIRLPOOL 0a62b7d9b58df0dd2827f405eaa05107ca49d7097b322df4427d272a5aa9cffc21d3625f59799003ace8df259ca8ca89fec9390514d174793db86ea9b89d4f1b
 EBUILD daemon_controller-0.2.6.ebuild 727 SHA256 f57baf87f9f55dad3f8a2f558c8eff8a3a86fef098f063f7b8f6a796331b7df5 SHA512 161d716e0387e65eb7ed845668ded55d1a11df65f435e3f62bc50d01091d497154937e29c02b06a8c49fd2b7a7f9e48d03a19eabc0188b1ad1660bd8e2b54845 WHIRLPOOL 74824b8f3eb27acbf0695e133cf7935493d16c611255a1833d614849c8745cc6a581c820f84b892aabbfcba25bdb9b4adddaace50b70532f3ea1226d35742e64
-EBUILD daemon_controller-1.0.0.ebuild 732 SHA256 798fba734e3a5652f28fdd38e767c36f4cfbc859ec90854ca9e861663bcde3a8 SHA512 8d9852f2930951190b7d1a377a7d71515592a930806cd9677fb63cc84c7b26a21fc498e099fa25137820707308370cfc2ab3d16af20da8fad54a41e5375c9a1d WHIRLPOOL 0dafb02167bfbcd194e718bc4fd3c163cd6c57c7b15a2564bc11be7f7ddda643ed05c97f2d241d576d4c4797f0c7d84fd6b990dad7c5cb417af4ed00dc77ee44
-MISC ChangeLog 1647 SHA256 0d3799267d9de408cace34ff0c572de34d9050f78f11a8204cd5dae5cda6cb89 SHA512 37d6eb672e1ca9165050c265679910e4289a92f3e295cc77b2d35bae7a37574ffed3bf59754b2d76681d110861d5ed7a899d2c6ddd89b4465480f46290ab4696 WHIRLPOOL 2faaed5a02b36c59436869ef0a77b68e941a06c6b9f151c866ad48de9ff90cecfce22dfb29125e0b5563ae84c0ce3ed77add869b90e5c8b4fd7be400ed6d899d
+EBUILD daemon_controller-1.0.0.ebuild 799 SHA256 78f513280b2afe01c488ea0572f2308212e54bfd15254a30796e76b259d5516b SHA512 c918cb7bb9c4d7a22c8fbc33ee38286a6cb012b624a3461ce7237b266268c7056692e4c4a37123576365c42474136e4aa1494acf6555ddb9b54689dd569b4af8 WHIRLPOOL 9a54e4eabfb43b32d31c7089aabd325a57bf7d6bffbb12306f7bd64fe48160747e448646ead002bca693dd12eb47d447cfcdc43addc4937c32482a4676d25258
+MISC ChangeLog 1901 SHA256 48b9ec370d1f43be89fdc31d2de1f5ae029bee64b329c25331143f755749b35e SHA512 0340670e9eb181c7dc9bbecba16cc430a5acf097ee85cb522e64d32ef7575c190f8cb2c43bb06b0b54b0e4da50ecbcc27a976deedba1ae03e2f1ed3fe97e551d WHIRLPOOL 2d554f093b6cfa05ee69502e7eccf391ec80d6b3cc0a1a601cec15985e690a9aef2499cf6d6a29b4edea09964e2bda091894b36db2f1a1888ca393c47c5fce27
 MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAeOCAACgkQiIP6VqMIqNclIQD+KTwK67pJtcd9/7QLTGNbv4id
-pfBiwqyeQCsk0VmR33EA/2BiNXZlJs7dL5uYyQay6HXcvPL5qKFQn9iRkKeOyl1h
-=a4qI
+iQEcBAEBCAAGBQJQKUsbAAoJEBzRPIrUMBNC8SIIAI1lnpR3geplie7eXdfpbhz8
+5qBz9rCp6m+fVLapNRZau1AX2nwLEgdwzt9sxk9ZxErBr1diY+DOZ2dhiFDsC1k1
+aG8qUgZCkSKkCakiyki1FNeq40sBKsuZgQEGRUzH7v0DokZ2KAOaYJn7aZw98h0L
+UGMMYx++tv02vd8ChL7/mUoeGrzsJ63HQcS9QZV+6JelRAIa7AcnpQsNQq8U4R/9
+3cEPtllo6xhCWR5nsxquaodDsw+v4ihHg2ECElMO1JPnqoTSBChDAt1ZGzf3T+dv
+Vt9nevP4q4wvLxGaSXt1mn3RlEh8JaSq9MVSOQ6ZDztcqdnDjyveqYtnxjUrYUM=
+=YWQq
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/daemon_controller/daemon_controller-1.0.0.ebuild b/dev-ruby/daemon_controller/daemon_controller-1.0.0.ebuild
index 040dd45d126a..d46e2d982a1f 100644
--- a/dev-ruby/daemon_controller/daemon_controller-1.0.0.ebuild
+++ b/dev-ruby/daemon_controller/daemon_controller-1.0.0.ebuild
@@ -1,11 +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/daemon_controller/daemon_controller-1.0.0.ebuild,v 1.1 2012/04/07 09:06:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemon_controller/daemon_controller-1.0.0.ebuild,v 1.2 2012/08/13 18:41:15 flameeyes Exp $
 
-EAPI=2
+EAPI=4
+
+# jruby → fails tests, looks like Unix sockets are bad on JRuby
 USE_RUBY="ruby18 ruby19 ree18"
 
-RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
@@ -18,10 +20,9 @@ HOMEPAGE="http://github.com/FooBarWidget/daemon_controller"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:0 ) "
+IUSE=""
 
-each_ruby_test() {
-	${RUBY} -S spec spec || die "Tests failed."
+all_ruby_prepare() {
+	# fix tests with RSpec 2
+	sed -i -e '1irequire "thread"' spec/test_helper.rb || die
 }