public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-ruby/hpricot: hpricot-0.8.6-r3.ebuild ChangeLog
@ 2015-02-27 15:19 Hans de Graaff (graaff)
  0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff (graaff) @ 2015-02-27 15:19 UTC (permalink / raw
  To: gentoo-commits

graaff      15/02/27 15:19:56

  Modified:             hpricot-0.8.6-r3.ebuild ChangeLog
  Log:
  Add ruby22. Drop jruby.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

Revision  Changes    Path
1.3                  dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?r1=1.2&r2=1.3

Index: hpricot-0.8.6-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hpricot-0.8.6-r3.ebuild	5 Aug 2014 16:00:48 -0000	1.2
+++ hpricot-0.8.6-r3.ebuild	27 Feb 2015 15:19:56 -0000	1.3
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v 1.2 2014/08/05 16:00:48 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v 1.3 2015/02/27 15:19:56 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
@@ -22,15 +22,11 @@
 ruby_add_bdepend "dev-ruby/rake
 	dev-ruby/rake-compiler"
 
-# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-USE_RUBY="${USE_RUBY/jruby/}" \
-	ruby_add_rdepend "dev-ruby/fast_xs"
+ruby_add_rdepend "dev-ruby/fast_xs"
 
 # Probably needs the same jdk as JRuby but I'm not sure how to express
 # that just yet.
-DEPEND+="
-	dev-util/ragel
-	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
+DEPEND+=" dev-util/ragel"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
@@ -41,30 +37,18 @@
 }
 
 each_ruby_prepare() {
-	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-	[[ ${RUBY} == */jruby ]] && return
-
 	pushd .. &>/dev/null
 	epatch "${FILESDIR}"/${P}-fast_xs.patch
 	popd .. &>/dev/null
 }
 
 each_ruby_configure() {
-	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-	[[ ${RUBY} == */jruby ]] && return
-
 	${RUBY} -Cext/hpricot_scan extconf.rb || die "hpricot_scan/extconf.rb failed"
 }
 
 each_ruby_compile() {
 	local modname=$(get_modname)
 
-	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-	if [[ ${RUBY} == */jruby ]]; then
-		${RUBY} -S rake compile_java || die "rake compile_java failed"
-		return
-	fi
-
 	emake V=1 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed"
 	cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die
 }



1.70                 dev-ruby/hpricot/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	17 Jan 2015 19:54:49 -0000	1.69
+++ ChangeLog	27 Feb 2015 15:19:56 -0000	1.70
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.69 2015/01/17 19:54:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.70 2015/02/27 15:19:56 graaff Exp $
+
+  27 Feb 2015; Hans de Graaff <graaff@gentoo.org> hpricot-0.8.6-r3.ebuild:
+  Add ruby22. Drop jruby.
 
   17 Jan 2015; Manuel Rüger <mrueg@gentoo.org> -hpricot-0.8.6-r1.ebuild:
   Remove old.





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-ruby/hpricot: hpricot-0.8.6-r3.ebuild ChangeLog
@ 2015-04-07 18:57 Hans de Graaff (graaff)
  0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff (graaff) @ 2015-04-07 18:57 UTC (permalink / raw
  To: gentoo-commits

graaff      15/04/07 18:57:22

  Modified:             hpricot-0.8.6-r3.ebuild ChangeLog
  Log:
  Avoid unneeded dependency on git.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

Revision  Changes    Path
1.4                  dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?r1=1.3&r2=1.4

Index: hpricot-0.8.6-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpricot-0.8.6-r3.ebuild	27 Feb 2015 15:19:56 -0000	1.3
+++ hpricot-0.8.6-r3.ebuild	7 Apr 2015 18:57:22 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v 1.3 2015/02/27 15:19:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v 1.4 2015/04/07 18:57:22 graaff Exp $
 
 EAPI=5
 
@@ -34,6 +34,9 @@
 	# Fix encoding assumption of environment for Ruby 1.9.
 	# https://github.com/hpricot/hpricot/issues/52
 	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e '/^REV/ s/.*/REV = "6"/' Rakefile || die
 }
 
 each_ruby_prepare() {



1.71                 dev-ruby/hpricot/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	27 Feb 2015 15:19:56 -0000	1.70
+++ ChangeLog	7 Apr 2015 18:57:22 -0000	1.71
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.70 2015/02/27 15:19:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.71 2015/04/07 18:57:22 graaff Exp $
+
+  07 Apr 2015; Hans de Graaff <graaff@gentoo.org> hpricot-0.8.6-r3.ebuild:
+  Avoid unneeded dependency on git.
 
   27 Feb 2015; Hans de Graaff <graaff@gentoo.org> hpricot-0.8.6-r3.ebuild:
   Add ruby22. Drop jruby.





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-07 18:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-07 18:57 [gentoo-commits] gentoo-x86 commit in dev-ruby/hpricot: hpricot-0.8.6-r3.ebuild ChangeLog Hans de Graaff (graaff)
  -- strict thread matches above, loose matches on Subject: below --
2015-02-27 15:19 Hans de Graaff (graaff)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox