dev-lang/ruby: add 3.3.3

Also avoid a hard-coded path to mkdir in RbConfig.

Bug: https://bugs.gentoo.org/932386
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
This commit is contained in:
Hans de Graaff 2024-06-16 11:05:50 +02:00
parent fdddcb83c4
commit b44b0fcafd
No known key found for this signature in database
GPG Key ID: DB347F938654FA34
3 changed files with 308 additions and 0 deletions

View File

@ -6,3 +6,4 @@ DIST ruby-3.2.4.tar.xz 15175656 BLAKE2B 9c2300a958b03528d51f0d74a069c8c538ca4009
DIST ruby-3.3.0.tar.xz 16345456 BLAKE2B 09ef6fb4b2768118207e7a9ece17c5c62c9f596b1c13ac6199245889fcc5d25f03336831ec3bf1367a460a8a26c4426c32bcd576b0da8bdafc90301032b4d2f0 SHA512 7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01
DIST ruby-3.3.1.tar.xz 16350792 BLAKE2B f3591d2420edd8c1d5b365d1442fcc07c014e402478dce01a80b81c16c3c7083bcd3e9e9aa0f8d586cd482f0f18eb64ad813ea31755f5d12b137ce03b1a0fa4c SHA512 c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347
DIST ruby-3.3.2.tar.xz 16349500 BLAKE2B 2a474df10363555e8f0b9ad73bb854ad34f3d1485b8bdde833c999b20bc2c17282d2097d887d10f454bbd4dfdf08f04bb644a7e41d0b4a0ff0e9eb144339b5e8 SHA512 70dd8eb933956f894c52a8ede42e8ee74ff0e062bd8134a0bfb6bffc83a2848a658b62c8df5530b4dd64087b2d5373909c48917528facb1e6f4e99e79b6ad449
DIST ruby-3.3.3.tar.xz 16361160 BLAKE2B e1dbb8f0d5de4b2d7efe3f68c1ea7f28e4fac19dcd9d6d5e301e5c565474958a916ea5f21ef2ce0d741d4d9c45a546dd3d00b3ca3d1eccfaf61f20eba3c871a7 SHA512 27dcae604e6613e1eaa20c6a75ee88b970bb0dd584d9bc0c021ad8da4340858e3c2e874ac841fcca0b0444a0c0146c4650d2d22bac3c9e12853533c37255f8f1

View File

@ -0,0 +1,13 @@
--- a/configure.ac 2024-05-30 02:23:11.000000000 +0200
+++ b/configure.ac 2024-06-01 10:10:07.602924940 +0200
@@ -519,6 +519,10 @@
ac_cv_path_mkdir="mkdir"
])
+AS_CASE(["$target_os"],[*],[
+ ac_cv_path_mkdir="mkdir"
+])
+
RUBY_PROG_MAKEDIRS
AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])

View File

