Create stable candidate. Cleanup.

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

4 files changed, 23 insertions, 24 deletions

diff --git a/dev-ruby/libxml/ChangeLog b/dev-ruby/libxml/ChangeLog
index f5a5a4078b96..e667d21c2969 100644
--- a/dev-ruby/libxml/ChangeLog
+++ b/dev-ruby/libxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/libxml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.97 2015/01/15 07:10:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.98 2015/03/14 06:13:39 graaff Exp $
+
+*libxml-2.8.0-r1 (14 Mar 2015)
+
+  14 Mar 2015; Hans de Graaff <graaff@gentoo.org> -libxml-2.7.0-r2.ebuild,
+  libxml-2.8.0.ebuild, +libxml-2.8.0-r1.ebuild:
+  Create stable candidate. Cleanup.
 
 *libxml-2.8.0 (15 Jan 2015)
 
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index ec54deb48382..9211f21f6a61 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 DIST libxml-ruby-2.7.0.gem 269824 SHA256 f1f8a3538a064923d8f718748f8771bf088a154c2967f1b7a0cd82d6cd15a9d8 SHA512 e41383cb0e31257361c0da27623de8be478a5ae82a4f59233238a66ce098ce2a6dab4b639490d0753ccd3ae8c6cf0edc5989c071cd5fe4ea7b2b9a25fd271dfa WHIRLPOOL 0de7efe2b0f16d95f69e830bfd08153f0039ecbdc49b4fd5201b205b57e2202c0defb70469031adc838734ddfb6e47561b431e15103bb643aa28ab3031eb246d
 DIST libxml-ruby-2.8.0.gem 261120 SHA256 0bd2780afaaf944d38786999d929a4fd37eb30922c404301b86dee94c9c512b6 SHA512 085670e0d343d47085d03d7d95a94498e7be049fbab5e60f1c5f43f9fc41222fe96315de7d5b12b221a3c866d0c178dbfbe2e717a206cce8c4471a2b3ddb9c42 WHIRLPOOL bae7fe3e885b35c58e314cf84ecf0f09abb754e4d41e047b101f20fc2d62f7695e328f8cc07f91d473de87ceb82c2a54d37ea4cb03c421897a5d539605883400
 EBUILD libxml-2.7.0-r1.ebuild 2334 SHA256 f0288477b0feda0323b946217b0eb0dfc752bc989dc1436f333a6ac5e94df076 SHA512 23303aafbf491873e0795be77666eff1023430ffa44d406eac29236ac8f60ff8de262d35ed0b0e78545c82bd18996ad9250e482454b48256e8637d791e757822 WHIRLPOOL 2bb889835225f50f65fef2037603d5167004118d26e4e807f76cbeefce9fd0f16314221e3be41f8dd56c0fbb99cce7e3170562785aa79694653e91b7bac0a4f4
