commit: 5214177d2d9c03da6dbc3427605c2494a0e912d3 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Apr 11 18:27:02 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Apr 12 02:04:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5214177d
dev-lang/ruby: Add 2.7.x, 3.0.x, 3.1.x Removes 2.7.6, 3.0.4 and 3.1.2-r1. Ruby 3.2 works with libressl using the ::gentoo repo. Closes: https://github.com/gentoo/libressl/pull/517 Signed-off-by: orbea <orbea <AT> riseup.net> dev-lang/ruby/Manifest | 9 ++++++--- .../ruby/files/3.1/011-default-gem-location.patch | 20 ++++++++++++++++++++ .../ruby/files/3.2/010-default-gem-location.patch | 11 +++++++++++ dev-lang/ruby/files/3.2/901-musl-stacksize.patch | 20 ++++++++++++++++++++ .../ruby/{ruby-2.7.6.ebuild => ruby-2.7.7.ebuild} | 2 +- .../ruby/{ruby-2.7.6.ebuild => ruby-2.7.8.ebuild} | 6 +++--- .../ruby/{ruby-3.0.4.ebuild => ruby-3.0.5.ebuild} | 4 ++-- .../ruby/{ruby-3.0.4.ebuild => ruby-3.0.6.ebuild} | 2 +- .../ruby/{ruby-3.1.2-r1.ebuild => ruby-3.1.3.ebuild} | 6 ++++-- .../ruby/{ruby-3.1.2-r1.ebuild => ruby-3.1.4.ebuild} | 8 +++++--- 10 files changed, 73 insertions(+), 15 deletions(-) diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 023e059..c74e26d 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,3 +1,6 @@ -DIST ruby-2.7.6.tar.xz 12084408 BLAKE2B 4b40e66aeeca3884983fffcf31c4713eb4fcdd62232e795dc5a0c03236c3c05200068902c0cb987455297bec2bcfc2a9a24f2841d18a480c7d09b86318daab3f SHA512 e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f -DIST ruby-3.0.4.tar.xz 15830368 BLAKE2B 3d1f2e6329269febbd02ac8a68aafd57d5ca858c816a81e754adfc9aa2990274d190672447244520fe9fbf9a1d337d17c845a97800f964e2046b2ef9eef733ee SHA512 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b -DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21 +DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683 +DIST ruby-2.7.8.tar.xz 12105320 BLAKE2B dde5dc368b0e23b19c2f52ec16f233a90f26aa42739882b5222a9112e42d424e16eb781ba0b5351c89c8845724f4e53073f6c60a6e29814c346f824ade5dfab0 SHA512 4b49dff3e1c2e79d914e10418e4c03026f5d4c137dc337f5c720fe26cb9fcdcf4afc6b7c967356cf5fbe04cc5ef431174c48a035becf3e2322c2c45d3c9b2f59 +DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0 +DIST ruby-3.0.6.tar.xz 15864560 BLAKE2B e1fca86cdf267fc2289ef4d605fdf0023265c3a291ca4088361c0acd64310a7c41bf0750b4ac762157c20ceaa5df8bdc0a67374bcad9654bca5c3fc8630ff89c SHA512 abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8 +DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 +DIST ruby-3.1.4.tar.xz 15316604 BLAKE2B 5d771c267451c05ae192991976957d43d1131e652ac5a90a8dfff9deba97cf6b139d0113f5d2ed44225a545aa79a1c732555de1efc83d1010d097ec35f7e92dd SHA512 a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633 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 0000000..fe5d33d --- /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/files/3.2/010-default-gem-location.patch b/dev-lang/ruby/files/3.2/010-default-gem-location.patch new file mode 100644 index 0000000..36009ad --- /dev/null +++ b/dev-lang/ruby/files/3.2/010-default-gem-location.patch @@ -0,0 +1,11 @@ +--- a/tool/rbinstall.rb 2022-11-13 08:12:27.373041649 +0100 ++++ b/tool/rbinstall.rb 2022-11-13 08:16:09.110406705 +0100 +@@ -994,7 +994,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/files/3.2/901-musl-stacksize.patch b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch new file mode 100644 index 0000000..f18aa27 --- /dev/null +++ b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch @@ -0,0 +1,20 @@ +--- a/thread_pthread.c 2023-02-08 05:02:20.000000000 +0100 ++++ b/thread_pthread.c 2023-03-10 17:46:25.694739053 +0100 +@@ -1033,7 +1033,7 @@ + { + native_main_thread.id = pthread_self(); + +-#if MAINSTACKADDR_AVAILABLE ++#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__)) + if (native_main_thread.stack_maxsize) return; + { + void* stackaddr; +@@ -2090,7 +2090,7 @@ + + #ifdef STACKADDR_AVAILABLE + if (get_stack(&base, &size) == 0) { +-# ifdef __APPLE__ ++# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__)) + if (pthread_equal(th->nt->thread_id, native_main_thread.id)) { + struct rlimit rlim; + if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) { diff --git a/dev-lang/ruby/ruby-2.7.6.ebuild b/dev-lang/ruby/ruby-2.7.7.ebuild similarity index 99% copy from dev-lang/ruby/ruby-2.7.6.ebuild copy to dev-lang/ruby/ruby-2.7.7.ebuild index 0828bae..0fcca32 100644 --- a/dev-lang/ruby/ruby-2.7.6.ebuild +++ b/dev-lang/ruby/ruby-2.7.7.ebuild @@ -26,7 +26,7 @@ RDEPEND=" jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) diff --git a/dev-lang/ruby/ruby-2.7.6.ebuild b/dev-lang/ruby/ruby-2.7.8.ebuild similarity index 96% rename from dev-lang/ruby/ruby-2.7.6.ebuild rename to dev-lang/ruby/ruby-2.7.8.ebuild index 0828bae..f0cbe07 100644 --- a/dev-lang/ruby/ruby-2.7.6.ebuild +++ b/dev-lang/ruby/ruby-2.7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ 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" +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 rubytests socks5 +ssl static-libs systemtap tk xemacs" RDEPEND=" @@ -26,7 +26,7 @@ RDEPEND=" jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) diff --git a/dev-lang/ruby/ruby-3.0.4.ebuild b/dev-lang/ruby/ruby-3.0.5.ebuild similarity index 97% copy from dev-lang/ruby/ruby-3.0.4.ebuild copy to dev-lang/ruby/ruby-3.0.5.ebuild index 557379d..99e94b2 100644 --- a/dev-lang/ruby/ruby-3.0.4.ebuild +++ b/dev-lang/ruby/ruby-3.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ 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" +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 rubytests socks5 +ssl static-libs systemtap tk xemacs" RDEPEND=" diff --git a/dev-lang/ruby/ruby-3.0.4.ebuild b/dev-lang/ruby/ruby-3.0.6.ebuild similarity index 99% rename from dev-lang/ruby/ruby-3.0.4.ebuild rename to dev-lang/ruby/ruby-3.0.6.ebuild index 557379d..3749162 100644 --- a/dev-lang/ruby/ruby-3.0.4.ebuild +++ b/dev-lang/ruby/ruby-3.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-lang/ruby/ruby-3.1.2-r1.ebuild b/dev-lang/ruby/ruby-3.1.3.ebuild similarity index 96% copy from dev-lang/ruby/ruby-3.1.2-r1.ebuild copy to dev-lang/ruby/ruby-3.1.3.ebuild index 8583cd8..f568aeb 100644 --- a/dev-lang/ruby/ruby-3.1.2-r1.ebuild +++ b/dev-lang/ruby/ruby-3.1.3.ebuild @@ -66,7 +66,7 @@ PDEPEND=" src_prepare() { eapply "${FILESDIR}"/${PN}-3.1-libressl.patch - eapply "${FILESDIR}"/"${SLOT}"/010*.patch + eapply "${FILESDIR}"/"${SLOT}"/011*.patch if use elibc_musl ; then eapply "${FILESDIR}"/3.1/901-musl-*.patch @@ -87,7 +87,9 @@ src_prepare() { # 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 + 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 diff --git a/dev-lang/ruby/ruby-3.1.2-r1.ebuild b/dev-lang/ruby/ruby-3.1.4.ebuild similarity index 95% rename from dev-lang/ruby/ruby-3.1.2-r1.ebuild rename to dev-lang/ruby/ruby-3.1.4.ebuild index 8583cd8..fd4ac5d 100644 --- a/dev-lang/ruby/ruby-3.1.2-r1.ebuild +++ b/dev-lang/ruby/ruby-3.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -66,7 +66,7 @@ PDEPEND=" src_prepare() { eapply "${FILESDIR}"/${PN}-3.1-libressl.patch - eapply "${FILESDIR}"/"${SLOT}"/010*.patch + eapply "${FILESDIR}"/"${SLOT}"/011*.patch if use elibc_musl ; then eapply "${FILESDIR}"/3.1/901-musl-*.patch @@ -87,7 +87,9 @@ src_prepare() { # 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 + 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
