Version bump, fixing bug 428714.

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

3 files changed, 77 insertions, 5 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 5b12a8c9dc82..0e602c5bd534 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.91 2012/07/31 05:40:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.92 2012/07/31 05:48:26 graaff Exp $
+
+*json-1.7.4 (31 Jul 2012)
+
+  31 Jul 2012; Hans de Graaff <graaff@gentoo.org> +json-1.7.4.ebuild:
+  Version bump, fixing bug 428714.
 
   31 Jul 2012; Hans de Graaff <graaff@gentoo.org> -json-1.4.6.ebuild,
   -json-1.6.3.ebuild, -json-1.6.4.ebuild, -json-1.6.6.ebuild:
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index cd8cf5c3d5d9..b7b64c28a32b 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 DIST json-1.5.4.gem 678912 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e SHA512 f38768fb3bb2f9a5348d662b65c608eec635aa6ae931245d8afeca03ced587ad55186d78f95a1dad95700621bad526ea2eac51e4db4c66b46c726eaa4f02a897 WHIRLPOOL ffb1903ee5bb2193c5cc08e5ee872fca92a4981663fa77ce9f27ff897ce6279fd793eec2df92716c09deab62afa9bc1876c02a542e06b2722b0bf991eb61d051
 DIST json-1.6.7.gem 143872 SHA256 02ad99f012ea4aaaab5b15fd3b0b44ac05aed08ef29e0173d46fcf01d63a070f SHA512 200c0fa2dfecdf78bc8d9faa6b8cccaaa61966d2314f2d7aee0ac778bd0a0959894c8c5bebf6cb858a084b041fd68fe5106ab6545be3bf7b3dc28e7449efe1d9 WHIRLPOOL 2a58c1219f5b82255a947fcea79aaccbe71b31e930efc9c3eb7d1a06f6e9f20c8fcc5e31f3fd07337d43e49723139ba0575c8027faa362cca25adc05bf3b6af9
+DIST json-1.7.4.gem 145920 SHA256 d2129e3fa9f5ed1629367559a0740d8d920e0f5d328e7450a380ee8040eb9e4d SHA512 c0e5deceb3f67009abc6297ab5845885256bfc23079fdd09ed2e8ba4a05fb836be50cc64f00768cd7c0f2997f4dcdf02e096b116ca453913aba08d808ca3883c WHIRLPOOL 694311f2614cecfc6352ede4b8f2d69b029c037a16cdf0ab9dc793483fd0c269ba3efae99fb13bb14d0eda896b3f545afdfe2891faf3369514e72da5ca4be0d6
 EBUILD json-1.5.4-r1.ebuild 1897 SHA256 0844022cc65f022e88b008cc8ebf0e17c51be3d584c056210490ae4102a6992d SHA512 7819d3ee8464b5af534a1d97cfe5873bbcf61324694fdb35c34377089a709545a33fde4bede444e4cd303965cd0888acbe368fd56f177491fc97f995aca59180 WHIRLPOOL 291e1774253b5cb687ecaa6c521885768a584368469ef81a6e49776d8de42240bd53ac659ba22670086596e842db0001e341238bb55f91da794ada6422a46978
 EBUILD json-1.5.4.ebuild 1882 SHA256 7d30ea4d1ddc3b04c248752a50c68080152c2c971352286689bcea02601d49a5 SHA512 98b79c0ba0d366ddf68360a3f01f8cf31bb8fb3b74c620eb1fb9aa31ef2ff43d767eaf10819f12a3e5fb04fae56c9908737a3eb4b4ba7d22c8172505245006d2 WHIRLPOOL 75bc2da173664550e50e9c7b4df1aef40cc9fe5ba928b2ea2a474445c4b8c12d538232115d0321e210d03cfa56d9ba3118193b8ed70d87d14a2c6c97d51ea1d1
 EBUILD json-1.6.7.ebuild 1995 SHA256 068b7f2c3cea88d8ad012a558f74e6a8a365d4bc9c2562a2260bee76f0d8a807 SHA512 635b399b744d965cb6cfa7412f987f6086c3892c9f9608635d6276c4e28a44ecabed70a5b2276a1618758a18af2ad41333cfcbf3da42d7bed13db819116a2400 WHIRLPOOL 196cda57c189c422005d1440e5574aab3317fe0fcf1bf8b3c0161a05419b6deaea8b558096d9a6fc58c41ba67f398965e3536139180818010f6b8d88940c3f01
-MISC ChangeLog 11879 SHA256 fc2d09b945035cda2a9527c9c8988d707293fe24277aa51e1706fb7584383501 SHA512 29fdc0f7c8df734ff8938b07161bb47574fa174bfff025b6ab46279a36db82a0bbb235413187e713b8e056bee4e16f2e20bfb05cde37497f18def3db4a4e35d6 WHIRLPOOL 64320749c4f4787bf49b3a6c177e116c2cfc81f11106bf8431ecaf3993c1f77d33fce32d439d43a695bc2ec1f02bfb2ab2429bf6120ef9f8f1a290af8d6dc601
+EBUILD json-1.7.4.ebuild 1995 SHA256 9e35b383be8a2faa6dfef6b8a6953482c1e3877da18f8871ebd7689a54b9ba2d SHA512 30c270d192be99cf06cc1e9555e4373f262effd51d2204a4124eb1f91155251584cee987f5ff8bebe32e09a65c23489393082fd598ff926592b5cd7e66674d2a WHIRLPOOL a781c8848e6058870462e35f20e7df4756753e0077c24ca24c8dbfae03c35b1b3c927d63b29e70ae02a8d792ca517d67f99fc53935bd8ad05dcca02147c93bed
+MISC ChangeLog 12012 SHA256 e597f52b5fad024d159d05a19e04cda08671454ea558c2ca0d3142f3c3f4735f SHA512 52f5f8de874fdcde924fe7b10361d9a531a5b6920daba47753eb956ef36d77398cdd8a5f61327c5c7b29c8732906c7a53631de5b9d2109986fb5dd5a3f3964e9 WHIRLPOOL 16d602ce0f8b3418c495d879f477cf6ecaa5473b4544066252d544ffd5a993e2afaa7fa84f3c7f1634e7121316a272e99ab93b5a9d008dfbb1f908322034dc60
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAXb9cACgkQiIP6VqMIqNcbHAD/W8ksYDCvhptyHXFpempW9n9+
-53uF9ZN4UrnSe3bijssBAJZFXKIZ4vw6tzxfTjpNYnryX+e3eMhu0pLjbP+KC2fC
-=IfQT
+iF4EAREIAAYFAlAXcbAACgkQiIP6VqMIqNfgrwD+LLIaCGu7iB83xvtDILdBUIdr
+n4FpVwwsxl8U0jTJBGcA/iQ3NoEih7W8yEPSDePup1dWLttkjJwWRL8CtCw68JJC
+=SuL3
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.7.4.ebuild b/dev-ruby/json/json-1.7.4.ebuild
new file mode 100644
index 000000000000..55ea579b596e
--- /dev/null
+++ b/dev-ruby/json/json-1.7.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.7.4.ebuild,v 1.1 2012/07/31 05:48:26 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 -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
+}