Version bump: compatibility fixes for Rubinius.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

3 files changed, 77 insertions, 5 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 19c1b931a0a8..56cdf0d6622d 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.19 2010/02/27 07:38:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.20 2010/03/01 07:09:43 graaff Exp $
+
+*json-1.2.2 (01 Mar 2010)
+
+  01 Mar 2010; Hans de Graaff <graaff@gentoo.org> json-1.2.1.ebuild,
+  +json-1.2.2.ebuild:
+  Version bump: compatibility fixes for Rubinius.
 
 *json-1.2.1 (27 Feb 2010)
 
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 86b2c7827915..87d377286fc6 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 DIST json-1.2.0.gem 385536 RMD160 f144cf6c41c2b52621359d353c5ae22e3e3d366b SHA1 418f823b76ba63a3af0b0f082aeca1fdb9105b41 SHA256 c79e55447aa2774079817589a888b8291273ff344a7fcb28a1428c8746862e6b
 DIST json-1.2.1.gem 386048 RMD160 a14ac15177bc0a2eb96c85ded42a787d1df963cd SHA1 78bdac383ee383221652f6e68e5f03a9675e198f SHA256 4ab9da3d9c720a7e260d35a309da485c37866565cf4ac4c83f2dd0be277aa95a
+DIST json-1.2.2.gem 386048 RMD160 d0451e6b6a781ef840860136cea7513f2e58f9ee SHA1 056c6dd361f2985167f49ef040bc2b119d899179 SHA256 9b0e4c2fcc1d61354106ff803b6d89357584c8969b0028c71070591d04f64012
 EBUILD json-1.2.0-r1.ebuild 1861 RMD160 450c4802caaa7c8c3ac7083dd063a03c8762b3a0 SHA1 6db8ffdbff49f0b5c9fac43f3c419c8fc8d17ac7 SHA256 4c9e4c270796510cf9003d48333ad3120e47037ff5a34e184e38a7341eca617a
 EBUILD json-1.2.0.ebuild 416 RMD160 dbc41f12a5e25853b66c7728ca4095de22a3203d SHA1 99e854c9aa3366713e145a9f0c11fc9135554a5c SHA256 f98bee2fe15cb2c7db9e14de76bb49fc5f4cf10d180821f8b8af0e985f503c97
 EBUILD json-1.2.1.ebuild 1857 RMD160 3b9773f0b780a2c710f419dba1e6daf97bdea5d3 SHA1 1f135796452119c29088e80cc4018112d16cc07d SHA256 bf80cbd32e9c132ef6dfa4e6af4d78fe41ea050eca90d89744a5eddb47024bdd
-MISC ChangeLog 2783 RMD160 4d70f6acec973fd05095c402e3c3813fadd1ed0d SHA1 5795bee84af7c48f0e51810b045b3049735d8c15 SHA256 3e2dbae77c733cb66f872288151e447e5b8d2edcbcf89a765aa689286002c7bb
+EBUILD json-1.2.2.ebuild 1857 RMD160 ff449234b6220da96d1d31df07f1efb1005478c5 SHA1 ce45ffc0ce95413f968d4aeb712028561a112891 SHA256 836efbb95f752549c4ca87ac5a1e3c23ec0bffca7c9111a8c929691820ea27b8
+MISC ChangeLog 2952 RMD160 7961c479bfa7a384e361d44108ddb4eb4b5c752e SHA1 153eb15d8d4841a258471bbca5d34e1c2e444854 SHA256 1818d1faf25c19d7d1899896a23836d67c4b0561376142eb9121eccc229aa784
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuIzB0ACgkQeM7EJeUH71MusQCfWo4UnxAbR76Z1ua0Bu/C4KuK
-yk8AnA9E6BpugCQbRra13zsPNY28IAV2
-=TQeK
+iEYEARECAAYFAkuLaEwACgkQeM7EJeUH71MQ5ACfc0nGhEsBCbH03jTamPClF5GK
+8x0An13oBShNgQXqejSsHtJeA+QKSdhG
+=MjLH
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.2.2.ebuild b/dev-ruby/json/json-1.2.2.ebuild
new file mode 100644
index 000000000000..38f79c213781
--- /dev/null
+++ b/dev-ruby/json/json-1.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.2.2.ebuild,v 1.1 2010/03/01 07:09:43 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension."
+HOMEPAGE="http://json.rubyforge.org/"
+LICENSE="|| ( Ruby GPL-2 )"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-util/ragel"
+
+ruby_add_bdepend test virtual/ruby-test-unit
+ruby_add_bdepend dev-ruby/rake
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	sed -i \
+		-e 's| => :compile_ext||' \
+		-e 's| => :clean||' \
+		Rakefile || die "rakefile fix failed"
+}
+
+each_ruby_compile() {
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		${RUBY} -S rake compile_ext || die "extension compile failed"
+	fi
+}
+
+each_ruby_test() {
+	# We have to set RUBYLIB because otherwise the tests will run
+	# against the sytem-installed json; at the same time, we cannot
+	# use the -I parameter because rake won't let it pass to the
+	# testrb call that is executed down the road.
+
+	RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
+		${RUBY} -S rake test_pure || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
+			${RUBY} -Ilib:ext/json/ext -S rake test_ext || die " ruby extension tests failed"
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		ruby_fakegem_newins ext/json/ext/generator.so lib/json/generator.so
+		ruby_fakegem_newins ext/json/ext/parser.so lib/json/parser.so
+	fi
+}