Add a patch that actually gets test-spec to work, and for prawn-security to work.

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

5 files changed, 114 insertions, 15 deletions

diff --git a/dev-ruby/test-spec/ChangeLog b/dev-ruby/test-spec/ChangeLog
index 0fa081810366..be40e86efd15 100644
--- a/dev-ruby/test-spec/ChangeLog
+++ b/dev-ruby/test-spec/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/test-spec
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.23 2012/05/01 18:24:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.24 2012/05/12 04:12:27 flameeyes Exp $
+
+*test-spec-0.10.0-r4 (12 May 2012)
+
+  12 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/test-spec-0.10.0+ruby-19.patch, +test-spec-0.10.0-r4.ebuild,
+  test-spec-0.10.0-r3.ebuild:
+  Add a patch that actually gets test-spec to work, and for prawn-security to
+  work.
 
   01 May 2012; Raúl Porcel <armin76@gentoo.org> test-spec-0.10.0-r2.ebuild,
   test-spec-0.10.0-r3.ebuild:
diff --git a/dev-ruby/test-spec/Manifest b/dev-ruby/test-spec/Manifest
index 1cc07ea800d0..c5291e0062b3 100644
--- a/dev-ruby/test-spec/Manifest
+++ b/dev-ruby/test-spec/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX test-spec-0.10.0+ruby-19.patch 1471 RMD160 68fb5cdc3c74419d9d217166addc66114625ab65 SHA1 af6a8982d70931e1a409f59798ea9db16162a1ba SHA256 753168c44baa4e1a6002a21b412cfb12429b0ca4f744fcda07e522b20b206a4f
 AUX test-spec-0.10.0-jruby.patch 1049 RMD160 601b2713659f334bd01e68c1306c35e3bbcafd78 SHA1 c4068cd4d13d6b66119b553ae49b1cca83b43c1a SHA256 8f475cb3a853abf2201fd8f69f251984d9415e1aec0a5454c9c0e3b71364976d
 DIST test-spec-0.10.0.gem 23040 RMD160 83ffab654c447d423ee7c6325eb09e779a88aa19 SHA1 ec7ea48707f247316a4556c3790d49e580c2e8c9 SHA256 73b9ec50f4dfdc4d730588466f1d3bf5b89cfb402176964d55a334f758514c99
 EBUILD test-spec-0.10.0-r2.ebuild 785 RMD160 c9aa238982e8a783d2ed93084ab77f6d63136121 SHA1 1da884137bef06c0acd9d2de4647bd4bd3c0e338 SHA256 1d7fb9dd1884119e1908f00fb0aeeb5dd00987a34e0720cbbf7b33c5d0239a2d
