1 |
commit: b05bede20cfd23bd27b0a58966696c1b9d05119e |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 17 07:12:37 2019 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 17 07:12:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b05bede2 |
7 |
|
8 |
dev-lang/ruby: add 2.6.1 |
9 |
|
10 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-lang/ruby/Manifest | 1 + |
14 |
.../ruby/files/2.6/010-default-gem-location.patch | 20 ++ |
15 |
dev-lang/ruby/ruby-2.6.1.ebuild | 237 +++++++++++++++++++++ |
16 |
3 files changed, 258 insertions(+) |
17 |
|
18 |
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest |
19 |
index e904f07e0af..1c6d7d24dd7 100644 |
20 |
--- a/dev-lang/ruby/Manifest |
21 |
+++ b/dev-lang/ruby/Manifest |
22 |
@@ -2,4 +2,5 @@ DIST ruby-2.3.8.tar.xz 11465792 BLAKE2B b9c8ef5c943872e3d1426c30cbd720acc66d17cc |
23 |
DIST ruby-2.4.5.tar.xz 10064712 BLAKE2B 0846125e617b43ea302b4c5309b20503577937865d445a6fee766323a188aa552d3a13740c3d38c7be812b19bffb2474021cb7b368cc144d51ea771552f62769 SHA512 658f676c623109f4c7499615e191c98c3dd72cfcaeeaf121337d0b8a33c5243145edd50ec5e2775f988e3cd19788984f105fa165e3049779066566f67172c1b4 |
24 |
DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518 |
25 |
DIST ruby-2.6.0.tar.xz 11918536 BLAKE2B f51fe57c1ff83d99c834f29d1bcc8e847f7a4cd3a10e202391327373d9d803fcc356d210cc07b9038915039a7462c0263fa7567b63366d1ab6273b9a82e651d1 SHA512 c56eaf85ef7b79deb34ee4590b143c07f4fc83eb79775290761aee5a7c63374659613538a41f25706ed6e19e49d5c67a1014c24d17f29948294c7abd0b0fcea8 |
26 |
+DIST ruby-2.6.1.tar.xz 11872964 BLAKE2B 789d1a174b02538e92a66372814b8be45f30187f99df15922e3dd899222fd5feea196ed0a352a19246d8c822e0eb97e8f4ff8229a6c00ac5c60cb214460b7289 SHA512 fb36289a955f0596c683cdadf1e4a9a9fd35222b1e1c6160c2e7cd82e5befd40a7aa4361e55f7a8f83c06ee899ec493821c7db34a60c4ac3bca0e874d33ef1a9 |
27 |
DIST ruby-patches-2.3.8-r1.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1 |
28 |
|
29 |
diff --git a/dev-lang/ruby/files/2.6/010-default-gem-location.patch b/dev-lang/ruby/files/2.6/010-default-gem-location.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..7a50c35ff6c |
32 |
--- /dev/null |
33 |
+++ b/dev-lang/ruby/files/2.6/010-default-gem-location.patch |
34 |
@@ -0,0 +1,20 @@ |
35 |
+--- a/tool/rbinstall.rb.~1~ 2019-01-24 02:00:07.000000000 +0100 |
36 |
++++ b/tool/rbinstall.rb 2019-02-03 08:39:49.778007118 +0100 |
37 |
+@@ -806,7 +806,7 @@ |
38 |
+ end |
39 |
+ |
40 |
+ def install_default_gem(dir, srcdir) |
41 |
+- gem_dir = Gem.default_dir |
42 |
++ gem_dir = ENV['GEM_DESTDIR'] |
43 |
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
44 |
+ prepare "default gems from #{dir}", gem_dir, directories |
45 |
+ |
46 |
+@@ -844,7 +844,7 @@ |
47 |
+ end |
48 |
+ |
49 |
+ install?(:ext, :comm, :gem, :'bundled-gems') do |
50 |
+- gem_dir = Gem.default_dir |
51 |
++ gem_dir = ENV['GEM_DESTDIR'] |
52 |
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
53 |
+ prepare "bundled gems", gem_dir, directories |
54 |
+ install_dir = with_destdir(gem_dir) |
55 |
|
56 |
diff --git a/dev-lang/ruby/ruby-2.6.1.ebuild b/dev-lang/ruby/ruby-2.6.1.ebuild |
57 |
new file mode 100644 |
58 |
index 00000000000..5af2c30ac97 |
59 |
--- /dev/null |
60 |
+++ b/dev-lang/ruby/ruby-2.6.1.ebuild |
61 |
@@ -0,0 +1,237 @@ |
62 |
+# Copyright 1999-2019 Gentoo Authors |
63 |
+# Distributed under the terms of the GNU General Public License v2 |
64 |
+ |
65 |
+EAPI=7 |
66 |
+ |
67 |
+inherit autotools flag-o-matic multilib |
68 |
+ |
69 |
+MY_P="${PN}-$(ver_cut 1-3)" |
70 |
+S=${WORKDIR}/${MY_P} |
71 |
+ |
72 |
+SLOT=$(ver_cut 1-2) |
73 |
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
74 |
+RUBYVERSION=${SLOT}.0 |
75 |
+ |
76 |
+DESCRIPTION="An object-oriented scripting language" |
77 |
+HOMEPAGE="https://www.ruby-lang.org/" |
78 |
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz" |
79 |
+ |
80 |
+LICENSE="|| ( Ruby-BSD BSD-2 )" |
81 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
82 |
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" |
83 |
+ |
84 |
+RDEPEND=" |
85 |
+ berkdb? ( sys-libs/db:= ) |
86 |
+ gdbm? ( sys-libs/gdbm:= ) |
87 |
+ jemalloc? ( dev-libs/jemalloc ) |
88 |
+ jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) |
89 |
+ ssl? ( |
90 |
+ !libressl? ( dev-libs/openssl:0= ) |
91 |
+ libressl? ( dev-libs/libressl ) |
92 |
+ ) |
93 |
+ socks5? ( >=net-proxy/dante-1.1.13 ) |
94 |
+ tk? ( |
95 |
+ dev-lang/tcl:0=[threads] |
96 |
+ dev-lang/tk:0=[threads] |
97 |
+ ) |
98 |
+ dev-libs/libyaml |
99 |
+ virtual/libffi:= |
100 |
+ sys-libs/readline:0= |
101 |
+ sys-libs/zlib |
102 |
+ >=app-eselect/eselect-ruby-20171225 |
103 |
+" |
104 |
+ |
105 |
+DEPEND="${RDEPEND}" |
106 |
+ |
107 |
+BUNDLED_GEMS=" |
108 |
+ >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] |
109 |
+ >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] |
110 |
+ >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] |
111 |
+ >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] |
112 |
+ >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] |
113 |
+ >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] |
114 |
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] |
115 |
+" |
116 |
+ |
117 |
+PDEPEND=" |
118 |
+ ${BUNDLED_GEMS} |
119 |
+ virtual/rubygems[ruby_targets_ruby26] |
120 |
+ >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] |
121 |
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby26] |
122 |
+ rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] ) |
123 |
+ xemacs? ( app-xemacs/ruby-modes )" |
124 |
+ |
125 |
+src_prepare() { |
126 |
+ # 005 does not compile bigdecimal and is questionable because it |
127 |
+ # compiles ruby in a non-standard way, may be dropped |
128 |
+ eapply "${FILESDIR}"/2.6/010*.patch |
129 |
+ |
130 |
+ einfo "Unbundling gems..." |
131 |
+ cd "$S" |
132 |
+ # Remove bundled gems that we will install via PDEPEND, bug |
133 |
+ # 539700. |
134 |
+ rm -fr gems/* || die |
135 |
+ |
136 |
+ einfo "Removing bundled libraries..." |
137 |
+ rm -fr ext/fiddle/libffi-3.2.1 || die |
138 |
+ |
139 |
+ eapply_user |
140 |
+ |
141 |
+ eautoreconf |
142 |
+} |
143 |
+ |
144 |
+src_configure() { |
145 |
+ local modules= myconf= |
146 |
+ |
147 |
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413. |
148 |
+ filter-flags -fomit-frame-pointer |
149 |
+ # In many places aliasing rules are broken; play it safe |
150 |
+ # as it's risky with newer compilers to leave it as it is. |
151 |
+ append-flags -fno-strict-aliasing |
152 |
+ # SuperH needs this |
153 |
+ use sh && append-flags -mieee |
154 |
+ |
155 |
+ # Socks support via dante |
156 |
+ if use socks5 ; then |
157 |
+ # Socks support can't be disabled as long as SOCKS_SERVER is |
158 |
+ # set and socks library is present, so need to unset |
159 |
+ # SOCKS_SERVER in that case. |
160 |
+ unset SOCKS_SERVER |
161 |
+ fi |
162 |
+ |
163 |
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000) |
164 |
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then |
165 |
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
166 |
+ fi |
167 |
+ |
168 |
+ # ipv6 hack, bug 168939. Needs --enable-ipv6. |
169 |
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" |
170 |
+ |
171 |
+ # Determine which modules *not* to build depending in the USE flags. |
172 |
+ if ! use berkdb ; then |
173 |
+ modules="${modules},dbm" |
174 |
+ fi |
175 |
+ if ! use gdbm ; then |
176 |
+ modules="${modules},gdbm" |
177 |
+ fi |
178 |
+ if ! use ssl ; then |
179 |
+ modules="${modules},openssl" |
180 |
+ fi |
181 |
+ if ! use tk ; then |
182 |
+ modules="${modules},tk" |
183 |
+ fi |
184 |
+ |
185 |
+ # Provide an empty LIBPATHENV because we disable rpath but we do not |
186 |
+ # need LD_LIBRARY_PATH by default since that breaks USE=multitarget |
187 |
+ # #564272 |
188 |
+ INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ |
189 |
+ --program-suffix=${MY_SUFFIX} \ |
190 |
+ --with-soname=ruby${MY_SUFFIX} \ |
191 |
+ --docdir=${EPREFIX}/usr/share/doc/${P} \ |
192 |
+ --enable-shared \ |
193 |
+ --enable-pthread \ |
194 |
+ --disable-rpath \ |
195 |
+ --with-out-ext="${modules}" \ |
196 |
+ $(use_with jemalloc jemalloc) \ |
197 |
+ $(use_enable jit jit-support ) \ |
198 |
+ $(use_enable socks5 socks) \ |
199 |
+ $(use_enable doc install-doc) \ |
200 |
+ --enable-ipv6 \ |
201 |
+ $(use_enable static-libs static) \ |
202 |
+ $(use_enable static-libs install-static-library) \ |
203 |
+ $(use_with static-libs static-linked-ext) \ |
204 |
+ $(use_enable debug) \ |
205 |
+ ${myconf} \ |
206 |
+ --enable-option-checking=no \ |
207 |
+ || die "econf failed" |
208 |
+ |
209 |
+ # Makefile is broken because it lacks -ldl |
210 |
+ rm -rf ext/-test-/popen_deadlock || die |
211 |
+} |
212 |
+ |
213 |
+src_compile() { |
214 |
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed" |
215 |
+} |
216 |
+ |
217 |
+src_test() { |
218 |
+ emake -j1 V=1 test || die "make test failed" |
219 |
+ |
220 |
+ elog "Ruby's make test has been run. Ruby also ships with a make check" |
221 |
+ elog "that cannot be run until after ruby has been installed." |
222 |
+ elog |
223 |
+ if use rubytests; then |
224 |
+ elog "You have enabled rubytests, so they will be installed to" |
225 |
+ elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" |
226 |
+ elog "than root, and you must place them into a writeable directory." |
227 |
+ elog "Then call: " |
228 |
+ elog |
229 |
+ elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" |
230 |
+ else |
231 |
+ elog "Enable the rubytests USE flag to install the make check tests" |
232 |
+ fi |
233 |
+} |
234 |
+ |
235 |
+src_install() { |
236 |
+ # Remove the remaining bundled gems. We do this late in the process |
237 |
+ # since they are used during the build to e.g. create the |
238 |
+ # documentation. |
239 |
+ rm -rf ext/json || die |
240 |
+ rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die |
241 |
+ |
242 |
+ # Ruby is involved in the install process, we don't want interference here. |
243 |
+ unset RUBYOPT |
244 |
+ |
245 |
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
246 |
+ |
247 |
+ LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
248 |
+ RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" |
249 |
+ for d in $(find "${S}/ext" -type d) ; do |
250 |
+ RUBYLIB="${RUBYLIB}:$d" |
251 |
+ done |
252 |
+ export LD_LIBRARY_PATH RUBYLIB |
253 |
+ |
254 |
+ # Create directory for the default gems |
255 |
+ local gem_home="/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" |
256 |
+ mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" |
257 |
+ |
258 |
+ emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make install failed" |
259 |
+ |
260 |
+ # Remove installed rubygems and rdoc copy |
261 |
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
262 |
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" |
263 |
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
264 |
+ rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
265 |
+ |
266 |
+ if use doc; then |
267 |
+ emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die "make install-doc failed" |
268 |
+ fi |
269 |
+ |
270 |
+ if use examples; then |
271 |
+ insinto /usr/share/doc/${PF} |
272 |
+ doins -r sample |
273 |
+ fi |
274 |
+ |
275 |
+ dodoc ChangeLog NEWS doc/NEWS* README* || die |
276 |
+ |
277 |
+ if use rubytests; then |
278 |
+ pushd test |
279 |
+ insinto /usr/share/${PN}-${SLOT}/test |
280 |
+ doins -r . |
281 |
+ popd |
282 |
+ fi |
283 |
+} |
284 |
+ |
285 |
+pkg_postinst() { |
286 |
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then |
287 |
+ eselect ruby set ruby${MY_SUFFIX} |
288 |
+ fi |
289 |
+ |
290 |
+ elog |
291 |
+ elog "To switch between available Ruby profiles, execute as root:" |
292 |
+ elog "\teselect ruby set ruby(23|24|...)" |
293 |
+ elog |
294 |
+} |
295 |
+ |
296 |
+pkg_postrm() { |
297 |
+ eselect ruby cleanup |
298 |
+} |