Revision bump to make 1.4.3-r1 the new stable candidate with support for ruby18 and jruby.

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

4 files changed, 81 insertions, 8 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 1958dc5cf729..75dccbc501c7 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2010/06/12 10:43:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.34 2010/06/26 11:48:40 graaff Exp $
+
+*json-1.4.3-r2 (26 Jun 2010)
+
+  26 Jun 2010; Hans de Graaff <graaff@gentoo.org> json-1.4.3-r1.ebuild,
+  +json-1.4.3-r2.ebuild:
+  Revision bump to make 1.4.3-r1 the new stable candidate with support for
+  ruby18 and jruby.
 
   12 Jun 2010; Hans de Graaff <graaff@gentoo.org> json-1.4.3-r1.ebuild:
   Fix static modname and add x64-macos keyword, fixing bug 323371. Thanks to
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 2e98eba5a984..1f62eea08311 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -4,14 +4,15 @@ Hash: SHA256
 DIST json-1.2.2.gem 386048 RMD160 d0451e6b6a781ef840860136cea7513f2e58f9ee SHA1 056c6dd361f2985167f49ef040bc2b119d899179 SHA256 9b0e4c2fcc1d61354106ff803b6d89357584c8969b0028c71070591d04f64012
 DIST json-1.4.3.gem 397824 RMD160 964a5c58e3621e8300650e5d8d62ea34c35f2b12 SHA1 a02bc81d86c3c956e4f2a49e55aa3959b99409d7 SHA256 46f26a861601de5d4332952c51a9cc867f36e4b54bcb496801b949cd8df17e64
 EBUILD json-1.2.2.ebuild 1851 RMD160 b739bcca43d7fec853ffb2c81c1f5870bc05f2d0 SHA1 91cbf260090bc7d1e51ca2b7832b4c845cbc29d9 SHA256 692057261f74953197ac27c6cd46bace623f0eae0e7d68faf387f60c599f7689
-EBUILD json-1.4.3-r1.ebuild 1932 RMD160 5f48acf6a32ee88c1cddfb9c5ab65c3d106e7036 SHA1 d11d83dad5ec757badc2d35a8d72ce7982e8ebd1 SHA256 7a5c2e5c8bb1cd2fac285fd681efb5239a5808f830675ed965cdefc382644e36
+EBUILD json-1.4.3-r1.ebuild 1919 RMD160 ddd82c23507c95c191ea97796cd21bc8bae648eb SHA1 b36d65f595c3616feee8b12ba8c0accf4ed048a9 SHA256 ef205f239733a5d35b97c961abc5fff9ab48679585910797a80f2618f29ec37c
+EBUILD json-1.4.3-r2.ebuild 1932 RMD160 f59c4b102d31099831c4496eaed3365444f93b7f SHA1 db91e025483278a08469497bd2e18ab3b718bc4c SHA256 4180a2b3d8c2d34b26db78221f7ec484b83c6421cf1d2722877303e6b970a298
 EBUILD json-1.4.3.ebuild 1873 RMD160 f0f0601205dfe91cf3dd24dfd43696b7ea5dc850 SHA1 3c357c9ae02b59e42222b0d5d7c96d93a654355d SHA256 e239409220596c99bdf9e136f187c71482530acbe3255470131820ea1eabe9fb
-MISC ChangeLog 4905 RMD160 c0331eeebaf47ef509ab804d0f6ba4cd7a87fe1f SHA1 6c3cb1431298376fc237d30a8d8c4de857154068 SHA256 d13a06b85594776499d223e58fe08d170ad763c98fd889ef1c56d176aa1b3cd0
+MISC ChangeLog 5128 RMD160 3655bfab582abf7f4ec00f45ed53a39048693bd3 SHA1 0f9eff701b5bba79912267433fd7965b94c3c557 SHA256 e057b946a777001f83153a40bc75f88f2d95c9c1385fa87bdfb8f633b9b0dde7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwTZNwACgkQZihJkut28SvNIAD/RZnN1E1e7VD3OANKCosw3SIU
-2X11ejRMFII/ppF+XtIBAIlETtsy2Xw03J5IUBo5QXHhBEOBjrgl79vnPGxqwvzE
-=PYBB
+iF4EAREIAAYFAkwl6SQACgkQZihJkut28Ss2YAD+KIeJp31GGmmVYnAT9G5dy0tw
+mPXZwAVc7mGdjmoOGxMA/1CD1aejUTO8dZcqmdeFf2qxh5MDvcz19njW7J08mVw7
+=zsFI
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.4.3-r1.ebuild b/dev-ruby/json/json-1.4.3-r1.ebuild
index 4388547f641a..77b787ca1a69 100644
--- a/dev-ruby/json/json-1.4.3-r1.ebuild
+++ b/dev-ruby/json/json-1.4.3-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.4.3-r1.ebuild,v 1.2 2010/06/12 10:43:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.3-r1.ebuild,v 1.3 2010/06/26 11:48:40 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
diff --git a/dev-ruby/json/json-1.4.3-r2.ebuild b/dev-ruby/json/json-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..afe604c336bd
--- /dev/null
+++ b/dev-ruby/json/json-1.4.3-r2.ebuild
@@ -0,0 +1,65 @@
+# 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.4.3-r2.ebuild,v 1.1 2010/06/26 11:48:40 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit multilib 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 ~x64-macos"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( virtual/ruby-test-unit )"
+
+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" \
+			${RUBY} -Ilib: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$(get_modname) lib/json/ext/generator$(get_modname)
+		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
+	fi
+}