-EBUILD test-spec-0.10.0-r3.ebuild 1128 RMD160 98847b66de8a5df567bbd228e2cb6cdad0538c59 SHA1 78d9701edb9632f25ef5e2c736fda57bb9c0b94f SHA256 3bfc1bddce4d8db77d5e452d62ff5593d995692edd313f68c939c0d76ffa6141
-MISC ChangeLog 3479 RMD160 a566169fc3eee3aa2f5cd295a3e5aa68df31d692 SHA1 507877f71b8e4e810f57bb99f0b223e4ccbbe26b SHA256 50cd26171736a0b37d8988a66287e0c01252e43b2c29bd9781f32a3b95815bdb
+EBUILD test-spec-0.10.0-r3.ebuild 852 RMD160 47644ed706c6c5d341b746354192cd505d3dc7f6 SHA1 04f00f140fa450aed862c0348ae665d763dd75df SHA256 7792e663107ec4ef4ae359322f65d8adbc2909cb7319b0fc150cdc52f46b5bff
+EBUILD test-spec-0.10.0-r4.ebuild 1085 RMD160 9bf66b93df6cc236f9aa0b5039fa54e0c2df4591 SHA1 c293db9cfcd13a767cc1488cd7f8322d349612d3 SHA256 54912458eafd9e4b9c664f17bd775d5318707123deeff778e5a944f6eb9a40d7
+MISC ChangeLog 3760 RMD160 5ab6e671a981e5e06d3bedebe6693be3ac1cdb3f SHA1 143bff1a20e95ffd5ea15be25fcfc95596294bf6 SHA256 aadfaa551e36f4384ee0ee34889b54e5d4ae5d22ebbb8f4c14228fae7b69a858
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+gKvUACgkQuQc30/atMkAN6ACgt+kIhp97n4jZMIn6dhL3pFXJ
-CQUAmgOwbRRbm+Z/wUR5oB4gRRmWxJIF
-=ZTE6
+iQEcBAEBAgAGBQJPreM1AAoJEBzRPIrUMBNCOdEH/RpUXjL+fZm8w9wUTpWG0G6r
+sd793azG2QYZhZHozH4MaR3mtUb4DaXaGBBO+Vdp4sVBuLraLfhhNNLe3p4IK+A9
+I7M7vORCJSv8DpJWsIBHvCG8lmIqsDdqN3lp4sc1fV1Fdz/rAyOr5kdPS5u20TkJ
+Pv29WZixHCcrryan45dOOcqJHAOs5ACg3PPZtMpzOZ4+mgzxU++zpU/rQYuUm146
+RnVb68/2JNtXOnCOKkuFGiyY+m509YuHR5vkU7IUm2gget2lgjtwaPK+v/rqxcN/
+NxPcJyCSh1SXgYH1UnaWkvjAaooyq4tkK8QNbJhLypOI1hPhgLtbkxWIF0GRxbU=
+=aqtF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-spec/files/test-spec-0.10.0+ruby-19.patch b/dev-ruby/test-spec/files/test-spec-0.10.0+ruby-19.patch
new file mode 100644
index 000000000000..63031672befc
--- /dev/null
+++ b/dev-ruby/test-spec/files/test-spec-0.10.0+ruby-19.patch
@@ -0,0 +1,45 @@
+Index: test-spec-0.10.0/lib/test/spec.rb
+===================================================================
+--- a/test-spec-0.10.0/lib/test/spec.rb
++++ b/test-spec-0.10.0/lib/test/spec.rb
+@@ -6,6 +6,8 @@
+ # This work is licensed under the same terms as Ruby itself.
+ #
+ 
++gem 'test-unit' if RUBY_VERSION =~ /1\.9/
++
+ require 'test/unit'
+ 
+ class Test::Unit::AutoRunner    # :nodoc:
+@@ -354,7 +356,7 @@ class Test::Spec::TestCase
+ 
+       # Don't let the default_test clutter up the results and don't
+       # flunk if no tests given, either.
+-      throw :invalid_test  if name.to_s == "default_test"
++      #throw :invalid_test  if name.to_s == "default_test"
+     end
+ 
+     def position
+Index: metadata
+===================================================================
+--- a/metadata
++++ b/metadata
+@@ -11,7 +11,17 @@ cert_chain: []
+ 
+ date: 2009-02-01 00:00:00 +01:00
+ default_executable: 
+-dependencies: []
++dependencies:
++- !ruby/object:Gem::Dependency
++  name: test-unit
++  type: :runtime
++  version_requirement:
++  version_requirements: !ruby/object:Gem::Requirement
++    requirements:
++    - - ">="
++      - !ruby/object:Gem::Version
++        version: 2.0.6
++    version:
+ 
+ description: test/spec layers an RSpec-inspired interface on top of Test::Unit, so you can mix TDD and BDD (Behavior-Driven Development).  test/spec is a clean-room implementation that maps most kinds of Test::Unit assertions to a `should'-like syntax.
+ email: chneukirchen@gmail.com
diff --git a/dev-ruby/test-spec/test-spec-0.10.0-r3.ebuild b/dev-ruby/test-spec/test-spec-0.10.0-r3.ebuild
index 5ca32b2dce50..1fde2f1fd82e 100644
--- a/dev-ruby/test-spec/test-spec-0.10.0-r3.ebuild
+++ b/dev-ruby/test-spec/test-spec-0.10.0-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/test-spec-0.10.0-r3.ebuild,v 1.3 2012/05/01 18:24:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/test-spec-0.10.0-r3.ebuild,v 1.4 2012/05/12 04:12:27 flameeyes Exp $
 
 EAPI="2"
 
 # ruby19 → incompatible with test-unit so fails badly
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_EXTRADOC="README SPECS ROADMAP TODO"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -23,12 +23,6 @@ IUSE=""
 ruby_add_rdepend virtual/ruby-test-unit
 ruby_add_bdepend test dev-ruby/mocha
 
-# On Ruby 1.9, the tests only work with test-unit-2, but generally
-# speaking, test-spec should work fine with test-unit-1.2.3, and
-# indeed some testsuites only work with that.
-USE_RUBY=ruby19 \
-	ruby_add_bdepend "ruby_targets_ruby19 test" '>=dev-ruby/test-unit-2.0.6'
-
 all_ruby_prepare() {
 	epatch "${FILESDIR}"/${P}-jruby.patch
 }
diff --git a/dev-ruby/test-spec/test-spec-0.10.0-r4.ebuild b/dev-ruby/test-spec/test-spec-0.10.0-r4.ebuild
new file mode 100644
index 000000000000..87fb155e7ba2
--- /dev/null
+++ b/dev-ruby/test-spec/test-spec-0.10.0-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/test-spec-0.10.0-r4.ebuild,v 1.1 2012/05/12 04:12:27 flameeyes Exp $
+
+EAPI="4"
+
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="README SPECS ROADMAP TODO"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A library to do Behavior Driven Development with Test::Unit"
+HOMEPAGE="http://chneukirchen.org/blog/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend virtual/ruby-test-unit
+ruby_add_bdepend test dev-ruby/mocha
+
+# On Ruby 1.9, the tests require test-unit as minitest is not enough
+USE_RUBY=ruby19 \
+	ruby_add_rdepend '>=dev-ruby/test-unit-2.0.6'
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-jruby.patch
+}
+
+each_ruby_prepare() {
+	if [[ ${RUBY} == */ruby19 ]]; then
+		pushd .. >/dev/null
+		epatch "${FILESDIR}"/${P}+ruby-19.patch
+		popd >/dev/null
+	fi
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}