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

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 143 insertions, 19 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/Manifest b/dev-ruby/nokogiri/Manifest
index 02b253352c50..eae89cfe2bc9 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nokogiri-1.4.4-libxml-2.7.8.patch 729 SHA256 56fbfb502adbb04dc77373a2d7c3708cf7b7cf21f0419f2fc6ff40dc6fa56321 SHA512 a61e9af8a4f94fa90fe07fc1b7348e85baa9da0922e3b55aea33b4c5940fa29cfab0f1e906c382989e23080269bf993771f444074014024cb9414fd166885ebb WHIRLPOOL 375d3fa74410cd783a15e6b7e399822733c14bbe8601e0a79e90aaedf40964700934293ea04b2eb69b81671a44f89368ccaa2b191505ecfad3043eaa8cbc82c5
+DIST nokogiri-1.5.10-git.tgz 2027539 SHA256 d52f63518be0fcaa4a618308847e57261f1007627ff89d2d02fca1a3f8061ee6 SHA512 3a7523fdaf13a0364fe073d957e887bd82b15556ea4059e7a6820ab7d1fd40f7f5f652f7838707953b4fd25d411ca8c76a378aa92c1eeba9a7035d7fbe21bb43 WHIRLPOOL 4e7bfab43d9b9c3203afe85d791e7b06e87e7406ee9147a2d043f508c9d34774900c88b2070be0c8ad9d4bd1ad0c352255db19ab70928c23ffbf4410989b13d5
 DIST nokogiri-1.5.5.tgz 2003354 SHA256 18c1dd504596e9f60267f48d9b9b28901bf1ba66be53b64ac78b32f5d277c685 SHA512 d70ea5975cd769f6b6d6e4cfae0daa5ddb430258e19ad70ac8caca6185a5a9dd08d4178ae39fa93dae09141508f754ff4166d7b6c4130eeabe081e2f653b99f9 WHIRLPOOL d8c9a60849056323eb9b2569d589358001623467af6e7926bbdfb842f2af46bacb75c6257289ab07803c9dda3cf48a971ad4e09617beb2d0a3d6fdf9cd9ae702
+EBUILD nokogiri-1.5.10.ebuild 3440 SHA256 c70fafc9c271e407e9fe2c86a4ad15af40d4339409a9738eab897aade2606764 SHA512 0d9cfcd2c191a86cdaeec70ae1cfb8b8e592390e0964d3f7e0200ad08d3f39c23acb3ceb02cb08f10bd8db66ae539014a1c1ead73d9f43d7d44c624c662cea1d WHIRLPOOL 8f7cab0ea5342bcb168a6e111c44cc457b8aed9890adc2f99ba66eca5cae97e42b20a888d23c0982024ae48dc5b93a0482afd09317448432d78ebc59a35a9911
 EBUILD nokogiri-1.5.5.ebuild 3044 SHA256 4bb9f6aeb571f21fdbb0a02acab053d48f5b313f747c81ba18af4d793508bf18 SHA512 7729a22cde7a9a4959a2a06e9e503ba0b6620c02c8996d2b3680d32525b6b91a2626af8f8ab6a447f274ae5a54d9c174432243e4cba3fba319def4d60d16cd06 WHIRLPOOL 632113c659be1945f586cd66336988851506edfd8441d623371eaabd73114cb0d26a02cf1bffbbe0745916ccfd087d0cec90a44221aae4362bfd47ccfaa2abdd
