[dev-libs/Ice] prepare for tree, jank 3.6

dev-libs/Ice/Ice-3.7.9999.ebuild

@@ -1,13 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# no py3k10 support yet
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby27"
+USE_RUBY="ruby31"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -15,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
 
 PHP_EXT_OPTIONAL_USE=php
 
-USE_PHP="php8-0"
+USE_PHP="php8-0 php8-1"
 
 EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
@@ -40,7 +39,7 @@ RDEPEND=">=app-arch/bzip2-1.0.5
 	dev-libs/openssl:0=
 	virtual/libcrypt:=
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby27) )"
+	ruby? ( $(ruby_implementation_depend ruby31) )"
 DEPEND="${RDEPEND}
 	test? (
 		${PYTHON_DEPS}
@@ -54,7 +53,7 @@ S="${WORKDIR}/${PN}"
 PHP_EXT_S="${S}/php"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.7.6-fix-musl-build.patch"
+	"${FILESDIR}/${PN}-3.7.7-fix-musl-build.patch"
 )
 
 pkg_setup() {
@@ -105,22 +104,22 @@ src_configure() {
 	fi
 
 	if use ruby; then
-		SITERUBY="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		SITERUBY="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
 		MAKE_RULES_RUBY=(
 			"install_rubydir=\"${ED}/${SITERUBY}\""
 			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
 		)
 
-		# make it use ruby27 only
+		# make it use ruby31 only
 		sed -i \
-			-e 's|RUBY ?= ruby|\027|' \
+			-e 's|RUBY ?= ruby|\031|' \
 			ruby/config/Make.rules || die
 		sed -i \
-			-e 's|env ruby|\027|' \
+			-e 's|env ruby|\031|' \
 			ruby/config/s2rb.rb || die
 		sed -i \
-			-e 's|env ruby|\027|' \
+			-e 's|env ruby|\031|' \
 			ruby/scripts/slice2rb || die
 	fi