| 1 |
graaff 15/02/27 15:19:56 |
| 2 |
|
| 3 |
Modified: hpricot-0.8.6-r3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add ruby22. Drop jruby. |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: hpricot-0.8.6-r3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- hpricot-0.8.6-r3.ebuild 5 Aug 2014 16:00:48 -0000 1.2 |
| 23 |
+++ hpricot-0.8.6-r3.ebuild 27 Feb 2015 15:19:56 -0000 1.3 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
-USE_RUBY="ruby19 ruby20 ruby21 jruby" |
| 34 |
+USE_RUBY="ruby19 ruby20 ruby21 ruby22" |
| 35 |
|
| 36 |
RUBY_FAKEGEM_DOCDIR="doc" |
| 37 |
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md" |
| 38 |
@@ -22,15 +22,11 @@ |
| 39 |
ruby_add_bdepend "dev-ruby/rake |
| 40 |
dev-ruby/rake-compiler" |
| 41 |
|
| 42 |
-# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now |
| 43 |
-USE_RUBY="${USE_RUBY/jruby/}" \ |
| 44 |
- ruby_add_rdepend "dev-ruby/fast_xs" |
| 45 |
+ruby_add_rdepend "dev-ruby/fast_xs" |
| 46 |
|
| 47 |
# Probably needs the same jdk as JRuby but I'm not sure how to express |
| 48 |
# that just yet. |
| 49 |
-DEPEND+=" |
| 50 |
- dev-util/ragel |
| 51 |
- ruby_targets_jruby? ( >=virtual/jdk-1.5 )" |
| 52 |
+DEPEND+=" dev-util/ragel" |
| 53 |
|
| 54 |
all_ruby_prepare() { |
| 55 |
sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die |
| 56 |
@@ -41,30 +37,18 @@ |
| 57 |
} |
| 58 |
|
| 59 |
each_ruby_prepare() { |
| 60 |
- # dev-ruby/fast_xs does not cover JRuby so still bundle it here for now |
| 61 |
- [[ ${RUBY} == */jruby ]] && return |
| 62 |
- |
| 63 |
pushd .. &>/dev/null |
| 64 |
epatch "${FILESDIR}"/${P}-fast_xs.patch |
| 65 |
popd .. &>/dev/null |
| 66 |
} |
| 67 |
|
| 68 |
each_ruby_configure() { |
| 69 |
- # dev-ruby/fast_xs does not cover JRuby so still bundle it here for now |
| 70 |
- [[ ${RUBY} == */jruby ]] && return |
| 71 |
- |
| 72 |
${RUBY} -Cext/hpricot_scan extconf.rb || die "hpricot_scan/extconf.rb failed" |
| 73 |
} |
| 74 |
|
| 75 |
each_ruby_compile() { |
| 76 |
local modname=$(get_modname) |
| 77 |
|
| 78 |
- # dev-ruby/fast_xs does not cover JRuby so still bundle it here for now |
| 79 |
- if [[ ${RUBY} == */jruby ]]; then |
| 80 |
- ${RUBY} -S rake compile_java || die "rake compile_java failed" |
| 81 |
- return |
| 82 |
- fi |
| 83 |
- |
| 84 |
emake V=1 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed" |
| 85 |
cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die |
| 86 |
} |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.70 dev-ruby/hpricot/ChangeLog |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/ChangeLog?rev=1.70&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/ChangeLog?rev=1.70&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/hpricot/ChangeLog?r1=1.69&r2=1.70 |
| 95 |
|
| 96 |
Index: ChangeLog |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v |
| 99 |
retrieving revision 1.69 |
| 100 |
retrieving revision 1.70 |
| 101 |
diff -u -r1.69 -r1.70 |
| 102 |
--- ChangeLog 17 Jan 2015 19:54:49 -0000 1.69 |
| 103 |
+++ ChangeLog 27 Feb 2015 15:19:56 -0000 1.70 |
| 104 |
@@ -1,6 +1,9 @@ |
| 105 |
# ChangeLog for dev-ruby/hpricot |
| 106 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 107 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.69 2015/01/17 19:54:49 mrueg Exp $ |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.70 2015/02/27 15:19:56 graaff Exp $ |
| 109 |
+ |
| 110 |
+ 27 Feb 2015; Hans de Graaff <graaff@g.o> hpricot-0.8.6-r3.ebuild: |
| 111 |
+ Add ruby22. Drop jruby. |
| 112 |
|
| 113 |
17 Jan 2015; Manuel Rüger <mrueg@g.o> -hpricot-0.8.6-r1.ebuild: |
| 114 |
Remove old. |
Archives