@ -0,0 +1,294 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools flag-o-matic multiprocessing
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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
RDEPEND="
berkdb? ( sys-libs/db:= )
gdbm? ( sys-libs/gdbm:= )
jemalloc? ( dev-libs/jemalloc:= )
jit? ( >=virtual/rust-1.58.1 )
ssl? (
dev-libs/openssl:0=
)
socks5? ( >=net-proxy/dante-1.1.13 )
systemtap? ( dev-debug/systemtap )
tk? (
dev-lang/tcl:0=[threads]
dev-lang/tk:0=[threads]
)
dev-libs/libyaml
dev-libs/libffi:=
sys-libs/zlib
virtual/libcrypt:=
>=app-eselect/eselect-ruby-20231226
"
DEPEND="
${RDEPEND}
valgrind? ( dev-debug/valgrind )
"
BUNDLED_GEMS="
>=dev-ruby/debug-1.9.1[ruby_targets_ruby33(-)]
>=dev-ruby/irb-1.11.0[ruby_targets_ruby33(-)]
>=dev-ruby/matrix-0.4.2[ruby_targets_ruby33(-)]
>=dev-ruby/minitest-5.20.0[ruby_targets_ruby33(-)]
>=dev-ruby/net-ftp-0.3.3[ruby_targets_ruby33(-)]
>=dev-ruby/net-imap-0.4.9[ruby_targets_ruby33(-)]
>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby33(-)]
>=dev-ruby/net-smtp-0.4.0[ruby_targets_ruby33(-)]
>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby33(-)]
>=dev-ruby/prime-0.1.2[ruby_targets_ruby33(-)]
>=dev-ruby/racc-1.7.3[ruby_targets_ruby33(-)]
>=dev-ruby/rake-13.1.0[ruby_targets_ruby33(-)]
>=dev-ruby/rbs-3.4.0[ruby_targets_ruby33(-)]
>=dev-ruby/rexml-3.2.8[ruby_targets_ruby33(-)]
>=dev-ruby/rss-0.3.0[ruby_targets_ruby33(-)]
>=dev-ruby/test-unit-3.6.1[ruby_targets_ruby33(-)]
>=dev-ruby/typeprof-0.21.9[ruby_targets_ruby33(-)]
"
PDEPEND="
${BUNDLED_GEMS}
virtual/rubygems[ruby_targets_ruby33(-)]
>=dev-ruby/bundler-2.5.11[ruby_targets_ruby33(-)]
>=dev-ruby/did_you_mean-1.6.3[ruby_targets_ruby33(-)]
>=dev-ruby/json-2.7.1[ruby_targets_ruby33(-)]
>=dev-ruby/rdoc-6.6.2[ruby_targets_ruby33(-)]
xemacs? ( app-xemacs/ruby-modes )
"
src_prepare() {
eapply "${FILESDIR}"/"${SLOT}"/010*.patch
eapply "${FILESDIR}"/"${SLOT}"/012*.patch
eapply "${FILESDIR}"/"${SLOT}"/902*.patch
if use elibc_musl ; then
eapply "${FILESDIR}"/${SLOT}/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
# Avoid the irb default gemspec since we will install the normal gem
# instead. This avoids a file collision with dev-ruby/irb.
rm lib/irb/irb.gemspec || 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 \
spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
rm -rf tool/test/webrick || die
# Avoid test using the system ruby
sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
# Avoid testing against hard-coded blockdev devices that most likely are not available
sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
# Avoid tests that require gem downloads
sed -e '/^\(test-syntax-suggest\|PREPARE_SYNTAX_SUGGEST\)/ s/\$(TEST_RUNNABLE)/no/' \
-i common.mk
# Avoid test that fails intermittently
sed -e '/test_gem_exec_gem_uninstall/aomit "Fails intermittently"' \
-i test/rubygems/test_gem_commands_exec_command.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
# disable using security framework (GCC barfs on those headers)
sed -i \
-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
random.c || die
fi
fi
eapply_user
eautoreconf
}
src_configure() {
local modules="win32,win32ole" myconf=
# Ruby's build system does interesting things with MAKEOPTS and doesn't
# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
# and use -j/-l parsed out from the original MAKEOPTS, then use that.
# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
export MAKEOPTS="${makeopts_tmp}"
# -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
# 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} \
--enable-shared \
--enable-pthread \
--disable-rpath \
--without-baseruby \
--with-compress-debug-sections=no \
--enable-mkmf-verbose \
--with-out-ext="${modules}" \
$(use_with jemalloc jemalloc) \
$(use_enable jit jit-support) \
$(use_enable jit yjit) \
$(use_enable socks5 socks) \
$(use_enable systemtap dtrace) \
$(use_enable doc install-doc) \
$(use_enable static-libs static) \
$(use_enable static-libs install-static-library) \
$(use_with static-libs static-linked-ext) \
$(use_enable debug) \
${myconf} \
$(use_with valgrind) \
--enable-option-checking=no
# Makefile is broken because it lacks -ldl
rm -rf ext/-test-/popen_deadlock || die
}
src_compile() {
local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
}
src_test() {
local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
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)
local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
if [[ ${CHOST} == *darwin* ]] ; then
local -x DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
fi
local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
for d in $(find "${S}/ext" -type d) ; do
RUBYLIB="${RUBYLIB}:$d"
done
# 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 README*
dodoc -r doc
}
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(30|31|...)"
elog
}
pkg_postrm() {
eselect ruby cleanup
}