Add ruby21 revision to create a stable candidate.

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

4 files changed, 85 insertions, 8 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/Manifest b/dev-ruby/hpricot/Manifest
index 23ea546bd94b..5ff5a9a59886 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -4,13 +4,14 @@ 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 2112 SHA256 36bb4b099c97f06bc153bfe196b40d2fd97c76cbab5c8d2f37667771445cf355 SHA512 d5df62de9c630448fd927d4455b31adc556d02637b7ea40ac2e4d7008ca24ed9a02bc4044313e78ea1037c335aba0432e40ec214daa8b9ec91621216f29f3dfe WHIRLPOOL 5b6848a73f8179720714543c6df8a67f2e384bae66b33d5574eec31dad5a1b699cdff79ff6baf4c58e5412dee0614eb57dc9983f1b104a594a9dd16e665a8386
-EBUILD hpricot-0.8.6-r2.ebuild 2135 SHA256 94a88bf9be3b48a9d2100643a83ed3ab805f3b5c781cd10821ea2939ce853adf SHA512 47f4ad2a24e0966cab807d224d67ffa4881fc5106cd7c294ff91732ffb81f1a82193b879dd6de3b988943c5ad53c2bf9bd6767a12db571814e179762198e7a39 WHIRLPOOL e2dd47028ef94346c01d62a6efa47ff9632e4560a3791feb5dd4840eb93141c8d9fc79b0cf5d0c4846668afdf4c59580757ca1f42b5dcdaba5402dda9bc37509
-MISC ChangeLog 7036 SHA256 8fe5036e1fbb7143f451b3e2ec137cc624297ea936a3fccdd5783e8cf8f18c1e SHA512 3d0f142c7fbc448c9568f4f3d591ee7001d9e83061ac29017b6994007ea60fde2ec62d81fdcf5673120e43fa81ff1d00e11e63348de5a294655e0f9c041dbc0d WHIRLPOOL f94316d54d8208e180c92baf443f076d8d2b196f5cb17427ce9efa09f4949f6f3757ec96ca129b41a274d56d0b2f311267aa99feb8a42a832ff076e8ecf4158f
+EBUILD hpricot-0.8.6-r2.ebuild 2128 SHA256 ab51a6fe0680912f0eba4030a8382d37d3d6a0e573759274a7e781665b7dfe8a SHA512 54c9524eaee2a5b259c14ce4cb8fc9d348cdaf226b4fb2ff114b75e4a8707de520ab1b73c4afdddf2189cafb3c8dae76687cba6e5c98ed1efc9deefd3267d09f WHIRLPOOL 2389a332a3bf76d566f6da0b8d8f630e9ab043ff1a8143bb987968f97a48f10d2b141dfe1cda5f20ae7676d6591ce876ba7ab94489182073766b6d095d8cb46f
+EBUILD hpricot-0.8.6-r3.ebuild 2135 SHA256 2d3eb86aab10b462cb72045bd2f1eaa9198cdbef7ab684fbf3ee9afc179b5c8e SHA512 ca4237100189c67805ae97c15d815f27e9f58c7d597efea27ded70525347d2e403d56b84d81c4bc3c5821df3eea75ef91db051ba29028bb74d45ea0c6ebc2dd3 WHIRLPOOL 643913df95a92395a8354e0d8bfbc6f80fe351f9ca014fe6cb335046376515f2aa1d5ea1cfa73bc6d1d6c44e19bbad96c97cd448d7e9f9b91a1dc43d35ac488c
+MISC ChangeLog 7225 SHA256 283d8203306abee3e608051d98f1c4c83bdb74c6ea599f54ee8994b8567ef179 SHA512 c9cde6bb511b10eea2c922fffff0e259e8c636f1c93f3e8d08e73327af94252a1bff9629068221497a0f2634e63cc4b90084710a767d1ee74214d499bab7f548 WHIRLPOOL 22f60adb4a38254bb56c2e62f10497837d7f9e8a6ac8debab5fceda3816d0237130d9ae95da8cfc43eacd352a2954996014a9a6eaa831faacf844b476b4ec93d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNTaowACgkQiIP6VqMIqNfARgD9FwXRj2FHka0dfLcnNk50+hWF
-Q7OOHZoNltkiEoElcS0A/RdvkLhTcuuTnf1mbVe9gHhPUcu/fG3UBmm+IbsnDWfv
-=T6Hm
+iF4EAREIAAYFAlNzsmgACgkQiIP6VqMIqNctPAD+LL+LN1ZFuTfDXeXdYSoOBkmC
+h44VSvBt/nh948MeI/kBAJPchKslWLLuXE8TWqulYEbA0xQVh9EhMWXExgha0Wh1
+=n04F
 -----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
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
+}