Version bump, add ffi USE flag to use the ffi interface rather than the compiled...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 396062f86de2de2398f88f847a79d6c7d1a9baff..995965e8fdb60ebd497939957163fdd59b329eb2 100644 (file)
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.29 2010/05/22 15:31:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.30 2010/06/19 10:32:56 flameeyes Exp $
+
+*nokogiri-1.4.2 (19 Jun 2010)
+
+  19 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +nokogiri-1.4.2.ebuild, metadata.xml:
+  Version bump, add ffi USE flag to use the ffi interface rather than the
+  compiled extension even on MRI.
 
   22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   nokogiri-1.4.0.ebuild:

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 6b4a42c789b8e21d24cd65d3e5ab042570a9f2e1..c16f091e2adc448853bdf1ca822f068bc5a07c3c 100644 (file)
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 AUX nokogiri-1.4.1-ruby19.patch 336 RMD160 72195083359b8e9a2ade643f4043e1fe8a791a7f SHA1 fb187fdb9071b617e372c0d8eeb2c09eedc276c0 SHA256 7f4edc71795d4b78739d21e44deba2819cb895b95ef07a0c928948ab31eaf109
 DIST nokogiri-1.4.0.gem 165376 RMD160 04eca3dfb7191a5ac8859d35729ac719a00f32df SHA1 5c2b03d93e8204d7a09fc66ba05129144ad370c3 SHA256 89ed690aa46e80b0a3d39f66ec4359f5acefc97a11a867539c2f4147d743b7f3
 DIST nokogiri-1.4.1.gem 176640 RMD160 9143fa7632827cfee3d74f2a6b3a8dfb04227fb9 SHA1 7b49e61c908121b93de851839818288e25442d07 SHA256 3a539fdb66df12c2ae76ea52d3d7789835dac1d10fb1517d8d2545f2567cee34
+DIST nokogiri-1.4.2.gem 183808 RMD160 aee3dcfbd5fe08780cbba56e99ab52052de53715 SHA1 cd14810105332889bbf792cc63f5a49535a9078e SHA256 a56c2cfe2aa4ab38fd1ff4c4fe3d4f029529f8da900e94b50861062ac70770d8
 EBUILD nokogiri-1.4.0.ebuild 506 RMD160 20717d54d9beb9eec9a263e0569d83c70c9d9ca8 SHA1 e6ca437588ae7a142510dbcd9fe2e5222e11c6ea SHA256 1d2889b6a8eadb4e16cb120146bfb4bea9c04464dea3791935d26072aefbc225
 EBUILD nokogiri-1.4.1-r1.ebuild 1067 RMD160 9bd050c6590924086dcfd6069ae138d6584d183d SHA1 9c68f40d5084398ee457f763e210a0571d46e3f8 SHA256 c73f11d4d76fdf3f98c8debe8d6ca430c3dd44c4500fbb80d202f9efebda075d
 EBUILD nokogiri-1.4.1.ebuild 829 RMD160 5f29988f51d593ae20a654ba777933ad840f78bb SHA1 4476ba15cc3b71b3143b27443c9194ea133735a2 SHA256 be05b4fe42cfc090cab8a4fa52182036fb503d5431faff8036cc50a3d3d03009
