Version bump; tests are partially restricted but this solves JRuby issues among others.

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

3 files changed, 117 insertions, 16 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 2629d48af689..246e1bae1cab 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.70 2012/05/06 15:13:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.71 2012/05/11 18:47:41 flameeyes Exp $
+
+*nokogiri-1.5.2 (11 May 2012)
+
+  11 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> +nokogiri-1.5.2.ebuild:
+  Version bump; tests are partially restricted but this solves JRuby issues
+  among others.
 
   06 May 2012; Kacper Kowalik <xarthisius@gentoo.org> nokogiri-1.4.4-r1.ebuild:
   ppc64 stable wrt #369573
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 190ec18ef704..bbbe334d23fe 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,30 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
 DIST nokogiri-1.5.0.gem 187904 RMD160 ab4f6f9704f71899edb815f033e4f70560653b3c SHA1 c82f210a45b7c6b87c681e79a29e6a08ec8c6d71 SHA256 47adaf8891dc9ea6f3b58435cf5cfabacb04390064eea1739c8a26678039ebc5
 DIST nokogiri-1.5.0.tgz 1968555 RMD160 c14cd53c8e3e0c4b74a056c2f47aa6fb8fb5820b SHA1 3cf32d8355d4558bfb372c92b28640925bec269f SHA256 9966fef1ff6369d0ea7a40ea9f5e42e2bc9ba83bb2e4e6bc817a1da95c55bf4e
+DIST nokogiri-1.5.2.tgz 1988760 RMD160 5acd8d4bbf8916f53237b102db21049510539e73 SHA1 fb75adc5fe4ea7e9cf6defdd634dc7614b2da045 SHA256 d977baa45baa700c107a25eefea6e4b4b2771dd05204d734eee2dab9d69b1dbc
 EBUILD nokogiri-1.4.4-r1.ebuild 1955 RMD160 f5df02170751a2f071e04eb98a3fa99ee81bfafd SHA1 fdfcf88bf9c4195fabda7d4429d68d63e1887906 SHA256 9d028084c87b8b9ccbae8f15b9c73e5c464971dd3f408205cc942e25efb8514a
 EBUILD nokogiri-1.5.0-r1.ebuild 3098 RMD160 7054d4e0f6e05cf9486ebb41f7bdba5775b83bd3 SHA1 32749cb8f9eef49b94a0888bf04b8e303b1176b4 SHA256 a957d4ec56df2f5427a46230c0160eab96d8ed013b8a6e6a62568e5fc40f3352
 EBUILD nokogiri-1.5.0-r2.ebuild 3224 RMD160 b7e6d61c51551dc2054593c42aa6b3fc9f840d05 SHA1 6fd077bf729e72a3efdaa15324b3b630745e9527 SHA256 69a34ed580f5c7a1683e0949c1758d16781d19bd91f1a9d7de36f40a53133a8a
 EBUILD nokogiri-1.5.0.ebuild 2225 RMD160 11e4b608711dbd4efe379c97dd3342bac82be17e SHA1 9f94c90ccd340ed634789b6cc6e8684173ecd6be SHA256 dab33ef2dc1515b03bb3e9ca34ba22d7a6f01720f18af8d464d7eaaeb85fbb32
-MISC ChangeLog 10362 RMD160 98f6c3b147920dc4a49fb45bd406c25c61f0fa29 SHA1 0b401ea03dd61a057f5dce40821cc7f5e9853b98 SHA256 d69cb6c61b8f2a3fbbf7a6edc3c4884c0da5005ba2db3bb005200611a77a64a9
+EBUILD nokogiri-1.5.2.ebuild 2913 RMD160 5e8b3f423a1615c1c5be1aceafba8ea23830e3fc SHA1 29b450c8e85054a07167f0ef821b06686e6c6eed SHA256 7fc56f32c520ce9e09924a10b42f8cc608f47c23737b014b76f9e077ca599a3d
+MISC ChangeLog 10565 RMD160 1ea08bcd95370d84eb512225a5bf4a7fc70e18cb SHA1 63b16ad67a1d72f57024088dfd8efb41e8a78304 SHA256 f08d9da0facdcb4d14e81b901ce1f8dbe05c8146fc60ef4b943fb7db38294a8b
 MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPppUGAAoJEF0huFKJUZL5qQMP/ipOoKYUaFLvq8DZ+9kfEUtl
