Version bump.

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

3 files changed, 77 insertions, 5 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 4da36401b741..45518650aeee 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.75 2012/01/15 10:22:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.76 2012/01/15 10:24:48 graaff Exp $
+
+*json-1.6.4 (15 Jan 2012)
+
+  15 Jan 2012; Hans de Graaff <graaff@gentoo.org> +json-1.6.4.ebuild:
+  Version bump.
 
   15 Jan 2012; Hans de Graaff <graaff@gentoo.org> json-1.5.4.ebuild:
   Drop ruby19 to create a stable candidate.
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index daeedc4af9b6..a46a541fb6a6 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST json-1.4.6.gem 398848 RMD160 bd5736e685d347e774d1a8800f60a8a21f59da2d SHA1 a50accee91805a57eb5f4613073edeb422043c57 SHA256 d3241a141c6da5963e59bf75a91d832d13e7ec6793b8e48465395216a1e17ec5
 DIST json-1.5.4.gem 678912 RMD160 c1fc66f466efbeedf2cd741fb3b9b9d2da6b9281 SHA1 f67c848af3014c986017baf1ffe07cc855a16f48 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e
 DIST json-1.6.3.gem 658432 RMD160 5e2ed6979de262aecdd3f61209e71d4efad9856c SHA1 72e2d149113b35dc538e035d8b12108e5aa53502 SHA256 15211258766f8a8186601a8af6b3a019949c443bec101f2c602583454036942d
+DIST json-1.6.4.gem 424960 RMD160 92357b234a2442c824cf00bcf0b479fa1093aafe SHA1 9e877a0fd8118d4195d06dcec7624ae2bc70e509 SHA256 340df772d3b50d6e19b6f085bca392b661f882b8cae32f5aa564a77f3c51b3a9
 EBUILD json-1.4.6.ebuild 1721 RMD160 412cb6fca8466187ae5dd5415e82145f37be1624 SHA1 52226fc2cd6ccbc7d17d9b8753a03067be54b788 SHA256 2dd071cd2b66f6094f6319efca9d84ea01ca4fc0d3855138db4b7631232634b9
 EBUILD json-1.5.4.ebuild 1890 RMD160 4d9b9e889237d1b272ba284d2325388215d20939 SHA1 352bf03f0603d71e6b6cc6c1137e0ccff7acca3e SHA256 40e3ed7041f6e9b09a4b318b1ad8062e551a45a6cf577ad51bfeed92598968e3
 EBUILD json-1.6.3.ebuild 2049 RMD160 7b168bc3bae6b45ffa97f9ec661e250fccb14fd7 SHA1 28437e28d950ac12725f346e4a85e5ce967051ef SHA256 3e2f8b982b01067c44239d669afa76dd4831bef469b3989ec8c0ed6846be04d6
-MISC ChangeLog 10118 RMD160 7d7e15bbc80adcbb355f7930402fb2bfadb38f4e SHA1 d4c85ab7f2a280a44241c891fd2652ec10e9cb4b SHA256 7248eaeb94b5c84549615876a1568444ac18129ad03ec03c20a628079ab00937
+EBUILD json-1.6.4.ebuild 2051 RMD160 f6d2e53685a9dcedb90289fc6720784c2206a8f3 SHA1 36167ae91b501dbe850cbd622cef59a8ef3da5d5 SHA256 f3dab7c4c23ec9f5f568c66d9d16d8cb128d3cdbb189ac169577f8c43f7baa93
+MISC ChangeLog 10232 RMD160 be9f652f6cef8a0437f92214a00987a1e05f78bb SHA1 b3ba863ae92e4dc52411eba6d015287248022921 SHA256 e7611517cf9f5fab3433c6d339dc21c57ee23c6b71040182a890d93904f533f7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8SqOgACgkQiIP6VqMIqNcRswD/fDVAwtSO5tK4grqeyw9fw6Cm
-cdjfD5j+9phPKPpaZJ8A/iaD0Zi4Uc+S0Xc1NEtLOpctr7NcZJErjQc5TyjRo4tO
-=4FaR
+iF4EAREIAAYFAk8SqXUACgkQiIP6VqMIqNeyOwD+Mmc48umQzWb+sIhANgrV+jfX
+wbE9DFnA3oBHC+YgO1QA/AwcwT0g/c5aPTlK6B0JolZ5Ejqd961KAPBSqnnb7YWU
+=gKV5
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.6.4.ebuild b/dev-ruby/json/json-1.6.4.ebuild
new file mode 100644
index 000000000000..6448e8eef64f
--- /dev/null
+++ b/dev-ruby/json/json-1.6.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.6.4.ebuild,v 1.1 2012/01/15 10:24:48 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"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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_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"
+}
+
+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 -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || 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
+}