From 7b24b6e3678f4d79b4681e921644556e12d75627 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 4 Jan 2015 10:12:40 +0000 Subject: [PATCH] Add rspec 2.14.8 revision that does not install /usr/bin/rspec, and let rspec 3.x block on it to avoid file collisions, fixing bug 534420. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- dev-ruby/rspec-core/ChangeLog | 11 +++++-- dev-ruby/rspec-core/Manifest | 12 ++++---- ...9.2.ebuild => rspec-core-2.14.8-r4.ebuild} | 30 +++++++++++-------- dev-ruby/rspec-core/rspec-core-3.1.7.ebuild | 5 ++-- 4 files changed, 36 insertions(+), 22 deletions(-) rename dev-ruby/rspec-core/{rspec-core-2.99.2.ebuild => rspec-core-2.14.8-r4.ebuild} (75%) diff --git a/dev-ruby/rspec-core/ChangeLog b/dev-ruby/rspec-core/ChangeLog index dfd0871e37cd..f3b7d8d63f54 100644 --- a/dev-ruby/rspec-core/ChangeLog +++ b/dev-ruby/rspec-core/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/rspec-core -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.88 2014/12/28 10:12:26 graaff Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.89 2015/01/04 10:12:39 graaff Exp $ + +*rspec-core-2.14.8-r4 (04 Jan 2015) + + 04 Jan 2015; Hans de Graaff +rspec-core-2.14.8-r4.ebuild, + -rspec-core-2.99.2.ebuild, rspec-core-3.1.7.ebuild: + Add rspec 2.14.8 revision that does not install /usr/bin/rspec, and let rspec + 3.x block on it to avoid file collisions, fixing bug 534420. *rspec-core-3.1.7 (28 Dec 2014) diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest index f86fadc0c361..73d78bc94dcd 100644 --- a/dev-ruby/rspec-core/Manifest +++ b/dev-ruby/rspec-core/Manifest @@ -6,16 +6,16 @@ DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2 DIST rspec-core-3.1.7-git.tgz 244774 SHA256 5fbb0b965bd590972bbf57272dbaf026e67493c69cc6f3c754bde829d39f1c81 SHA512 ded71c0f6e36c177044c796dd9c22d53d803ba45a7c8849daab2c22392082ae72a0479d2ffe45ed0f1492b4b6c94dfab187c01af7c55f14fa8111d0fa9999790 WHIRLPOOL 74fdd0b1c52df1d738ffadf1d03b0951b0b0e8ca538cdeb44412c20ca80d8f26d02fb82de63f6ec19eb4fe3e7ec42a5c140e241904e4c80b1f8f1efb98733d7b EBUILD rspec-core-2.14.8-r2.ebuild 2748 SHA256 001d27479f30b88f009ad4bc13a8a14aefdd72980f7f88944e5c72521fa0f67b SHA512 f24a5bd0aa20578dbcd32b9a68f973f4352546872849590b84b733da7cc2dfd5e04fc9e10eb5196aa167cb143cd8ba6f1c2c939f82d23e5ea7d745e267ae23f2 WHIRLPOOL 9b9b4147a4872b1bf3bed3cd375b094843f0a7a638f1d1a65bc0ee9569565a270cc37fc46ee1fe4ab23d17340032985ffaf4687b957de6e447774b0f603f5a9a EBUILD rspec-core-2.14.8-r3.ebuild 2764 SHA256 7b56fea7e06d03d7fa0f33d5ba95297a4f61cbb2bef10e9397ebbcb11ec1d671 SHA512 8f52b580944222ddc69207fc5d0c5ce9abcf475ea7ce0469cf0b0a7c1574b7fe61249fd7b06afe1a8c35dcc1d6680acb7a9830886c053377af49c4658769f9f5 WHIRLPOOL d07e7bb349e315e84465a7b55c720ec1956f3a20712fd2f72e40af85bc3b9a07e5ba3082a2339d8ae059988d96d283c3e6ad8764ed8d5a50d9108103e1962702 +EBUILD rspec-core-2.14.8-r4.ebuild 2789 SHA256 05cbdd3bec71118cfe7159ec6115c08b5dd534fc9ad4b95b4e77acfe584adee4 SHA512 e9686b53d8638b73573df9da5b1ac9eedc0e67f7b28dada684cd917384158ed193f9b622e5bd4f5bab1988833bff9507771f1f59910503f5b32f93919d2cae6e WHIRLPOOL b532e1d92b742c783d7d81809687ef961616e6dce6fced33c579972217a7502409388236ca5c88f9fa04330a6a58937b9ef177231ce05197059d445ae05778c3 EBUILD rspec-core-2.14.8.ebuild 2546 SHA256 93c37ba4215d2012e2b3713236210db8d651760b8372ed332f2d6217ab930b01 SHA512 c0bc2f59dc7003bfa9457654f9374398add77ba7e9808b1485591bd80a941791cac0fedf640c61bea1db2454b548f90191e1b7793a30af94db0dbf269069446e WHIRLPOOL 96332ae0d915b5460ff37079ba746f1a8aaafc7f76a626fca4072aed67ac5a7993d9555d8d5f14558adfadf0de8cf9f6cc5b2e470321cb8f6bcdac0682addd2d EBUILD rspec-core-2.99.2-r1.ebuild 2492 SHA256 9fa5f88e3790dab4d53eff65da11a8a59627837b531b49c4d9d9a4fdb9334fbc SHA512 51f71230434fd7faf609a281b322d5e7c7a5539aeae382c790695d8183b72804ed2d0f31cb207d8866a46dc0ce2d353efa907b340b304afbe6f5b2f05d097d3e WHIRLPOOL bd5388d1d6eb26373f2b7b789f167707cfc6c3b6844bcb349bf78794631109ad67a3455ed751739f5289ce2955dca020c4d5dd932880ace88d895e64545db3ab -EBUILD rspec-core-2.99.2.ebuild 2536 SHA256 43fecdf3408db43893701609bcbe1dc8adbb8bd3cee41d4d9115fd5212d9982d SHA512 f5c6276cc84612f32a14b23afc3bf88dd6d0bc26a692de1859c69eebcb4285cf8a296e80cb5d0d30b8d9f58498f861c6dc718e6c814e2f5179c1cbf98257867c WHIRLPOOL f28744a2df69c3a02bbafdb485859c1754e4c9e6f57bc53f1e7937a248ef2e18c44f68e05226f4335823e3023b3cfcc5df662b17d69b70391158223b0b67136a -EBUILD rspec-core-3.1.7.ebuild 2569 SHA256 d6882aa4dd0f75591e12dd9a494f32618d9e9a448838d67d258c826d905daad0 SHA512 4106abd8e6e794a2a2237c7f61a8a7bde023168c8951db4113095378c375d3c69c7532a72fd015c83eb750475bb174c2c11cab94548d96d243df4a3f59ea7079 WHIRLPOOL 092a22b82f1ab06f33ee1bd887d63a68d23fcde613488e144b6508ad64b10e1ec3ab9de3fee72cc22b0510d1c2293c4ce15503f267b55510093e64cb31cabdcc -MISC ChangeLog 11380 SHA256 9f42b38f8fc8b2c26eb2c0afe8ccb0476681d30d04eef949a75a622d21dc2279 SHA512 8a0b7096d45e8bc3b459fb0756979233eba79eff7dbba55d462037685752e959a83bea32a508f1eb0eeff4714e83dd5c22286afa4cf4ce02984cc3f0012b28bb WHIRLPOOL 3185fe5114e43bf72ee10e806d3b816938052f66b9271c99a8c1129ccbe7e2ff4c699133ac233b8189859037f2fe3451c5cff570ab6f46d6ec45c257d4a6e89d +EBUILD rspec-core-3.1.7.ebuild 2603 SHA256 4b57d6d1a7674b8a2693fd669a7fdbfd95cceb34b30484b560799acbf0a56df7 SHA512 328d9dac2a62f8f4410e07f83d0f9a1a9db0729afcd419ed2aa03b955633fb6ba1f787895d4101c23f3916e32efb7eba811edd5e6ee5cba9a40d6daaae8d2bd9 WHIRLPOOL e7bdfec2f56422fe9379915fe0129f1d084343cf55af23cd0c7c0346e2bdbcc6297fa899ee20970000f494f0dfa2281876df3b63caccea7e503eb4c7f67c8a78 +MISC ChangeLog 11695 SHA256 d92f131efd5dcfc48df804ffa4e9a9a34e7c82b099ef159c6cd96660229f704c SHA512 505bb8b5e58ac6532c4cf2d35363d6830a6b774c3c362ccb37aad9aeb2b3d207e524f04e3d7147295399d7f64e391cc006f267b2d72f091d12e5e63177a8257a WHIRLPOOL 473be3f4ae017b37625602e68571797fda6f3b651a2e690332a4b802fe49b23c78a07df4a06d31671a9def3a8737c8a37a6dd57a55c36a4eee16efbe99d43273 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSf14sACgkQiIP6VqMIqNeNHwD9H3EQkw1VDSfucX1JKQNYI8bu -USNJy5Hx9szs8Xqsc1MBAIf+JGweZgPTowvnVJDCsbZoEiKz3FcpSwTzzEY7fzX6 -=LIjm +iF4EAREIAAYFAlSpEhgACgkQiIP6VqMIqNfq1wD/UMiSiltRZcjTW1J77vLM+bAd +HeXicrlq/0kfFDxseQwA/A5vhYFULH6FRzouPt9JzP4OBdSylubycOv++PZSxqtT +=5cwc -----END PGP SIGNATURE----- diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild similarity index 75% rename from dev-ruby/rspec-core/rspec-core-2.99.2.ebuild rename to dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild index c07c98086c30..25e0c4144bfe 100644 --- a/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild +++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2.ebuild,v 1.1 2014/08/20 05:40:55 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild,v 1.1 2015/01/04 10:12:39 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_TASK_TEST="none" RUBY_FAKEGEM_TASK_DOC="none" @@ -13,6 +13,8 @@ RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" # Also install this custom path since internal paths depend on it. RUBY_FAKEGEM_EXTRAINSTALL="exe" +RUBY_FAKEGEM_BINWRAP="" + RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec" inherit ruby-fakegem @@ -31,7 +33,7 @@ ruby_add_bdepend "test? ( dev-ruby/syntax >=dev-ruby/zentest-4.6.2 >=dev-ruby/rspec-expectations-2.14.0:2 - >=dev-ruby/rspec-mocks-2.99.0:2 + >=dev-ruby/rspec-mocks-2.12.0:2 )" # Skip yard for ruby20 for now since we don't support ruby20 eselected @@ -45,6 +47,11 @@ all_ruby_prepare() { # Avoid dependency on cucumber since we can't run the features anyway. sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die + # Cover all released versions of ruby 2.1.x. This should be reported + # upstream since ruby 2.1.x uses semantic versioning and the file + # should not have the full version number. + cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.1.html|| die + # Duplicate exe also in bin. We can't change it since internal stuff # also depends on this and fixing that is going to be fragile. This # way we can at least install proper bin scripts. @@ -54,19 +61,12 @@ all_ruby_prepare() { sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die # Avoid aruba dependency so that we don't end up in dependency hell. - sed -i -e '/aruba/ s:^:#:' -e '/Aruba/,/}/ s:^:#:' spec/spec_helper.rb || die + sed -i -e '/aruba/ s:^:#:' -e '104,106 s:^:#:' spec/spec_helper.rb || die rm spec/command_line/order_spec.rb || die } each_ruby_prepare() { sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die - - case ${RUBY} in - *jruby) - # Avoid tests specific to jruby but without jruby 1.6 support. - sed -e '/JRUBY_VERSION/ s:^:#:' -i spec/rspec/core/filter_manager_spec.rb || die - ;; - esac } all_ruby_compile() { @@ -78,3 +78,9 @@ all_ruby_compile() { each_ruby_test() { PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." } + +all_ruby_install() { + all_fakegem_install + + ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"' +} diff --git a/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild b/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild index 83a0dcf11a65..2da5a89ecde0 100644 --- a/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild +++ b/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild,v 1.1 2014/12/28 10:12:26 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild,v 1.2 2015/01/04 10:12:39 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" @@ -30,6 +30,7 @@ SUBVERSION="$(get_version_component_range 1-2)" ruby_add_rdepend " =dev-ruby/rspec-support-${SUBVERSION}* + !!