Add back nokogiri-1.4.1-r1 since it is the last version that supports jruby and dev-ruby/mechanize depends on it.

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

3 files changed, 54 insertions, 5 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 28645068fcea..93889b253bc1 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
 # 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.43 2010/11/26 12:29:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.44 2010/11/29 08:12:16 graaff Exp $
+
+  29 Nov 2010; Hans de Graaff <graaff@gentoo.org> +nokogiri-1.4.1-r1.ebuild:
+  Add back nokogiri-1.4.1-r1 since it is the last version that supports
+  jruby and dev-ruby/mechanize depends on it.
 
 *nokogiri-1.4.4 (26 Nov 2010)
 
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 444d44bb7fa4..b16b5d4b79d5 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 AUX nokogiri-1.4.1-ruby19.patch 336 RMD160 72195083359b8e9a2ade643f4043e1fe8a791a7f SHA1 fb187fdb9071b617e372c0d8eeb2c09eedc276c0 SHA256 7f4edc71795d4b78739d21e44deba2819cb895b95ef07a0c928948ab31eaf109
 AUX nokogiri-1.4.2+ruby-1.9.2.patch 855 RMD160 b0d160d167d512e4489ddc7c50ba697ef2c1fd58 SHA1 ee629eab4ae22635545d21ddd9d6412fe7220483 SHA256 44cc1f8c08ab3f1b65794b7eb34bdcbcf9735c8b7edbd43972731501c429270e
+DIST nokogiri-1.4.1.gem 176640 RMD160 9143fa7632827cfee3d74f2a6b3a8dfb04227fb9 SHA1 7b49e61c908121b93de851839818288e25442d07 SHA256 3a539fdb66df12c2ae76ea52d3d7789835dac1d10fb1517d8d2545f2567cee34
 DIST nokogiri-1.4.3.1.gem 188928 RMD160 01f66e7e2e63b18ab9c4afbf4e3aade2a5c5d704 SHA1 9e0bcc42efca3f345c04f6383ad216b09c4ed0a1 SHA256 354c38ca7d802bf1b2c072ec1bf3214e2358323b30f28a05d24e46f5831862e9
 DIST nokogiri-1.4.4.gem 198656 RMD160 9f5fc2b15da160ccd03a096cf3074afb46e1a170 SHA1 15f5c381d98a4e53a879981b8fbc301d3561c675 SHA256 3d1ed8cc4b6caf1f1cdb7b53be26e72ab70b7111d463d76f898f1f32d998a7b2
+EBUILD nokogiri-1.4.1-r1.ebuild 1079 RMD160 562141d32333f73b4993ccb6d16e4ce0d6a33dcd SHA1 c22c2a7fb5a75cd7d71444661f271c72704cb10f SHA256 c359da32b02694b5e2e2e6fbe0497cf8783772832bbdedc04c0788517832b5b9
 EBUILD nokogiri-1.4.3.1-r1.ebuild 1910 RMD160 ab099ec8cd40442e7bd06bb69d34acd5084cd244 SHA1 a790f20147c5a9605edcc4810fdab2e67a81e02d SHA256 6b5a2e8d680de4b0dfef2b612ac08f6e5817cdc02fd9284bb939c6e138264382
 EBUILD nokogiri-1.4.3.1.ebuild 1913 RMD160 8ce166c4253a616e4c5ccd3c26af96cf4d636708 SHA1 05536e7098118af6a609ad94cb63f7d25fa0ca31 SHA256 53ff600414035d393667e4f0f43782082f8b4edaebcb252ea8ab46319c7a551a
 EBUILD nokogiri-1.4.4.ebuild 1908 RMD160 e56bb3194313f931f026674ff7215f49adf133fb SHA1 268a7a10b944317a59fd5a27c6b68a150f41bc7a SHA256 3d95a916a8a8016ee748e56d54670968d42f98a8f4500f8fc93ab29a47e1a3ba
-MISC ChangeLog 6444 RMD160 0977ce0837790e9eab23ec6c52ac73acacbc5345 SHA1 af3907844d42fd93ea0b12ae27504e44c51d36a8 SHA256 7dc67d9b4cfc6115c9ea4aef1b2e30f743c14e553ab983dd48c6629c34985657
+MISC ChangeLog 6640 RMD160 fa2723d5a0a8977f952ebe7488c4167262dcc6b4 SHA1 24b382fcf8e32127f9d4bfe1e277e009b7f0ce12 SHA256 ecb473e1fce725ad29fcf4bcfde35464d74d7858a42a94e22b5f8ec3d8ff228b
 MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzvqCcACgkQZihJkut28Stb1wD7BhLtJz6M4Ug7MSZRG6NHl3Fb
-Tzp1E0SOaJZbi/Uiy4QA/RPRGGdO5BXz9EcPGCsja0NCSh+yh3SJeLFXz53g4QIi
-=Xrql
+iF4EAREIAAYFAkzzYIMACgkQZihJkut28SuO8AEAxZHv9kstROqKuUlopFQ/WHyX
+WedZMbJaMzUuRKBrsqMA/2B3DrDdbUT/tGkvHRP0H6snw/6s320Qcj8+ycxzdXUw
+=7tlO
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..d409909ff795
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild
@@ -0,0 +1,43 @@
+# 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.1-r1.ebuild,v 1.11 2010/11/29 08:12:16 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 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
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
+HOMEPAGE="http://nokogiri.rubyforge.org/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/libxslt"
+DEPEND="${RDEPEND}"
+
+ruby_add_bdepend "dev-ruby/rake-compiler dev-ruby/rexical dev-ruby/hoe"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-ruby19.patch
+}
+
+each_ruby_compile() {
+	case ${RUBY} in
+		*jruby)
+			einfo "NokoGiri does not build a native extension for JRury."
+			einfo "Instead, the FFI library will be used."
+			;;
+		*)
+			${RUBY} -S rake compile || die "extension build failed"
+			;;
+	esac
+}