Add ruby22. Drop jruby.

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

3 files changed, 21 insertions, 24 deletions

diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog
index ba4e1865df94..e76e52f684cd 100644
--- a/dev-ruby/hpricot/ChangeLog
+++ b/dev-ruby/hpricot/ChangeLog
@@ -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.
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 1b96f2354246..f9ece515c9f0 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-r2.ebuild 2116 SHA256 16c6038ea195081b1e11ebc49080e5bf49af9d031a34fbe41300df87278e564c SHA512 e0771bd7fea2a146704493ec44f6c751206ebc81b9081d8a5ae6d0f1df14da30356ae282317a0ca02995f95f9c52f55d99424872abe8337f545f06979aed396d WHIRLPOOL 438e73e605e6d3cdc03a40b95c92d40d5a6edfd6166ec2b227d071a44b9e1c58b7bc8dd18de1cc5541b6e9b367838a7e418a9984f0f460b6cb7a04c1af64541d
-EBUILD hpricot-0.8.6-r3.ebuild 2133 SHA256 13302bc29156bd2195d29a6bf5416f5eb05ae8c03b39a25fc7af0ecfc9d3ee4d SHA512 04380eae588a85603d7c67de93d159b4729c7f9748ea3a8f1439e580f17d0b1681b8b68b674347e5092bdb21e4df89ca1d8936c3061e74f818f757b3ac4ab9ee WHIRLPOOL c1e1e6d01e3d45fbdbf96f393c05e93a3b81abc11e3a6976444ecc0630ca1000bf509128a28ec47ec405d7f0ae53e17e2cd8bc0de2d56f4022de0828c0fb7d4c
-MISC ChangeLog 8887 SHA256 372177452495bdbdad583eafdc6dbae33e2951a22fb383782edce821b9cdd700 SHA512 7b6dfd59c0ea9454a6410a6178352ff378eb28d5c42d5a434d9de13e64119c17fcaf622a79c84bcc1634fdecede8eddbc4e0eb25761a4efe8bb8bccccb42ab5a WHIRLPOOL b42877a996143bfdf32a7d9b9603b243b51f5f0f0d6b6069ba2073cc18400e6fd291950113752f78e980fb6aaad80941cc96208690721922aeef6792961920e9
+EBUILD hpricot-0.8.6-r3.ebuild 1579 SHA256 2f8f93ae13ca8a409ebf454eee86bad4ebcb847fe990264ef19002b10434a7d8 SHA512 6a5097ce99d1d57a6305d29b7d3e3e8f74d44d185c1ec7233c5aec0b5de7778f0a596d0bb2cd520ba2ae71ba58ed287e5739e7f9d7208f8c1cc2bc37cc3ff644 WHIRLPOOL 77c97ddf7ff7a51d2dc12e99f59f7ebc4f561c3dc9c23eddefde8451cada544da2d66be0f1c55b1b0607e39354bb06b4a7099c606be237588a37c5f4def504f1
+MISC ChangeLog 8990 SHA256 031bb4572f73929e5faceb483ed2f886c569b7c5349fbd0b8101802383742ebe SHA512 f4f04ea495cdd1160581af6a8ec964ab9978a42f4bc69a8e32676478ae60e755eedf0c20739bf11efe64813a279bde8ebdab6290a56cf707e3a1e5930cc77348 WHIRLPOOL c152d4e45dde90df45b3d84856e52be3dfe0a966d79cf9f8289f22395a3999193b60980daf1f7fe3e71962a4acbb4927757dfe1735ef287a69744f71e50e19e8
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlTwix0ACgkQiIP6VqMIqNdTiAD/d3R30MdBg28gBXscpdoMhjqD
+gr7tWlK85SgAygWzR+8A/j51UYmaa3QJowdheHAZnWk9e2K31N2gmtv/1h22C/17
+=xoKc
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
index 15083e96f86c..b56ec85f1940 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
@@ -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 @@ 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"
+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 @@ all_ruby_prepare() {
 }
 
 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
 }