Version bump.

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

4 files changed, 106 insertions, 5 deletions

diff --git a/dev-ruby/libxml/ChangeLog b/dev-ruby/libxml/ChangeLog
index 606a6351f359..9bb8a27ed6bf 100644
--- a/dev-ruby/libxml/ChangeLog
+++ b/dev-ruby/libxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/libxml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.83 2013/05/05 06:16:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.84 2013/05/09 07:18:00 graaff Exp $
+
+*libxml-2.6.0 (09 May 2013)
+
+  09 May 2013; Hans de Graaff <graaff@gentoo.org> +libxml-2.6.0.ebuild,
+  +files/libxml-2.6.0-fix-test.patch:
+  Version bump.
 
   05 May 2013; Hans de Graaff <graaff@gentoo.org> -libxml-2.2.1.ebuild:
   Cleanup.
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index 6b61413421a1..882cf902d351 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libxml-2.6.0-fix-test.patch 647 SHA256 85663cbec055f88ceeb902c3610e5007ade47c93e711101e018700ab9ee26b1a SHA512 557f731e7018053ec3dc21dcc36c2d33685bad3b3c71b5886796e825dbd7624b849295d0c41daf380dcb74e71739a62ae9671105a1dbb3feeb48f52bea6c318c WHIRLPOOL 04666a5f8665389d87bddebaf0204d15f943517860788caaa12c120db4c9213aae4ddf405531f70447efc5287b0086dea4123d4f9e7c4e96305354e2ce84dce3
 DIST libxml-ruby-2.4.0.gem 260608 SHA256 5dabf6d9859ede50a6ffb0230f7031741037c1d6ac38988e816a90b208c2467f SHA512 870d72b978cf6b09ee932dff424ca8735d106b6b237a0b0ab963f8b14829adb48e4303ceaa6e382b28bb7b510648467d33a53cb40aa56f3e350227856ba18b99 WHIRLPOOL e73dd0e8a30824516de02a279068dd4a26f5c991bf2558aaaf2deb64089b9bf0d7b08758fe52276335898440f21c755091877b2ce9654f147d566dd5b96ffba6
+DIST libxml-ruby-2.6.0.gem 268800 SHA256 9be18419b128e1806723a0fafec4895555dd7bf08ceda16fdd23f4b7f542061e SHA512 a94c4b7543f4657f0def452d04904ef6b4773099b2d24f52de63f8cf6dc498a2fa849e4322d3be5eee1c8bb4ec1a3eeb908327ab08f29d9832bf5c29afa29ace WHIRLPOOL 75e7ac24df897c58fed0ebc0971daed2d63c4e5d641585e005d35ea5289cbfb4ba3cabf68a80d9e6c56930aa00ab9b64ecdff891dac51d63749a12681c4f1f17
 EBUILD libxml-2.4.0.ebuild 2167 SHA256 89d7ce1a52041695c1857ee4abc34f0d4e3072402006d7ff65fb8dbd7fc9bbd4 SHA512 8fc62eb687dd12ccdf41c85a9c436dbe96f312c3cb50d90ff3544df7ea88b8c7760a88870080cc32357cc9178d6bb8ae86a6a5718554bbb36778a5976606cdb9 WHIRLPOOL b0bde10bd37ae101b9baf5a8cae449372726a31a9edb0a6e18449f2b30cd30e3c590097fed834ebd55ea744c7b3ce2ea031b8e85e9b71503deb75c3f2557df91