-MISC ChangeLog 12398 SHA256 a87f998e5919c2ecd3712c904c85765b7b30a5b5f923d59c4c11123aca1befbc SHA512 a1b551352eb8d2d9fd62bcbdd1303227f5729954e823e06db8bfe2a0d525dee98ef22b02751b67d34733e60877ce328e73d6799c76c212f95fd2e91c6463ac7f WHIRLPOOL 98864e62fab440d687bf33b5fa710e1337f765a1948c276a8320a4ec22e97ac7f1170182c47933c1e5d8c335f7b9acb9c02dbaa8ae214cdb4382cd6d6fff9955
+MISC ChangeLog 12572 SHA256 efdc931b9064756a19f90a8aef9d4b91b2b04d109c35bc62d67bdba7f12ddfde SHA512 5c80e050d732fa58104680942943282f95215c9f1413e51c1277c15cfbe9f37f8a5e56ef34a640378df92ddab33ca6175782b12680d07362327324b63f32085d WHIRLPOOL 1fc2ee118f9fba8daea46dfa2a915b20ba9aaf6d25535f7fc46b045be34ef849b9b06ba2d82a32e9b759534253facc6c676dc8db49372df4a8d25f43ef7fcb15
 MISC metadata.xml 159 SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679 SHA512 39d857a527ff3a066b0fa7a6e57f789e60178ca13c5ddaa93802b58ec8d45f47418c2ce85c389e2eed619216aca72d761651efa5a401d84357df9b24b478b3fb WHIRLPOOL ddb2c776f81935d41c9e81592c1ddbabc4f94422f44bab6e312730aa541994234a2405ea5ba2782818404a730be20dc53c9cc205efbf8f0843bd21cf839b0980
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQ9f5VAAoJEKXdFCfdEflKCDMP/2+25V9iWAyF+/Bkun4Ly1ac
-74LlMGkKjFhGBXEyWNicm1ju0qBq4oTQ9Edx95AgNAWjvzOmS4XJyVWRZ3b004w9
-tuvFd0sdPLDEpNSwKBIJNhSdZckML3Gq4WiTezC/oFV+f2opveKYqYo71dYjJbWy
-31oONysQWgcz8pUd489YKvqVXHfQ/OKvwrSuFKvtslpF6ovXFFXBjYFfVs4sgb9S
-LacBxg+hjulwBh6GEXLD2zPuj9iBNJNJyL7PnQJfrp3wjHbCjrGMgEi3hSDFT2wz
-1/zepJnZdIfSiAuxRqOGA0CAFcplqf+CcRCw+jD6PB56e7oWJH8wVTFYjarEyeon
-ol+4Ezy6FvrXoFhfS6ZzyTQ8GdGVPYbv03l/i7/+u0EGZd2zxLCA3SZf2Zh9VS3L
-z6z/Tz3gFHmG8wzIXh1lCxOGsWSZpOtK+Fq2ottWpRk19WWqjMXbVwd4xiNhVzF0
-vpPfttQVA5sQGWsMsE9SBionMUBdDtH+D0DO1xiE0lwywZA1wxXtxxdtQHIg/KHn
-slMSqrcSMLgPY3wMsGQfLdZrPw65ngctE7OiQfRwsgPYlDuCA72vQuEK+c3maUjL
-eNQOjW3ortEvKQtyR8nVavdfMea8AerD3CSOdbelneTclHOYr77hAPekq0LATR3M
-0zNdzG9gloQ2yCoZ5sYr
-=+4kK
+iF4EAREIAAYFAlJRMoEACgkQiIP6VqMIqNeCOwD8C9178WARHSEfOGn4mwaqRCho
+qiA6dnikhdF6xm5qr1sA/3SiK5qp+4SAI4jxNPbpk7ROTm78AHrL844WJh1RGwEC
+=ph3t
 -----END PGP SIGNATURE-----
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
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 75ced774f1da..f7fcb35c363d 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rspec-mocks-2.4.0-no-cucumber.patch 2769 SHA256 9681154da4940032c3cadf176936d9bd951a474f68fc9010ee67fbc6819b79c0 SHA512 a195649901307acafc57f4236493d01ed9ff976d2d889b03bc677cf13b2e47e903d44293bf3ef1d72d8e916b01ab02d7930b86cd6014e450b3e5b2540000e05c WHIRLPOOL 855afbe4e17d1175da748fa9a5ed1bbf193db8c9dbbd1a8ebc32c172db7f8b8af7a8897bbb26266ae0f0d8d025082a6a71e78bb24917ee90c6253686473de4c5
 DIST rspec-mocks-2.12.1-git.tgz 71235 SHA256 7602e3d83988bc1694abf10825d46485681beafa8fbfb65c067d01cb8100cebf SHA512 146fe9de3f22036a202bc064b1ed8520c7c34543c8160a6a86f80774578e40afd935c0656875cb101bb1d40da71c047c6307d1ae404676b8c45e660d81738593 WHIRLPOOL e2c274bcfb072c42840946bb8ac38da83f1694ffafc6e6b784dace40a651b41f15ad7a61536961840a02bd35a4d41d88d2ae1ea1f9d69399304454ef288f3666
 DIST rspec-mocks-2.12.2-git.tgz 72237 SHA256 6753daefa839704b889fe9ca5af6209cbf12f6eb5108dff61130172b71e414c6 SHA512 7e556044aab99522704605d611972eec2536c4fe1a5ee4ada4dbf1556d2181c4461cf442396ffac1f58c44779440b31f6c95b86e5e98bccf4196e1889569e004 WHIRLPOOL ff504ebdc6c6921c68eae9644cd00b2e12e804a72b7618beb79444944cb6fab2bc7dbe78528d788c9c53d9c42ea69b3bbb121f1a3b10bf1d0b70085c3bc2868e
