From 46c6eaec0a01e53fd4dd4d00354299ccf8ba30bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 8 Dec 2011 19:27:29 +0000 Subject: [PATCH] Add missing virtual/ruby-test-unit dependency to stay on the safe side; fix tests with Ruby 1.9, both in the call and by replacing an ulimit call from within Ruby. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- dev-ruby/libxml/ChangeLog | 7 ++++++- dev-ruby/libxml/Manifest | 22 ++++++---------------- dev-ruby/libxml/libxml-2.2.2.ebuild | 10 +++++++--- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dev-ruby/libxml/ChangeLog b/dev-ruby/libxml/ChangeLog index 4bd1a073cd86..f08c3315e223 100644 --- a/dev-ruby/libxml/ChangeLog +++ b/dev-ruby/libxml/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/libxml # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.57 2011/12/05 14:04:24 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.58 2011/12/08 19:27:29 flameeyes Exp $ + + 08 Dec 2011; Diego E. Pettenò libxml-2.2.2.ebuild: + Add missing virtual/ruby-test-unit dependency to stay on the safe side; fix + tests with Ruby 1.9, both in the call and by replacing an ulimit call from + within Ruby. 05 Dec 2011; Naohiro Aota libxml-2.2.2.ebuild: Add ~x86-fbsd. diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest index 03126173d7f4..998e5bdc2da8 100644 --- a/dev-ruby/libxml/Manifest +++ b/dev-ruby/libxml/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 DIST libxml-ruby-1.1.3.tgz 1495372 RMD160 03f79a4338b0d30a2b1921e14b502ae87bee8109 SHA1 575354bcff4dbd8d2e0f019384ddce8b654baa14 SHA256 53eac48f6a4bdb389e84d2bdf7dda68952fae1ba83de3e520a0c85d499cf6122 DIST libxml-ruby-2.0.5.gem 232448 RMD160 abeb52dcdd451cd9cfe7e97c95c22436aa754c01 SHA1 2ffe00af6e19eb433e6de16c3726384041666268 SHA256 ebde1a6964fe4ac179b069921198d0ed42275fd39907361c892c472728970e75 @@ -12,23 +12,13 @@ EBUILD libxml-2.0.5.ebuild 1357 RMD160 e9fe9e2acdf877bcd6f6f5a48059cfbf434d3f03 EBUILD libxml-2.1.1.ebuild 1521 RMD160 97a7865ddca5d20f8055d4fbdfa2a6bc5bcdd384 SHA1 09f842fcdcd14e7662f71d287ef8962dfaa4bf8e SHA256 e83934b1b7cce058e20ba0f8d603bce548aab8b6ffbd5a2e39468b1990888aa7 EBUILD libxml-2.2.0.ebuild 1521 RMD160 8cc656dc535622488677e622ce957502730b10f1 SHA1 cba3f64fa9c59b82e41edae5209f9e007e5931d7 SHA256 424c171f2260a50077da647cadd2a2ace25ecd090aca44f57b12a0e44c5f912e EBUILD libxml-2.2.1.ebuild 1521 RMD160 e2334a2ab629cc104f4f3906bd73fb1fc55a008c SHA1 aeb225255865461d6861ec762d014127fadb40b2 SHA256 1530856a952efa2881b8019de0c72cb662ec02b63764860bd5d3f62b9dbba174 -EBUILD libxml-2.2.2.ebuild 1530 RMD160 a78801f762dbfe686271d2f19abf38f24cfba110 SHA1 d6b9b0f0fe22557f718354b23b15c27d415f81df SHA256 2f7d7981e7fdc08e408ef8abd416912408a93ba1d4435c75976424ca0c684920 -MISC ChangeLog 7702 RMD160 0c1e0af000b6faf382b47d12d24967f7b37c69d6 SHA1 3a75f6006fa4868e95ea778aad70b31b05f5add5 SHA256 e7f693eea276477ce00584ba0bba0605881f8684e44fd555cb399b470f36d3b4 +EBUILD libxml-2.2.2.ebuild 1702 RMD160 4502ee62bcfb213027c2488dd0c49e017d604fb1 SHA1 308aa318e1fbaf308d6e9c6cc865720229d77c43 SHA256 405fc572adae89b2ea3cbaac1375dc97fb0c962a0444d19574166c62d7586639 +MISC ChangeLog 7954 RMD160 f5006acc06c7ecdbe6f89e2f4128632d4ef0ff45 SHA1 ed325e19218b164d549c9266ef90f3f2cb38bce3 SHA256 a4bbf3f89ef6ea8235aca6a59235f5ea05cf0896462b5c67fa71214ffdd9f895 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJO3M9oAAoJEDYO1FT4VRUUY/MP/1IA/3FRNusfxj4rnGTcYPBF -HUR5xDHnrRuPjFNfa8dyZV9aLKu1SY0FJ9eKVZhgC5NLhG0DE5G04nfYWCW03ceM -YCgW7xPr2NZp6CNfQE7a/kSyWGG3OVh98TaJSNgz8ud5ZWNRATQI+GK4LYT8ulKF -4+ZrBWqf+PUKneTyw/OhU/AbVu2K3byfwU70ffxBWXSfF6xNm5fFWSyaVs/WIciE -agXVFK8NsqVrV++hL65HHVtljRSdGvwj5UhNLBK572OoNUDO0yALllCQjWeePXTK -u7bwq/SeUKsa6IIJL6DoMPWUiNBOu6zPrqlSPSMKTngZ0BweeCu/77ekUUvWpQs+ -WoOzpXjsCBM3yA8mnavY/1AiZUX6xMFA7UK6/ocf4LPlBHLEVohqFCynyBxFK6hX -CrgcjicC+utWinINVQM8tjB44+aoylElBtqjZrN83mBTcV3z6x6oefk9M8lKCEJr -N0S+6ewzxmxwge7MJveXw10vARWeSwQFfVBe4hoPe3BPgFLj5Ppg/0BVzBU7lN2k -l9kISw9J04OmQYTLSKK0LzAffRLmQMsr4telPmBoJSL3atveaN6D5by/HF+YrucG -LtG26SDq27DSzdSmdZ2nkSlhQItJffvN5SosKlpd/V6s5hTscJR3cB5N2KC8YSjR -5oT7agJfmVRgPfiASXlG -=eXO6 +iEYEARECAAYFAk7hD6EACgkQAiZjviIA2XhDeQCg1iaTfaL+WJRdWdw5/T5aokWY +JEwAoIQUfv8uY1WAlgNoOqhXF9x8uxz5 +=wmcO -----END PGP SIGNATURE----- diff --git a/dev-ruby/libxml/libxml-2.2.2.ebuild b/dev-ruby/libxml/libxml-2.2.2.ebuild index 00d6a2fe61be..3804d6e413ea 100644 --- a/dev-ruby/libxml/libxml-2.2.2.ebuild +++ b/dev-ruby/libxml/libxml-2.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.2.2.ebuild,v 1.2 2011/12/05 14:04:24 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.2.2.ebuild,v 1.3 2011/12/08 19:27:29 flameeyes Exp $ EAPI=2 @@ -26,7 +26,8 @@ IUSE="" RDEPEND="${RDEPEND} dev-libs/libxml2" DEPEND="${DEPEND} dev-libs/libxml2" -ruby_add_bdepend "doc? ( dev-ruby/rdoc )" +ruby_add_bdepend "doc? ( dev-ruby/rdoc ) + test? ( virtual/ruby-test-unit )" all_ruby_prepare() { # Remove grancher tasks only needed for publishing the website @@ -37,6 +38,9 @@ all_ruby_prepare() { # 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 } each_ruby_configure() { @@ -51,5 +55,5 @@ each_ruby_compile() { 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 + ${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die } -- 2.26.2