diff options
author | Hans de Graaff <graaff@gentoo.org> | 2014-05-14 18:13:59 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2014-05-14 18:13:59 +0000 |
commit | 79218fe19a8c97920a7a2b3893130120276094e1 (patch) | |
tree | 234372d9224f2d49c179031a6b16bddba99ae4d6 /dev-ruby/hpricot | |
parent | amd64/x86 stable wrt #506592 (diff) | |
download | gentoo-2-79218fe19a8c97920a7a2b3893130120276094e1.tar.gz gentoo-2-79218fe19a8c97920a7a2b3893130120276094e1.tar.bz2 gentoo-2-79218fe19a8c97920a7a2b3893130120276094e1.zip |
Add ruby21 revision to create a stable candidate.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby/hpricot')
-rw-r--r-- | dev-ruby/hpricot/ChangeLog | 8 | ||||
-rw-r--r-- | dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild | 4 | ||||
-rw-r--r-- | dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild | 70 |
3 files changed, 79 insertions, 3 deletions
diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog index 3919a7794f1d..1341ec64397b 100644 --- a/dev-ruby/hpricot/ChangeLog +++ b/dev-ruby/hpricot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/hpricot # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.53 2014/04/20 06:34:51 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.54 2014/05/14 18:13:59 graaff Exp $ + +*hpricot-0.8.6-r3 (14 May 2014) + + 14 May 2014; Hans de Graaff <graaff@gentoo.org> hpricot-0.8.6-r2.ebuild, + +hpricot-0.8.6-r3.ebuild: + Add ruby21 revision to create a stable candidate. 20 Apr 2014; Hans de Graaff <graaff@gentoo.org> hpricot-0.8.6-r2.ebuild: Add ruby21. diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild index 05c51ca10c13..483db4f43ccf 100644 --- a/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild +++ b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 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-r2.ebuild,v 1.5 2014/04/20 06:34:51 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild,v 1.6 2014/05/14 18:13:59 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 jruby" +USE_RUBY="ruby19 ruby20 jruby" RUBY_FAKEGEM_DOCDIR="doc" RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md" diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild new file mode 100644 index 000000000000..c5c45d03386a --- /dev/null +++ b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2014 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.1 2014/05/14 18:13:59 graaff Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 jruby" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md" + +inherit ruby-fakegem eutils + +DESCRIPTION="A fast and liberal HTML parser for Ruby." +HOMEPAGE="http://wiki.github.com/hpricot/hpricot" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="" + +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" + +# 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 )" + +all_ruby_prepare() { + sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die + + # 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 +} + +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 +} |