Version bump.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 80 insertions, 5 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 18808f51af51..f5d2ca1341f5 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.128 2013/06/30 08:36:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.129 2013/06/30 08:38:54 graaff Exp $
+
+*json-1.8.0 (30 Jun 2013)
+
+  30 Jun 2013; Hans de Graaff <graaff@gentoo.org> +json-1.8.0.ebuild:
+  Version bump.
 
   30 Jun 2013; Hans de Graaff <graaff@gentoo.org> -json-1.6.7.ebuild,
   -json-1.7.6.ebuild:
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 3630ad39d806..22f65b4d9508 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 DIST json-1.6.8.gem 144384 SHA256 2c66ad4038eb4a0823ee8c2d8f0a4cbf66991011b031aab0d22ded2ca75e7708 SHA512 9e63f5d3a85f6bdb93ff15b40aac4ad7d576f801ba9acb0401e87e27485f62f66209cab096131d92fa4bb015cfe2ff72cfffa632b4ff45542b402ab687d12a3c WHIRLPOOL 364cb032ab3ea62f491858d5ae9d2cd49cc51d5b4ffb0512496dd282a127da65dd154a0fcacd0e76b39c7bf9bb46e93d7fdbcde6f40a7a90e5c3bf876654cd96
 DIST json-1.7.7.gem 148480 SHA256 fd702ed46565b354d7508e88bb3c4855f7fdd771ab89435d7ecbbe98deb0b7ec SHA512 b73cc6427854b00fecc36fb6a3da89562b9ef352342d2766da7c22a9311620c12090d84704b9dda9ca35da5893676f1c1b2ced53ca06da27194230825f73b7e8 WHIRLPOOL 29c4a581c60a2311ac77eaec278bb123be18f4c6acac23d286e3116a8a84df3ae5089be0116827e579f5460b803cf3d8066cb8ff9c298a4b045e67c473c0d431
+DIST json-1.8.0.gem 148992 SHA256 87e49cccff3fb2091c53141a605956e8d9a252cda43128714f9fdb51d0ca1729 SHA512 7a8ae0d975e10be06d1026df6c9736e8e724814ea7ef8c92b512c60fd7b4ac18e46a9f44615f57407e58decebc4891e2e97b78a177f7e283cc540619264c4400 WHIRLPOOL 159cd8d1cf95d6f7ca5ed16ec294015f873453a1ec8f9eb3667442c0ca582487e5dfcd78d2106c72c5a3563e1ace5b69f2c256c05a35630f09c3499b95f12505
 EBUILD json-1.6.8.ebuild 1982 SHA256 01a927c37523bd075c784d23dd220eb441a624edd5dba105c9f77df4faa9a25e SHA512 47a4110ebeb74eb0af0f6125aacf6d36a71f299f0eef1a432299454e99bbe553ace49d6ac1922357b439c82675022ca0240f78441db4d60153dbb3f0db05bdc2 WHIRLPOOL 95ff7f0cdcee79650695b35dac919146869b67319ec61199046f3059cd1a9667c4489e1fb2959c0967e7f88cdd0500aa3e8a479aa89b6e3dfde27731df958fab
 EBUILD json-1.7.7-r1.ebuild 2146 SHA256 d45278d30740b3cefff705740f7fb954e20bb2d13e80f712f6e9f64157102407 SHA512 f48a9f528be1328a64b8c12cd4de74ecc050bb8458e764d18c246f650c762602fd332686f660fbfbc717b95c8a588f2e339dbd1059fb86b2697bbaadaa999781 WHIRLPOOL 7db21419888209353d8bbb3a2846a81384f89387e0f2503834b90dab86b9ccd8aee4e0c03a94df5df918e76a42fbcbe08305ef980cda274a0dc9cff79266fb0f
 EBUILD json-1.7.7.ebuild 1994 SHA256 1029fc804a2be258dad78a72143e12f97d871f859d7ae673bdea2587c00fef70 SHA512 83595f04a4eb7da1c7d3fa79dfa0e698e7458f8a6a00f728459f81b2c551ba8c484876f2155357d2a9fd84fc5b140d419608cac011fefdf5a68c5552155d839f WHIRLPOOL f44f2eb684c5695510cec499099274c654779e1befa75194d2609b5b098dbedf3fe420dfaa3ed1625c5401685380aa523c92e34d5143c0798465b0ab5039cc51
-MISC ChangeLog 15903 SHA256 1b10be83e1240effa646b3af1cf4096ee61e0843e6fb659d114cc676355b22ed SHA512 55b3da0bd648d9eb77a578404ee7db91203d726e9ce3baa77851aff9ba95183e8ee8410d41904ed5161aca62ee7328d0721fd60610a01abaab7ce83f33dd7d2b WHIRLPOOL 45c36eba56977d4e3c3272fc2981bb189650ca27b056c31798a5bc42c5834e337c71a773a7f4e53fcb366fded45d986a45bc3d55490d6d89deab435211cf4a28
+EBUILD json-1.8.0.ebuild 2143 SHA256 b248a8bd1a7f159feb720c3ef9d78922782dd8f96ca6fbff14e031858062efb8 SHA512 e67e702521de04d51fd4380483463e0cf9c3a1e8c6975184d83a97f9fc8df8416e2b7fa187d17838beb39976dd3ada200fa72ab375a3eff07fff192567cbfc67 WHIRLPOOL 6605c32d4c3ddd4947c10fa666e6115c45cff15c604f77f6c393802414200bd83878bef9f57d5d7836170ad21c17029d2341f6792147e362f2291a411096752a
+MISC ChangeLog 16017 SHA256 93facc7d25ad2d00a29b86a477ed737e3fef5f85065ecfd5a36eb80d6f642f51 SHA512 68099ae9e8d7cd31e17408cf4729f96c9b42d932eab6a7d1ed0c22b4901845d43793a1e69c9207d48e8f46a048df4b5252d3614cfb74c222d9906f4b21e27ff9 WHIRLPOOL 9f8eed31140245cdadcd0a67ebcd8df0ada789863cb285d849a7c8fae20e47c4443a817f41b3db072ed6120e4b0671496a660a6ed0f90455904ad37d4aa6daab
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHP7hAACgkQiIP6VqMIqNfX2wD+IIHhgaMJczJqeznwB/UdI8LP
-ion8aPIVa8xObfmHzBQA/1axayKXdVVPXghH0CXzoYO1CqOUBHlNNlXecpsmGcIj
-=WXMg
+iF4EAREIAAYFAlHP7p8ACgkQiIP6VqMIqNd8NgD/WDakyvQjx9YwvpBE28sJaQ+R
+dXz4Kf7/CggFhgMDSMMA/Rjp6ZJq3Ze9v8yy1nflZ8jv1zSKTjeTjf85g8haEt+Y
+=B1JZ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.8.0.ebuild b/dev-ruby/json/json-1.8.0.ebuild
new file mode 100644
index 000000000000..c0064d6410cb
--- /dev/null
+++ b/dev-ruby/json/json-1.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.0.ebuild,v 1.1 2013/06/30 08:38:54 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 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 ~amd64-fbsd ~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"
+
+	# Remove hardcoded and broken -O setting.
+	sed -i -e '/^unless/,/^end/ d' -e '/^  (if|unless)/,/^  end/ d' ext/json/ext/*/extconf.rb || die
+}
+
+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/test_*.rb || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb tests/test_*.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
+}