commit:     b6f595d3b55bf612a488f1743875e596adea9725
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 06:21:46 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 06:22:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f595d3

dev-lang/ruby: add 3.1.3

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-lang/ruby/Manifest                             |   1 +
 .../ruby/files/3.1/011-default-gem-location.patch  |  20 ++
 dev-lang/ruby/ruby-3.1.3.ebuild                    | 251 +++++++++++++++++++++
 3 files changed, 272 insertions(+)

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index f76ea38b2a16..222fbc7580a3 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -3,3 +3,4 @@ DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 
35f53835259217e344bde7fa3e2fe18e24c3e56e
 DIST ruby-3.0.4.tar.xz 15830368 BLAKE2B 
3d1f2e6329269febbd02ac8a68aafd57d5ca858c816a81e754adfc9aa2990274d190672447244520fe9fbf9a1d337d17c845a97800f964e2046b2ef9eef733ee
 SHA512 
53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
 DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 
581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024
 SHA512 
1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
 DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 
3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533
 SHA512 
4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
+DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B 
f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41
 SHA512 
4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69

diff --git a/dev-lang/ruby/files/3.1/011-default-gem-location.patch 
b/dev-lang/ruby/files/3.1/011-default-gem-location.patch
new file mode 100644
index 000000000000..fe5d33d69c01
--- /dev/null
+++ b/dev-lang/ruby/files/3.1/011-default-gem-location.patch
@@ -0,0 +1,20 @@
+--- a/tool/rbinstall.rb.~1~    2020-12-25 04:33:01.000000000 +0100
++++ b/tool/rbinstall.rb        2020-12-25 10:05:34.629096405 +0100
+@@ -897,7 +897,7 @@
+ end
+ 
+ def install_default_gem(dir, srcdir, bindir)
+-  gem_dir = Gem.default_dir
++  gem_dir = ENV['GEM_DESTDIR']
+   install_dir = with_destdir(gem_dir)
+   prepare "default gems from #{dir}", gem_dir
+   makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map 
{|d| File.join(gem_dir, d)})
+@@ -1010,7 +1010,7 @@
+ end
+ 
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+-  gem_dir = Gem.default_dir
++  gem_dir = ENV['GEM_DESTDIR']
+   install_dir = with_destdir(gem_dir)
+   prepare "bundled gems", gem_dir
+   RbInstall.no_write do