-L5eHSLsf8H6LwoS9R12Y1i+7PeB6jpRO6G9S/iNDcakcYw5kSO73vCLHQUr7v+82
-zFnjrSohx1uNiTIaqiIbO1B9FNnsoDP7cfPP/JC1kB3fz8PMfXhLi3iZlvs1Q3CF
-cYlHJfRQOX05tw6YkHxZUwnO2BUMLK2ULby0K79PHnEz+MTWtZDXBxlJTFe0HKlh
-cdga5RXszmo+AgUqwZ8oa/XblbzyYgpnaiHZwe2mLTV+sBachvEPMNFbooPn3tvV
-wHYf4XwrBVCIISnVVpimzJgwTHVKznbVpDaCu7YEOoiVqH5sbRSpfFGX0V9Fis5u
-SVzghftkjtr9Iadu0g54s0WiDE+oklLsCkHzD545gVmosY95/f8L9mJGaK0FdOiL
-MOz4STm+2xsDul0Gj8jGbqkqHGRcdSqb8dIx9o5MqMopNgEJdOj/S6cWBp3MVqMF
-8T3jHMLZ96ZkuvuLUjlpz6aTVvLm70VE8xVg7/rHZuO3oemxyEkBzdioS6gXDrGs
-sSdtIKnu+6eRcxnJNFDPrr27kszpz/2rYJ1mRXWWiJoDcW8Rk9j6K/M8xGE6XMjp
-/zV1HeVklKK0cGhBD1rybzCtoJ2bTT/8WntJb/79uugSDjwQ9aLMSg+SMHJ+cfeT
-aDpFY0SsoGTjR2kj4bbb
-=JzEd
+iQEcBAEBAgAGBQJPrV8MAAoJEBzRPIrUMBNCFzoH/jyuQQAYc2XoIBwB0TLoinFI
++VLxM39LTlKnOQhSStHD5oMRADP4/WGKZ1YfSc3GtRcEeuZkBu6poNUQYqLtrEiB
+vzK3bcT1MtI6jWgSJIfvc/IwYjuDtKBWOXwiqwDt96xdOWr+u+tIRemGXKlLd5IV
+pnM/h159FQ723LBCHG63hrIaQcBRCBBj83WDdCuA1XVaQ1Gw0vJuVNhEvXLQF2NV
+QH4sGOb3xvhGqIGvKni8K7vkeuPzy7cq0gUhlzZ4FkTOwizbTB+qSDT/ZwPHZyE9
+i5Ykv9BuLfUmvlYEG7BRKdtyV/Yu3QPx+BwednhnVkvqKoDZSFOnOHn/w2iBcpE=
+=QIqk
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild
new file mode 100644
index 000000000000..9cb10d1b99fa
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild,v 1.1 2012/05/11 18:47:41 flameeyes Exp $
+
+EAPI=4
+
+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"
+SRC_URI="https://github.com/tenderlove/nokogiri/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="tenderlove-nokogiri-*"
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+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/rdoc
+	dev-ruby/racc
+	test? ( dev-ruby/minitest )"
+
+# tests currently work only with Ruby 1.9; there is a small issue with
+# JRuby, but it's insignificant, while 1.8 and EE 1.8 are failing due to
+# the hashing order changes.
+RESTRICT="ruby_targets_ruby18? ( test )
+	ruby_targets_ree18? ( test )
+	ruby_targets_jruby? ( test )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+}
+
+each_ruby_configure() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			${RUBY} -Cext/${PN} extconf.rb \
+				--with-zlib-include="${EPREFIX}"/usr/include \
+				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+				--with-iconv-include="${EPREFIX}"/usr/include \
+				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+				--with-xslt-dir="${EPREFIX}"/usr \
+				--with-iconvlib=iconv \
+				|| die "extconf.rb failed"
+			;;
+	esac
+}
+
+each_ruby_compile() {
+	case ${RUBY} in
+		*jruby)
+			${RUBY} -S rake compile || die
+			;;
+		*)
+			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+			fi
+
+			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+			fi
+
+			emake -Cext/${PN} \
+				CFLAGS="${CFLAGS} -fPIC" \
+				archflag="${LDFLAGS}" || die "make extension failed"
+			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+			;;
+	esac
+}