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-lang/ruby/
Date: Sun, 07 Jan 2018 08:48:42
Message-Id: 1515314897.80db55621a1d770704ee64730359c0e8f1927e14.graaff@gentoo
1 commit: 80db55621a1d770704ee64730359c0e8f1927e14
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 08:43:02 2018 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 08:48:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80db5562
7
8 dev-lang/ruby: cleanup
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12 dev-lang/ruby/Manifest | 5 -
13 dev-lang/ruby/ruby-2.3.5.ebuild | 242 ---------------------------------------
14 dev-lang/ruby/ruby-2.4.2.ebuild | 243 ----------------------------------------
15 dev-lang/ruby/ruby-2.5.0.ebuild | 238 ---------------------------------------
16 4 files changed, 728 deletions(-)
17
18 diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
19 index cc45cfcbd89..6a961e280f0 100644
20 --- a/dev-lang/ruby/Manifest
21 +++ b/dev-lang/ruby/Manifest
22 @@ -1,15 +1,10 @@
23 DIST ruby-2.2.8.tar.xz 10520648 BLAKE2B 96c483786b1a7e0b1483c337a13fe7e07e740bb21b507b518e142dc9ac8cf19ba00c094b4357db4305c645d370d776269145b699ad11429aa56a0de78abfbf83 SHA512 e21004bee537f0c706f4ac9526507b414ddb6a8d721e8fad8d7fe88992a4f048eb5eb79f8d8b8af2a8b331dcfa74b560490218a1acb3532c2cdb4fb4909da3c9
24 DIST ruby-2.2.9.tar.xz 10511456 BLAKE2B aeb631c47def96e8dd19e4f7281ef95833d9d0cde0912ffccd341032d2be22d6eebf259b0926f248298a5a290fd4d99b7ec38e29b805c9d77d4f3f4481fc0edb SHA512 c4ef84cd00f72f60d6c168f0726d9d7e9573549c2bbae83893e1a9d5e64fc7938f4c9d50a47147b28b37cbf36263f95e10a810c0797bad941775a48d75a8c933
25 -DIST ruby-2.3.5.tar.xz 11437868 BLAKE2B db50d7b36b6a8fa5b0b030f56d5d7bfc3c43e21d7255e9db73fed4d42cda1f161457c0f478e865766e2b7ef703335aa5b6bdf0bbc23c26a1cdb0163b75528de0 SHA512 c55e3b71241f505b6bbad78b3bd40235064faae3443ca14b77b6356556caed6a0d055dc2e2cd7ebdb5290ab908e06d2b7d68f72469af5017eda4b29664b0d889
26 DIST ruby-2.3.6.tar.xz 11445628 BLAKE2B 052f09fef806581824b14196abecde7def7c4ebc922c8af75281fe26ec2a7a2a325d1702a382b29e91b302064ab55972b63430248813b24b591fe74b7bc18e30 SHA512 a09c8715097d16190ee17ee39e7a74438cefc9013add350217b7e3fb4d60aa9dcb30595adf832b0d67a5c45b1fe9d4effb767c995af2759420859f8d763c693a
27 -DIST ruby-2.4.2.tar.xz 10046412 BLAKE2B 33af07ee102367fe811dd3248edc72238bddfc3332f64280b6b36497c7de70bce939127c1efcc965072451ddd60ede98c855fc1fd24be9b12eedc58a21faad5a SHA512 c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595
28 DIST ruby-2.4.3.tar.xz 10040072 BLAKE2B 87ad9700312a104a60b079f4ef95804d2a9e01109e9fef6e83e593464f1d2c5077af54cbbaff6e0d25a925d05f513cade6c76f05960d9bcc1817bdee51ad4a0f SHA512 8bcf60c994a96787da5d743c66f5609a5a6d834d6d61243cdea7fd059197c3b10da43c99e5649be85e2f2329eedcbb1dd76e89ce3ac586be9056348f7449ed09
29 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
30 DIST ruby-patches-2.2.8.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
31 DIST ruby-patches-2.2.9.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
32 -DIST ruby-patches-2.3.5.tar.bz2 3593 BLAKE2B 48aba5d68ad7b648065a3580cb7160470ad308659fa11249afab1efe6482edf3805087f4054762717a89b61da4fd7a50c84ab8e76ba00052fd95d937655dcdba SHA512 eacb7f6787b36c7d848453b29152190a164ebc6882ab509eeb6584e49af4b66a665c4baff4ecf75e5831ae54d47dbc651d6f048918f3327500c429f1f419ed94
33 DIST ruby-patches-2.3.6.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
34 -DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
35 DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
36 DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
37 -DIST ruby-patches-2.5.0.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
38
39 diff --git a/dev-lang/ruby/ruby-2.3.5.ebuild b/dev-lang/ruby/ruby-2.3.5.ebuild
40 deleted file mode 100644
41 index d41fd224c41..00000000000
42 --- a/dev-lang/ruby/ruby-2.3.5.ebuild
43 +++ /dev/null
44 @@ -1,242 +0,0 @@
45 -# Copyright 1999-2017 Gentoo Foundation
46 -# Distributed under the terms of the GNU General Public License v2
47 -
48 -EAPI=5
49 -
50 -#PATCHSET=1
51 -
52 -inherit autotools eutils flag-o-matic multilib versionator
53 -
54 -MY_P="${PN}-$(get_version_component_range 1-3)"
55 -S=${WORKDIR}/${MY_P}
56 -
57 -SLOT=$(get_version_component_range 1-2)
58 -MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
59 -RUBYVERSION=2.3.0
60 -
61 -if [[ -n ${PATCHSET} ]]; then
62 - if [[ ${PVR} == ${PV} ]]; then
63 - PATCHSET="${PV}-r0.${PATCHSET}"
64 - else
65 - PATCHSET="${PVR}.${PATCHSET}"
66 - fi
67 -else
68 - PATCHSET="${PVR}"
69 -fi
70 -
71 -DESCRIPTION="An object-oriented scripting language"
72 -HOMEPAGE="https://www.ruby-lang.org/"
73 -SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
74 - https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
75 -
76 -LICENSE="|| ( Ruby-BSD BSD-2 )"
77 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
78 -IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
79 -
80 -RDEPEND="
81 - berkdb? ( sys-libs/db:= )
82 - gdbm? ( sys-libs/gdbm )
83 - jemalloc? ( dev-libs/jemalloc )
84 - ssl? (
85 - !libressl? ( dev-libs/openssl:0= )
86 - libressl? ( dev-libs/libressl )
87 - )
88 - socks5? ( >=net-proxy/dante-1.1.13 )
89 - tk? (
90 - dev-lang/tcl:0=[threads]
91 - dev-lang/tk:0=[threads]
92 - )
93 - ncurses? ( sys-libs/ncurses:0= )
94 - readline? ( sys-libs/readline:0= )
95 - dev-libs/libyaml
96 - virtual/libffi
97 - sys-libs/zlib
98 - >=app-eselect/eselect-ruby-20151229
99 - !<dev-ruby/rdoc-3.9.4
100 - !<dev-ruby/rubygems-1.8.10-r1"
101 -
102 -DEPEND="${RDEPEND}"
103 -
104 -BUNDLED_GEMS="
105 - >=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
106 - >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
107 - >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
108 - >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
109 - >=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
110 - >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
111 -"
112 -
113 -PDEPEND="
114 - ${BUNDLED_GEMS}
115 - virtual/rubygems[ruby_targets_ruby23]
116 - >=dev-ruby/json-1.8.3[ruby_targets_ruby23]
117 - rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
118 - xemacs? ( app-xemacs/ruby-modes )"
119 -
120 -src_prepare() {
121 - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
122 - epatch "${WORKDIR}/patches"
123 -
124 - einfo "Unbundling gems..."
125 - cd "$S"
126 - # Remove bundled gems that we will install via PDEPEND, bug
127 - # 539700. Use explicit version numbers to ensure rm fails when they
128 - # change so we can update dependencies accordingly.
129 - rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
130 -
131 - # Fix a hardcoded lib path in configure script
132 - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
133 - configure.in || die "sed failed"
134 -
135 - eautoreconf
136 -}
137 -
138 -src_configure() {
139 - local modules= myconf=
140 -
141 - # -fomit-frame-pointer makes ruby segfault, see bug #150413.
142 - filter-flags -fomit-frame-pointer
143 - # In many places aliasing rules are broken; play it safe
144 - # as it's risky with newer compilers to leave it as it is.
145 - append-flags -fno-strict-aliasing
146 - # SuperH needs this
147 - use sh && append-flags -mieee
148 -
149 - # Socks support via dante
150 - if use socks5 ; then
151 - # Socks support can't be disabled as long as SOCKS_SERVER is
152 - # set and socks library is present, so need to unset
153 - # SOCKS_SERVER in that case.
154 - unset SOCKS_SERVER
155 - fi
156 -
157 - # Increase GC_MALLOC_LIMIT if set (default is 8000000)
158 - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
159 - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
160 - fi
161 -
162 - # ipv6 hack, bug 168939. Needs --enable-ipv6.
163 - use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
164 -
165 - # Determine which modules *not* to build depending in the USE flags.
166 - if ! use readline ; then
167 - modules="${modules},readline"
168 - fi
169 - if ! use berkdb ; then
170 - modules="${modules},dbm"
171 - fi
172 - if ! use gdbm ; then
173 - modules="${modules},gdbm"
174 - fi
175 - if ! use ssl ; then
176 - modules="${modules},openssl"
177 - fi
178 - if ! use ncurses ; then
179 - modules="${modules},curses"
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 socks5 socks) \
198 - $(use_enable doc install-doc) \
199 - --enable-ipv6 \
200 - $(use_enable debug) \
201 - ${myconf} \
202 - --enable-option-checking=no \
203 - || die "econf failed"
204 -}
205 -
206 -src_compile() {
207 - emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
208 -}
209 -
210 -src_test() {
211 - emake -j1 V=1 test || die "make test failed"
212 -
213 - elog "Ruby's make test has been run. Ruby also ships with a make check"
214 - elog "that cannot be run until after ruby has been installed."
215 - elog
216 - if use rubytests; then
217 - elog "You have enabled rubytests, so they will be installed to"
218 - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
219 - elog "than root, and you must place them into a writeable directory."
220 - elog "Then call: "
221 - elog
222 - elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
223 - else
224 - elog "Enable the rubytests USE flag to install the make check tests"
225 - fi
226 -}
227 -
228 -src_install() {
229 - # Remove the remaining bundled gems. We do this late in the process
230 - # since they are used during the build to e.g. create the
231 - # documentation.
232 - rm -rf ext/json || die
233 -
234 - # Ruby is involved in the install process, we don't want interference here.
235 - unset RUBYOPT
236 -
237 - local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
238 -
239 - LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
240 - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
241 - for d in $(find "${S}/ext" -type d) ; do
242 - RUBYLIB="${RUBYLIB}:$d"
243 - done
244 - export LD_LIBRARY_PATH RUBYLIB
245 -
246 - emake V=1 DESTDIR="${D}" install || die "make install failed"
247 -
248 - # Remove installed rubygems and rdoc copy
249 - rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
250 - rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
251 - rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
252 - rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
253 -
254 - if use doc; then
255 - make DESTDIR="${D}" install-doc || die "make install-doc failed"
256 - fi
257 -
258 - if use examples; then
259 - insinto /usr/share/doc/${PF}
260 - doins -r sample
261 - fi
262 -
263 - dodoc ChangeLog NEWS doc/NEWS* README* || die
264 -
265 - if use rubytests; then
266 - pushd test
267 - insinto /usr/share/${PN}-${SLOT}/test
268 - doins -r .
269 - popd
270 - fi
271 -}
272 -
273 -pkg_postinst() {
274 - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
275 - eselect ruby set ruby${MY_SUFFIX}
276 - fi
277 -
278 - elog
279 - elog "To switch between available Ruby profiles, execute as root:"
280 - elog "\teselect ruby set ruby(22|23|...)"
281 - elog
282 -}
283 -
284 -pkg_postrm() {
285 - eselect ruby cleanup
286 -}
287
288 diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.2.ebuild
289 deleted file mode 100644
290 index 46a0abb3372..00000000000
291 --- a/dev-lang/ruby/ruby-2.4.2.ebuild
292 +++ /dev/null
293 @@ -1,243 +0,0 @@
294 -# Copyright 1999-2017 Gentoo Foundation
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI=6
298 -
299 -#PATCHSET=1
300 -
301 -inherit autotools eutils flag-o-matic multilib versionator
302 -
303 -MY_P="${PN}-$(get_version_component_range 1-3)"
304 -S=${WORKDIR}/${MY_P}
305 -
306 -SLOT=$(get_version_component_range 1-2)
307 -MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
308 -RUBYVERSION=${SLOT}.0
309 -
310 -if [[ -n ${PATCHSET} ]]; then
311 - if [[ ${PVR} == ${PV} ]]; then
312 - PATCHSET="${PV}-r0.${PATCHSET}"
313 - else
314 - PATCHSET="${PVR}.${PATCHSET}"
315 - fi
316 -else
317 - PATCHSET="${PVR}"
318 -fi
319 -
320 -DESCRIPTION="An object-oriented scripting language"
321 -HOMEPAGE="http://www.ruby-lang.org/"
322 -SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
323 - https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
324 -
325 -LICENSE="|| ( Ruby-BSD BSD-2 )"
326 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
327 -IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
328 -
329 -RDEPEND="
330 - berkdb? ( sys-libs/db:= )
331 - gdbm? ( sys-libs/gdbm )
332 - jemalloc? ( dev-libs/jemalloc )
333 - ssl? (
334 - !libressl? ( dev-libs/openssl:0= )
335 - libressl? ( dev-libs/libressl )
336 - )
337 - socks5? ( >=net-proxy/dante-1.1.13 )
338 - tk? (
339 - dev-lang/tcl:0=[threads]
340 - dev-lang/tk:0=[threads]
341 - )
342 - dev-libs/libyaml
343 - virtual/libffi
344 - sys-libs/zlib
345 - >=app-eselect/eselect-ruby-20161226
346 - !<dev-ruby/rdoc-3.9.4
347 - !<dev-ruby/rubygems-1.8.10-r1"
348 -
349 -DEPEND="${RDEPEND}"
350 -
351 -BUNDLED_GEMS="
352 - >=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
353 - >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
354 - >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
355 - >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
356 - >=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
357 - >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
358 - >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
359 -"
360 -
361 -PDEPEND="
362 - ${BUNDLED_GEMS}
363 - virtual/rubygems[ruby_targets_ruby24]
364 - >=dev-ruby/json-2.0.2[ruby_targets_ruby24]
365 - rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
366 - xemacs? ( app-xemacs/ruby-modes )"
367 -
368 -src_prepare() {
369 - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
370 - epatch "${WORKDIR}/patches"
371 -
372 - einfo "Unbundling gems..."
373 - cd "$S"
374 - # Remove bundled gems that we will install via PDEPEND, bug
375 - # 539700. Use explicit version numbers to ensure rm fails when they
376 - # change so we can update dependencies accordingly.
377 - rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
378 -
379 - einfo "Removing bundled libraries..."
380 - rm -fr ext/fiddle/libffi-3.2.1 || die
381 -
382 - # Fix a hardcoded lib path in configure script
383 - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
384 - configure.in || die "sed failed"
385 -
386 - eapply_user
387 -
388 - eautoreconf
389 -}
390 -
391 -src_configure() {
392 - local modules= myconf=
393 -
394 - # -fomit-frame-pointer makes ruby segfault, see bug #150413.
395 - filter-flags -fomit-frame-pointer
396 - # In many places aliasing rules are broken; play it safe
397 - # as it's risky with newer compilers to leave it as it is.
398 - append-flags -fno-strict-aliasing
399 - # SuperH needs this
400 - use sh && append-flags -mieee
401 -
402 - # Socks support via dante
403 - if use socks5 ; then
404 - # Socks support can't be disabled as long as SOCKS_SERVER is
405 - # set and socks library is present, so need to unset
406 - # SOCKS_SERVER in that case.
407 - unset SOCKS_SERVER
408 - fi
409 -
410 - # Increase GC_MALLOC_LIMIT if set (default is 8000000)
411 - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
412 - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
413 - fi
414 -
415 - # ipv6 hack, bug 168939. Needs --enable-ipv6.
416 - use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
417 -
418 - # Determine which modules *not* to build depending in the USE flags.
419 - if ! use berkdb ; then
420 - modules="${modules},dbm"
421 - fi
422 - if ! use gdbm ; then
423 - modules="${modules},gdbm"
424 - fi
425 - if ! use ssl ; then
426 - modules="${modules},openssl"
427 - fi
428 - if ! use tk ; then
429 - modules="${modules},tk"
430 - fi
431 -
432 - # Provide an empty LIBPATHENV because we disable rpath but we do not
433 - # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
434 - # #564272
435 - INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
436 - --program-suffix=${MY_SUFFIX} \
437 - --with-soname=ruby${MY_SUFFIX} \
438 - --docdir=${EPREFIX}/usr/share/doc/${P} \
439 - --enable-shared \
440 - --enable-pthread \
441 - --disable-rpath \
442 - --with-out-ext="${modules}" \
443 - $(use_with jemalloc jemalloc) \
444 - $(use_enable socks5 socks) \
445 - $(use_enable doc install-doc) \
446 - --enable-ipv6 \
447 - $(use_enable static-libs static) \
448 - $(use_enable static-libs install-static-library) \
449 - $(use_with static-libs static-linked-ext) \
450 - $(use_enable debug) \
451 - ${myconf} \
452 - --enable-option-checking=no \
453 - || die "econf failed"
454 -}
455 -
456 -src_compile() {
457 - emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
458 -}
459 -
460 -src_test() {
461 - emake -j1 V=1 test || die "make test failed"
462 -
463 - elog "Ruby's make test has been run. Ruby also ships with a make check"
464 - elog "that cannot be run until after ruby has been installed."
465 - elog
466 - if use rubytests; then
467 - elog "You have enabled rubytests, so they will be installed to"
468 - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
469 - elog "than root, and you must place them into a writeable directory."
470 - elog "Then call: "
471 - elog
472 - elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
473 - else
474 - elog "Enable the rubytests USE flag to install the make check tests"
475 - fi
476 -}
477 -
478 -src_install() {
479 - # Remove the remaining bundled gems. We do this late in the process
480 - # since they are used during the build to e.g. create the
481 - # documentation.
482 - rm -rf ext/json || die
483 -
484 - # Ruby is involved in the install process, we don't want interference here.
485 - unset RUBYOPT
486 -
487 - local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
488 -
489 - LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
490 - RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
491 - for d in $(find "${S}/ext" -type d) ; do
492 - RUBYLIB="${RUBYLIB}:$d"
493 - done
494 - export LD_LIBRARY_PATH RUBYLIB
495 -
496 - emake V=1 DESTDIR="${D}" install || die "make install failed"
497 -
498 - # Remove installed rubygems and rdoc copy
499 - rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
500 - rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
501 - rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
502 - rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
503 -
504 - if use doc; then
505 - make DESTDIR="${D}" install-doc || die "make install-doc failed"
506 - fi
507 -
508 - if use examples; then
509 - insinto /usr/share/doc/${PF}
510 - doins -r sample
511 - fi
512 -
513 - dodoc ChangeLog NEWS doc/NEWS* README* || die
514 -
515 - if use rubytests; then
516 - pushd test
517 - insinto /usr/share/${PN}-${SLOT}/test
518 - doins -r .
519 - popd
520 - fi
521 -}
522 -
523 -pkg_postinst() {
524 - if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
525 - eselect ruby set ruby${MY_SUFFIX}
526 - fi
527 -
528 - elog
529 - elog "To switch between available Ruby profiles, execute as root:"
530 - elog "\teselect ruby set ruby(23|24|...)"
531 - elog
532 -}
533 -
534 -pkg_postrm() {
535 - eselect ruby cleanup
536 -}
537
538 diff --git a/dev-lang/ruby/ruby-2.5.0.ebuild b/dev-lang/ruby/ruby-2.5.0.ebuild
539 deleted file mode 100644
540 index 0149280e240..00000000000
541 --- a/dev-lang/ruby/ruby-2.5.0.ebuild
542 +++ /dev/null
543 @@ -1,238 +0,0 @@
544 -# Copyright 1999-2017 Gentoo Foundation
545 -# Distributed under the terms of the GNU General Public License v2
546 -
547 -EAPI=6
548 -
549 -#PATCHSET=1
550 -
551 -inherit autotools eutils flag-o-matic multilib versionator
552 -
553 -MY_P="${PN}-$(get_version_component_range 1-3)"
554 -S=${WORKDIR}/${MY_P}
555 -
556 -SLOT=$(get_version_component_range 1-2)
557 -MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
558 -RUBYVERSION=${SLOT}.0
559 -
560 -if [[ -n ${PATCHSET} ]]; then
561 - if [[ ${PVR} == ${PV} ]]; then
562 - PATCHSET="${PV}-r0.${PATCHSET}"
563 - else
564 - PATCHSET="${PVR}.${PATCHSET}"
565 - fi
566 -else
567 - PATCHSET="${PVR}"
568 -fi
569 -
570 -DESCRIPTION="An object-oriented scripting language"
571 -HOMEPAGE="http://www.ruby-lang.org/"
572 -SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
573 - https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
574 -
575 -LICENSE="|| ( Ruby-BSD BSD-2 )"
576 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
577 -IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
578 -
579 -RDEPEND="
580 - berkdb? ( sys-libs/db:= )
581 - gdbm? ( sys-libs/gdbm )
582 - jemalloc? ( dev-libs/jemalloc )
583 - ssl? (
584 - !libressl? ( dev-libs/openssl:0= )
585 - libressl? ( dev-libs/libressl )
586 - )
587 - socks5? ( >=net-proxy/dante-1.1.13 )
588 - tk? (
589 - dev-lang/tcl:0=[threads]
590 - dev-lang/tk:0=[threads]
591 - )
592 - dev-libs/libyaml
593 - virtual/libffi
594 - sys-libs/zlib
595 - >=app-eselect/eselect-ruby-20171225
596 -"
597 -
598 -DEPEND="${RDEPEND}"
599 -
600 -BUNDLED_GEMS="
601 - >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
602 - >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
603 - >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
604 - >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
605 - >=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
606 - >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
607 - >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
608 -"
609 -
610 -PDEPEND="
611 - ${BUNDLED_GEMS}
612 - virtual/rubygems[ruby_targets_ruby24]
613 - >=dev-ruby/json-2.0.2[ruby_targets_ruby24]
614 - rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
615 - xemacs? ( app-xemacs/ruby-modes )"
616 -
617 -src_prepare() {
618 - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
619 - epatch "${WORKDIR}/patches"
620 -
621 - einfo "Unbundling gems..."
622 - cd "$S"
623 - # Remove bundled gems that we will install via PDEPEND, bug
624 - # 539700. Use explicit version numbers to ensure rm fails when they
625 - # change so we can update dependencies accordingly.
626 - rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
627 -
628 - einfo "Removing bundled libraries..."
629 - rm -fr ext/fiddle/libffi-3.2.1 || die
630 -
631 - eapply_user
632 -
633 - eautoreconf
634 -}
635 -
636 -src_configure() {
637 - local modules= myconf=
638 -
639 - # -fomit-frame-pointer makes ruby segfault, see bug #150413.
640 - filter-flags -fomit-frame-pointer
641 - # In many places aliasing rules are broken; play it safe
642 - # as it's risky with newer compilers to leave it as it is.
643 - append-flags -fno-strict-aliasing
644 - # SuperH needs this
645 - use sh && append-flags -mieee
646 -
647 - # Socks support via dante
648 - if use socks5 ; then
649 - # Socks support can't be disabled as long as SOCKS_SERVER is
650 - # set and socks library is present, so need to unset
651 - # SOCKS_SERVER in that case.
652 - unset SOCKS_SERVER
653 - fi
654 -
655 - # Increase GC_MALLOC_LIMIT if set (default is 8000000)
656 - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
657 - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
658 - fi
659 -
660 - # ipv6 hack, bug 168939. Needs --enable-ipv6.
661 - use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
662 -
663 - # Determine which modules *not* to build depending in the USE flags.
664 - if ! use berkdb ; then
665 - modules="${modules},dbm"
666 - fi
667 - if ! use gdbm ; then
668 - modules="${modules},gdbm"
669 - fi
670 - if ! use ssl ; then
671 - modules="${modules},openssl"
672 - fi
673 - if ! use tk ; then
674 - modules="${modules},tk"
675 - fi
676 -
677 - # Provide an empty LIBPATHENV because we disable rpath but we do not
678 - # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
679 - # #564272
680 - INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
681 - --program-suffix=${MY_SUFFIX} \
682 - --with-soname=ruby${MY_SUFFIX} \
683 - --docdir=${EPREFIX}/usr/share/doc/${P} \
684 - --enable-shared \
685 - --enable-pthread \
686 - --disable-rpath \
687 - --with-out-ext="${modules}" \
688 - $(use_with jemalloc jemalloc) \
689 - $(use_enable socks5 socks) \
690 - $(use_enable doc install-doc) \
691 - --enable-ipv6 \
692 - $(use_enable static-libs static) \
693 - $(use_enable static-libs install-static-library) \
694 - $(use_with static-libs static-linked-ext) \
695 - $(use_enable debug) \
696 - ${myconf} \
697 - --enable-option-checking=no \
698 - || die "econf failed"
699 -}
700 -
701 -src_compile() {
702 - emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
703 -}
704 -
705 -src_test() {
706 - emake -j1 V=1 test || die "make test failed"
707 -
708 - elog "Ruby's make test has been run. Ruby also ships with a make check"
709 - elog "that cannot be run until after ruby has been installed."
710 - elog
711 - if use rubytests; then
712 - elog "You have enabled rubytests, so they will be installed to"
713 - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
714 - elog "than root, and you must place them into a writeable directory."
715 - elog "Then call: "
716 - elog
717 - elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
718 - else
719 - elog "Enable the rubytests USE flag to install the make check tests"
720 - fi
721 -}
722 -
723 -src_install() {
724 - # Remove the remaining bundled gems. We do this late in the process
725 - # since they are used during the build to e.g. create the
726 - # documentation.
727 - rm -rf ext/json || die
728 -
729 - # Ruby is involved in the install process, we don't want interference here.
730 - unset RUBYOPT
731 -
732 - local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
733 -
734 - LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
735 - RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
736 - for d in $(find "${S}/ext" -type d) ; do
737 - RUBYLIB="${RUBYLIB}:$d"
738 - done
739 - export LD_LIBRARY_PATH RUBYLIB
740 -
741 - emake V=1 DESTDIR="${D}" install || die "make install failed"
742 -
743 - # Remove installed rubygems and rdoc copy
744 - rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
745 - rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
746 - rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
747 - rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
748 -
749 - if use doc; then
750 - make DESTDIR="${D}" install-doc || die "make install-doc failed"
751 - fi
752 -
753 - if use examples; then
754 - insinto /usr/share/doc/${PF}
755 - doins -r sample
756 - fi
757 -
758 - dodoc ChangeLog NEWS doc/NEWS* README* || die
759 -
760 - if use rubytests; then
761 - pushd test
762 - insinto /usr/share/${PN}-${SLOT}/test
763 - doins -r .
764 - popd
765 - fi
766 -}
767 -
768 -pkg_postinst() {
769 - if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
770 - eselect ruby set ruby${MY_SUFFIX}
771 - fi
772 -
773 - elog
774 - elog "To switch between available Ruby profiles, execute as root:"
775 - elog "\teselect ruby set ruby(23|24|...)"
776 - elog
777 -}
778 -
779 -pkg_postrm() {
780 - eselect ruby cleanup
781 -}