From c265c8d7f7fb63f37b7fe4fc352e25663d35c479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Thu, 14 May 2020 14:31:29 +0200
Subject: [PATCH] [dev-libs/Ice] move targets forward

---
 dev-libs/Ice/Ice-3.6.5.ebuild    | 22 +++++++++++-----------
 dev-libs/Ice/Ice-3.6.9999.ebuild |  2 +-
 dev-libs/Ice/Ice-3.7.9999.ebuild | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
index efcf74d..1c7f998 100644
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby25"
+USE_RUBY="ruby26"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
 
 PHP_EXT_OPTIONAL_USE=php
 
-USE_PHP="php7-3"
+USE_PHP="php7-4"
 
 # This variable does not belong to any eclass. It is solely used in this ebuild
 BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby25) )
+	ruby? ( $(ruby_implementation_depend ruby26) )
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	readline? ( sys-libs/readline:0= )
@@ -159,25 +159,25 @@ src_configure() {
 	fi
 
 	if use ruby; then
-		SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
 		MAKE_RULES_RUBY=(
 			"install_rubydir=\"${ED}/${SITERUBY}\""
 			"install_libdir=\"${ED}/${SITERUBYARCH}\""
 		)
 
-		# make it use ruby25 only
+		# make it use ruby26 only
 		sed -i \
-			-e 's|RUBY = ruby|\025|' \
+			-e 's|RUBY = ruby|\026|' \
 			ruby/config/Make.rules || die
 		sed -i \
-			-e 's|env ruby|\025|' \
+			-e 's|env ruby|\026|' \
 			ruby/config/s2rb.rb || die
 		sed -i \
-			-e 's|env ruby|\025|' \
+			-e 's|env ruby|\026|' \
 			ruby/scripts/slice2rb || die
 		sed -i \
-			-e 's|output.write("ruby|\025|' \
+			-e 's|output.write("ruby|\026|' \
 			scripts/TestUtil.py || die
 	fi
 
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index 1c95e82..f96bbc8 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
 
 PHP_EXT_OPTIONAL_USE=php
 
-USE_PHP="php7-3"
+USE_PHP="php7-4"
 
 EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild
index 61a5f11..cd61256 100644
--- a/dev-libs/Ice/Ice-3.7.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.7.9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby26"
+USE_RUBY="ruby27"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -101,22 +101,22 @@ src_configure() {
 	fi
 
 	if use ruby; then
-		SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		SITERUBY="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
 		MAKE_RULES_RUBY=(
 			"install_rubydir=\"${ED}/${SITERUBY}\""
 			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
 		)
 
-		# make it use ruby26 only
+		# make it use ruby27 only
 		sed -i \
-			-e 's|RUBY = ruby|\026|' \
+			-e 's|RUBY = ruby|\027|' \
 			ruby/config/Make.rules || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\026|' \
+			-e 's|env ruby|\027|' \
 			ruby/config/s2rb.rb || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\026|' \
+			-e 's|env ruby|\027|' \
 			ruby/scripts/slice2rb || die "sed failed"
 	fi