graaff 15/07/05 08:31:39 Modified: ChangeLog eventmachine-1.0.7.ebuild Log: Avoid tests requiring a network connection, fixing bug 342029. Fix openssl slot dependency. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.32 dev-ruby/eventmachine/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/eventmachine/ChangeLog?rev=1.32&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/eventmachine/ChangeLog?rev=1.32&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/eventmachine/ChangeLog?r1=1.31&r2=1.32 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ChangeLog 10 Jun 2015 10:03:43 -0000 1.31 +++ ChangeLog 5 Jul 2015 08:31:39 -0000 1.32 @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/eventmachine # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.31 2015/06/10 10:03:43 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.32 2015/07/05 08:31:39 graaff Exp $ + + 05 Jul 2015; Hans de Graaff <[email protected]> eventmachine-1.0.7.ebuild: + Avoid tests requiring a network connection, fixing bug 342029. Fix openssl + slot dependency. *eventmachine-1.0.7 (10 Jun 2015) 1.2 dev-ruby/eventmachine/eventmachine-1.0.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild?r1=1.1&r2=1.2 Index: eventmachine-1.0.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eventmachine-1.0.7.ebuild 10 Jun 2015 10:03:43 -0000 1.1 +++ eventmachine-1.0.7.ebuild 5 Jul 2015 08:31:39 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild,v 1.1 2015/06/10 10:03:43 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.7.ebuild,v 1.2 2015/07/05 08:31:39 graaff Exp $ EAPI=5 @@ -23,7 +23,7 @@ DEPEND="${DEPEND} dev-libs/openssl" RDEPEND="${RDEPEND} - dev-libs/openssl" + dev-libs/openssl:=" ruby_add_bdepend "doc? ( dev-ruby/yard ) test? ( dev-ruby/test-unit:2 )" @@ -38,8 +38,20 @@ # Remove the resolver tests since they require network access and # the localhost test fails with an IPv6 localhost. rm tests/test_resolver.rb || die - # Needs a tty + # Needs a tty rm tests/test_kb.rb || die + # Avoid tests that require network access + sed -i -e '/test_bind_connect/,/^ end/ s:^:#:' \ + tests/test_basic.rb || die + sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^ end/ s:^:#:' \ + tests/test_httpclient.rb || die + sed -i -e '/test_\(get\|https_get\)/,/^ end/ s:^:#:' \ + tests/test_httpclient2.rb || die + sed -i -e '/test_connect_timeout/,/^ end/ s:^:#:' \ + tests/test_unbind_reason.rb || die + sed -i -e '/test_for_real/,/^ end/ s:^:#:' \ + tests/test_pending_connect_timeout.rb || die + rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die } each_ruby_configure() {
