Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/RubyInline/files/, dev-ruby/RubyInline/
Date: Wed, 31 May 2017 04:39:00
Message-Id: 1496204655.cb9240875025a6f827251e24e604972ddbbb5fb7.graaff@gentoo
1 commit: cb9240875025a6f827251e24e604972ddbbb5fb7
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 31 04:21:32 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Wed May 31 04:24:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb924087
7
8 remove masked dev-ruby/RubyInline
9
10 dev-ruby/RubyInline/Manifest | 2 -
11 dev-ruby/RubyInline/RubyInline-3.12.3.ebuild | 45 ---------------
12 dev-ruby/RubyInline/RubyInline-3.12.4.ebuild | 46 ---------------
13 .../files/ruby-inline-3.11.1-ldflags.patch | 10 ----
14 .../files/ruby-inline-3.12.2-gentoo.patch | 67 ----------------------
15 dev-ruby/RubyInline/metadata.xml | 8 ---
16 6 files changed, 178 deletions(-)
17
18 diff --git a/dev-ruby/RubyInline/Manifest b/dev-ruby/RubyInline/Manifest
19 deleted file mode 100644
20 index fe49649deea..00000000000
21 --- a/dev-ruby/RubyInline/Manifest
22 +++ /dev/null
23 @@ -1,2 +0,0 @@
24 -DIST RubyInline-3.12.3.gem 31232 SHA256 c1ececb4057d22638818c1bf1998cdbe485bf6eda81c3fe52a543487c9c35ad6 SHA512 26b852abe21b077deca6206bac3a29e402e37b9bd96997275a8075172fee34d25e68b9455a933188bb71807e3fe2a35bf15350f568ba3786034796bc5a33f7cf WHIRLPOOL b42ba1f45206758d1dc50990c9be3b4167a40771f09eaeb352fbd2038515979fd307983d37c3a5aa4a1b32edc114aa5ed229e7573e387c112e54cb45fd5f5e16
25 -DIST RubyInline-3.12.4.gem 31232 SHA256 205bbc14c02d3d55e1b497241ede832ab87f3d981f92f3bda98b75e8144103e0 SHA512 9bdef81653a6c8da86aac638ff402b226526fbd38b9b8538382ac2d1a7655e232eafff4979b57d667ad9b0f3955b13c6f4cc01eb9dfa287c3a7abbfc5e9416fe WHIRLPOOL 5b92ecde15ee188d5d1ef51c83327e96486527680b33e3b4d0b4057df6804c8e566748e14d656a9ae62c6d549b462b148776a3f92707c456c28a8820f4410c1e
26
27 diff --git a/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
28 deleted file mode 100644
29 index 13633a21e7a..00000000000
30 --- a/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
31 +++ /dev/null
32 @@ -1,45 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=5
37 -
38 -USE_RUBY="ruby20 ruby21"
39 -
40 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
41 -RUBY_FAKEGEM_DOCDIR="doc"
42 -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
43 -
44 -inherit ruby-fakegem
45 -
46 -DESCRIPTION="Allows to embed C/C++ in Ruby code"
47 -HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
48 -
49 -LICENSE="MIT"
50 -SLOT="0"
51 -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
52 -IUSE="doc test"
53 -
54 -ruby_add_rdepend "dev-ruby/zentest"
55 -
56 -ruby_add_bdepend "
57 - test? (
58 - dev-ruby/hoe
59 - dev-ruby/hoe-seattlerb
60 - virtual/ruby-minitest
61 - )"
62 -
63 -RUBY_PATCHES=(
64 - ruby-inline-3.12.2-gentoo.patch
65 - ruby-inline-3.11.1-ldflags.patch
66 -)
67 -
68 -all_ruby_prepare() {
69 - sed -i -e '/isolate/ s:^:#:' Rakefile || die
70 -}
71 -
72 -all_ruby_install() {
73 - all_fakegem_install
74 -
75 - docinto examples
76 - dodoc example.rb example2.rb demo/*.rb
77 -}
78
79 diff --git a/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild
80 deleted file mode 100644
81 index fa81d871927..00000000000
82 --- a/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild
83 +++ /dev/null
84 @@ -1,46 +0,0 @@
85 -# Copyright 1999-2016 Gentoo Foundation
86 -# Distributed under the terms of the GNU General Public License v2
87 -
88 -EAPI=5
89 -
90 -# ruby22 -> Code uses obsolete Config module.
91 -USE_RUBY="ruby20 ruby21"
92 -
93 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
94 -RUBY_FAKEGEM_DOCDIR="doc"
95 -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
96 -
97 -inherit ruby-fakegem
98 -
99 -DESCRIPTION="Allows to embed C/C++ in Ruby code"
100 -HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
101 -
102 -LICENSE="MIT"
103 -SLOT="0"
104 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
105 -IUSE="doc test"
106 -
107 -ruby_add_rdepend "dev-ruby/zentest"
108 -
109 -ruby_add_bdepend "
110 - test? (
111 - >=dev-ruby/hoe-3
112 - dev-ruby/hoe-seattlerb
113 - dev-ruby/minitest:5
114 - )"
115 -
116 -RUBY_PATCHES=(
117 - ruby-inline-3.12.2-gentoo.patch
118 - ruby-inline-3.11.1-ldflags.patch
119 -)
120 -
121 -all_ruby_prepare() {
122 - sed -i -e '/isolate/ s:^:#:' Rakefile || die
123 -}
124 -
125 -all_ruby_install() {
126 - all_fakegem_install
127 -
128 - docinto examples
129 - dodoc example.rb example2.rb demo/*.rb
130 -}
131
132 diff --git a/dev-ruby/RubyInline/files/ruby-inline-3.11.1-ldflags.patch b/dev-ruby/RubyInline/files/ruby-inline-3.11.1-ldflags.patch
133 deleted file mode 100644
134 index e6856ac5a0d..00000000000
135 --- a/dev-ruby/RubyInline/files/ruby-inline-3.11.1-ldflags.patch
136 +++ /dev/null
137 @@ -1,10 +0,0 @@
138 ---- lib/inline.rb.~1~ 2010-08-28 14:49:06.866480357 +0200
139 -+++ lib/inline.rb 2010-08-28 15:05:14.553732182 +0200
140 -@@ -577,6 +577,7 @@
141 - "-L#{Config::CONFIG['libdir']}",
142 - '-o', so_name.inspect,
143 - File.expand_path(src_name).inspect,
144 -+ Config::CONFIG['LIBRUBYARG_SHARED'],
145 - libs,
146 - crap_for_windoze ].join(' ')
147 -
148
149 diff --git a/dev-ruby/RubyInline/files/ruby-inline-3.12.2-gentoo.patch b/dev-ruby/RubyInline/files/ruby-inline-3.12.2-gentoo.patch
150 deleted file mode 100644
151 index 2acd527cdcb..00000000000
152 --- a/dev-ruby/RubyInline/files/ruby-inline-3.12.2-gentoo.patch
153 +++ /dev/null
154 @@ -1,67 +0,0 @@
155 -we have to patch the code so that it takes the RUBY_DESCRIPTION into
156 -consideration, to avoid loading Ruby-Enterprise (REE18) objects in MRI
157 -and vice-versa; we're a bit “greedier” since we will rebuild objects
158 -even when just switching versions, but it'll be better this way than
159 -being too conservatives.
160 -
161 -Index: ruby-inline-3.8.4/lib/inline.rb
162 -===================================================================
163 ---- ruby-inline-3.8.4.orig/lib/inline.rb
164 -+++ ruby-inline-3.8.4/lib/inline.rb
165 -@@ -360,13 +360,18 @@ module Inline
166 - ext.join "\n"
167 - end
168 -
169 -+ def implementation_checksum
170 -+ @implementation_checksum ||=
171 -+ (Digest::MD5.new << RUBY_DESCRIPTION).to_s[0,4]
172 -+ end
173 -+
174 - def module_name
175 - unless defined? @module_name then
176 - module_name = @mod.name.gsub('::','__')
177 - md5 = Digest::MD5.new
178 - @pre.each { |m| md5 << m.to_s }
179 - @sig.keys.sort_by { |x| x.to_s }.each { |m| md5 << m.to_s }
180 -- @module_name = "Inline_#{module_name}_#{md5}"
181 -+ @module_name = "Inline_#{module_name}_#{md5}_#{implementation_checksum}"
182 - end
183 - @module_name
184 - end
185 -Index: ruby-inline-3.8.4/test/test_inline.rb
186 -===================================================================
187 ---- ruby-inline-3.8.4.orig/test/test_inline.rb
188 -+++ ruby-inline-3.8.4/test/test_inline.rb
189 -@@ -404,6 +404,7 @@ static VALUE method_name_equals(VALUE se
190 - end
191 -
192 - def util_module_name(*signatures)
193 -+ implementation = (Digest::MD5.new << RUBY_DESCRIPTION).to_s[0,4]
194 - md5 = Digest::MD5.new
195 -
196 - signatures.each do |signature|
197 -@@ -411,6 +412,6 @@ static VALUE method_name_equals(VALUE se
198 - md5 << signature.to_s
199 - end
200 -
201 -- assert_equal("Inline_TestInline__TestC_#{md5}", @builder.module_name)
202 -+ assert_equal("Inline_TestInline__TestC_#{md5}_#{implementation}", @builder.module_name)
203 - end
204 -
205 -@@ -757,6 +758,7 @@ puts(s); return rb_str_new2(s)}"
206 - @builder.c "VALUE my_method() { return Qnil; }"
207 -
208 - windoze = "\n __declspec(dllexport)" if Inline::WINDOZE
209 -+ implementation = (Digest::MD5.new << RUBY_DESCRIPTION).to_s[0,4]
210 -
211 - expected = <<-EXT
212 - #include "ruby.h"
213 -@@ -773,7 +775,7 @@ static VALUE my_method(VALUE self) {
214 - #ifdef __cplusplus
215 - extern \"C\" {
216 - #endif#{windoze}
217 -- void Init_Inline_TestInline__TestC_3ab8c09639e499394bb1f0a0194a839f() {
218 -+ void Init_Inline_TestInline__TestC_3ab8c09639e499394bb1f0a0194a839f_#{implementation}() {
219 - VALUE c = rb_cObject;
220 - c = rb_const_get(c, rb_intern("TestInline"));
221 - c = rb_const_get(c, rb_intern("TestC"));
222
223 diff --git a/dev-ruby/RubyInline/metadata.xml b/dev-ruby/RubyInline/metadata.xml
224 deleted file mode 100644
225 index 28ab0c15f20..00000000000
226 --- a/dev-ruby/RubyInline/metadata.xml
227 +++ /dev/null
228 @@ -1,8 +0,0 @@
229 -<?xml version="1.0" encoding="UTF-8"?>
230 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
231 -<pkgmetadata>
232 -<maintainer type="project">
233 - <email>ruby@g.o</email>
234 - <name>Gentoo Ruby Project</name>
235 -</maintainer>
236 -</pkgmetadata>