[dev-libs/Ice] add upstream fix for IceFuture, more QA

dev-libs/Ice/Ice-3.7.7-r1.ebuild

@@ -51,6 +51,7 @@ S="${WORKDIR}/${P,}"
 PHP_EXT_S="${S}/php"
 
 PATCHES=(
+	"${FILESDIR}/${P}-fix-python-version-check.patch"
 	"${FILESDIR}/${P}-fix-musl-build.patch"
 )
 
@@ -166,8 +167,8 @@ src_test() {
 			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
 				"${MAKE_RULES[@]}" \
 				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
-				install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test
+				install_libdir="\"$(python_get_sitedir)\"" test
 		}
 		local S="${S}/python"
 		python_foreach_impl testing

dev-libs/Ice/Ice-3.7.7-r2.ebuild

@@ -51,6 +51,7 @@ S="${WORKDIR}/${P,}"
 PHP_EXT_S="${S}/php"
 
 PATCHES=(
+	"${FILESDIR}/${P}-fix-python-version-check.patch"
 	"${FILESDIR}/${P}-fix-musl-build.patch"
 )
 
@@ -166,8 +167,8 @@ src_test() {
 			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
 				"${MAKE_RULES[@]}" \
 				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
-				install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test
+				install_libdir="\"$(python_get_sitedir)\"" test
 		}
 		local S="${S}/python"
 		python_foreach_impl testing

dev-libs/Ice/Ice-3.7.7.ebuild

@@ -51,6 +51,7 @@ S="${WORKDIR}/${P,}"
 PHP_EXT_S="${S}/php"
 
 PATCHES=(
+	"${FILESDIR}/${P}-fix-python-version-check.patch"
 	"${FILESDIR}/${P}-fix-musl-build.patch"
 )
 
@@ -166,8 +167,8 @@ src_test() {
 			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
 				"${MAKE_RULES[@]}" \
 				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
-				install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test
+				install_libdir="\"$(python_get_sitedir)\"" test
 		}
 		local S="${S}/python"
 		python_foreach_impl testing

dev-libs/Ice/Ice-3.7.9999.ebuild

@@ -168,8 +168,8 @@ src_test() {
 			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
 				"${MAKE_RULES[@]}" \
 				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
-				install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test
+				install_libdir="\"$(python_get_sitedir)\"" test
 		}
 		local S="${S}/python"
 		python_foreach_impl testing

dev-libs/Ice/files/Ice-3.7.7-fix-musl-build.patch

@@ -1,3 +1,5 @@
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/Ice/patches/fix-musl.patch
+
 --- a/cpp/src/IceUtil/UtilException.cpp
 +++ b/cpp/src/IceUtil/UtilException.cpp
 @@ -43,7 +43,7 @@

dev-libs/Ice/files/Ice-3.7.7-fix-python-version-check.patch

@@ -0,0 +1,35 @@
+From 8daf1ed1f4ea0dd0f548d37875bdf5fbd7e9e950 Mon Sep 17 00:00:00 2001
+From: Jose <pepone@users.noreply.github.com>
+Date: Wed, 13 Jul 2022 09:08:03 +0200
+Subject: [PATCH] Fix python version check (#1381)
+
+---
+ python/config/Make.rules | 1 -
+ python/python/Makefile   | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/python/config/Make.rules b/python/config/Make.rules
+index 7a1c0f47480..d414db7933b 100644
+--- a/python/config/Make.rules
++++ b/python/config/Make.rules
+@@ -16,7 +16,6 @@ PYTHON              ?= python3
+ -include        $(lang_srcdir)/config/Make.rules.$(os)
+ 
+ # PYTHON must be set to a value that has a corresponding PYTHON-config
+-python-version := $(shell $(PYTHON) -c "import sys; print(\"{0}.{1}\".format(sys.version_info[0], sys.version_info[1]))")
+ python-config := $(PYTHON)-config
+ 
+ ifeq ($(os),Linux)
+diff --git a/python/python/Makefile b/python/python/Makefile
+index f5bb725a3af..ba1df33e586 100644
+--- a/python/python/Makefile
++++ b/python/python/Makefile
+@@ -32,7 +32,7 @@ install:: | $(DESTDIR)$(install_pythondir)/Ice
+ 	$(E) "Installing generated code"
+ 	$(Q)$(INSTALL) -m 644 Ice/__init__.py $(DESTDIR)$(install_pythondir)/Ice
+ # Ice/Future requires python >= 3.5
+-ifeq ($(shell $(PYTHON) -c "print(1 if $(python-version) >= 3.5 else 0)"),1)
++ifeq ($(shell $(PYTHON) -c "import sys; print(1 if sys.version_info[:2] >= (3, 5) else 0)"),1)
+ 	$(Q)$(MKDIR) -p -m 755 $(DESTDIR)$(install_pythondir)/Ice/Py3
+ 	$(Q)$(INSTALL) -m 644 Ice/Py3/IceFuture.py $(DESTDIR)$(install_pythondir)/Ice/Py3/
+ endif