-EBUILD libxml-2.7.0-r2.ebuild 2355 SHA256 f2ae1c12ff6e4929c03e6a06d00de4c1aeb1cf05ceba9101c0b5f9c3423f719f SHA512 3b4629e22316269d41de72d6ceaa803cccf427153ca79c0a61179ca9b45a25ceca9728a59fe9b557bb96eb48889498c97bd173127c2a8018ebc99eb283f31b4f WHIRLPOOL 7a5cca0e0fdae1fa2f69b2fce6446293475a978e79eaf09a7a3558cd4ed2074698fcfb614cf067db4698353b45e440d09fc2e8d8d1e4253bccf73ce7873c6fa2
-EBUILD libxml-2.8.0.ebuild 2099 SHA256 c0a6769084b8f954b446fa3e0044ee0c673975b13f0bda4d677f7effb0d3efbf SHA512 8026d292351761cfa8034f886a79a4fa7e60d04b7c4c99ae536c916c2ad484346b02602e7dd92e9dad5e28bdca9834cb0c770de2aab39c0a6ccb7ef7c152979a WHIRLPOOL 409477c2d77323a97f86759aa2b171b26ac92e2d30956d4705f0c05ba480b542024e2835d58028c37522e0243c64fe556627f68c62b39588216e86bad17ba106
-MISC ChangeLog 12780 SHA256 75784ee4bc2f7b998d9785282bc60045ed9d00af7322f4b3f18c52f43482ca50 SHA512 bc00dcb396b655e157d25d331c0e5bd608f57372e072c6b4e9099719221ea5f5fa9c3fbd45b8bc155d143129d2b93d72b4ef25157aeb89702c76b4e7165b450e WHIRLPOOL 2060227e7ac00242fa35f816d2e5639fea4c49d2f33d9f69052952e76addce80222443d560bbd29cc7f0c32986bf929ecb65f78e084940522fd1409af5012ab5
+EBUILD libxml-2.8.0-r1.ebuild 2109 SHA256 9754d83f576cde5eb6973b5a904dfaa5254df778fb1fcd87ebd3fbd3d9c9f15c SHA512 debd7d28690d4d7072f586edf814f5cdc478d7969408d9e02487f0a427c5b327a3df46ddb2a45cee65d2be00f726fe5f99adc4565ea920731454087dcb5386fe WHIRLPOOL b2c49dbcd1e61f0aa5a775107a9251ad7b3918fce82e2eaf72365fefd6a5e1b9a07786a57f3fa9298e79cc01bfe94e5994529e516ed1cd6ff195d60b8e721a98
+EBUILD libxml-2.8.0.ebuild 2092 SHA256 85585ccd32d8c24d37a8c91eb78c3c993be3c9c5054e5ccc0c889595e43f0c26 SHA512 5d6f62c23caf33d5f7926dd5038942d8e0e16d923b5ab0390fee3302aae18ba07e86519f863ec572a299e634434cf546b72cd302c2648d5189e358627022de95 WHIRLPOOL 5a00f8c70c4f141199bda5c96994ebc487cb447b5e41e6d6b0cfabbcbb171e5962e34b9a5dc03866b15cd0efb35cca14a33b4b4f18b59a97a057db8df2ecce5d
+MISC ChangeLog 12972 SHA256 04fea807f8e09161c2d3d3fbe98c5c9eccf9e2d251156ceb2bd278af17e529ec SHA512 06d3a532424fa4fb0a2eea0f4cae47689be63a8529cd6932262728c57d43afaa95ac43ff8fa50239932d0ad2bb5fed1b58631b73452b45dbe70b5b4498fcdc1e WHIRLPOOL 2e0717c46532ad565c1aca92640b35625c34473830a81329d6918982416016bcd4491f4c03e5c1bf7f04b7533e0d9899d0f72142feb41a1752f25132c2a9507c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS3Z+sACgkQiIP6VqMIqNcXSQD/XVEpgXHReYnu85CuXEfN5qJ5
-M2hJlqYh2BSqXSX88doA+wfyLTeITkWjZQhIoLrSF/IRi7moNbaZHDA3jxWyReXJ
-=D/wH
+iF4EAREIAAYFAlUD0ZQACgkQiIP6VqMIqNcm+gD/bBmwCELO28rLtFTIAo07Wkfq
+jZJsZSxP1vKmXOpfZEgA/3e49qo0WzuwV9FNvza8ALEPwx7RPPaQSi9hy4Xab0D/
+=b2Su
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/libxml/libxml-2.7.0-r2.ebuild b/dev-ruby/libxml/libxml-2.8.0-r1.ebuild
index a26a0d80d9cd..d76f67ea6770 100644
--- a/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
+++ b/dev-ruby/libxml/libxml-2.8.0-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r2.ebuild,v 1.4 2014/08/05 16:00:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.8.0-r1.ebuild,v 1.1 2015/03/14 06:13:39 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+# ruby22 → test suite hangs
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
@@ -41,18 +42,10 @@ all_ruby_prepare() {
 	# 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
+	# Avoid test failures with libxml2-2.9.2 since that is the oldest
+	# secure version available: https://github.com/xml4r/libxml-ruby/issues/103
+	sed -i -e '/tc_html_parser_context/d' test/test_suite.rb || die
+	sed -i -e '/test_bad_xml/,/^  end/ s:^:#:' test/tc_parser.rb || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/libxml/libxml-2.8.0.ebuild b/dev-ruby/libxml/libxml-2.8.0.ebuild
index 7f523dd1e04c..c40681c19f55 100644
--- a/dev-ruby/libxml/libxml-2.8.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.8.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.8.0.ebuild,v 1.1 2015/01/15 07:10:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.8.0.ebuild,v 1.2 2015/03/14 06:13:39 graaff Exp $
 
 EAPI=5
 
 # ruby22 → test suite hangs
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"