Fix install with JRuby; add missing dependency.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 82 insertions, 5 deletions

diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog
index ffe69ddaf9ec..ed590180af1d 100644
--- a/dev-ruby/hpricot/ChangeLog
+++ b/dev-ruby/hpricot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.35 2012/01/25 01:21:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.36 2012/02/25 13:12:59 flameeyes Exp $
+
+*hpricot-0.8.6-r1 (25 Feb 2012)
+
+  25 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +hpricot-0.8.6-r1.ebuild:
+  Fix install with JRuby; add missing dependency.
 
 *hpricot-0.8.6 (25 Jan 2012)
 
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 0272ecf8fe1e..3c37434622dc 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -8,13 +8,14 @@ DIST hpricot-0.8.6.gem 293888 RMD160 782464d9532ca5008f2e9a1732d9812230069330 SH
 EBUILD hpricot-0.8.4-r1.ebuild 1086 RMD160 f806d2378c3d8d315bf19d18a0d177d04c79dff7 SHA1 bc08c4f29aa626b3c1e015fa02a1b6860963cbc6 SHA256 2031a2e35e6cb504205455bb76e3eb7c8021edb27ad84dcbfc4ccffa70a119f2
 EBUILD hpricot-0.8.4.ebuild 1074 RMD160 69c167b5ba46ee19ef2a994b3835a411d56e4659 SHA1 c9bec636c04748e00a9c291018f72ecf207d8d31 SHA256 c4895f3ccb29feaa2b611e930744837afb053f82093ce73507905241f9c9ce4d
 EBUILD hpricot-0.8.5.ebuild 1387 RMD160 7015dcb938e044101a595b076857e70518c6350d SHA1 88c1c748376436893e94e5d013e2b7442b4ddec9 SHA256 a35f625b62292f42e30b8c4cd613c6d7270616ea19e3980752a7ffd1f79caa71
+EBUILD hpricot-0.8.6-r1.ebuild 2124 RMD160 33a40d5ad58f978a8dec991edffb6ae67104555d SHA1 f42d222f93a80885c9a36be1f020faff120ddae8 SHA256 1b4b44f907a45431127ec3060ec8bc8d8395cbcfe3fac84aee12811b83a76a9d
 EBUILD hpricot-0.8.6.ebuild 2293 RMD160 0ced17e2cbe759547e68bd63307617ff8fbf662e SHA1 3160910557e9f6e99af001cb8e3e732c2ab2aca8 SHA256 616da01ec7ccb4c7e582b82758607c911317c9d3a5d9ff5140c869e7fea0a2de
-MISC ChangeLog 4726 RMD160 0009ce746682ff1f2ae97c5343b8eaddfbad0ba2 SHA1 ea1decf329884e442f82152a075e19436aefaa02 SHA256 bb04e544ff40bc392364618ac0875761e9b08314ea097cc99aa28720483a7df7
+MISC ChangeLog 4892 RMD160 1fb46aa5ed7e8f2ea75a9ce3b636a5c24d282762 SHA1 1331a92e4bdc9e133d5f814f883508bf9c926b47 SHA256 5c3cd217639b332d545d91b2f384188706b369396401919ec593ec7ef755dee7
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8fWOYACgkQAiZjviIA2Xjt7wCgs08nlE/4CVfBw8RbnecqQkFs
-48AAnid5NLGTLTd5LcjRzxwfyaerGkW3
-=MDoD
+iEYEARECAAYFAk9I3hcACgkQAiZjviIA2XjGkgCeKcGPqnhMTCl/RUh1Mth7a9T7
+pqQAoOR2ySiiuQy49IsLYE8MJvp6+sPA
+=JxAX
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..ac5c0842d297
--- /dev/null
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/02/25 13:12:59 flameeyes Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18 ruby19 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="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rake
+	dev-ruby/rake-compiler
+	test? ( virtual/ruby-test-unit )"
+
+# 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 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed"
+	cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die
+}