From: Hans de Graaff Date: Sat, 27 Dec 2014 20:59:40 +0000 (+0000) Subject: Add ruby22 with ruby patch for compatibility. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f19246e672fc923461ce1b36f0b7a1ba985f94f3;p=gentoo.git Add ruby22 with ruby patch for compatibility. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog index f82ea94f9682..b299fbcba35e 100644 --- a/dev-ruby/json/ChangeLog +++ b/dev-ruby/json/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/json # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.150 2014/12/10 06:41:13 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.151 2014/12/27 20:59:39 graaff Exp $ + +*json-1.8.1-r1 (27 Dec 2014) + + 27 Dec 2014; Hans de Graaff +json-1.8.1-r1.ebuild, + +files/json-1.8.1-ruby22.patch: + Add ruby22 with ruby patch for compatibility. 10 Dec 2014; Hans de Graaff -json-1.7.7.ebuild: Cleanup. diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest index da02bbf67073..974139304dfa 100644 --- a/dev-ruby/json/Manifest +++ b/dev-ruby/json/Manifest @@ -1,17 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX json-1.8.1-ruby22.patch 513 SHA256 839b84fb4840fd1ca51a26f6dfb7fef355b866bfa3530c340d670a2b4d5d7863 SHA512 34ca964ae56c51aba2221c61cf95cc172fcebe5f450a93139d4266f9fdf87b2a2650cc973a2884724cbefce075d1e1a9cdf3c09626abcfe4d044003d5f5697d1 WHIRLPOOL cb40f9d362d6607d7f30046f97be7fbf43f9b845aa5208e44d83af97c46c05a1c4ca15e164727ddb02f23ba55a82bfb91bad5f869be35f4983b6520f75b36459 DIST json-1.8.0.gem 148992 SHA256 87e49cccff3fb2091c53141a605956e8d9a252cda43128714f9fdb51d0ca1729 SHA512 7a8ae0d975e10be06d1026df6c9736e8e724814ea7ef8c92b512c60fd7b4ac18e46a9f44615f57407e58decebc4891e2e97b78a177f7e283cc540619264c4400 WHIRLPOOL 159cd8d1cf95d6f7ca5ed16ec294015f873453a1ec8f9eb3667442c0ca582487e5dfcd78d2106c72c5a3563e1ace5b69f2c256c05a35630f09c3499b95f12505 DIST json-1.8.1.gem 148992 SHA256 961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200 SHA512 ad729c00a9f7b4940e077a151a1e74f054d9df5bff8bac996634b3df3eb42ad7c732035c4bbb40de92816c3989339b113c4fecebd36ee3f5c301b76169fe4fb7 WHIRLPOOL 01c7444598612055b73dd0cc3f803210b9936028523dd446f3a1808b3e87fa94825c4daf1267472945898def78ce7cf851d9325d2235aa7008d3bba470839e40 EBUILD json-1.8.0-r1.ebuild 2161 SHA256 365def817ade2898e2e493f877b1b697c68a1dff13985b5856b6eb08fe63d409 SHA512 1f1376f92d15a8dc8224744fee370511f68c8af49026fc28b7cb76d57984867cb996116e2513e6d623df7a8b78e1e6ba928b15eb1801893f7892a7abfffdc310 WHIRLPOOL d72127b99bd383e10e8e7cba4a0048031ba6260b849a3c47a477c54211f08cf5e7cf1586beeaa249c0ffdd6d58b278addd84a7dea44d5899c2240828eb7fc6bb EBUILD json-1.8.0.ebuild 2133 SHA256 1130ce580987f27b5a0022c05dcf6dfc65c82a0dadd66eadd4f14e0c76d5f2e1 SHA512 79c985b23274e5ab3e7e527a3780bb16a5e6bca5256b29f6361318b126fe64d76c1425d896e9849685ecd5580161d90aedbb6d183adc3ce2cd32e7b68962fed2 WHIRLPOOL 3745cc00018fab4c26d8139aa1e899518629a140941a6cf544ee8956bbb0fd70636fb5c340805a21ec785ea50d0ea16f260be7402c817295f2d36fdba80a36be +EBUILD json-1.8.1-r1.ebuild 2211 SHA256 835170ea6bb59994b90c17aad96a2ebadf3914abd75e6a482bcc8d6ad342d9e4 SHA512 e06c008bb0bc3da032aa64157f004350b5ff4095e2df9f525d201950c7908f52b2093bad4073346fd86e11308367461f3094fcd3ecd2aa4c25ceaeeb1deeccba WHIRLPOOL 9ec8f1369ea1da123b35cef2f91242b634c34d309ea566cd500cb4f8faeb0e43e9fe3234cb2b394f43906c60819ebf20111fb2c3dd6430fcb046388bf61fb5e4 EBUILD json-1.8.1.ebuild 2165 SHA256 525850881495262ca93067fd5d36a791dcd912de1b6df391318a0c892b6a868e SHA512 915a3569dc0e35646640c8ba9c27dd2a6b5ef0ebd5ab1875fdf8367d3e1f8143c32c26090f13e0000cd394de6c9e292df5cc416d3661aa8565375cd231a79450 WHIRLPOOL 1fd9e4fad1ee2df5d418062eabd32f3c0d564da2e175a07cbfff4607aed591797ce246e62c96fe1a9331dd1998a88b5bb9048a780bca98d4f28d871778c1ea76 -MISC ChangeLog 18489 SHA256 d0dc11fffbabdcb45781ef534c801bd7f1191d16c26154f6d6334d84b24cea95 SHA512 990c131056999904e1b232186e53fd61a2100a05ac1c53f014bd2b91131fa0ad4d36e8a9ed9029a95470eaf2f348601aeb90ce01049a5e162cfec44f6b25f786 WHIRLPOOL 71883118a6700c042b626f4cc06515da5635333ec1ba3e4622e121b13856a4994dcc077405c28423c29aa918de532cf500334a8cfce0a354c4edaf8bbb2197f9 +MISC ChangeLog 18675 SHA256 cd3b461c6646c647657cedbae2a47297cc01cc1fc49a8995e657c71dcdf543d6 SHA512 cdea7f2cae90eb4c54306036cb3854bf706fac5ea2c1b1c92a50b9fff28585e502b4aad12ac3f1dbeedf90e13683c8150b57bca44def8bacde223d96aac3e608 WHIRLPOOL 12bd8f33262e934d87ededd9cc68d70e662ad391311b879f8ed9b2cf1dbafec522551d61f72c2ee0ce8dd2ce6ed11ca516cbf2e4ac8fc83f62ed3190effce205 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSH6woACgkQiIP6VqMIqNedWgD9EOW3my/x9qFl+Sr0RTTofJq9 -X3JkDgKV7zG+OuWeeJYA/RZq811foK04IKGvmaCilX6toet6KIJv7OOqnCRhYl+z -=Owdm +iF4EAREIAAYFAlSfHbwACgkQiIP6VqMIqNddoAD9FrTVkyaOH1OjutBKrcxr5dGE +WqMdOQlM4jomgdh7fC4A/AsMYQu9Q3o13RONBZxrDc6nau3le4NAE9yDJEFQQHhi +=8t5F -----END PGP SIGNATURE----- diff --git a/dev-ruby/json/files/json-1.8.1-ruby22.patch b/dev-ruby/json/files/json-1.8.1-ruby22.patch new file mode 100644 index 000000000000..a2d55c44ed57 --- /dev/null +++ b/dev-ruby/json/files/json-1.8.1-ruby22.patch @@ -0,0 +1,17 @@ +Fix compilation issue with ruby22. + +See https://github.com/flori/json/issues/229 + +Taken from the ruby-core changes. + +--- ext/json/ext/fbuffer/fbuffer.h.orig 2014-12-27 21:27:31.701991610 +0100 ++++ ext/json/ext/fbuffer/fbuffer.h 2014-12-27 21:28:11.252956858 +0100 +@@ -172,7 +172,7 @@ + + static VALUE fbuffer_to_s(FBuffer *fb) + { +- VALUE result = rb_str_new(FBUFFER_PAIR(fb)); ++ VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb)); + fbuffer_free(fb); + FORCE_UTF8(result); + return result; diff --git a/dev-ruby/json/json-1.8.1-r1.ebuild b/dev-ruby/json/json-1.8.1-r1.ebuild new file mode 100644 index 000000000000..24add25dfff2 --- /dev/null +++ b/dev-ruby/json/json-1.8.1-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.1-r1.ebuild,v 1.1 2014/12/27 20:59:39 graaff Exp $ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="doc" +RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown" +RUBY_FAKEGEM_DOCDIR="doc" + +RUBY_FAKEGEM_GEMSPEC="json.gemspec" + +inherit multilib ruby-fakegem + +DESCRIPTION="A JSON implementation as a Ruby extension" +HOMEPAGE="https://github.com/flori/json" +LICENSE="|| ( Ruby GPL-2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="" + +RDEPEND="${RDEPEND}" +DEPEND="${DEPEND} + dev-util/ragel" + +RUBY_PATCHES=( "${P}-ruby22.patch" ) + +ruby_add_bdepend "dev-ruby/rake" + +all_ruby_prepare() { + # Avoid building the extension twice! + # And use rdoc instead of sdoc which we don't have packaged + # And don't call git to list files. We're using the pregenerated spec anyway. + sed -i \ + -e 's| => :compile||' \ + -e 's| => :clean||' \ + -e 's|sdoc|rdoc|' \ + -e 's|`git ls-files`|""|' \ + Rakefile || die "rakefile fix failed" + + # Remove hardcoded and broken -O setting. + sed -i -e '/^ \(if\|unless\)/,/^ end/ s:^:#:' \ + -e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die +} + +each_ruby_compile() { + # Since 1.5.0 a Java extension is provided but it does not compile. + if [[ $(basename ${RUBY}) != "jruby" ]]; then + ${RUBY} -S rake compile || die "extension compile failed" + fi +} + +each_ruby_test() { + JSON=pure \ + ${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "pure ruby tests failed" + + if [[ $(basename ${RUBY}) != "jruby" ]]; then + JSON=ext \ + ${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "ext ruby tests failed" + fi +} + +each_ruby_install() { + each_fakegem_install + if [[ $(basename ${RUBY}) != "jruby" ]]; then + ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname) + ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname) + fi +}