dev-ruby/weakling is actually a runtime dependency when using jruby. Drop x86 keyword because of this, bug 365417.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 89 insertions, 5 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index f23b0aa7fee6..49cca4e8dbed 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.52 2011/04/30 15:44:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.53 2011/04/30 15:56:15 graaff Exp $
+
+*nokogiri-1.4.4-r1 (30 Apr 2011)
+
+  30 Apr 2011; Hans de Graaff <graaff@gentoo.org> +nokogiri-1.4.4-r1.ebuild:
+  dev-ruby/weakling is actually a runtime dependency when using jruby. Drop
+  x86 keyword because of this, bug 365417.
 
   30 Apr 2011; Hans de Graaff <graaff@gentoo.org> nokogiri-1.4.4.ebuild:
   Depend on rdoc for documentation, as the rdoc implementation of ruby 1.8
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 09760141e16f..7f83f410b253 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -3,13 +3,14 @@ Hash: SHA256
 
 AUX nokogiri-1.4.4-libxml-2.7.8.patch 729 RMD160 06a660ef03645ca35cf93fb5aa5ec46a5ce0da34 SHA1 9bcd7a6fbefc75db8691200e9714460864a51ed3 SHA256 56fbfb502adbb04dc77373a2d7c3708cf7b7cf21f0419f2fc6ff40dc6fa56321
 DIST nokogiri-1.4.4.gem 198656 RMD160 9f5fc2b15da160ccd03a096cf3074afb46e1a170 SHA1 15f5c381d98a4e53a879981b8fbc301d3561c675 SHA256 3d1ed8cc4b6caf1f1cdb7b53be26e72ab70b7111d463d76f898f1f32d998a7b2
+EBUILD nokogiri-1.4.4-r1.ebuild 1960 RMD160 6eb8f806ab1fb6dbafa1afd0f9dd8117c80e7399 SHA1 e6224bd2ea327e4e279d13d893406b9e637570b8 SHA256 caf2738102fd8f61fe6214bc3ddcd495c1eca2622e3f9611dfb0f8a81a4544b0
 EBUILD nokogiri-1.4.4.ebuild 2237 RMD160 bbf3f1b129d12b968e3a68b72d3117d765581797 SHA1 a00dda2cf070147db41bd80fbf44333d2f026cf8 SHA256 82ed15ae1d1f15ba630a0cdd4bb6fc2affca0d81460103c26c3c2ce6a9e2c0c2
-MISC ChangeLog 7887 RMD160 1bcc9ba995dbad0c39ccb8f027ce70d8af848edb SHA1 0c83b4630d672d525ad5b084a638d181fcd721f1 SHA256 576c4e55225c78cfc2d0e47e774a5586f8df768ee0d6a6f4ef3fcf04270a53ce
+MISC ChangeLog 8118 RMD160 7890aab474fa0a6e610116ccf65afd4384825ffd SHA1 1ebca79d5765b5b165e7b21dbbc20e7e8f4e99be SHA256 b1f8ba23a46844239dfee34d0e0d9267fa76e6eaa0891bce7644792ce0300b17
 MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk28LkoACgkQrnu0mw69Jko6ugD/TPzaOnp9Hz2nWqyg75IQ990r
-ja2rca822JGhekRA/9EA+wc1mjyaUqo2/RjJR0TroU8yLYWn8Tc8x0AyvRugnpWM
-=/Ziv
+iF4EAREIAAYFAk28MSQACgkQrnu0mw69JkrF9wD/Xims3X3cYNNJZzmHMMzc2tKk
+eGLS04gZHeab0FVEHHwA/2Byqf00DREEcHqyrhIKtBErE9h2ulg1AcDuF60dyjOE
+=52OH
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..5b402903e779
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild,v 1.1 2011/04/30 15:56:15 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+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 multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
+HOMEPAGE="http://nokogiri.rubyforge.org/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+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
+	dev-ruby/racc
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend "ffi? ( virtual/ruby-ffi )"
+
+USE_RUBY=jruby ruby_add_rdepend "dev-ruby/weakling"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-libxml-2.7.8.patch"
+
+	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}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	nokogiri_ffi && export NOKOGIRI_FFI=yes
+	each_fakegem_test
+}