1 |
commit: 5c85bec8fd544202fe5736d658a351e82c2fe16e |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 25 13:00:27 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 25 13:00:27 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c85bec8 |
7 |
|
8 |
dev-lang/ruby: drop 2.6.10 |
9 |
|
10 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
11 |
|
12 |
dev-lang/ruby/Manifest | 1 - |
13 |
dev-lang/ruby/ruby-2.6.10.ebuild | 258 --------------------------------------- |
14 |
profiles/package.mask | 5 - |
15 |
3 files changed, 264 deletions(-) |
16 |
|
17 |
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest |
18 |
index 5aab4011dd7d..023e059d8d44 100644 |
19 |
--- a/dev-lang/ruby/Manifest |
20 |
+++ b/dev-lang/ruby/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST ruby-2.6.10.tar.xz 11582056 BLAKE2B faa0fd6e4b462ed6473191b39bb19dda78f64c555b6eae0c9d53a81cffca55c31d1fa04345dc2f8a951029e41bb973b2194b1f15964d8a3db973bf2872fff126 SHA512 06ebf1442c4bf4be62eb710348cfb714cbc4c4acc5125319a425fe76ef2be7cccfd41e50bf3751bfef3ceb8ac47ad41a027d2c2ad560e25ec694e34fd9f62a8a |
23 |
DIST ruby-2.7.6.tar.xz 12084408 BLAKE2B 4b40e66aeeca3884983fffcf31c4713eb4fcdd62232e795dc5a0c03236c3c05200068902c0cb987455297bec2bcfc2a9a24f2841d18a480c7d09b86318daab3f SHA512 e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f |
24 |
DIST ruby-3.0.4.tar.xz 15830368 BLAKE2B 3d1f2e6329269febbd02ac8a68aafd57d5ca858c816a81e754adfc9aa2990274d190672447244520fe9fbf9a1d337d17c845a97800f964e2046b2ef9eef733ee SHA512 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b |
25 |
DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21 |
26 |
|
27 |
diff --git a/dev-lang/ruby/ruby-2.6.10.ebuild b/dev-lang/ruby/ruby-2.6.10.ebuild |
28 |
deleted file mode 100644 |
29 |
index 15e12897400e..000000000000 |
30 |
--- a/dev-lang/ruby/ruby-2.6.10.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,258 +0,0 @@ |
33 |
-# Copyright 1999-2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit autotools flag-o-matic |
39 |
- |
40 |
-MY_P="${PN}-$(ver_cut 1-3)" |
41 |
-S=${WORKDIR}/${MY_P} |
42 |
- |
43 |
-SLOT=$(ver_cut 1-2) |
44 |
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
45 |
-RUBYVERSION=${SLOT}.0 |
46 |
- |
47 |
-DESCRIPTION="An object-oriented scripting language" |
48 |
-HOMEPAGE="https://www.ruby-lang.org/" |
49 |
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz" |
50 |
- |
51 |
-LICENSE="|| ( Ruby-BSD BSD-2 )" |
52 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
53 |
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs" |
54 |
- |
55 |
-RDEPEND=" |
56 |
- berkdb? ( sys-libs/db:= ) |
57 |
- gdbm? ( sys-libs/gdbm:= ) |
58 |
- jemalloc? ( dev-libs/jemalloc:= ) |
59 |
- jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) |
60 |
- ssl? ( |
61 |
- dev-libs/openssl:0= |
62 |
- ) |
63 |
- socks5? ( >=net-proxy/dante-1.1.13 ) |
64 |
- systemtap? ( dev-util/systemtap ) |
65 |
- tk? ( |
66 |
- dev-lang/tcl:0=[threads] |
67 |
- dev-lang/tk:0=[threads] |
68 |
- ) |
69 |
- dev-libs/libyaml |
70 |
- dev-libs/libffi:= |
71 |
- sys-libs/readline:0= |
72 |
- sys-libs/zlib |
73 |
- virtual/libcrypt:= |
74 |
- >=app-eselect/eselect-ruby-20181225 |
75 |
-" |
76 |
- |
77 |
-DEPEND="${RDEPEND}" |
78 |
- |
79 |
-BUNDLED_GEMS=" |
80 |
- >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] |
81 |
- >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] |
82 |
- >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] |
83 |
- >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] |
84 |
- >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] |
85 |
- >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] |
86 |
- >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] |
87 |
-" |
88 |
- |
89 |
-PDEPEND=" |
90 |
- ${BUNDLED_GEMS} |
91 |
- virtual/rubygems[ruby_targets_ruby26] |
92 |
- >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] |
93 |
- >=dev-ruby/json-2.0.2[ruby_targets_ruby26] |
94 |
- rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) |
95 |
- xemacs? ( app-xemacs/ruby-modes )" |
96 |
- |
97 |
-src_prepare() { |
98 |
- # 005 does not compile bigdecimal and is questionable because it |
99 |
- # compiles ruby in a non-standard way, may be dropped |
100 |
- eapply "${FILESDIR}"/2.6/{002,010}*.patch |
101 |
- |
102 |
- einfo "Unbundling gems..." |
103 |
- cd "$S" |
104 |
- # Remove bundled gems that we will install via PDEPEND, bug |
105 |
- # 539700. |
106 |
- rm -fr gems/* || die |
107 |
- |
108 |
- einfo "Removing bundled libraries..." |
109 |
- rm -fr ext/fiddle/libffi-3.2.1 || die |
110 |
- |
111 |
- if use prefix ; then |
112 |
- # Fix hardcoded SHELL var in mkmf library |
113 |
- sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die |
114 |
- |
115 |
- if [[ ${CHOST} == *darwin* ]] ; then |
116 |
- # avoid symlink loop on Darwin (?!) |
117 |
- sed -i \ |
118 |
- -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ |
119 |
- configure.ac || die |
120 |
- |
121 |
- # make ar/libtool hack for Darwin work |
122 |
- sed -i \ |
123 |
- -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ |
124 |
- configure.ac || die |
125 |
- fi |
126 |
- fi |
127 |
- |
128 |
- eapply_user |
129 |
- |
130 |
- eautoreconf |
131 |
-} |
132 |
- |
133 |
-src_configure() { |
134 |
- local modules= myconf= |
135 |
- |
136 |
- # -fomit-frame-pointer makes ruby segfault, see bug #150413. |
137 |
- filter-flags -fomit-frame-pointer |
138 |
- # In many places aliasing rules are broken; play it safe |
139 |
- # as it's risky with newer compilers to leave it as it is. |
140 |
- append-flags -fno-strict-aliasing |
141 |
- |
142 |
- # Socks support via dante |
143 |
- if use socks5 ; then |
144 |
- # Socks support can't be disabled as long as SOCKS_SERVER is |
145 |
- # set and socks library is present, so need to unset |
146 |
- # SOCKS_SERVER in that case. |
147 |
- unset SOCKS_SERVER |
148 |
- fi |
149 |
- |
150 |
- # Increase GC_MALLOC_LIMIT if set (default is 8000000) |
151 |
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then |
152 |
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
153 |
- fi |
154 |
- |
155 |
- # ipv6 hack, bug 168939. Needs --enable-ipv6. |
156 |
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" |
157 |
- |
158 |
- # Determine which modules *not* to build depending in the USE flags. |
159 |
- if ! use berkdb ; then |
160 |
- modules="${modules},dbm" |
161 |
- fi |
162 |
- if ! use gdbm ; then |
163 |
- modules="${modules},gdbm" |
164 |
- fi |
165 |
- if ! use ssl ; then |
166 |
- modules="${modules},openssl" |
167 |
- fi |
168 |
- if ! use tk ; then |
169 |
- modules="${modules},tk" |
170 |
- fi |
171 |
- |
172 |
- # Provide an empty LIBPATHENV because we disable rpath but we do not |
173 |
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget |
174 |
- # #564272 |
175 |
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ |
176 |
- --program-suffix=${MY_SUFFIX} \ |
177 |
- --with-soname=ruby${MY_SUFFIX} \ |
178 |
- --with-readline-dir="${EPREFIX}"/usr \ |
179 |
- --enable-shared \ |
180 |
- --enable-pthread \ |
181 |
- --disable-rpath \ |
182 |
- --with-out-ext="${modules}" \ |
183 |
- $(use_with jemalloc jemalloc) \ |
184 |
- $(use_enable jit jit-support ) \ |
185 |
- $(use_enable socks5 socks) \ |
186 |
- $(use_enable systemtap dtrace) \ |
187 |
- $(use_enable doc install-doc) \ |
188 |
- --enable-ipv6 \ |
189 |
- $(use_enable static-libs static) \ |
190 |
- $(use_enable static-libs install-static-library) \ |
191 |
- $(use_with static-libs static-linked-ext) \ |
192 |
- $(use_enable debug) \ |
193 |
- ${myconf} \ |
194 |
- --enable-option-checking=no |
195 |
- |
196 |
- # Makefile is broken because it lacks -ldl |
197 |
- rm -rf ext/-test-/popen_deadlock || die |
198 |
-} |
199 |
- |
200 |
-src_compile() { |
201 |
- emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" |
202 |
-} |
203 |
- |
204 |
-src_test() { |
205 |
- emake -j1 V=1 test |
206 |
- |
207 |
- elog "Ruby's make test has been run. Ruby also ships with a make check" |
208 |
- elog "that cannot be run until after ruby has been installed." |
209 |
- elog |
210 |
- if use rubytests; then |
211 |
- elog "You have enabled rubytests, so they will be installed to" |
212 |
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" |
213 |
- elog "than root, and you must place them into a writeable directory." |
214 |
- elog "Then call: " |
215 |
- elog |
216 |
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" |
217 |
- else |
218 |
- elog "Enable the rubytests USE flag to install the make check tests" |
219 |
- fi |
220 |
-} |
221 |
- |
222 |
-src_install() { |
223 |
- # Remove the remaining bundled gems. We do this late in the process |
224 |
- # since they are used during the build to e.g. create the |
225 |
- # documentation. |
226 |
- einfo "Removing default gems before installation" |
227 |
- rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die |
228 |
- |
229 |
- # Ruby is involved in the install process, we don't want interference here. |
230 |
- unset RUBYOPT |
231 |
- |
232 |
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
233 |
- |
234 |
- LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
235 |
- |
236 |
- if [[ ${CHOST} == *darwin* ]] ; then |
237 |
- DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" |
238 |
- export DYLD_LIBRARY_PATH |
239 |
- fi |
240 |
- |
241 |
- RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" |
242 |
- for d in $(find "${S}/ext" -type d) ; do |
243 |
- RUBYLIB="${RUBYLIB}:$d" |
244 |
- done |
245 |
- export LD_LIBRARY_PATH RUBYLIB |
246 |
- |
247 |
- # Create directory for the default gems |
248 |
- local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" |
249 |
- mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" |
250 |
- |
251 |
- emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install |
252 |
- |
253 |
- # Remove installed rubygems and rdoc copy |
254 |
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
255 |
- rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" |
256 |
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
257 |
- rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
258 |
- |
259 |
- if use doc; then |
260 |
- emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc |
261 |
- fi |
262 |
- |
263 |
- if use examples; then |
264 |
- dodoc -r sample |
265 |
- fi |
266 |
- |
267 |
- dodoc ChangeLog NEWS doc/NEWS* README* |
268 |
- |
269 |
- if use rubytests; then |
270 |
- pushd test |
271 |
- insinto /usr/share/${PN}-${SLOT}/test |
272 |
- doins -r . |
273 |
- popd |
274 |
- fi |
275 |
-} |
276 |
- |
277 |
-pkg_postinst() { |
278 |
- if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then |
279 |
- eselect ruby set ruby${MY_SUFFIX} |
280 |
- fi |
281 |
- |
282 |
- elog |
283 |
- elog "To switch between available Ruby profiles, execute as root:" |
284 |
- elog "\teselect ruby set ruby(23|24|...)" |
285 |
- elog |
286 |
-} |
287 |
- |
288 |
-pkg_postrm() { |
289 |
- eselect ruby cleanup |
290 |
-} |
291 |
|
292 |
diff --git a/profiles/package.mask b/profiles/package.mask |
293 |
index 2a248d2e5254..e594bf6b9421 100644 |
294 |
--- a/profiles/package.mask |
295 |
+++ b/profiles/package.mask |
296 |
@@ -316,11 +316,6 @@ dev-haskell/chaselev-deque |
297 |
# Removal: 2022-08-23 |
298 |
dev-go/golint |
299 |
|
300 |
-# Hans de Graaff <graaff@g.o> (2022-07-16) |
301 |
-# No longer supported upstream. Use a newer ruby version instead. |
302 |
-# Masked for removal in 30 days. |
303 |
-dev-lang/ruby:2.6 |
304 |
- |
305 |
# Marek Szuba <marecki@g.o> (2022-07-13) |
306 |
# Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them), |
307 |
# which have seriously messed up dependency handling and trigger several |