Version bump. Also drop multi_json dependency from older version where it no longer needed.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

4 files changed, 50 insertions, 7 deletions

diff --git a/dev-ruby/execjs/ChangeLog b/dev-ruby/execjs/ChangeLog
index 5bda51cbe2c3..aefbb2291e39 100644
--- a/dev-ruby/execjs/ChangeLog
+++ b/dev-ruby/execjs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/execjs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/ChangeLog,v 1.16 2014/05/21 02:19:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/ChangeLog,v 1.17 2014/05/28 05:50:08 graaff Exp $
+
+*execjs-2.1.0 (28 May 2014)
+
+  28 May 2014; Hans de Graaff <graaff@gentoo.org> execjs-2.0.2.ebuild,
+  execjs-2.0.2-r1.ebuild, +execjs-2.1.0.ebuild:
+  Version bump. Also drop multi_json dependency from older version where it no
+  longer needed.
 
   21 May 2014; Manuel Rüger <mrueg@gentoo.org> execjs-1.4.0.ebuild:
   Remove ruby18 target.
diff --git a/dev-ruby/execjs/execjs-2.0.2-r1.ebuild b/dev-ruby/execjs/execjs-2.0.2-r1.ebuild
index 7283aade4702..ac01521c8b59 100644
--- a/dev-ruby/execjs/execjs-2.0.2-r1.ebuild
+++ b/dev-ruby/execjs/execjs-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.0.2-r1.ebuild,v 1.1 2014/04/22 19:22:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.0.2-r1.ebuild,v 1.2 2014/05/28 05:50:08 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -22,8 +22,6 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 
 IUSE="test"
 
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0"
-
 # execjs supports various javascript runtimes. They are listed in order
 # as per the documentation. For now only include the ones already in the
 # tree.
diff --git a/dev-ruby/execjs/execjs-2.0.2.ebuild b/dev-ruby/execjs/execjs-2.0.2.ebuild
index e73e719c4c52..f366e6ee2d26 100644
--- a/dev-ruby/execjs/execjs-2.0.2.ebuild
+++ b/dev-ruby/execjs/execjs-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.0.2.ebuild,v 1.4 2014/04/22 19:22:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.0.2.ebuild,v 1.5 2014/05/28 05:50:08 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -22,8 +22,6 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 
 IUSE="test"
 
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0"
-
 # execjs supports various javascript runtimes. They are listed in order
 # as per the documentation. For now only include the ones already in the
 # tree.
diff --git a/dev-ruby/execjs/execjs-2.1.0.ebuild b/dev-ruby/execjs/execjs-2.1.0.ebuild
new file mode 100644
index 000000000000..e51f2754256c
--- /dev/null
+++ b/dev-ruby/execjs/execjs-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.1.0.ebuild,v 1.1 2014/05/28 05:50:08 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
+HOMEPAGE="https://github.com/sstephenson/execjs"
+SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+
+IUSE="test"
+
+# execjs supports various javascript runtimes. They are listed in order
+# as per the documentation. For now only include the ones already in the
+# tree.
+
+# therubyracer, therubyrhino, node.js, spidermonkey (deprecated)
+
+# spidermonkey doesn't pass the test suite:
+# https://github.com/sstephenson/execjs/issues/62
+
+RDEPEND+=" || ( net-libs/nodejs )"
+
+all_ruby_prepare() {
+	# Avoid test requiring network connectivity. We could potentially
+	# substitute dev-ruby/coffee-script-source for this.
+	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
+}