1 |
commit: 70b8ef2605acc363ea1a0347f9df23fa92590847 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 28 01:07:41 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 28 01:07:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b8ef26 |
7 |
|
8 |
dev-ruby/eventmachine: restore stable version (1.2.7-r1) |
9 |
|
10 |
And cut the new changes into ~arch'd -r2. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/765253 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild | 71 +++++++++++++--------- |
16 |
....2.7-r1.ebuild => eventmachine-1.2.7-r2.ebuild} | 0 |
17 |
2 files changed, 42 insertions(+), 29 deletions(-) |
18 |
|
19 |
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild |
20 |
index 1954db7ace0..7128a0f86c4 100644 |
21 |
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild |
22 |
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild |
23 |
@@ -1,20 +1,15 @@ |
24 |
# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=7 |
28 |
+EAPI=6 |
29 |
|
30 |
-USE_RUBY="ruby25 ruby26 ruby27" |
31 |
+USE_RUBY="ruby23 ruby24 ruby25 ruby26" |
32 |
|
33 |
RUBY_FAKEGEM_RECIPE_DOC="rdoc" |
34 |
RUBY_FAKEGEM_DOCDIR="rdoc" |
35 |
-RUBY_FAKEGEM_EXTRADOC="docs/*.md CHANGELOG.md README.md" |
36 |
+RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md" |
37 |
|
38 |
-RUBY_FAKEGEM_GEMSPEC="eventmachine.gemspec" |
39 |
- |
40 |
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/fastfilereader/extconf.rb) |
41 |
-RUBY_FAKEGEM_EXTRAINSTALL=(examples) |
42 |
- |
43 |
-inherit multilib ruby-fakegem |
44 |
+inherit ruby-fakegem |
45 |
|
46 |
DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs" |
47 |
HOMEPAGE="https://github.com/eventmachine/eventmachine" |
48 |
@@ -22,9 +17,8 @@ SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> $ |
49 |
|
50 |
LICENSE="|| ( GPL-2 Ruby )" |
51 |
SLOT="0" |
52 |
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" |
53 |
-IUSE="test" |
54 |
-RESTRICT="!test? ( test )" |
55 |
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" |
56 |
+IUSE="" |
57 |
|
58 |
DEPEND="${DEPEND} |
59 |
dev-libs/openssl:0" |
60 |
@@ -37,7 +31,6 @@ all_ruby_prepare() { |
61 |
# Remove package tasks to avoid dependency on rake-compiler. |
62 |
rm rakelib/package.rake || die |
63 |
|
64 |
- sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die |
65 |
# Remove the resolver tests since they require network access and |
66 |
# the localhost test fails with an IPv6 localhost. |
67 |
rm tests/test_resolver.rb || die |
68 |
@@ -46,28 +39,45 @@ all_ruby_prepare() { |
69 |
rm tests/test_kb.rb || die |
70 |
|
71 |
# Avoid tests that require network access |
72 |
- sed -e '/test_bind_connect/,/^ end/ s:^:#:' \ |
73 |
- -e '/test_invalid_address_bind_connect_src/,/^ end/ s:^:#:' \ |
74 |
- -e '/test_invalid_address_bind_connect_dst/,/^ end/ s:^:#:' \ |
75 |
- -i tests/test_basic.rb || die |
76 |
+ sed -i -e '/test_bind_connect/,/^ end/ s:^:#:' \ |
77 |
+ tests/test_basic.rb || die |
78 |
+ sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^ end/ s:^:#:' \ |
79 |
+ tests/test_httpclient.rb || die |
80 |
+ sed -i -e '/test_\(get\|https_get\)/,/^ end/ s:^:#:' \ |
81 |
+ tests/test_httpclient2.rb || die |
82 |
+ sed -i -e '/test_connect_timeout/,/^ end/ s:^:#:' \ |
83 |
+ tests/test_unbind_reason.rb || die |
84 |
+ sed -i -e '/test_for_real/,/^ end/ s:^:#:' \ |
85 |
+ tests/test_pending_connect_timeout.rb || die |
86 |
+ rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die |
87 |
+ |
88 |
# Avoid tests for insecure SSL versions that may not be available |
89 |
- sed -e '/test_any_to_v3/,/^ end/ s:^:#:' \ |
90 |
+ sed -i -e '/test_any_to_v3/,/^ end/ s:^:#:' \ |
91 |
-e '/test_v3_/,/^ end/ s:^:#:' \ |
92 |
-e '/test_tlsv1_required_with_external_client/aomit "sslv3"' \ |
93 |
- -e '/test_any_to_any/,/^ end/ s:^:#:' \ |
94 |
- -e '/test_case_insensitivity/,/^ end/ s:^:#:' \ |
95 |
- -e '/test_default_to_default/,/^ end/ s:^:#:' \ |
96 |
- -i tests/test_ssl_protocols.rb || die |
97 |
- # Those also want network |
98 |
- sed -e '/test_ipv6_udp_local_server/,/^ end/ s:^:#:' \ |
99 |
- -e '/test_ipv6_tcp_local_server/,/^ end/ s:^:#:' \ |
100 |
- -i tests/test_ipv6.rb || die |
101 |
- |
102 |
- rm tests/test_{sock_opt,ssl_verify,ssl_methods,ssl_dhparam,ssl_ecdh_curve,idle_connection}.rb || die |
103 |
+ tests/test_ssl_protocols.rb || die |
104 |
|
105 |
# Avoid test that deliberately triggers a C++ exception which causes |
106 |
# a SEGFAULT. This does not appear to happen upstream (on travis). |
107 |
- rm tests/test_exc.rb || die |
108 |
+ rm -f tests/test_exc.rb || die |
109 |
+} |
110 |
+ |
111 |
+each_ruby_configure() { |
112 |
+ for extdir in ext ext/fastfilereader; do |
113 |
+ pushd $extdir |
114 |
+ ${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}" |
115 |
+ popd |
116 |
+ done |
117 |
+} |
118 |
+ |
119 |
+each_ruby_compile() { |
120 |
+ for extdir in ext ext/fastfilereader; do |
121 |
+ pushd $extdir |
122 |
+ # both extensions use C++, so use the CXXFLAGS not the CFLAGS |
123 |
+ emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" |
124 |
+ popd |
125 |
+ cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}" |
126 |
+ done |
127 |
} |
128 |
|
129 |
each_ruby_test() { |
130 |
@@ -76,4 +86,7 @@ each_ruby_test() { |
131 |
|
132 |
all_ruby_install() { |
133 |
all_fakegem_install |
134 |
+ |
135 |
+ insinto /usr/share/doc/${PF}/ |
136 |
+ doins -r examples |
137 |
} |
138 |
|
139 |
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r2.ebuild |
140 |
similarity index 100% |
141 |
copy from dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild |
142 |
copy to dev-ruby/eventmachine/eventmachine-1.2.7-r2.ebuild |