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, 23 Jul 2017 08:49:22
Message-Id: 1500798716.3cfc93b9a43b0b6dfd796c42ce99e592c13ee5b2.graaff@gentoo
1 commit: 3cfc93b9a43b0b6dfd796c42ce99e592c13ee5b2
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 23 08:31:56 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 23 08:31:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfc93b9
7
8 dev-lang/ruby: backport fix for security bug 621878
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-lang/ruby/Manifest | 1 +
13 dev-lang/ruby/ruby-2.2.7-r3.ebuild | 245 +++++++++++++++++++++++++++++++++++++
14 2 files changed, 246 insertions(+)
15
16 diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
17 index 9c0466af909..28dedaabd35 100644
18 --- a/dev-lang/ruby/Manifest
19 +++ b/dev-lang/ruby/Manifest
20 @@ -9,6 +9,7 @@ DIST ruby-patches-2.1.10.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52
21 DIST ruby-patches-2.1.9.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
22 DIST ruby-patches-2.2.6.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603
23 DIST ruby-patches-2.2.7-r2.tar.bz2 5338 SHA256 cf7002fe00e18b35d7d2a70c3d0a51a57a8aa0d9b3f312c5f844b349a759c21c SHA512 ba97f1875acaff31babd9279470414777971bc163ea2578185cfd037441b5aba23075b20db9c1cbd98b6e0d6cf8355dc0f226fdd82c870c48b51c8531319029f WHIRLPOOL 92db2244170cdce944975f14e61bc18fb7b8e69e5236eb0877306527507ea97fface4cbe331a6741c876f2ee4f4b9f3d2b6fb8504cb15962851634f89b61aa60
24 +DIST ruby-patches-2.2.7-r3.tar.bz2 5757 SHA256 3470915805a6264ad74a9c7cb7280c4be3585b4dc255685e53205eb4c90536f9 SHA512 9766a44633ddc33e575e2f82d0954ea54620ce7ff7f73d58e76dc3c8ab1cb664c02bc3dac5ca5834d955d5cdfc8d3b647f91c19160e3a9f62c9a69839705702e WHIRLPOOL 6476c46449424a73b75ce4605b2501240b20972960064f0c6380afba67c5472563292dd7d1965400c641b746715c3ff547566d674244b127699196043ab87d18
25 DIST ruby-patches-2.3.3-r1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
26 DIST ruby-patches-2.3.4-r1.tar.bz2 2255 SHA256 32bb888f3ea9e81e4fdff5e852493aafc8f12bfcf9997981f7b7588d6e8ec9c1 SHA512 af7ad3255cf8450859e3c5564393ca106893fd1e40178ad153fb8e66871d30e326f63d48c1904fac5c353408f71e767c72d49fdbf47198c041a628b41c51c868 WHIRLPOOL dc412a788ec77dc9dad4fd631fc8aa5c909b9d21bf6b0b538c4ba398c1670cb01fbf1e4d92a38fa869b96f786707a9c45c7fe5ca7e04f75ff428b20d9fb34c53
27 DIST ruby-patches-2.3.4-r2.tar.bz2 3423 SHA256 5bea5f60033bfaf711c62004dfb4ed3d677b3a96d98de30ffe18ccd40c8533c3 SHA512 502bceb711e4ae1add64dde1ca94cfbb09c8a69010b8e640bb41d8278c0bb8073d3b6c3350217b9775a76746d3bdbc46f0b51342f4812e36341f0671c574d28e WHIRLPOOL cae21a87e76e3da40ee8d2a73c028bc658c6e6b6860b9f4e656fb769830734396a1ccf47453f355636e252fe3f8d3fc44d427d08249c08f37a6fdbffcdc25c8e
28
29 diff --git a/dev-lang/ruby/ruby-2.2.7-r3.ebuild b/dev-lang/ruby/ruby-2.2.7-r3.ebuild
30 new file mode 100644
31 index 00000000000..621e417b2cf
32 --- /dev/null
33 +++ b/dev-lang/ruby/ruby-2.2.7-r3.ebuild
34 @@ -0,0 +1,245 @@
35 +# Copyright 1999-2017 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=5
39 +
40 +#PATCHSET=1
41 +
42 +inherit autotools eutils flag-o-matic multilib versionator
43 +
44 +MY_P="${PN}-$(get_version_component_range 1-3)"
45 +S=${WORKDIR}/${MY_P}
46 +
47 +SLOT=$(get_version_component_range 1-2)
48 +MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
49 +RUBYVERSION=2.2.0
50 +
51 +if [[ -n ${PATCHSET} ]]; then
52 + if [[ ${PVR} == ${PV} ]]; then
53 + PATCHSET="${PV}-r0.${PATCHSET}"
54 + else
55 + PATCHSET="${PVR}.${PATCHSET}"
56 + fi
57 +else
58 + PATCHSET="${PVR}"
59 +fi
60 +
61 +DESCRIPTION="An object-oriented scripting language"
62 +HOMEPAGE="http://www.ruby-lang.org/"
63 +SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
64 + https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
65 +
66 +LICENSE="|| ( Ruby-BSD BSD-2 )"
67 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
68 +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
69 +
70 +RDEPEND="
71 + berkdb? ( sys-libs/db:= )
72 + gdbm? ( sys-libs/gdbm )
73 + jemalloc? ( dev-libs/jemalloc )
74 + ssl? (
75 + !libressl? ( dev-libs/openssl:0= )
76 + libressl? ( dev-libs/libressl )
77 + )
78 + socks5? ( >=net-proxy/dante-1.1.13 )
79 + tk? (
80 + dev-lang/tcl:0=[threads]
81 + dev-lang/tk:0=[threads]
82 + )
83 + ncurses? ( sys-libs/ncurses:0= )
84 + readline? ( sys-libs/readline:0= )
85 + dev-libs/libyaml
86 + virtual/libffi
87 + sys-libs/zlib
88 + >=app-eselect/eselect-ruby-20141227
89 + !<dev-ruby/rdoc-3.9.4
90 + !<dev-ruby/rubygems-1.8.10-r1"
91 +
92 +DEPEND="${RDEPEND}"
93 +
94 +BUNDLED_GEMS="
95 + >=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
96 + >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
97 + >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
98 +"
99 +
100 +PDEPEND="
101 + ${BUNDLED_GEMS}
102 + virtual/rubygems[ruby_targets_ruby22]
103 + >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
104 + >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
105 + rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
106 + xemacs? ( app-xemacs/ruby-modes )"
107 +
108 +src_prepare() {
109 + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
110 + epatch "${WORKDIR}/patches"
111 +
112 + # We can no longer unbundle all of rake because rubygems now depends
113 + # on this. We leave the actual rake code around to bootstrap
114 + # rubygems, but remove the bits that would cause a file collision.
115 + einfo "Unbundling gems..."
116 + cd "$S"
117 + rm -rf \
118 + {bin,lib}/rake lib/rake.rb man/rake.1 \
119 + bin/gem || die "removal failed"
120 + # Remove bundled gems that we will install via PDEPEND, bug
121 + # 539700. Use explicit version numbers to ensure rm fails when they
122 + # change so we can update dependencies accordingly.
123 + rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
124 +
125 + # Fix a hardcoded lib path in configure script
126 + sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
127 + configure.in || die "sed failed"
128 +
129 + eautoreconf
130 +}
131 +
132 +src_configure() {
133 + local modules= myconf=
134 +
135 + # -fomit-frame-pointer makes ruby segfault, see bug #150413.
136 + filter-flags -fomit-frame-pointer
137 + # In many places aliasing rules are broken; play it safe
138 + # as it's risky with newer compilers to leave it as it is.
139 + append-flags -fno-strict-aliasing
140 + # SuperH needs this
141 + use sh && append-flags -mieee
142 +
143 + # Socks support via dante
144 + if use socks5 ; then
145 + # Socks support can't be disabled as long as SOCKS_SERVER is
146 + # set and socks library is present, so need to unset
147 + # SOCKS_SERVER in that case.
148 + unset SOCKS_SERVER
149 + fi
150 +
151 + # Increase GC_MALLOC_LIMIT if set (default is 8000000)
152 + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
153 + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
154 + fi
155 +
156 + # ipv6 hack, bug 168939. Needs --enable-ipv6.
157 + use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
158 +
159 + # Determine which modules *not* to build depending in the USE flags.
160 + if ! use readline ; then
161 + modules="${modules},readline"
162 + fi
163 + if ! use berkdb ; then
164 + modules="${modules},dbm"
165 + fi
166 + if ! use gdbm ; then
167 + modules="${modules},gdbm"
168 + fi
169 + if ! use ssl ; then
170 + modules="${modules},openssl"
171 + fi
172 + if ! use ncurses ; then
173 + modules="${modules},curses"
174 + fi
175 + if ! use tk ; then
176 + modules="${modules},tk"
177 + fi
178 +
179 + # Provide an empty LIBPATHENV because we disable rpath but we do not
180 + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
181 + # #564272
182 + INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
183 + --program-suffix=${MY_SUFFIX} \
184 + --with-soname=ruby${MY_SUFFIX} \
185 + --docdir=${EPREFIX}/usr/share/doc/${P} \
186 + --enable-shared \
187 + --enable-pthread \
188 + --disable-rpath \
189 + --with-out-ext="${modules}" \
190 + $(use_with jemalloc jemalloc) \
191 + $(use_enable socks5 socks) \
192 + $(use_enable doc install-doc) \
193 + --enable-ipv6 \
194 + $(use_enable debug) \
195 + ${myconf} \
196 + --enable-option-checking=no \
197 + || die "econf failed"
198 +}
199 +
200 +src_compile() {
201 + emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
202 +}
203 +
204 +src_test() {
205 + emake -j1 V=1 test || die "make test failed"
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 + rm -rf ext/json || die
227 +
228 + # Ruby is involved in the install process, we don't want interference here.
229 + unset RUBYOPT
230 +
231 + local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
232 +
233 + LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
234 + RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
235 + for d in $(find "${S}/ext" -type d) ; do
236 + RUBYLIB="${RUBYLIB}:$d"
237 + done
238 + export LD_LIBRARY_PATH RUBYLIB
239 +
240 + emake V=1 DESTDIR="${D}" install || die "make install failed"
241 +
242 + # Remove installed rubygems copy
243 + rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
244 + rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
245 + rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
246 +
247 + if use doc; then
248 + make DESTDIR="${D}" install-doc || die "make install-doc failed"
249 + fi
250 +
251 + if use examples; then
252 + insinto /usr/share/doc/${PF}
253 + doins -r sample
254 + fi
255 +
256 + dodoc ChangeLog NEWS doc/NEWS* README* || die
257 +
258 + if use rubytests; then
259 + pushd test
260 + insinto /usr/share/${PN}-${SLOT}/test
261 + doins -r .
262 + popd
263 + fi
264 +}
265 +
266 +pkg_postinst() {
267 + if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
268 + eselect ruby set ruby${MY_SUFFIX}
269 + fi
270 +
271 + elog
272 + elog "To switch between available Ruby profiles, execute as root:"
273 + elog "\teselect ruby set ruby(19|20|...)"
274 + elog
275 +}
276 +
277 +pkg_postrm() {
278 + eselect ruby cleanup
279 +}