| 1 |
commit: e5009906eb35ddb3c5c65eb217f69d13538ac8dc |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 26 08:42:20 2017 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 26 08:42:20 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5009906 |
| 7 |
|
| 8 |
dev-ruby/test-unit: Use rdoc to avoid yard dependency chain issues |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-ruby/test-unit/Manifest | 12 ++++++------ |
| 13 |
dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild | 18 ++---------------- |
| 14 |
dev-ruby/test-unit/test-unit-3.1.9.ebuild | 21 +++++---------------- |
| 15 |
3 files changed, 13 insertions(+), 38 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest |
| 18 |
index b3e5215b199..4dec316f604 100644 |
| 19 |
--- a/dev-ruby/test-unit/Manifest |
| 20 |
+++ b/dev-ruby/test-unit/Manifest |
| 21 |
@@ -1,6 +1,6 @@ |
| 22 |
-DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 WHIRLPOOL 2d459056aabf5804cc868d893060f6833570fbdd5c3d1d3fae09c2488909a55bdd340ab34297ac57298a03ff9c48a660705c1e28390e498aaef7ed40bf165205 |
| 23 |
-DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3 |
| 24 |
-DIST test-unit-3.1.9.gem 124416 SHA256 3efe0e17e4bc9880ada13515198531f6101bf6d03c5e5556f53cc72b45c33aec SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428 WHIRLPOOL 715cd547da273b6384a5f6191d2d80c26a1044ff94639cd4bdfd9a80553e026522e495683323572be41081dbad1f35fcab20b6b4c98a9f65ac576c8682e088f7 |
| 25 |
-DIST test-unit-3.2.4.gem 128000 SHA256 470fe5e582650ea485c7a5c2242fc9b6dc2018d9aa11dab1662a3b672919ab26 SHA512 e2ff209c9aef1b01c14a9dcea0c07d22fdc302cb42d68ffa8dd98d64dc444252ee746c3f3a2ad6ff4651c176d84d1b862e037a8a140c078b7f142a624115d3c7 WHIRLPOOL 96f0be0e15e9492ee9370c1562b7f987f35125058d6b66eb55cfa3bb72d50967025216f65695b357396df223539bad9a6aa1a19a5e133ab6355f5dc8fb4c6b4b |
| 26 |
-DIST test-unit-3.2.5.gem 128512 SHA256 a230fc4f832ca770bf0bdcd82dd6e83f48fb24cf4e6e883bf83806c09d197d15 SHA512 4c2efa61893d20d593c3b4ab620219c4540f04abd8566c4448e17f50727a955188d76e2d09759f7829b4587c40369a2b7419bf13315537cea7da8bb95c795ab0 WHIRLPOOL 5925a10923d864a2750d965589eca8f2eaed14839cbe56b492606f767368e87e85a37e3586e60e6f5cb3287cc6d1b45cfb56f53c4cd8a8c144e2823ff690f208 |
| 27 |
-DIST test-unit-3.2.6.gem 128512 SHA256 db329c4721e02964d63f0c78a99f71c7341e8dc5a4f41f14a856fb659a5885be SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e WHIRLPOOL 31caec7a087de173fc8fde354a3c9efb88481d94c8465a4cad8fe209b27af47cc98dd1e5b623bd206fbd77f5d9a4355f4578ee8d12ab77877c886afe2f36b303 |
| 28 |
+DIST test-unit-1.2.3.gem 40960 BLAKE2B f376db195cc7daf90807f8824954185591d913912c2b0f66efdff5fcbeb034dad4f9adc8586afcefe7946698be9d19d3afddea16b266a4c035376e84c2936470 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 |
| 29 |
+DIST test-unit-2.5.5.gem 111104 BLAKE2B c74aaffb3c7a4cee2d4bc31de9616918725af917aab507e175b16a92677ae6b83bf0c0453ce3c663ed0989c0c6e145476777750ff563280212312092058fca69 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 |
| 30 |
+DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711d013f0bc38ffb3f04d2b290eeaa50fde14078cedf1d86e26ebf12061ed03b9b82a2d9365a0c61796ef25eb72 SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428 |
| 31 |
+DIST test-unit-3.2.4.gem 128000 BLAKE2B d651a951d41d0a1ee2b95380d68dd15862959244eaec0e77750b910fecbe0f1be8d75f0dad7a2ac9f73bc4398e996a737a1218404f532f9b87ea7980ecc048e5 SHA512 e2ff209c9aef1b01c14a9dcea0c07d22fdc302cb42d68ffa8dd98d64dc444252ee746c3f3a2ad6ff4651c176d84d1b862e037a8a140c078b7f142a624115d3c7 |
| 32 |
+DIST test-unit-3.2.5.gem 128512 BLAKE2B 08758e57b9080b37a00af804d86ab63c582440e879724427ffe8429c5d9cc1c7d7bb0fc94df7c5d72fa18e07ace565b39b9e8531328b227b8ef997306ea95fd7 SHA512 4c2efa61893d20d593c3b4ab620219c4540f04abd8566c4448e17f50727a955188d76e2d09759f7829b4587c40369a2b7419bf13315537cea7da8bb95c795ab0 |
| 33 |
+DIST test-unit-3.2.6.gem 128512 BLAKE2B 51d20d77858d706c3db7e653cfa372d10f339b441fd6ee8a0487f89e7ba82bb525ace07da6962a87fc01d0515825dd72bc376309010bcaf4ff2a21faded0edff SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e |
| 34 |
|
| 35 |
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild |
| 36 |
index 5c143bad133..2839444f670 100644 |
| 37 |
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild |
| 38 |
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild |
| 39 |
@@ -2,20 +2,14 @@ |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
EAPI=5 |
| 43 |
-USE_RUBY="ruby21 ruby22" |
| 44 |
+USE_RUBY="ruby22" |
| 45 |
|
| 46 |
-RUBY_FAKEGEM_TASK_DOC="" |
| 47 |
+RUBY_FAKEGEM_RECIPE_DOC="rdoc" |
| 48 |
RUBY_FAKEGEM_DOCDIR="doc" |
| 49 |
RUBY_FAKEGEM_EXTRADOC="TODO README.textile" |
| 50 |
|
| 51 |
inherit ruby-fakegem |
| 52 |
|
| 53 |
-# Assume for now that ruby21 is not eselected yet and only depend on |
| 54 |
-# yard for the other ruby implementations. Without this assumption |
| 55 |
-# bootstrapping ruby21 won't be possible due to the yard dependency |
| 56 |
-# tree. |
| 57 |
-USE_RUBY="${USE_RUBY/ruby21/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" |
| 58 |
- |
| 59 |
DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8" |
| 60 |
HOMEPAGE="http://test-unit.rubyforge.org/" |
| 61 |
|
| 62 |
@@ -24,14 +18,6 @@ SLOT="2" |
| 63 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 64 |
IUSE="doc test" |
| 65 |
|
| 66 |
-all_ruby_compile() { |
| 67 |
- all_fakegem_compile |
| 68 |
- |
| 69 |
- if use doc; then |
| 70 |
- yard doc --title ${PN} || die |
| 71 |
- fi |
| 72 |
-} |
| 73 |
- |
| 74 |
each_ruby_test() { |
| 75 |
${RUBY} test/run-test.rb || die "testsuite failed" |
| 76 |
} |
| 77 |
|
| 78 |
diff --git a/dev-ruby/test-unit/test-unit-3.1.9.ebuild b/dev-ruby/test-unit/test-unit-3.1.9.ebuild |
| 79 |
index df7041285b1..9148e3b2634 100644 |
| 80 |
--- a/dev-ruby/test-unit/test-unit-3.1.9.ebuild |
| 81 |
+++ b/dev-ruby/test-unit/test-unit-3.1.9.ebuild |
| 82 |
@@ -2,20 +2,13 @@ |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
EAPI=5 |
| 86 |
-USE_RUBY="ruby20 ruby21 ruby22 ruby23" |
| 87 |
+USE_RUBY="ruby22 ruby23" |
| 88 |
|
| 89 |
-RUBY_FAKEGEM_TASK_DOC="" |
| 90 |
-RUBY_FAKEGEM_DOCDIR="doc" |
| 91 |
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md" |
| 92 |
+RUBY_FAKEGEM_RECIPE_DOC="rdoc" |
| 93 |
+RUBY_FAKEGEM_EXTRADOC="README.md doc.orig/text/news.md" |
| 94 |
|
| 95 |
inherit ruby-fakegem |
| 96 |
|
| 97 |
-# Assume for now that ruby23 is not eselected yet and only |
| 98 |
-# depend on yard for the other ruby implementations. Without this |
| 99 |
-# assumption bootstrapping ruby23 won't be possible due to the yard |
| 100 |
-# dependency tree. |
| 101 |
-USE_RUBY="${USE_RUBY/ruby23/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" |
| 102 |
- |
| 103 |
DESCRIPTION="An xUnit family unit testing framework for Ruby" |
| 104 |
HOMEPAGE="https://rubygems.org/gems/test-unit" |
| 105 |
|
| 106 |
@@ -26,12 +19,8 @@ IUSE="doc test" |
| 107 |
|
| 108 |
ruby_add_rdepend "dev-ruby/power_assert" |
| 109 |
|
| 110 |
-all_ruby_compile() { |
| 111 |
- all_fakegem_compile |
| 112 |
- |
| 113 |
- if use doc; then |
| 114 |
- yard doc --title ${PN} || die |
| 115 |
- fi |
| 116 |
+all_ruby_prepare() { |
| 117 |
+ mv doc doc.orig || die |
| 118 |
} |
| 119 |
|
| 120 |
each_ruby_test() { |
Archives