Version bump.

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

3 files changed, 73 insertions, 5 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index b302b7b7b5de..1ba1f4bfd014 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.67 2011/10/10 18:48:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.68 2011/10/16 08:09:44 graaff Exp $
+
+*json-1.6.1 (16 Oct 2011)
+
+  16 Oct 2011; Hans de Graaff <graaff@gentoo.org> +json-1.6.1.ebuild:
+  Version bump.
 
   10 Oct 2011; Hans de Graaff <graaff@gentoo.org> json-1.5.4.ebuild:
   Call tests directly instead of via testrb to address bug 339126.
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 3da7b67835e3..4a22d178de35 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.3.gem 675328 RMD160 c9687e4554bb1146db3f1a04131c638d32a1f34c SHA1 3289c1acacd148c787f361c2c01ef454a4c70553 SHA256 dd0a9449a21d85c20701adc14758b86d19760a2a2351a3f6029f5608dd99077a
 DIST json-1.5.4.gem 678912 RMD160 c1fc66f466efbeedf2cd741fb3b9b9d2da6b9281 SHA1 f67c848af3014c986017baf1ffe07cc855a16f48 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e
+DIST json-1.6.1.gem 654336 RMD160 6be52c7bc8cd9894a626d607ad433ffa9fb9f369 SHA1 be8108a67bbaf149ee5af2991575ac5a12766895 SHA256 84615d86cbf748fe60870e722e8450b871e6885f3294628eefb90b1d12c9b877
 EBUILD json-1.4.6.ebuild 1721 RMD160 412cb6fca8466187ae5dd5415e82145f37be1624 SHA1 52226fc2cd6ccbc7d17d9b8753a03067be54b788 SHA256 2dd071cd2b66f6094f6319efca9d84ea01ca4fc0d3855138db4b7631232634b9
 EBUILD json-1.5.3.ebuild 1833 RMD160 d6930aa0e9312f790a3c077edc04f576a0ac857d SHA1 0a2c9dc1ee5483d4a3a158116f9a5991fde0af33 SHA256 aa73c5b5da73ea0c3731b62f32b07e42ef6e73e0a150d5e19dd5ffa49fa9f408
 EBUILD json-1.5.4.ebuild 1897 RMD160 bc737eef3bfbc3260a018aa1fec13a61bda31174 SHA1 631384cd1c61934fa5a2193a5f10b44d63f3b134 SHA256 faf7cf0c83954b2f5a23fbbc578a4e1e629f1c7fed97ad4f82745c3ba783f4ae
-MISC ChangeLog 9134 RMD160 b212745ce32d3aec73c64b8da7757c076281f423 SHA1 a30cbfc0da394e223af4328c2ef788a21004c461 SHA256 1566cc823a8f305bed512913874346ef71c10e1be90a0cc9a7b660eb2bc6c4fd
+EBUILD json-1.6.1.ebuild 1863 RMD160 8509c2030c741481bc0d551876f7d043d4fa3288 SHA1 c9d1d557d58ec61911af3d51c4cbcedca3eb6150 SHA256 25f90bd6c0d1e80e430709e3ad6303860fb7c4cbadb6c8df51415c8caa62ee28
+MISC ChangeLog 9248 RMD160 4e6dc8753a711bc504096cf8c3a381cea7da6403 SHA1 344dce57ced626c9f5fc6c9c5fb2f55c76071806 SHA256 46ca4b1410b3f42162a3bc9cbf11339108b067b9dad449229e3cf82a50de1de6
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6TPgMACgkQiIP6VqMIqNdYCQD/S+cI8JGiV2lMU1D88uYxcVl0
-7/O6szZJ78zE45l4Br8A/2JSzHRgfVBqRNXK35gKqdknCtnwGSPfLaClh5spg1GV
-=m1Gz
+iF4EAREIAAYFAk6akU0ACgkQiIP6VqMIqNe7KwD9HvprSf4FMAF0nggb6cixsHNA
+XBNuVHU1M8MtdglmUaQA/jLTeeKPAktYklM937BSJcAP0B6AvwnPBG6b8oJqOlQU
+=9mGA
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.6.1.ebuild b/dev-ruby/json/json-1.6.1.ebuild
new file mode 100644
index 000000000000..30198ead310c
--- /dev/null
+++ b/dev-ruby/json/json-1.6.1.ebuild
@@ -0,0 +1,61 @@
+# 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.6.1.ebuild,v 1.1 2011/10/16 08:09:44 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 ~mips ~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"
+
+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 -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
+}