[gentoo-commits] gentoo-x86 commit in dev-ruby/json: ChangeLog json-1.4.6.ebuild json-1.5.0.ebuild

[Hans de Graaff (graaff)]

graaff      11/01/23 09:00:22

  Modified:             ChangeLog json-1.4.6.ebuild
  Added:                json-1.5.0.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.1.9.25/cvs/Linux x86_64)

Revision  Changes    Path
1.55                 dev-ruby/json/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/ChangeLog?r1=1.54&r2=1.55

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog	7 Jan 2011 20:51:47 -0000	1.54
+++ ChangeLog	23 Jan 2011 09:00:22 -0000	1.55
@@ -1,6 +1,15 @@
 # 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.54 2011/01/07 20:51:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.55 2011/01/23 09:00:22 graaff Exp $
+
+*json-1.5.0 (23 Jan 2011)
+
+  23 Jan 2011; Hans de Graaff <graaff@g.o> json-1.4.6.ebuild,
+  +json-1.5.0.ebuild:
+  Version bump.
+
+  23 Jan 2011; Hans de Graaff <graaff@g.o> json-1.4.6.ebuild:
+  Backport testing fix for bug 343473.
 
   07 Jan 2011; Brent Baude <ranger@g.o> json-1.4.6.ebuild:
   stable ppc, bug 343473



1.8                  dev-ruby/json/json-1.4.6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.4.6.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.4.6.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.4.6.ebuild?r1=1.7&r2=1.8

Index: json-1.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.6.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- json-1.4.6.ebuild	7 Jan 2011 20:51:47 -0000	1.7
+++ json-1.4.6.ebuild	23 Jan 2011 09:00:22 -0000	1.8
@@ -1,6 +1,6 @@
 # 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.4.6.ebuild,v 1.7 2011/01/07 20:51:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.6.ebuild,v 1.8 2011/01/23 09:00:22 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -44,17 +44,12 @@
 }
 
 each_ruby_test() {
-	# We have to set RUBYLIB because otherwise the tests will run
-	# against the sytem-installed json; at the same time, we cannot
-	# use the -I parameter because rake won't let it pass to the
-	# testrb call that is executed down the road.
-
-	RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \
-		${RUBY} -S rake test_pure || die "pure ruby tests failed"
+	JSON=pure \
+	${RUBY} -Iext:lib -S testrb tests/*.rb || die "pure ruby tests failed"
 
 	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext" \
-			${RUBY} -Ilib:ext -S rake test_ext || die " ruby extension tests failed"
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb tests/*.rb || die "ext ruby tests failed"
 	fi
 }
 



1.1                  dev-ruby/json/json-1.5.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.5.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.5.0.ebuild?rev=1.1&content-type=text/plain

Index: json-1.5.0.ebuild
===================================================================
# 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.5.0.ebuild,v 1.1 2011/01/23 09:00:22 graaff Exp $

EAPI=2
USE_RUBY="ruby18 ree18 ruby19 jruby"

RUBY_FAKEGEM_TASK_DOC="doc"
RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
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 )"
SRC_URI="mirror://rubygems/${P}.gem"

KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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
	test? ( virtual/ruby-test-unit )"

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_ext||' \
		-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_ext || die "extension compile failed"
	fi
}

each_ruby_test() {
	JSON=pure \
	${RUBY} -Iext:lib -S testrb tests/*.rb || die "pure ruby tests failed"

	if [[ $(basename ${RUBY}) != "jruby" ]]; then
		JSON=ext \
		${RUBY} -Iext:lib -S testrb tests/*.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
}