diff --git a/dev-lang/ruby/ruby-3.1.3.ebuild b/dev-lang/ruby/ruby-3.1.3.ebuild
new file mode 100644
index 000000000000..a918b04cd949
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.1.3.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/";
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz";
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+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"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl 
static-libs systemtap tk xemacs"
+
+RDEPEND="
+       berkdb? ( sys-libs/db:= )
+       gdbm? ( sys-libs/gdbm:= )
+       jemalloc? ( dev-libs/jemalloc:= )
+       jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+       ssl? (
+               dev-libs/openssl:0=
+       )
+       socks5? ( >=net-proxy/dante-1.1.13 )
+       systemtap? ( dev-util/systemtap )
+       tk? (
+               dev-lang/tcl:0=[threads]
+               dev-lang/tk:0=[threads]
+       )
+       dev-libs/libyaml
+       dev-libs/libffi:=
+       sys-libs/readline:0=
+       sys-libs/zlib
+       virtual/libcrypt:=
+       >=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+       >=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
+       >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
+       >=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
+       >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
+       >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
+       >=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
+       >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
+       >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
+"
+
+PDEPEND="
+       ${BUNDLED_GEMS}
+       virtual/rubygems[ruby_targets_ruby31]
+       >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
+       >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
+       >=dev-ruby/json-2.6.1[ruby_targets_ruby31]
+       rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
+       xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+       eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+
+       if use elibc_musl ; then
+               eapply "${FILESDIR}"/3.1/901-musl-*.patch
+       fi
+
+       einfo "Unbundling gems..."
+       cd "$S"
+       # Remove bundled gems that we will install via PDEPEND, bug
+       # 539700.
+       rm -fr gems/* || die
+       touch gems/bundled_gems || die
+       # Don't install CLI tools since they will clash with the gem
+       rm -f bin/{racc,racc2y,y2racc} || die
+       sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+       einfo "Removing bundled libraries..."
+       rm -fr ext/fiddle/libffi-3.2.1 || die
+
+       # Remove tests that are known to fail or require a network connection
+       rm -f test/ruby/test_process.rb 
test/rubygems/test_gem{,_path_support}.rb || die
+       rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb 
test/fiber/test_address_resolve.rb test/resolv/test_addr.rb \
+          spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+       sed -i -e '/def test_test/askip "Depends on system setup"' 
test/ruby/test_file_exhaustive.rb || die
+
+       if use prefix ; then
+               # Fix hardcoded SHELL var in mkmf library
+               sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb 
|| die
+
+               if [[ ${CHOST} == *darwin* ]] ; then
+                       # avoid symlink loop on Darwin (?!)
+                       sed -i \
+                               -e 
'/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+                               configure.ac || die
+
+                       # make ar/libtool hack for Darwin work
+                       sed -i \
+                               -e 
"s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+                               configure.ac || die
+               fi
+       fi
+
+       eapply_user
+
+       eautoreconf
+}
+
+src_configure() {
+       local modules="win32,win32ole" myconf=
+
+       # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+       filter-flags -fomit-frame-pointer
+       # In many places aliasing rules are broken; play it safe
+       # as it's risky with newer compilers to leave it as it is.
+       append-flags -fno-strict-aliasing
+
+       # Socks support via dante
+       if use socks5 ; then
+               # Socks support can't be disabled as long as SOCKS_SERVER is
+               # set and socks library is present, so need to unset
+               # SOCKS_SERVER in that case.
+               unset SOCKS_SERVER
+       fi
+
+       # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+       if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+               append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+       fi
+
+       # ipv6 hack, bug 168939. Needs --enable-ipv6.
+       use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+       # Determine which modules *not* to build depending in the USE flags.
+       if ! use berkdb ; then
+               modules="${modules},dbm"
+       fi
+       if ! use gdbm ; then
+               modules="${modules},gdbm"
+       fi
+       if ! use ssl ; then
+               modules="${modules},openssl"
+       fi
+       if ! use tk ; then
+               modules="${modules},tk"
+       fi
+
+       # Provide an empty LIBPATHENV because we disable rpath but we do not
+       # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+       # #564272
+       INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+               --program-suffix=${MY_SUFFIX} \
+               --with-soname=ruby${MY_SUFFIX} \
+               --with-readline-dir="${EPREFIX}"/usr \
+               --enable-shared \
+               --enable-pthread \
+               --disable-rpath \
+               --with-out-ext="${modules}" \
+               $(use_with jemalloc jemalloc) \
+               $(use_enable jit jit-support ) \
+               $(use_enable socks5 socks) \
+               $(use_enable systemtap dtrace) \
+               $(use_enable doc install-doc) \
+               --enable-ipv6 \
+               $(use_enable static-libs static) \
+               $(use_enable static-libs install-static-library) \
+               $(use_with static-libs static-linked-ext) \
+               $(use_enable debug) \
+               ${myconf} \
+               --enable-option-checking=no
+
+       # Makefile is broken because it lacks -ldl
+       rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+       emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" 
MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+       emake V=1 check
+}
+
+src_install() {
+       # Remove the remaining bundled gems. We do this late in the process
+       # since they are used during the build to e.g. create the
+       # documentation.
+       einfo "Removing default gems before installation"
+       rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+       # Ruby is involved in the install process, we don't want interference 
here.
+       unset RUBYOPT
+
+       local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo 
$(MINIRUBY)'|make -f - getminiruby)
+
+       
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+       if [[ ${CHOST} == *darwin* ]] ; then
+               
DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+               export DYLD_LIBRARY_PATH
+       fi
+
+       RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+       for d in $(find "${S}/ext" -type d) ; do
+               RUBYLIB="${RUBYLIB}:$d"
+       done
+       export LD_LIBRARY_PATH RUBYLIB
+
+       # Create directory for the default gems
+       local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+       mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+       emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+       # Remove installed rubygems and rdoc copy
+       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die 
"rm rubygems failed"
+       rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
+       rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die 
"rm rdoc bins failed"
+
+       if use doc; then
+               emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+       fi
+
+       if use examples; then
+               dodoc -r sample
+       fi
+
+       dodoc ChangeLog NEWS.md doc/NEWS* README*
+}
+
+pkg_postinst() {
+       if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+               eselect ruby set ruby${MY_SUFFIX}
+       fi
+
+       elog
+       elog "To switch between available Ruby profiles, execute as root:"
+       elog "\teselect ruby set ruby(23|24|...)"
+       elog
+}
+
+pkg_postrm() {
+       eselect ruby cleanup
+}

Reply via email to