Version bump. Add ruby20. Skip tests failing due to newer libxml2.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

2 files changed, 123 insertions, 1 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 82da36eafc81..840097dc113e 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.86 2013/01/16 01:10:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.87 2013/10/06 09:50:56 graaff Exp $
+
+*nokogiri-1.5.10 (06 Oct 2013)
+
+  06 Oct 2013; Hans de Graaff <graaff@gentoo.org> +nokogiri-1.5.10.ebuild:
+  Version bump. Add ruby20. Skip tests failing due to newer libxml2.
 
   16 Jan 2013; Rick Farina <zerochaos@gentoo.org> metadata.xml,
   nokogiri-1.5.5.ebuild:
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
new file mode 100644
index 000000000000..ddc934b363c0
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild,v 1.1 2013/10/06 09:50:56 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
+
+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/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~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 )"
+
+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_prepare() {
+	# Avoid tests most likely broken by libxml2 2.9.x
+	sed -i -e '/test_path_round_trip/,/^      end/ s:^:#:' \
+		-e '/test_css_path_round_trip/,/^      end/ s:^:#:' \
+		test/html/test_node.rb || die
+	sed -i -e '/test_multiple_filters/,/^  end/ s:^:#:' \
+		test/test_convert_xpath.rb || die
+	sed -i -e '/entity_reference_without_dtdload/,/^      end/ s:^:#:' \
+		test/xml/test_entity_reference.rb || die
+
+	case ${RUBY} in
+		*jruby)
+			# Avoid failing tests:
+			# https://github.com/sparklemotion/nokogiri/issues/721
+			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+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)
+			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+			fi
+
+			${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} \
+				V=1 \
+				CFLAGS="${CFLAGS} -fPIC" \
+				archflag="${LDFLAGS}" || die "make extension failed"
+			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+			;;
+	esac
+}