gentoo auto-resync : 17:06:2023 - 01:42:56

5 files changed, 6 insertions, 274 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c05a06a39a7d..8f397e763ee8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -14,8 +14,7 @@ AUX 3.2/902-hppa-pthread-stack-size.patch 1690 BLAKE2B 84c8478a69e108c68f96eeb0f
 DIST ruby-3.0.6.tar.xz 15864560 BLAKE2B e1fca86cdf267fc2289ef4d605fdf0023265c3a291ca4088361c0acd64310a7c41bf0750b4ac762157c20ceaa5df8bdc0a67374bcad9654bca5c3fc8630ff89c SHA512 abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8
 DIST ruby-3.1.4.tar.xz 15316604 BLAKE2B 5d771c267451c05ae192991976957d43d1131e652ac5a90a8dfff9deba97cf6b139d0113f5d2ed44225a545aa79a1c732555de1efc83d1010d097ec35f7e92dd SHA512 a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633
 DIST ruby-3.2.2.tar.xz 15118856 BLAKE2B 8e09fb0f6808d4572f86ea190db4f4b950ff3a13391bf7bc3e515b6d14f356d3f7c1eb5bbbe2de460ef78edee54462fdf9be56722cd9e27a613febfe45f8c40a SHA512 a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935
-EBUILD ruby-3.0.6-r2.ebuild 8622 BLAKE2B 133e617680058e483d15c8515d3e253c6de94047f74c79835c6ac06d76e8e8f62068e9bfff752d9b3254205f7f856f8c2f0358dcd52c0d1482c2db5b9581ccd3 SHA512 5c5604506ede12a5a3c591a7d244b8f7d299535e52f4d2a58b1075e6ce72b55f2a5b0fd9a94bf410b3a20db8e51407af41df3fa8a13aa62e618c180ede4b17f3
-EBUILD ruby-3.0.6.ebuild 7721 BLAKE2B 29a8006a10b57861d260a94e2760bd9d4c1322616abdb50af904055812ea4794696772962c930ca33dd007023dfffacf8bb8cb46edaa03c4aff7c5eefb8b5eeb SHA512 620ea2c16f8966b1aaa86b625b348fdca4852847b16b63bbe100d4a240fde1d3e07e3db9e10e47bbc475b2940e5437b4e96aa7979ca4541d2adf118a6ceea4fc
-EBUILD ruby-3.1.4-r2.ebuild 8379 BLAKE2B 269286ac3fa2c751f7468ca42968d6d75f969e4b4fc0194331230c47d25744327f87eb34e9399a5dfda716e282ebc2329dde42cd4da0ef4707261091a32ff770 SHA512 f0eac2a9d69ad7aa80ac2ae0a4f0599f8196e2a11d816362c516bd76c2a6ad950f5771a2db8391847781eda25a48f70048fd2dbf82e34dde48ff50518eb38854
-EBUILD ruby-3.2.2-r2.ebuild 9357 BLAKE2B 88d6e2cd10dcbea1a85f16e2ff24f57a39f875e24b8f7cd03740211ba8237ef9f5af8a43827ce3c0231bb404a8d553701492d07d470bc66b7e55db828913e5b0 SHA512 b35960797e53c56c3e926c978a821d937b968c3221f0a3776d0abf51a29e0e1567e0fb3b6e96cec6b2c65cd94144774bc056e6ba615de119ed791ee79ba7760d
+EBUILD ruby-3.0.6-r3.ebuild 8625 BLAKE2B 07a741d5baca7a777128ba5e4bffb6f3769b3122f6c2ec77b9889ccca7e6d35322719de4f31d9fdcac27f21266f57c6052ba111d253e52355ed71b587f029b01 SHA512 7f1217de107c66023bac96c83aa5a0801193a63156c0999b956e015bd11b80f48a84a272f7d748b41136d79bb246baf6459426b011844ebabaab24eaf3a7a9a2
+EBUILD ruby-3.1.4-r3.ebuild 8382 BLAKE2B b90dc380e43c01ba79a004bb56602c400e8212bd6783e32190ee2e72b443f93aff6995a1862013b0d811d737674a9414de32f7b2212e1f4f312593887bc7c804 SHA512 3b0d0071fcbf6b7cf109941473baab45b3806549e994d7d0b3ebd584f3c00e460f6c088612888526ba3fc01577f702af27a94e9531fec43e7bc05ec9c1862e6f
+EBUILD ruby-3.2.2-r3.ebuild 9360 BLAKE2B 9b91782a1aa451ec2a28245552081c5f52fa4ab2f6beadf85522f0e9355ec8d3022e04dc148673e78c5b685b93d8506e1f5791113d94ec807004725e3c708b30 SHA512 ac9f05f450ab4d17c05d1d912a69560627232f5911382c927d93d66a30f50e73b9a500a303e17435b4157276680f46d7e91a92d1c7340e18fb0aa956f0f4f69c
 MISC metadata.xml 602 BLAKE2B a6e6786b21d135c4a952d48d7430a1ad545d1ae45687e83eae3164818a20b7322aac330a8b125247f1772411564a799451a3a94f5375986277dbaf824970992d SHA512 3af744c835dfeefe931af01c2b50e721ac2ba82f65ab06160aa4b63a5c2eb6543c0954902f9eee80e86cbcd727d496c2de9a9a8ebfd1cd0af9e995c6f6ab8cd8
