Version bump.

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

3 files changed, 74 insertions, 5 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index d4bc4af1c02b..d7486463d9eb 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.61 2011/06/15 05:54:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.62 2011/06/15 06:02:10 graaff Exp $
+
+*json-1.5.2 (15 Jun 2011)
+
+  15 Jun 2011; Hans de Graaff <graaff@gentoo.org> +json-1.5.2.ebuild:
+  Version bump.
 
   15 Jun 2011; Hans de Graaff <graaff@gentoo.org> -json-1.4.3-r1.ebuild,
   -json-1.4.6-r1.ebuild, -json-1.5.0.ebuild:
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index ea682a5a86f1..32667d5dd3bc 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST json-1.4.6.gem 398848 RMD160 bd5736e685d347e774d1a8800f60a8a21f59da2d SHA1 a50accee91805a57eb5f4613073edeb422043c57 SHA256 d3241a141c6da5963e59bf75a91d832d13e7ec6793b8e48465395216a1e17ec5
 DIST json-1.5.1.gem 669696 RMD160 3d27421616c3cc2087f738c33d0caec251ca8109 SHA1 5be4aa27c73b9a0c6159b47fe58b6abc8f100a93 SHA256 d6319dc5213c11297e5441d1bf204e1517036b0680b4373a7eda4f1ba33404ed
+DIST json-1.5.2.gem 674816 RMD160 cc5f1901918980b650078a14908e023b28199749 SHA1 970af87a3b6e5233c76b8d79d039e3cca627dd75 SHA256 f486f02e271cc290c5f76793c0036e1c2886306be54cf42feb8cf32152b00a79
 EBUILD json-1.4.6.ebuild 1721 RMD160 412cb6fca8466187ae5dd5415e82145f37be1624 SHA1 52226fc2cd6ccbc7d17d9b8753a03067be54b788 SHA256 2dd071cd2b66f6094f6319efca9d84ea01ca4fc0d3855138db4b7631232634b9
 EBUILD json-1.5.1.ebuild 1839 RMD160 6443777acfc8841febaefa613893bd5f3f3d7ffc SHA1 0724eb2d97891dc2934caa7894a970aca9bf95cd SHA256 bde0e739aaa734ecfc0e99ce841332f8f16e03618b283c5a454afcbc3a33ed1b
-MISC ChangeLog 8444 RMD160 618dba4475605fec73b03e60ced4335a664e0e7e SHA1 9bb8dc9dcfea80d51075bf32159053cbf06e12a9 SHA256 419aaa055f29f24012b129c1744b9e6064869f476c279c689911b1299f09df79
+EBUILD json-1.5.2.ebuild 1825 RMD160 1388a1488ecab4cd1e969c94a33f77e9c52b03ce SHA1 5371563ed40594f829d2fc4251c5a5088d08b139 SHA256 4f45c709b4efbe4879e2da30270162783cb160809fab0acbceae74c8a98f0d9f
+MISC ChangeLog 8558 RMD160 22a6bda8c6e3f049474e896877a48288b36651c0 SHA1 e87466ed5e60d5b2adef3cf387749347d555e3fe SHA256 21d9311fb0c8a0b33e686b590757b9a563a463b7559b11da39597438a7aeb772
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk34SSIACgkQrnu0mw69Jkp9XgD+No58GvjlweK1opb+ey1Hv3/R
-XHWmmClCRrekLUud/BwA/2DTzv3g6wbgETzSyTNyHuH0t/9a1/QAV8HWCoiQrJOd
-=Cz3v
+iF4EAREIAAYFAk34SuoACgkQrnu0mw69JkrkyAD7B9n/QSmOftAUxCckTZ/zUsLb
+kCUL+QI6GvmQOuCEL5YA/A8M89ZfrWSgg7qSyCM7cGRzYJr3f/xXUtyF+WkvDRg8
+=2/ND
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.5.2.ebuild b/dev-ruby/json/json-1.5.2.ebuild
new file mode 100644
index 000000000000..715533a23a83
--- /dev/null
+++ b/dev-ruby/json/json-1.5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.2.ebuild,v 1.1 2011/06/15 06:02:10 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
+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 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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!
+	# And use rdoc instead of sdoc which we don't have packaged
+	sed -i \
+		-e 's| => :compile||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		Rakefile || die "rakefile fix failed"
+}
+
+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/*.rb || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb tests/*.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
+}