Drop ree18. Drop useless ruby-test-unit dependency. Add ruby20. Make compilation verbose.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 83 insertions, 6 deletions

diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog
index 49f4d5bbf33e..851177c88800 100644
--- a/dev-ruby/hpricot/ChangeLog
+++ b/dev-ruby/hpricot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.45 2013/07/16 07:37:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.46 2013/10/15 19:36:36 graaff Exp $
+
+*hpricot-0.8.6-r2 (15 Oct 2013)
+
+  15 Oct 2013; Hans de Graaff <graaff@gentoo.org> +hpricot-0.8.6-r2.ebuild:
+  Drop ree18. Drop useless ruby-test-unit dependency. Add ruby20. Make
+  compilation verbose.
 
   16 Jul 2013; Hans de Graaff <graaff@gentoo.org> -hpricot-0.8.4.ebuild,
   -hpricot-0.8.6.ebuild:
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 159fc499167f..6653e24c7e2c 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -4,12 +4,13 @@ Hash: SHA256
 AUX hpricot-0.8.6-fast_xs.patch 650 SHA256 82d2b8c3b4df44da8f7a8a1b5263cff57f27b853b84843e9d4edcf305d184216 SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d WHIRLPOOL 4511612f245a6f36b86d4f2de24169013d216d6b981a3dfe0eb53f81714f8ec0fcd504701a207e74170ea6fd7d3fc971ecb87c862778dc304978d5bea418c00a
 DIST hpricot-0.8.6.gem 293888 SHA256 dfe8f4b3414ba8377d7626030f3aa605caadee9de87cffbeadf8a50359eac8ca SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad WHIRLPOOL d45ca1c1d8edfab43abcc0a14c3b035b9b9b934d95212ce61109692d83bbc641c34451b3dbd946fe9af7583628ab76eaeb097c909db5a182d2a86973b755ad4c
 EBUILD hpricot-0.8.6-r1.ebuild 2165 SHA256 b10afc64d7f90b1cec51b9cb2cbad30b40f8faaaaa283c5a560381bdc31a4c1e SHA512 8114609735799c285582703d02411cd50e93e0aa263ad08dad9b545ed15e37b2bb89716a34b78563249e9ceda6560898b2a6ecb72bae797054e9c1d343dda7e6 WHIRLPOOL 033da6ad8834d940a7d77310362699ced9b2f0cc6158efaa9ab9a191e235addfe2e5db385d0baab34b53d9030514619849c748e3a02bf73fcd7161a93d8634d8
-MISC ChangeLog 5989 SHA256 905534fd5ca57c3161472958943e4452bed8253f00671b1636cd362e806e276d SHA512 1458e86a1335d821081b102c9af000b9e07d794c34692842c4e78a9d94aaa881265b225666be61d0b777b4168ff505e4a347d7069d12ae4a38939b78d280ded5 WHIRLPOOL d3bc41eadc63187e8ca36e370532386ddd3ce81514542bb1383c480f5ecf2ecc0632ad955e917a91511c314670bb5109999171534b62fe2de66f7daff6cdbbd2
+EBUILD hpricot-0.8.6-r2.ebuild 2135 SHA256 343e95a1dbf97017513afb926e5a5a37bcb9be77d4da24d21a5afeda96d771ba SHA512 5aef35cb78722733d81823ce14ad91681cd5a354fbe219e0b2c7d02f0d169cab863b50d37824bee85602ff178affa0932c31c5fd2a7a6fba37cb3d35648b8ee2 WHIRLPOOL a0346856c38889d1bb27c77184dead994665a5d8b00ecea33e04c7c4a298032d1f91d8c5019bdb1d5980d7585bfea56c4f23b89359c67e32385bc598cc63f3c8
+MISC ChangeLog 6193 SHA256 8a32fadd3ab5b4880be4def4473d09e3f77f952cc05e6d1026d34178e0448713 SHA512 37d5a4170ab2542c64faaf7a5be50643dc35a9d9333cf39396c0fdb9203422496a9e74a57e0403fc264b1397be05a07c00f9610122c8d3210de601af179f3f1e WHIRLPOOL 2c54a495ed1c41b3044daced644913fa78bae7d673d5911355ea4cff481c0f677b2a95c439c1540e3083a4d92a8dacd7fdd99201e5ef78ed9d7d2761ded85a77
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlHk+EUACgkQiIP6VqMIqNc4KgD/dDFbuFhM94nyg5r124j5fyX3
-+zzPv8/9WC34754gbGkA+gMf32fE6tjY5Ys8kSSaC0RPzULOsG5CZaToeb33qs/m
-=IRIk
+iF4EAREIAAYFAlJdmUUACgkQiIP6VqMIqNeumAD6Ar8bCcOktIuPc4uxRgh6hQbI
+bRmr4O+rYiNprIWuvOwA/1fgkdNyuKJTPtQUxAvGUO4d+LdAeseTd+G5or4yT4bg
+=wwYF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild
new file mode 100644
index 000000000000..ca390385371c
--- /dev/null
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 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.1 2013/10/15 19:36:36 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 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
+}