Fix failing test, bug 299782.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 38 insertions, 7 deletions

diff --git a/dev-ruby/eventmachine/ChangeLog b/dev-ruby/eventmachine/ChangeLog
index 1f5ea7e97869..230ee4fa9cf8 100644
--- a/dev-ruby/eventmachine/ChangeLog
+++ b/dev-ruby/eventmachine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/eventmachine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.13 2010/08/08 13:34:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.14 2010/08/08 13:43:49 graaff Exp $
+
+  08 Aug 2010; Hans de Graaff <graaff@gentoo.org>
+  eventmachine-0.12.10-r2.ebuild,
+  +files/eventmachine-0.12.10-https-test.patch:
+  Fix failing test, bug 299782.
 
   08 Aug 2010; Hans de Graaff <graaff@gentoo.org>
   -eventmachine-0.12.10.ebuild, -eventmachine-0.12.10-r1.ebuild:
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 91d80708dcb6..f53052c2da87 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX eventmachine-0.12.10-gentoo.patch 1644 RMD160 9b8cf21be9e4832389fc2a9c473e591b7dfa3827 SHA1 a1d572de43e9a395bf803320c08398b0a1f9ec85 SHA256 11e8bbfa3b776d05d7a64ca729398e35b0083a6738ba3a1a297760090cb3781e
+AUX eventmachine-0.12.10-https-test.patch 816 RMD160 a5525b7e81b5168b1730e9a8151302bb8457e187 SHA1 45106d3789abc8c6c9df5543dfcf3efa3dcc3f21 SHA256 f437298272476b92ccbe13a85d8e995dfba92761922238375b2e945bfdc4aa17
 DIST eventmachine-0.12.10.gem 220672 RMD160 625b4917e84d55fec468a810e9ee0bb5273387f0 SHA1 d9b3ec65e3e94e461ed2d53c01a2b9ab62fe6a07 SHA256 dcbe6193937366b5c6803f8aa09886ff241eeb13b782c1a33ff1a76f99a6ede8
-EBUILD eventmachine-0.12.10-r2.ebuild 1715 RMD160 94e7f125eb617a43b7d86aca4a1e7892d856cdb9 SHA1 41f0d367dcf3a0ac80137723980c2cb019bd522d SHA256 f3c7a9d00ba0d2631871ca56ab2a3e2335ab074c36ef0d72c15b97e2805878ef
-MISC ChangeLog 2366 RMD160 522e85da48057bbcf0f9834ed4e288f3b5186254 SHA1 a2d5d11a2446628e3af3a073ef2efa86b040cb1f SHA256 ff5ea10672c511eb3af5ec29b0c7d32b696b18e6f4545391129a281f696239e6
+EBUILD eventmachine-0.12.10-r2.ebuild 1792 RMD160 b09c9a4b56a38b4c97b16c45e9ec84a5387016d8 SHA1 c5e0564a8ac518f71529f278d24f1e9d4bc2ac4d SHA256 a885788f1e50f5f28484d05a2544df39111def3e27ee1482fe26bbcfd75f56a3
+MISC ChangeLog 2531 RMD160 717026502e70ef09ebd270797018d17471f4f04d SHA1 1353937d63d5caae677aa9c9a47784e0a0169c6d SHA256 e9fabf8cb4d3996c5b612f2513285c2c930aa71c2c85de0cd01c38499440df55
 MISC metadata.xml 433 RMD160 b5bc8163799d4caf1299a8fc0bf59b65fc8e3856 SHA1 e0ad3695d36bb1dcee0607262d0b1934d6d23cb8 SHA256 cb277b1f4d7367e9b925224bd5e742773d371799cdfc39a3f56b8d568f7d2e27
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkxesl8ACgkQZihJkut28SsmZQD/S64Dtz2E6/CIxcOkHGTwP8SA
-Qe64FHIjjPN0OJCLUV8A/RCDpWFyiRgMrI+qmDHsfGIBFDNWnBZH1X8BWzZJuVO2
-=ShX6
+iF4EAREIAAYFAkxetJsACgkQZihJkut28StwKwEAsPxZC3Nnpf2Ep0NnbQexM5Bp
+0LsNwNjDEuh81n6fGR0A/j25a8AhTbXrOBv3p3x8+0h97ZcBFoqMp7otOmrp32NA
+=B3yd
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild b/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild
index 0fc3f8742060..fd8165ac0efc 100644
--- a/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v 1.3 2010/05/24 21:53:24 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v 1.4 2010/08/08 13:43:49 graaff Exp $
 
 EAPI="2"
 # jruby → has shims for Java handling but tests fail badly, remaining
@@ -31,6 +31,9 @@ all_ruby_prepare() {
 	# fix tests on non-FreeBSD (where kqueue is missing) — sent upstream
 	# fix building when git is not available — sent upstream
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# Fix https test: bug 299782
+	epatch "${FILESDIR}/${P}-https-test.patch"
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch b/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch
new file mode 100644
index 000000000000..d589d71ce650
--- /dev/null
+++ b/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch
@@ -0,0 +1,22 @@
+commit 63f2debff906a0f51bb807ac8f67c749d72b492d
+Author: Michael S. Klishin <michael@novemberain.com>
+Date:   Sun May 23 21:09:03 2010 +0400
+
+    Makes HTTPS client tests pass
+    
+    https://www.amazon.com now redirects to http version. Switching site
+    is enough to make the test pass.
+
+diff --git a/tests/test_httpclient2.rb b/tests/test_httpclient2.rb
+index ef72e7c..4705e42 100644
+--- a/tests/test_httpclient2.rb
++++ b/tests/test_httpclient2.rb
+@@ -142,7 +142,7 @@ class TestHttpClient2 < Test::Unit::TestCase
+   def test_https_get
+     d = nil
+     EM.run {
+-      http = EM::P::HttpClient2.connect :host => 'www.amazon.com', :port => 443, :ssl => true
++      http = EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true
+       d = http.get "/"
+       d.callback {
+         EM.stop