Updating liguros repo

18 files changed, 37 insertions, 17 deletions

diff --git a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
index b5fb1c358bcb..bb56efe674d7 100644
--- a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
+++ b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 # gdl's build system is a travesty, and actually calls
 # itself in the testsuite, which is something that ninja
diff --git a/dev-lang/hy/hy-0.14.0.ebuild b/dev-lang/hy/hy-0.14.0.ebuild
index 11f4a62a5dae..58a5303eb125 100644
--- a/dev-lang/hy/hy-0.14.0.ebuild
+++ b/dev-lang/hy/hy-0.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 eutils
 DESCRIPTION="A LISP dialect running in python"
diff --git a/dev-lang/hy/hy-0.15.0.ebuild b/dev-lang/hy/hy-0.15.0.ebuild
index d14f72161210..fafc25c1c2df 100644
--- a/dev-lang/hy/hy-0.15.0.ebuild
+++ b/dev-lang/hy/hy-0.15.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 eutils
 DESCRIPTION="A LISP dialect running in python"
diff --git a/dev-lang/hy/hy-0.16.0.ebuild b/dev-lang/hy/hy-0.16.0.ebuild
index 0c0be619dd3d..fafc25c1c2df 100644
--- a/dev-lang/hy/hy-0.16.0.ebuild
+++ b/dev-lang/hy/hy-0.16.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 eutils
 DESCRIPTION="A LISP dialect running in python"
diff --git a/dev-lang/hy/hy-0.17.0.ebuild b/dev-lang/hy/hy-0.17.0.ebuild
index d9d9057b0c1e..2ba90caaf192 100644
--- a/dev-lang/hy/hy-0.17.0.ebuild
+++ b/dev-lang/hy/hy-0.17.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 eutils
 DESCRIPTION="A LISP dialect running in python"
diff --git a/dev-lang/jsonnet/jsonnet-0.15.0.ebuild b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
index 376e4e886d5c..bce684c06ecc 100644
--- a/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 python3_{7,8} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit toolchain-funcs flag-o-matic distutils-r1
 
diff --git a/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
index d4d1373fa872..80a6b7899133 100644
--- a/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit toolchain-funcs flag-o-matic distutils-r1
 
diff --git a/dev-lang/jsonnet/jsonnet-0.16.0.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
index 54be993393d9..7ebe1bf59827 100644
--- a/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit toolchain-funcs flag-o-matic distutils-r1
 
diff --git a/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
index 3faabad2b33b..2445229673e3 100644
--- a/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit toolchain-funcs flag-o-matic distutils-r1
 
diff --git a/dev-lang/php/files/php-7.4.13-issue80368.patch b/dev-lang/php/files/php-7.4.13-issue80368.patch
new file mode 100644
index 000000000000..adad8f864ec1
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.13-issue80368.patch
@@ -0,0 +1,17 @@
+https://github.com/php/php-src/commit/0f579fd7c8171cb0f7ecc8db912933df450f3861
+https://github.com/php/php-src/commit/ecee3f1209a7c0ac9f99c7f640b2f5df56656e58
+
+--- a/ext/openssl/openssl.c
++++ b/ext/openssl/openssl.c
+@@ -6496,7 +6496,9 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c
+ 	int cipher_mode = EVP_CIPHER_mode(cipher_type);
+ 	memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
+ 	switch (cipher_mode) {
+-#if PHP_OPENSSL_API_VERSION >= 0x10100
++#ifdef EVP_CIPH_OCB_MODE
++		/* Since OpenSSL 1.1, all AEAD ciphers use a common framework. We check for
++		 * EVP_CIPH_OCB_MODE, because LibreSSL does not support it. */
+ 		case EVP_CIPH_GCM_MODE:
+ 		case EVP_CIPH_OCB_MODE:
+ 		case EVP_CIPH_CCM_MODE:
+ 
diff --git a/dev-lang/php/php-7.4.13.ebuild b/dev-lang/php/php-7.4.13.ebuild
index 3ac0d8c9ace3..97ccf43d8c7c 100644
--- a/dev-lang/php/php-7.4.13.ebuild
+++ b/dev-lang/php/php-7.4.13.ebuild
@@ -150,7 +150,10 @@ BDEPEND="virtual/pkgconfig"
 
 PHP_MV="$(ver_cut 1)"
 
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+PATCHES=(
+	"${FILESDIR}"/php-iodbc-header-location.patch
+	"${FILESDIR}"/${P}-issue80368.patch
+)
 
 php_install_ini() {
 	local phpsapi="${1}"
diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
index 3be34e81fda6..1fb7bebb9fce 100644
--- a/dev-lang/rust/rust-1.46.0.ebuild
+++ b/dev-lang/rust/rust-1.46.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.47.0-r2.ebuild b/dev-lang/rust/rust-1.47.0-r2.ebuild
index eb492a7361c1..319822163f30 100644
--- a/dev-lang/rust/rust-1.47.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.47.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.48.0.ebuild b/dev-lang/rust/rust-1.48.0.ebuild
index 19da77c7c399..8f18568cf045 100644
--- a/dev-lang/rust/rust-1.48.0.ebuild
+++ b/dev-lang/rust/rust-1.48.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild b/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
index 1a3cf72f182b..d1eb6f51f072 100644
--- a/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 WANT_AUTOCONF="2.1"
 
diff --git a/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild b/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
index 51c99770b037..4f9697098de8 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
@@ -7,7 +7,7 @@ EAPI="7"
 FIREFOX_PATCHSET="firefox-78esr-patches-04.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-02.tar.xz"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 WANT_AUTOCONF="2.1"
 
diff --git a/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
index a2df2c41b345..cd5555449e1f 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
@@ -7,7 +7,7 @@ EAPI="7"
 FIREFOX_PATCHSET="firefox-78esr-patches-07.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-02.tar.xz"
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 WANT_AUTOCONF="2.1"
 
diff --git a/dev-lang/yap/yap-6.3.4.ebuild b/dev-lang/yap/yap-6.3.4.ebuild
index a6150aebdea6..a45611821e73 100644
--- a/dev-lang/yap/yap-6.3.4.ebuild
+++ b/dev-lang/yap/yap-6.3.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P=YAP-${PV}
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit cmake-utils eutils flag-o-matic multilib python-r1