@@ -12,6 +15,13 @@ EBUILD rspec-mocks-2.13.0.ebuild 1124 SHA256 8a55ff47c675b364877c1108a529d0c36af
 EBUILD rspec-mocks-2.13.1.ebuild 1118 SHA256 2962b2f155a062b85b68cd6293b6d85badcd59c48156eaefd0df8d6212283483 SHA512 87642b479d2f2ab8bebd45938725c7d95d871ccd983fe1302351f89639c742b2bebd7a15bf763fe0d3adcb3d3c04f7da74dc1e08b90631f157f781dbfa8a3470 WHIRLPOOL 83bf1e9183143a6b6bc6081e513dd1ca48726c476c7311c323a18b6e00cd154183547bb0897fdeb9078c2cfef84bd53a998a1141a384938ea1f49f29bb678686
 EBUILD rspec-mocks-2.14.1.ebuild 1220 SHA256 3ce8ee8dd9165d6b8ed866210711f554a835f5d804abbf05cdc5a22155248237 SHA512 c57f3ae97dff957a58f10e45616e0967591fb836e3078ec4206a5397f6e4fab01ea2921cf4730b26ab628c91ec46b47b439f1be6fde74863da62146546f4d8c9 WHIRLPOOL ecd3561eaefd566950329bf65e4546e9bc70f6886bbb811444665e652bda649bf4794a5c5022c7b54ed2845196336c32530e51c51a1f295ad1424658d43ac227
 EBUILD rspec-mocks-2.14.2.ebuild 1219 SHA256 325a61731ebf49b8accf9de052b7943daf5275ab176ef651b17a43666ec43267 SHA512 92099f1ecfc48c8370242475391c404f1417ce1777412b0d1423dd20c938c84c40c5065f1ec4284b6b1e27a7a9228115f91b8c349b0d4a4d1d2de1a2104ceb14 WHIRLPOOL 36f3df93356acaef9631b19cddf562f17325f69dde80a7f80bc65b5b9202173d0a6a5661703c01f0bac8afa4ba1631773832c2a43bbebc6008e5d594cf472d14
-EBUILD rspec-mocks-2.14.3.ebuild 1219 SHA256 d6a378da8379f8e95b71e65d02cebd231bcf149290f4c7140663426853d986be SHA512 4f9bcb5c7c687b598834cf4a88d1c037533510c9ceb8761f2d5481b9252964db23b22cb8b67d391c969d1ef7e4d34fb1f8d59ed883f1982525b8f00d047627ae WHIRLPOOL 4c76ee2716d6eb7a9e4c66f0c9ca60eb22dd2ed09746c8f282d8b418a53cdef89498e600d15035f986fe6fce8bf09c898a0df5e8ed71c78f4927339e9b136bf0
-MISC ChangeLog 7596 SHA256 f4211d6d10ddf36d7854a7f98f742635e48c368909f49c13ae09947f614f7a88 SHA512 b804e82a53d126e5df68b59bc026b84420101be925983031a36386fd41c5a07bc5cf8540b35ea2aa14a21bf22d7eae17d7c01e23ffc451f9d1fa7af6e31846b8 WHIRLPOOL 4b21fe58743d984ba6bd3412a9940f3f25557d2a3de6982080a22e79e87968ff05b37be8695b71120cecc0a29c18f289402974b9313a2742899fcc783316550c
+EBUILD rspec-mocks-2.14.3.ebuild 1227 SHA256 ca1b0a47a5dcd8948257f067ba570916fa6569abe3ee3cd8c17654b4ba50647e SHA512 2b2dc17378b6020eff3720133a0a82800e625dafb29a940b229e81abbe0c362aa23052b88b6acf90cf2c95c9f7ed34d3bd9293618d2df0c1d568113cad761bd2 WHIRLPOOL 8df3d96cab09f66e21a916c91d0adcefba7ba61995ae98ff42a922bc1a6aab88a25999a0e8878283218d6279bf777fd8e20657870ef842811df6df149dc3f220
+MISC ChangeLog 7689 SHA256 95df1e647e1cdcf41acaa247a573f4363f2af5ac400da5bb68e82d79eece7467 SHA512 99eb2a82607a2c67571bfe6593cd3abd89770fb42b3457b8d82a3ef7f66bd7f4a41099483de9b90e6523415fda40ebbc3a5facd1a0e60d240047badfff414b03 WHIRLPOOL 164d27ef9d0ce64b42fda3600c8cb28f9d0b0a133803105ad3f01ec122fd2b69293b45d32f00f54b783fb05a9b23202267a7edc9052636d902cfdf4c73172600
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlJRMgsACgkQiIP6VqMIqNeGnwD/bDp4T5nSovJos0QXxWh+y0Wy
+dpCgm2zTLK8b0L/J7XYBAIj40WtsxAZcPpPSB7nlBan9EqGzexbg9JU9O9DbtJpu
+=rhC6
+-----END PGP SIGNATURE-----