From: Hans de Graaff <graaff@gentoo.org>
Date: Fri, 30 Apr 2010 08:30:03 +0000 (+0000)
Subject: Version bump.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa78f970fae669e4c8fd7498953411cb9dd4f777;p=gentoo.git

Version bump.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index c2fb9174f044..ab3de60ebd86 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2010/04/25 16:35:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.25 2010/04/30 08:30:03 graaff Exp $
+
+*json-1.4.2 (30 Apr 2010)
+
+  30 Apr 2010; Hans de Graaff <graaff@gentoo.org> +json-1.4.2.ebuild:
+  Version bump.
 
   25 Apr 2010; Hans de Graaff <graaff@gentoo.org> json-1.2.2.ebuild:
   Drop ruby19 and jruby so that this version can be stabilized.
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 405eb34b9ceb..7a60a30a0559 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -5,16 +5,18 @@ DIST json-1.2.0.gem 385536 RMD160 f144cf6c41c2b52621359d353c5ae22e3e3d366b SHA1
 DIST json-1.2.2.gem 386048 RMD160 d0451e6b6a781ef840860136cea7513f2e58f9ee SHA1 056c6dd361f2985167f49ef040bc2b119d899179 SHA256 9b0e4c2fcc1d61354106ff803b6d89357584c8969b0028c71070591d04f64012
 DIST json-1.2.3.gem 386048 RMD160 6751122f6261f382d93981f3059eff15839121f1 SHA1 edecc79a59dff06d5cdc3b91333859a885f401c4 SHA256 7088797171ee45a400a5cfa10fd675faa5f7d4dd04ac83f14e167dd5087ea9e5
 DIST json-1.2.4.gem 386560 RMD160 f578a045281f1101ac8657e45c68cb6de6421095 SHA1 b1cdf371966e6901faf42366c59092a1c01d6924 SHA256 5de55c4531a01c1b02ed9440713a4aa86c83005a05897ff97c4bf5435748b2f1
+DIST json-1.4.2.gem 397824 RMD160 ceadeb392b1230d126b33edb402ab19f8666b4ec SHA1 125d4cb1b867e8c64114ae74f20309d855565a9e SHA256 aed3ca14a953a5e2fd8fbf165a046efb66047d5bc7f0c717924a024ba819e275
 EBUILD json-1.2.0.ebuild 416 RMD160 dbc41f12a5e25853b66c7728ca4095de22a3203d SHA1 99e854c9aa3366713e145a9f0c11fc9135554a5c SHA256 f98bee2fe15cb2c7db9e14de76bb49fc5f4cf10d180821f8b8af0e985f503c97
 EBUILD json-1.2.2.ebuild 1844 RMD160 f9915b5eb7d741ab6b2b9752f40bdfecbe1e7556 SHA1 58ab4c8321fc40b32d8dd2787ab4af2fe77f6efa SHA256 70a86f80b094d161691653b3a5736be50c3cb38a5f8b191cf976580ce4387253
 EBUILD json-1.2.3.ebuild 1857 RMD160 0a7236cfa55fefb69c8a5698f7c3638db49cb2f8 SHA1 64978bd7dae6bec4948d1c6fc8e4986747ef9615 SHA256 8775ee0e1b0c41fa8bf002efb236239058a017b862b60b4df3d6df8c8f65fb21
 EBUILD json-1.2.4.ebuild 1857 RMD160 d41c7f11f64b27e79e3663d4d09f488fce1f7e88 SHA1 7f8dea6ab0d44e47818f78925bc6a0b0f9d7dde4 SHA256 b9e45a0484fa7489208094450e39cc4bce97374036fb2d7aae8130d0f4945a81
-MISC ChangeLog 3558 RMD160 c57530bf7683ecdfa7b955d4bfb065da26859efa SHA1 485748f23ef4cfbe924e2be8309f61df73f21501 SHA256 dfbcda66d8324571a4e6bd2a90e7e22a151f4ebbce588170cc70d1da2eddbb3c
+EBUILD json-1.4.2.ebuild 1857 RMD160 efab9dbe0f5c121fe8065f89aa7fd40abd3a0922 SHA1 3e577d8f91e4137f7b424757cb8858d868fef65d SHA256 1b5b0a778ba3a2389eaa45d74bac8b8657177c34255b4cc9b09ebe5cca2d19e1
+MISC ChangeLog 3672 RMD160 0a078658f0866883bf90674409fa35178440456d SHA1 20973a9079cd3423bfac9a765455a4d09a648c09 SHA256 1e3e65f40f7ddb51c13b8aee737f7b4b40236098a7db4e854dc5e3f4fdcc3526
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvUbzoACgkQeM7EJeUH71M1sQCfe2/rpSQwcPSSez8yaeDAeBP8
-w6MAn0fE+H46aq30uoUXvVWDBBqjCktD
-=NZWW
+iEYEARECAAYFAkvalREACgkQeM7EJeUH71PA3wCfR51hCATgfjAV+8+93jK36BUs
+ICEAnRvinonvrhwePXVULQjx1oAzKBer
+=3qty
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.4.2.ebuild b/dev-ruby/json/json-1.4.2.ebuild
new file mode 100644
index 000000000000..3d161e4783dc
--- /dev/null
+++ b/dev-ruby/json/json-1.4.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.4.2.ebuild,v 1.1 2010/04/30 08:30:03 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
+}