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, 20 Dec 2015 19:44:26
Message-Id: 1450640503.b7b16416a3c9b6e6abd3af2d158b7900f025ca9e.graaff@gentoo
1 commit: b7b16416a3c9b6e6abd3af2d158b7900f025ca9e
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 20 19:41:43 2015 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 20 19:41:43 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b16416
7
8 dev-lang/ruby: remove masked ruby19
9
10 Package-Manager: portage-2.2.24
11
12 dev-lang/ruby/Manifest | 2 -
13 dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild | 217 --------------------------------
14 2 files changed, 219 deletions(-)
15
16 diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
17 index 0559144..ce071e2 100644
18 --- a/dev-lang/ruby/Manifest
19 +++ b/dev-lang/ruby/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256 b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e SHA512 5ea40f8c40cf116030ffdedbe436c1fdbf9a50b7bb44bc890845c9c2a885c34da711bc1a9e9694788c2f4710f7e6e0adc4410aec1ab18a25a27168f25ac3d68c WHIRLPOOL a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
22 DIST ruby-2.0.0-p645.tar.xz 8295192 SHA256 875be4f57bdbb2d2be0d64bfd8fc5022f004d55261ead8fd0cdc2e9e415e9f7b SHA512 440f8ea50f51c53f90e42a8dfd7cd41f806b290d5c12c09f84d9159ab9c95e19b036cd8a5dc788844da501b9fcd1fa8ad8352ef7417998debc1b43a61a4ea4dc WHIRLPOOL 6201a39976f793dd3702ba580aafb881ba6e9f5cbc9d544bdddf508ca86dc14fc2970451a386ba495d16f2f68724197ef089ba02e7d1a9423870a0fa5c39cbc8
23 DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 SHA512 38fd2ad631588a0e8adf9a7ae01cb5274eca4fd794c5ed7030e5fae9e53cd8920eaac9d388c73b844a154c7eb56fa6fed8e2ee5df5617efd624b6a568ea4953b WHIRLPOOL c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
24 DIST ruby-2.0.0-p648.tar.xz 8303584 SHA256 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 SHA512 95df515d37f04193eaceaded4a4f568f83041683349cd44767803f77361a66533226d83eac6586ac894ae61d79bd36ce047f951aed43f9a8356dbb3244280774 WHIRLPOOL ef78b838d061b1707219453a70c8b4a503d46e9f95797007555943a837de21f22c0c93039c75172d7df4fe9b5eca38472ee7177f98785cb5993c7e80140a1d27
25 @@ -8,7 +7,6 @@ DIST ruby-2.1.8.tar.xz 9382672 SHA256 94eeae3b3e3ac93cfd205e1aaef4c5325227b7656c
26 DIST ruby-2.2.2.tar.xz 10463044 SHA256 f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64 WHIRLPOOL ee9c3a664ac1d67bd9ff4ed8fcc7d4c8e9b6e2f5774c938f876223b22022b498932afc41990890a03b560c65ffe29a039761d18bbeeab46fe13cbfff515bc115
27 DIST ruby-2.2.3.tar.xz 10453204 SHA256 c6ec90e9ed018e6d9a578fc93755d8565839908d5796809e1aecd1798c7ea8a7 SHA512 e3ce3333e8d59f4f3bfc84cf9bbbc6f74272470e12913d299fd1d41fc166dee21921eed1789591f50c3f3b6e5fd38fd1b99855c16aff28bdc4ae8fcc680c71bd WHIRLPOOL 3fae4fc3112f24004f0f043d29b2e624e559fa3d53e6b0479af03df910d210aaeb8274c294dfe1ef0602f63790b4cdc31147d5fd92707e38ea29f01fd07e8839
28 DIST ruby-2.2.4.tar.xz 10464500 SHA256 d28bff4641e382681c58072ddc244d025ac47ff71dd9426a92fcfc3830d1773c SHA512 755257eea0cb79f28f1d2dc6e2a5ee4b1954280f51153e5fe90605a875b1d52077660b87e4e04d11552591a1f60a1241e4c70056f073a217b3bad896f64780da WHIRLPOOL 9d3d549dce991d2d594df624bf2f55f4ff9269c35193b190e3fd774b8883facb568f010a3b79927e083cc5bad277281e4c8a9fc3979f609fca50f86775563484
29 -DIST ruby-patches-1.9.3_p551-r1.tar.bz2 3685 SHA256 362d94b77c3408d200c42855868ebb5ddbee287d66bbed8e269255f9cb63418a SHA512 646a1979c1b879ef46cb195204bdcea83215f6407331f92d8caed910e03d1f426bfb203629f4bea307740742757877edae22bf9978b55cbda03921a0c25b8409 WHIRLPOOL 3001b1c6189a882a45125d04b6264e22e0bf2b773c249bf00c2cfc98dec3392ae422913d278aae289767db0aaf8782e1a7dd44e94965aa02893833d5737ad494
30 DIST ruby-patches-2.0.0_p645.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
31 DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
32 DIST ruby-patches-2.0.0_p647.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
33
34 diff --git a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
35 deleted file mode 100644
36 index c8dc376..0000000
37 --- a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
38 +++ /dev/null
39 @@ -1,217 +0,0 @@
40 -# Copyright 1999-2015 Gentoo Foundation
41 -# Distributed under the terms of the GNU General Public License v2
42 -# $Id$
43 -
44 -EAPI=4
45 -
46 -#PATCHSET=1
47 -
48 -inherit autotools eutils flag-o-matic multilib versionator
49 -
50 -RUBYPL=$(get_version_component_range 4)
51 -
52 -MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
53 -S=${WORKDIR}/${MY_P}
54 -
55 -SLOT=$(get_version_component_range 1-2)
56 -MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
57 -# 1.9.3 still uses 1.9.1
58 -RUBYVERSION=1.9.1
59 -
60 -if [[ -n ${PATCHSET} ]]; then
61 - if [[ ${PVR} == ${PV} ]]; then
62 - PATCHSET="${PV}-r0.${PATCHSET}"
63 - else
64 - PATCHSET="${PVR}.${PATCHSET}"
65 - fi
66 -else
67 - PATCHSET="${PVR}"
68 -fi
69 -
70 -DESCRIPTION="An object-oriented scripting language"
71 -HOMEPAGE="http://www.ruby-lang.org/"
72 -SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
73 - https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
74 -
75 -LICENSE="|| ( Ruby-BSD BSD-2 )"
76 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
77 -IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml" #libedit
78 -
79 -# libedit support is removed everywhere because of this upstream bug:
80 -# http://redmine.ruby-lang.org/issues/show/3698
81 -
82 -RDEPEND="
83 - berkdb? ( sys-libs/db )
84 - gdbm? ( sys-libs/gdbm )
85 - ssl? ( dev-libs/openssl:0 )
86 - socks5? ( >=net-proxy/dante-1.1.13 )
87 - ncurses? ( sys-libs/ncurses )
88 - readline? ( sys-libs/readline )
89 - yaml? ( dev-libs/libyaml )
90 - virtual/libffi
91 - sys-libs/zlib
92 - >=app-eselect/eselect-ruby-20100402
93 - !<dev-ruby/rdoc-3.9.4
94 - !<dev-ruby/rubygems-1.8.10-r1"
95 -# libedit? ( dev-libs/libedit )
96 -# !libedit? ( readline? ( sys-libs/readline ) )
97 -
98 -DEPEND="${RDEPEND}"
99 -PDEPEND="
100 - virtual/rubygems[ruby_targets_ruby19]
101 - rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
102 - xemacs? ( app-xemacs/ruby-modes )"
103 -
104 -src_prepare() {
105 - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
106 - epatch "${WORKDIR}/patches"
107 -
108 - einfo "Unbundling gems..."
109 - cd "$S"
110 - rm -r \
111 - {bin,lib}/rake lib/rake.rb man/rake.1 \
112 - ext/json \
113 - bin/gem || die "removal failed"
114 -
115 - # Fix a hardcoded lib path in configure script
116 - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
117 - configure.in || die "sed failed"
118 -
119 - eautoreconf
120 -}
121 -
122 -src_configure() {
123 - local myconf=
124 -
125 - # -fomit-frame-pointer makes ruby segfault, see bug #150413.
126 - filter-flags -fomit-frame-pointer
127 - # In many places aliasing rules are broken; play it safe
128 - # as it's risky with newer compilers to leave it as it is.
129 - append-flags -fno-strict-aliasing
130 - # SuperH needs this
131 - use sh && append-flags -mieee
132 -
133 - # Socks support via dante
134 - if use socks5 ; then
135 - # Socks support can't be disabled as long as SOCKS_SERVER is
136 - # set and socks library is present, so need to unset
137 - # SOCKS_SERVER in that case.
138 - unset SOCKS_SERVER
139 - fi
140 -
141 - # Increase GC_MALLOC_LIMIT if set (default is 8000000)
142 - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
143 - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
144 - fi
145 -
146 - # ipv6 hack, bug 168939. Needs --enable-ipv6.
147 - use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
148 -
149 -# if use libedit; then
150 -# einfo "Using libedit to provide readline extension"
151 -# myconf="${myconf} --enable-libedit --with-readline"
152 -# elif use readline; then
153 -# einfo "Using readline to provide readline extension"
154 -# myconf="${myconf} --with-readline"
155 -# else
156 -# myconf="${myconf} --without-readline"
157 -# fi
158 - myconf="${myconf} $(use_with readline)"
159 -
160 - # Always disable tk because the module is no longer compatible with
161 - # stable tcl/tk: https://bugs.gentoo.org/show_bug.cgi?id=500894
162 - INSTALL="${EPREFIX}/usr/bin/install -c" econf \
163 - --program-suffix=${MY_SUFFIX} \
164 - --with-soname=ruby${MY_SUFFIX} \
165 - --enable-shared \
166 - --enable-pthread \
167 - --without-tk \
168 - $(use_enable socks5 socks) \
169 - $(use_enable doc install-doc) \
170 - --enable-ipv6 \
171 - $(use_enable debug) \
172 - $(use_with berkdb dbm) \
173 - $(use_with gdbm) \
174 - $(use_with ssl openssl) \
175 - $(use_with ncurses curses) \
176 - $(use_with yaml psych) \
177 - ${myconf} \
178 - --enable-option-checking=no \
179 - || die "econf failed"
180 -}
181 -
182 -src_compile() {
183 - emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
184 -}
185 -
186 -src_test() {
187 - emake -j1 V=1 test || die "make test failed"
188 -
189 - elog "Ruby's make test has been run. Ruby also ships with a make check"
190 - elog "that cannot be run until after ruby has been installed."
191 - elog
192 - if use rubytests; then
193 - elog "You have enabled rubytests, so they will be installed to"
194 - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
195 - elog "than root, and you must place them into a writeable directory."
196 - elog "Then call: "
197 - elog
198 - elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
199 - else
200 - elog "Enable the rubytests USE flag to install the make check tests"
201 - fi
202 -}
203 -
204 -src_install() {
205 - # Ruby is involved in the install process, we don't want interference here.
206 - unset RUBYOPT
207 -
208 - local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
209 -
210 - LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
211 - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
212 - for d in $(find "${S}/ext" -type d) ; do
213 - RUBYLIB="${RUBYLIB}:$d"
214 - done
215 - export LD_LIBRARY_PATH RUBYLIB
216 -
217 - emake V=1 DESTDIR="${D}" install || die "make install failed"
218 -
219 - # Remove installed rubygems copy
220 - rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
221 - rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
222 - rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
223 -
224 - if use doc; then
225 - make DESTDIR="${D}" install-doc || die "make install-doc failed"
226 - fi
227 -
228 - if use examples; then
229 - insinto /usr/share/doc/${PF}
230 - doins -r sample
231 - fi
232 -
233 - dodoc ChangeLog NEWS doc/NEWS* README* ToDo || die
234 -
235 - if use rubytests; then
236 - pushd test
237 - insinto /usr/share/${PN}-${SLOT}/test
238 - doins -r .
239 - popd
240 - fi
241 -}
242 -
243 -pkg_postinst() {
244 - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
245 - eselect ruby set ruby${MY_SUFFIX}
246 - fi
247 -
248 - elog
249 - elog "To switch between available Ruby profiles, execute as root:"
250 - elog "\teselect ruby set ruby(19|20|...)"
251 - elog
252 -}
253 -
254 -pkg_postrm() {
255 - eselect ruby cleanup
256 -}