From b7a26ebabd353d5721752eb9f7238935af2ebe5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20R=C3=BCger?= Date: Wed, 26 Nov 2014 02:08:04 +0000 Subject: [PATCH] Drop jruby target. Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- dev-ruby/minitest/ChangeLog | 5 ++++- dev-ruby/minitest/Manifest | 4 ++-- dev-ruby/minitest/minitest-4.7.5-r1.ebuild | 4 ++-- dev-ruby/multi_json/ChangeLog | 7 ++++++- dev-ruby/multi_json/Manifest | 12 +++++------ dev-ruby/multi_json/multi_json-1.10.1.ebuild | 20 ++++--------------- dev-ruby/multi_json/multi_json-1.5.0.ebuild | 9 ++++----- .../multi_json/multi_json-1.6.1-r1.ebuild | 9 ++++----- dev-ruby/multi_json/multi_json-1.8.4.ebuild | 20 ++++--------------- dev-ruby/multi_json/multi_json-1.9.3.ebuild | 20 ++++--------------- 10 files changed, 40 insertions(+), 70 deletions(-) diff --git a/dev-ruby/minitest/ChangeLog b/dev-ruby/minitest/ChangeLog index 242cd22896ad..36554824ab8b 100644 --- a/dev-ruby/minitest/ChangeLog +++ b/dev-ruby/minitest/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/minitest # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/ChangeLog,v 1.173 2014/11/26 01:52:15 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/ChangeLog,v 1.174 2014/11/26 02:07:59 mrueg Exp $ + + 26 Nov 2014; Manuel Rüger minitest-4.7.5-r1.ebuild: + Drop jruby target. *minitest-5.3.3-r1 (26 Nov 2014) diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest index bd523761e898..ba27410ab725 100644 --- a/dev-ruby/minitest/Manifest +++ b/dev-ruby/minitest/Manifest @@ -1,10 +1,10 @@ DIST minitest-4.7.5.gem 57856 SHA256 3e0ac720a6d0787b4c822514739319493e187400e993fba96397bd64d58ae60e SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851 WHIRLPOOL 49bbc557d62053b58208e6aef13dba085f393dbecd731b2915a0b885393ba2b4f1a612b46a018442d2f4fcfda9dfbe3025ae72d2946106a589623748fa4b382d DIST minitest-5.3.3.gem 67072 SHA256 b17c560235e6ab96ed243d7a821e4370af1316ad7a845188d22c56d7d71302d4 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509 WHIRLPOOL 66c72352b2cdeeeec494be4b2b0aac49153bce9d37c0dbcc9bb0eec4f4759d3f61fd12bbbda0a2a7f26bb75741033a4208da02f1f1a892ff3819bb597218d45f DIST minitest-5.4.3.gem 68608 SHA256 a41b54b1c6e64b102fe78bf265045896845c38177a10bdb32d04caf4e06542f3 SHA512 2a2df1502e449732d39da377c262d8c481e5b6399b39781c5d55fb0c3065f3dc4cdd326794a16731b2dbc970c40b4dc1399929913fcc2dd1f8ffb1f78df81a9f WHIRLPOOL c58bcc6ed3ead20ac4c6a8782a77686b2df13954b3a3a849730f40f150c21ba6052bcd2d78e9ce5f8f593c37a69f3502cceb0398bd58dcc87c99639bba854335 -EBUILD minitest-4.7.5-r1.ebuild 884 SHA256 a71207e14d044efd61cf98eef3d4b1713e7ac81aa99fcfb1b25f25e942601b43 SHA512 b944460e1fe3b472f3e8baeb7ea0504e67e610b82c8df009863ddf034faaf5fe0b35bb393a1996bcc2d5050c9fe19ba4cf485ab95157fcb152f4f9c8b36f738e WHIRLPOOL f55d83c5d66744f9ba39ff580fbb866ee71927995640fb7b67083b97921009198f4a9d85ce5264906eb494662ffba97dd14e045d1137ba1b0674ef4c33273524 +EBUILD minitest-4.7.5-r1.ebuild 878 SHA256 c03f6c0aa819224c5449b8609b8485830361cb8152678230119a0edd95a0d3e7 SHA512 09b794631dcc5e29fc92c4d03be8eac1311e7d9bb8af60ac32c17ad077597d39116037a946329fa5c334ecf416f54f9a8b2758e073d2c9bf1bd36e0cd479cf14 WHIRLPOOL f3774651bd82a69fb5fa9ff43dc3afe41a025e71a0767e14e021fa1dba8dd288f7ceb02ee30dfe288ff00a25908f8ea59d40466b675beda7875485e68f5dad3e EBUILD minitest-4.7.5.ebuild 860 SHA256 141e95f97e6739b526ea33aee2777c09dad8faa783c6800dc3be1883626b5b33 SHA512 db0b9a7f379f41fc0f30bb32631f8198cf5fc6b3d3307d675e2c26141043fd537d2f0196622b5f8e77eadcb953b56d31f2cfeeaa304a7ebe9e39a69c884dd061 WHIRLPOOL 23713f5ea0155e64f0be0424580bf13025f7c36c34ee951cf9c4a212588f739e7d1c6de750a1d2a0e96315ec28e6754fbaa3c6403616dcc222a631e5cef55a5f EBUILD minitest-5.3.3-r1.ebuild 927 SHA256 77f89a91dbead259ffd4b9610dde6f031f7f5d0867fa315b54bf86de893781b5 SHA512 fd74245426e098ae9b375a69e5e519e9950911c49a94e48d4e87c7e2f28747204ade1f833d2e89c89235afc10932caf9437757e96f99b4f1f01a9e482ce6df00 WHIRLPOOL 61afdd279bd505f7b2755d5589e007d8ec33b3b5686e2eda5cd2826289c6d6e2d0fe44e210f065de0a1460533c23936d9cd160065bf6c90b23139f1796a332d9 EBUILD minitest-5.3.3.ebuild 909 SHA256 1f2ec37c9a1bc5f0b3e8bf3f41770c4922f264faf712841766d5e311230e75b7 SHA512 1f24aa0c47e2d642912cd3bb294af102472864a4125fe0e2eaf1765baff434d520139fdbe0fb61ddd22aedde9df1c847a0f70c98093ca078442ff75c3c312eed WHIRLPOOL 45ec7d791203061567770fe3d2608d9d5d58002b7897f647cd9205fac253af2754c9af52a1ef0ddfed175e56cba85bde55b516e965d78be46b4735b2b5ba9ce0 EBUILD minitest-5.4.3.ebuild 1184 SHA256 83aed10c59e5d301782c3d16c04ddc60f599a1325be3ff9a9cb1d61eb18c6196 SHA512 e6cfa14df6152820d0d6b81a5dc09770838acfcd2e04eb38d43c426ff44a89bf7f281d560ae4fb914701bdac6cff7241d18a86895118a1bc2073f12450e0142f WHIRLPOOL b53942424d2cf05717ad9428292010cb638db13a792b94984a9822d2530a11be8d869435ba7b627cad88d3e04a4aa03463f3b7cf1eec8b09c2473381f8b057ea -MISC ChangeLog 21849 SHA256 f5d41547d1a51fe8580fdc3553a3ebaa82ca24421f1c46262254e92375d189cd SHA512 c0e7f95fe71750603692523de2bd7dbc8a092198af3e5c4419ed24455d55f69c9d7d2ea92c03ba8e290bef1b70ba54faaef4de58b4a966ec9eb5b126daf89643 WHIRLPOOL 777b23d08533840cf31ca4ea62314a9b43eaf21116d64d2cce5e2ede2266255821231d696dacc1a6ea2c2de8ca17176978bd0d66e051b49d3899972b6af6be94 +MISC ChangeLog 21945 SHA256 17ed8af5bf156153209f337d638dceec0508d38936bb0649dfdf5c14ee6892e5 SHA512 8adf5c924fdc6381d0f593e1e30e1937570935381a30af9b8d541e68d8f98e9c9167ab526dbffa715a26fa2294f12cb3af41df57930553cc5bb200b5a60c0fcf WHIRLPOOL 16ee0fa8d0a0935e685375c9d46bed5a66753be51650c3a55ecf8af9c2699dcc97e044eff7417a081ff08549ebcfc1ab678d632986238f738ab6e1355eca331d MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b diff --git a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild b/dev-ruby/minitest/minitest-4.7.5-r1.ebuild index 8791797f7856..f9cc330f1593 100644 --- a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild +++ b/dev-ruby/minitest/minitest-4.7.5-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-4.7.5-r1.ebuild,v 1.3 2014/11/25 20:52:47 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-4.7.5-r1.ebuild,v 1.4 2014/11/26 02:07:42 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog index 15586d585b35..b455243f163b 100644 --- a/dev-ruby/multi_json/ChangeLog +++ b/dev-ruby/multi_json/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/multi_json # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.46 2014/08/30 11:28:01 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.47 2014/11/26 02:07:59 mrueg Exp $ + + 26 Nov 2014; Manuel Rüger multi_json-1.10.1.ebuild, + multi_json-1.5.0.ebuild, multi_json-1.6.1-r1.ebuild, multi_json-1.8.4.ebuild, + multi_json-1.9.3.ebuild: + Drop jruby target. 30 Aug 2014; Manuel Rüger -multi_json-1.10.0.ebuild, -multi_json-1.6.1.ebuild, -multi_json-1.9.2.ebuild: diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest index 9e87cc15c80b..50f5216851bf 100644 --- a/dev-ruby/multi_json/Manifest +++ b/dev-ruby/multi_json/Manifest @@ -5,10 +5,10 @@ DIST multi_json-1.5.0.gem 15872 SHA256 e94cf8a6db88eb35657b20f5a17631fcc7e46a867 DIST multi_json-1.6.1.gem 24064 SHA256 8fe5991287b6d1a77719feaa03e460ab1f8c689b326106f6e627c54419d7635c SHA512 1672a4c7cad6ad4f9bd532b425a71ec7be2115675c04f66afbb203f2e1c078543175e4d0e01f118e86e503d29e078f52a6beb043e98af4e51de3c32f5eba402b WHIRLPOOL 5f1cf218f9214d3f2e62aa54c5cc8bf3175269f66d13e6f1f73e4235112bdaa10b88cca9887ca1f4eb2f2cefad8360b4a81add877d16dc767667bc357b62b226 DIST multi_json-1.8.4.gem 29696 SHA256 011a3868b5179a3c8bc87b6f3568124d6e2ee0d4f19321ce8c976b0668164585 SHA512 a998f2800bdad3990dc678d538095671307958a2996c3eaaa08430c53dfab33421aacba1a579d7afc7f4c6d8994bd3c61fec4467d0cd2e14a8145d709cee8963 WHIRLPOOL 32db0dc927b816010587d22bc71cbf72bafd1a9d080a43abf3ef910ce15d32a3dae72ec12cbcbc2cdb6c9deabd5f2810ab65d47ff841d3fa0cff798b8c58b212 DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0 -EBUILD multi_json-1.10.1.ebuild 2302 SHA256 e73899b10a56615ca17b6c934e5073915dae7cc647cac2051e802130277cc26e SHA512 5b1c1ed09ec7c98e9c12e07dc9016ecfa714e80e4604e8fde4f7b298de807f665199bf5bdc6268608fdd38afa5ba342c760684dd2df119941d42bab37fbec63c WHIRLPOOL 856fb901fd4df0a87a6187111ee875eae4b695b9e99e4524854d89d68dd2b49f7ce6edce35c5a5db6ae00acb4b71e4e406c4e79c5e59445878d1b7c992f00cc7 -EBUILD multi_json-1.5.0.ebuild 1773 SHA256 3b44a305590552da17c14d84d47e551367cc78ca7609431d1fd723eb29f9faeb SHA512 1282c7ea98eb2b6794180004987f16b821decec2f34459f773eb80b42e7192218584b41a834b9a8d31fedfefe465851c55d11776b7b4c1584e6a2ae05a8f32d0 WHIRLPOOL 74ceb9852a67cef138c3d897003fef5283046b4f8bab87cdf58b2dcc1c29501ede19837a64627d2e7d87c5de07a26adae6f2c8b218652532c24b8e3309ed6101 -EBUILD multi_json-1.6.1-r1.ebuild 2033 SHA256 9e14e3364856e0e2d44e4e85a49c1951ec1b000bc0fc6992ee0d12b3348d9f92 SHA512 85c7a0e63bd18ce7c1e80c93a41efb8c49a6536fe25da398c18c1a35d6b92c058602790b198e7971529f30d98b7e3daf67452d1b3aaadfd2b2adc5ee12d72636 WHIRLPOOL 4d2e0402be7bb5b36bf43bfe35e8e53fb40c7d13293cbe4d1f4903ae710e31d9372fbdde5b1f55fc43080b4014480ba422354eb65789d06366c99ea0ba70f1ec -EBUILD multi_json-1.8.4.ebuild 2349 SHA256 1fe9c41a24f30a0e5fccd5c28629ccdfab441305b18d3cb28dfeb2b7bbb97313 SHA512 32e2c9db125d50704dda8889958d5af733f788437f904d5b7d6e98f4273509262e96ad1f3be7a067aee8f5ed5829c0858c220be272c69b3f60d09bcf6ad20d70 WHIRLPOOL e8302a4608b994b8e74c264be051b189136451fade36f4f4d0008bf1a0ebf2155ae897e0256a1e08ab45d86700256a192a6e6d61fae417bd8052618223a75a8e -EBUILD multi_json-1.9.3.ebuild 2356 SHA256 e1d6fff3c2af51646e097f7b98c362df6225cf2f51741ce987140ede2aa6c5dd SHA512 c93792319876cd0fc1707cf12e4bf28b4e30ccad8b903e393b2bdebf0022209052bf133e3c09655a7e369d12e84e2934679c269b37e3bf1b844836bf2c3c7334 WHIRLPOOL a3621f275a53fd72655ebe13b08c796e89f9191428aabecd9797672508dd22bbabec0bf5f0c219ce79064ebbc56b8de1f8b3d03069289c943253fcb0626fe323 -MISC ChangeLog 7152 SHA256 046d3dcfcf3838d49af08ee9e0702d7facaed8a8b44d88bc8058f27fdcda1fb1 SHA512 9f239167dfbad83cb99e2f4c734c8dae37190441049ec00a633734ca693233c921bc77672a85c05ba35253a393018509ffe3966ecbe2dc09c9884f97d7823de5 WHIRLPOOL 1dfbc7187d6d62b4d4b89de79c7dbd8116a1d11eb3fe9a8220bf7acbaa7a63a971e3663dbee9362df150c45c723a0cc30cfcde4955a814dda279e900eb243879 +EBUILD multi_json-1.10.1.ebuild 1975 SHA256 b21c4c05230198d71f2a363fc736a68233f73d192cd924ad31f8ba55a6800413 SHA512 d1eb7c7b6d188f4bf7e92c7d155a66b6ad38e6c2de97dce70fafedb7f3ceddc4e36e16eef7f24eff542d51639114d15492126f709856120becf25c521d16ffec WHIRLPOOL 3b4e37413cebc269b13364dbbce2e59da532e9382a572f2e2d7dc7948fcfaa8aee6850bba22f01b05405f3eff29836b280735ef3a87b8c7b1d7cc242eccd2236 +EBUILD multi_json-1.5.0.ebuild 1706 SHA256 67022c10a4aad041decd7ca9c1952dc268aea904746a7004c0a96fcad0e592ca SHA512 e6422cb611df3b5640c28ca478e691c54ec911dce7c477ab19b0e3ca5b333dfa6997bd32819fd28c1e824064dd1217dd71a8e5cf02f858f1736ea9d272cf8c47 WHIRLPOOL 1f2b03a0533895084993b188d25bac7d6fa955b52726cbded7562d180553c076ba81982472db0eac5cf8415d71937734dd38e5189af936c5076dcb63db32b5f0 +EBUILD multi_json-1.6.1-r1.ebuild 1968 SHA256 bb799710368b3df4a35f47154b8461a797c842d068db06af4656d222985f4bc6 SHA512 7fb9516de0c744f8a5133c46af15c5726780dad9c40e2597cbf10c54d4730da40ad86532332d675fc511134b4123feab71827177c6b757d068b61fac332c6daa WHIRLPOOL 446dd4d643c62ccc0835c733ec6f88188796e6a746c52dc62dedbb043bd38ed445eec35bd6873470e6b416958a3762700b3a7f78b76e0b3eba5202f1af7db1df +EBUILD multi_json-1.8.4.ebuild 2022 SHA256 340d5f2efdaf1c7134363154da8d09403e540c27cf419d1ed073ec9a19c23a1f SHA512 2a741a08e67238f913e0d544087ed2d1d1cfba938f04b99711e3d75432b974d549fd45fd930ab05e30ba2a7e4ffc28ab5898f1d8c2915f06b2351caa50643efe WHIRLPOOL f6a3f792c3240546628005c09a65565e24a27f210c0bc23e028304b71adfa2fb80e59df3d71387f9bdd36c9972e9efa3339e929bf5fbdcac6f683eed918ae730 +EBUILD multi_json-1.9.3.ebuild 2029 SHA256 b92666573c0c5b5837baa918e70c411e4f0e286d05e9135b27924f0976474c7d SHA512 99e134c0c0ac6f51bf91c402fd2870f1e4086f2ef87237e4d86794e387ea369fbb00e5aa06f93a95c73b7766a4a19e528cbfc3f0ec276f3a2fdd88a20fd58ce7 WHIRLPOOL 4367fc4e791bc40ee2d019e05f573679bb165d7f93ebbf655e66aa28902babe0696ce88a435ad6a4b5f998fe923c281a710b49786e2e1b9a936017cc4a93645f +MISC ChangeLog 7355 SHA256 bd35fc06c3585d58ba2cc22e964c04351caff1e70581449cf434040b3f043691 SHA512 703cfa997e1adb84afa478d7f84906253e7d2e602addff7f3ec059f3536deadc7714b6cd7f1f48e55cfc93cb7337ab0a4efb3ab08b1cf0cf3ad7c1b64407ca80 WHIRLPOOL d4fa5275e43e5d028579c876662bc4508cdfdf7a06f0f1f26b74efcef6054cad69f0d6b981ed1a63da2bce820ad9bd8e13a203e69119d39509cf145fa5cb3967 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b diff --git a/dev-ruby/multi_json/multi_json-1.10.1.ebuild b/dev-ruby/multi_json/multi_json-1.10.1.ebuild index 46ba4bf1da62..bf2f79aaed94 100644 --- a/dev-ruby/multi_json/multi_json-1.10.1.ebuild +++ b/dev-ruby/multi_json/multi_json-1.10.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.10.1.ebuild,v 1.2 2014/08/15 16:56:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.10.1.ebuild,v 1.3 2014/11/26 02:07:25 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="yard" @@ -28,9 +28,8 @@ ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-1.0 =dev-ruby/ac ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )" -ruby_add_bdepend "test? ( dev-ruby/json )" - -USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler." @@ -55,17 +54,6 @@ all_ruby_prepare() { rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die } -each_ruby_prepare() { - case ${RUBY} in - *jruby) - # Compiled code is not supported for jruby 1.6 - rm spec/json_gem_adapter_spec.rb || die - # jr_jackson is not supported but needed for the common tests. - rm spec/multi_json_spec.rb || die - ;; - esac -} - each_ruby_test() { for t in spec/*_spec.rb; do ${RUBY} -S rspec ${t} || die diff --git a/dev-ruby/multi_json/multi_json-1.5.0.ebuild b/dev-ruby/multi_json/multi_json-1.5.0.ebuild index 7dcef47859ff..2c55e11cbbd4 100644 --- a/dev-ruby/multi_json/multi_json-1.5.0.ebuild +++ b/dev-ruby/multi_json/multi_json-1.5.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.5.0.ebuild,v 1.7 2014/08/15 16:56:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.5.0.ebuild,v 1.8 2014/11/26 02:07:59 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 jruby" +USE_RUBY="ruby19" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="doc:rdoc" @@ -28,9 +28,8 @@ ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/ac ruby_add_bdepend "doc? ( dev-ruby/rspec:2 )" -ruby_add_bdepend "test? ( dev-ruby/json )" - -USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler." diff --git a/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild b/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild index 9d986864fc3d..e815394b8513 100644 --- a/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild +++ b/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild,v 1.6 2014/08/30 10:27:56 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild,v 1.7 2014/11/26 02:07:59 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 jruby" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="yard" @@ -28,9 +28,8 @@ ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/ac ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )" -ruby_add_bdepend "test? ( dev-ruby/json )" - -USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler." diff --git a/dev-ruby/multi_json/multi_json-1.8.4.ebuild b/dev-ruby/multi_json/multi_json-1.8.4.ebuild index 24070f23b890..d3e0be6f21a7 100644 --- a/dev-ruby/multi_json/multi_json-1.8.4.ebuild +++ b/dev-ruby/multi_json/multi_json-1.8.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.8.4.ebuild,v 1.4 2014/08/15 16:56:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.8.4.ebuild,v 1.5 2014/11/26 02:07:59 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 jruby" +USE_RUBY="ruby19 ruby20" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="yard" @@ -28,9 +28,8 @@ ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/ac ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )" -ruby_add_bdepend "test? ( dev-ruby/json )" - -USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler." @@ -56,17 +55,6 @@ all_ruby_prepare() { rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die } -each_ruby_prepare() { - case ${RUBY} in - *jruby) - # Compiled code is not supported for jruby 1.6 - rm spec/json_gem_adapter_spec.rb || die - # jr_jackson is not supported but needed for the common tests. - rm spec/multi_json_spec.rb || die - ;; - esac -} - each_ruby_test() { for t in spec/*_spec.rb; do ${RUBY} -S rspec ${t} || die diff --git a/dev-ruby/multi_json/multi_json-1.9.3.ebuild b/dev-ruby/multi_json/multi_json-1.9.3.ebuild index ca6d9b6297b1..6fe547b7206b 100644 --- a/dev-ruby/multi_json/multi_json-1.9.3.ebuild +++ b/dev-ruby/multi_json/multi_json-1.9.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.9.3.ebuild,v 1.2 2014/08/15 16:56:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.9.3.ebuild,v 1.3 2014/11/26 02:07:59 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="yard" @@ -28,9 +28,8 @@ ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/ac ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )" -ruby_add_bdepend "test? ( dev-ruby/json )" - -USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler." @@ -56,17 +55,6 @@ all_ruby_prepare() { rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die } -each_ruby_prepare() { - case ${RUBY} in - *jruby) - # Compiled code is not supported for jruby 1.6 - rm spec/json_gem_adapter_spec.rb || die - # jr_jackson is not supported but needed for the common tests. - rm spec/multi_json_spec.rb || die - ;; - esac -} - each_ruby_test() { for t in spec/*_spec.rb; do ${RUBY} -S rspec ${t} || die -- 2.26.2