diff --git a/dev-lang/ruby/ruby-3.0.6-r2.ebuild b/dev-lang/ruby/ruby-3.0.6-r3.ebuild
index 4c5b1fc9d445..fc394df452a0 100644
--- a/dev-lang/ruby/ruby-3.0.6-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.0.6-r3.ebuild
@@ -50,7 +50,7 @@ DEPEND="
 BUNDLED_GEMS="
 	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30(-)]
 	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30(-)]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30(-)]
+	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby30(-)]
 	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30(-)]
 	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30(-)]
 	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30(-)]
diff --git a/dev-lang/ruby/ruby-3.0.6.ebuild b/dev-lang/ruby/ruby-3.0.6.ebuild
deleted file mode 100644
index 5ba44b3fd38a..000000000000
--- a/dev-lang/ruby/ruby-3.0.6.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x64-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests 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-1.1*: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.14.2[ruby_targets_ruby30]
-	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
-	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
-	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
-	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
-	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby30]
-	>=dev-ruby/bundler-2.2.15[ruby_targets_ruby30]
-	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
-	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
-	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.0/900-musl-*.patch
-		eapply "${FILESDIR}"/3.0/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
-
-	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= 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 -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-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*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-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
-}
diff --git a/dev-lang/ruby/ruby-3.1.4-r2.ebuild b/dev-lang/ruby/ruby-3.1.4-r3.ebuild
index ccace9cc29bf..b82f8a54cfe5 100644
--- a/dev-lang/ruby/ruby-3.1.4-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.1.4-r3.ebuild
@@ -50,7 +50,7 @@ DEPEND="
 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/rake-13.0.6-r2[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(-)]
diff --git a/dev-lang/ruby/ruby-3.2.2-r2.ebuild b/dev-lang/ruby/ruby-3.2.2-r3.ebuild
index a81f6cbca257..4bd9dd360dac 100644
--- a/dev-lang/ruby/ruby-3.2.2-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.2.2-r3.ebuild
@@ -57,7 +57,7 @@ BUNDLED_GEMS="
 	>=dev-ruby/net-smtp-0.3.3[ruby_targets_ruby32(-)]
 	>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32(-)]
 	>=dev-ruby/prime-0.1.2[ruby_targets_ruby32(-)]
-	>=dev-ruby/rake-13.0.6[ruby_targets_ruby32(-)]
+	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby32(-)]
 	>=dev-ruby/rbs-2.8.2[ruby_targets_ruby32(-)]
 	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby32(-)]
 	>=dev-ruby/rss-0.2.9[ruby_targets_ruby32(-)]