-MISC ChangeLog 4437 RMD160 8765d304bccec257caad3712bd57b1d3c4e68c7e SHA1 97adad2a156d5d553ca7694d64fe6c29d371f4d0 SHA256 bed5792b123f74b5860891484297aa2bc279739ad80f63ea592f15b1c8952154
-MISC metadata.xml 251 RMD160 31f012ad36db2d4125f29e8da90124d0a59c1ac2 SHA1 8738194626cdbb2bf28f1b9b4785863b6019a755 SHA256 59f004fe4f4489ab22df78419f826d46b8e3962348c5cd0e5acafeebd96eb3a2
+EBUILD nokogiri-1.4.2.ebuild 1833 RMD160 f5ea157b252074144b17433dd7edcff93499a06e SHA1 e68d40291212b061debfb9fabae326f2ba7f5f82 SHA256 945d84b1e8777b52ed9fb1f80c85d8b4069bd63185b1a5cda1f9c2932482fe6b
+MISC ChangeLog 4673 RMD160 0589e2acef3a45a2579e7118643506b4f657c5d9 SHA1 fc84037d66953cf9949aba2e25b8da890f54034c SHA256 f613b7a00ffa06fdb96d175695f52e5b63294c52c007f511f4c7917e99319540
+MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv3+LAACgkQAiZjviIA2XhssQCg2AkqPBvDn6QF0ToffN6tw1VB
-9I0An2LF97FIxUqbdsJpdlrSvpS1YtfS
-=KkUu
+iEYEARECAAYFAkwcnEUACgkQAiZjviIA2XiG9wCfc2QiANF8ApgB3sDlRli5lvYA
+d9cAn2Cd1kOSaty0ODVYYK8+4/Jdlv8X
+=oHYU
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/nokogiri/metadata.xml b/dev-ruby/nokogiri/metadata.xml
index 22be59015354b1edad21c51857ec9d5f2f70daaf..12663410a393e92a7ebf328cc3d084162c93c31f 100644 (file)
--- a/dev-ruby/nokogiri/metadata.xml
+++ b/dev-ruby/nokogiri/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
-<longdescription>Nokogiri (驪ｸ) is an HTML, XML, SAX, and Reader parser.</longdescription>
+  <herd>ruby</herd>
+  <use>
+    <flag name="ffi">
+      Use the Foreign Function Interface library (as provided by
+      <pkg>dev-java/jruby</pkg> or <pkg>dev-ruby/ffi</pkg> depending
+      on the implementation) rather than building a C extension to
+      wrap around the libxml/libxslt interfaces. Note: JRuby always
+      uses the FFI interface as native extensions are not supported.
+    </flag>
+  </use>
 </pkgmetadata>

diff --git a/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild
new file mode 100644 (file)
index 0000000..69f52ba
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.4.2.ebuild,v 1.1 2010/06/19 10:32:56 flameeyes Exp $
+
+EAPI=2
+
+# jruby → needs weakling for testing , will add back in a bit
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
+HOMEPAGE="http://nokogiri.rubyforge.org/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="ffi"
+
+RDEPEND="${RDEPEND}
+       dev-libs/libxml2
+       dev-libs/libxslt"
+DEPEND="${DEPEND}
+       dev-libs/libxml2
+       dev-libs/libxslt"
+
+# The tests require _minitest_, not the virtual; what is shipped with
+# Ruby 1.9 is *not* enough, unfortunately
+ruby_add_bdepend "
+       dev-ruby/rake-compiler
+       dev-ruby/rexical
+       dev-ruby/hoe
+       test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend "ffi? ( virtual/ruby-ffi )"
+
+# USE_RUBY=jruby \
+#      ruby_add_bdepend "test? ( dev-ruby/weakling )"
+
+all_ruby_prepare() {
+       sed -i \
+               -e '/tasks\/cross_compile/s:^:#:' \
+               -e '/:test.*prerequisites/s:^:#:' \
+               Rakefile || die
+}
+
+nokogiri_ffi() {
+       [[ $(basename ${RUBY}) == "jruby" ]] || use ffi
+}
+
+each_ruby_configure() {
+       nokogiri_ffi && return
+       ${RUBY} -Cext/${PN} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+       if ! [[ -f lib/nokogiri/css/generated_tokenizer.rb ]]; then
+               ${RUBY} -S rake lib/nokogiri/css/generated_tokenizer.rb || die "rexical failed"
+       fi
+
+       nokogiri_ffi && return
+       emake -Cext/${PN} \
+               CFLAGS="${CFLAGS} -fPIC" \
+               archflag="${LDFLAGS}" || die "make extension failed"
+       cp -l ext/${PN}/${PN}.so lib/${PN}/ || die
+}
+
+each_ruby_test() {
+       nokogiri_ffi && export NOKOGIRI_FFI=yes
+       each_fakegem_test
+}