-MISC ChangeLog 10980 SHA256 d3ae237209a70a922c8d0ebecf9d4e543c52ff4ba35e0c163870f1e95e7b0bf9 SHA512 0d6d87d9699c59ca3924dacc6dd650d5dde41acf7b7d18fd45f762e0c32cbd21145cef7a2f403675f14263c18ec8f5ddead533f723909d31fbd90fd70aeac84e WHIRLPOOL 65362b60b922845f909d737dcef4e19be9c321beab1f403542de0c215415d6c76a823d794db67820313fc6a7d45f120807423bb5eb1ceb9a9bfccd4b60a18c35
+EBUILD libxml-2.6.0.ebuild 2374 SHA256 83dbcfbe8c37d5d01cf208aa250b6dc254d143431de95b4aeae7d380ce7c7d84 SHA512 b27269281de97dbef8f9cec76285867f6fec426f9acd91fb5af292288d41ee1b894f2446a81586097b97a4ab96e00a6a25ac3bdffc2920c3d8a2009b8e09d449 WHIRLPOOL 17b40d54c4ffe63d79e161ee7a698ba7dbc430a37f6b28c9cd247f277095bd71ab53c3ef0be174b865dd81d232cdbc2c2beb0f0b37d85aa7462c132a1f6506d3
+MISC ChangeLog 11136 SHA256 c60b3027b3a9e6c3f97a3b61eb55649fce3456831f1ef9365cc51dd1f3bc1431 SHA512 f0c9f33193c6d1f37dcc1ccd4d663bc1f656ffbe1fa04c53d17f0ae2610be936d8e69cd53d3df458d14955c2a434425ed961993b6a8af382b2848e8293d85d5c WHIRLPOOL b5690acfac3b6d500500789b60d805d9fda7f9b61b70bb4583b3ee036695566f88979281e0d83e699b794a5e4f071374d7872eca4de081af304ba00a10970e7e
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGF+UoACgkQiIP6VqMIqNcm8gD/ZYYzZILY3Q2oGdOV7Ayw6Ka6
-w9PUAmuMdqs+helpxLsA/R3i/H2PkS1CfCA8t7qW2YpUCb4Uk8sRh5UCWzRrjYux
-=ESq3
+iF4EAREIAAYFAlGLTaoACgkQiIP6VqMIqNe4sQEAkudqtNefade7d1sazsb0g2RT
+t3JrKO5KH/3kUHrPKp8BAIVlWx7gfRNHtH8PJDVE9cV8GVsEnufPAtwHXXo7id1+
+=FRDF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/libxml/files/libxml-2.6.0-fix-test.patch b/dev-ruby/libxml/files/libxml-2.6.0-fix-test.patch
new file mode 100644
index 000000000000..827002205efb
--- /dev/null
+++ b/dev-ruby/libxml/files/libxml-2.6.0-fix-test.patch
@@ -0,0 +1,19 @@
+commit 25b4a6e53c894609b9e4a66bf288423d212407e2
+Author: julp <poinsot.julien@gmail.com>
+Date:   Sun May 5 21:36:47 2013 +0200
+
+    To fix XML::Writer.set_quote_char UT, wrong expected string (#63)
+
+diff --git a/test/tc_writer.rb b/test/tc_writer.rb
+index fcc5e0f..ab89763 100644
+--- a/test/tc_writer.rb
++++ b/test/tc_writer.rb
+@@ -250,7 +250,7 @@ class TestWriter < Test::Unit::TestCase
+           assert(writer.end_attribute)
+         end
+       end
+-      assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<root><child abc='def'>ghi</child></root>")
++      assert(writer.result.strip!.end_with? "<root abc='def'/>")
+     end
+   end
+ 
diff --git a/dev-ruby/libxml/libxml-2.6.0.ebuild b/dev-ruby/libxml/libxml-2.6.0.ebuild
new file mode 100644
index 000000000000..6285bd52da1a
--- /dev/null
+++ b/dev-ruby/libxml/libxml-2.6.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.6.0.ebuild,v 1.1 2013/05/09 07:18:00 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_NAME="libxml-ruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster."
+HOMEPAGE="https://github.com/xml4r/libxml-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND} dev-libs/libxml2"
+DEPEND="${DEPEND} dev-libs/libxml2"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
+
+RUBY_PATCHES=( ${P}-fix-test.patch )
+
+all_ruby_prepare() {
+	# Remove grancher tasks only needed for publishing the website
+	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
+
+	# We don't have the hanna template available.
+	sed -i -e 's/hanna/rake/' Rakefile || die
+
+	# Remove rake-compiler bits since we don't use it
+	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
+
+	# replace ulimit -n output as it does not work with Ruby 1.9
+	sed -i -e 's:`ulimit -n`:"'`ulimit -n`'":' test/tc_parser.rb || die
+
+	# Avoid test failing due to different semantics in libxml 2.8.
+	# https://github.com/xml4r/libxml-ruby/issues/43
+	sed -i -e '/test_invalid_encoding/,/^  end/ s:^:#:' test/tc_reader.rb || die
+
+	# Ignore two test failures on ruby18 for now given that older
+	# versions no longer compile.
+	sed -i -e '/test_schema_type/,/end/ s:^:#:' \
+		-e '/test_schema_element/,/end/ s:^:#:' test/tc_schema.rb || die
+
+	# Remove the pregenerated extconf.h. It should not be included, but
+	# it also confuses our hardlink-based duplication scheme.
+	rm ext/libxml/extconf.h || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/libxml extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -C ext/libxml
+	cp ext/libxml/libxml_ruby.so lib/ || die
+}
+
+each_ruby_test() {
+	# The test suite needs to load its files in alphabetical order but
+	# this is not guaranteed. See bug 370501.
+	${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die
+}