gentoo resync : 25.08.2020

4 files changed, 96 insertions, 12 deletions

diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index b4c665eec664..359a5404c709 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,7 @@
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
 DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
-EBUILD PyQt5-sip-4.19.22.ebuild 2149 BLAKE2B 2041761c23aedb1d17596f59ca891e3289f730e907c1aa46c0e809e98364e2fd8cb34cbaaaffb3c08facfadd37304b6c8b685814316632a8ed5fc15cfc6a0105 SHA512 b023c90e43e30376b95355abbe66df3160995c0bb352db01ced54dfcf264bff486f677c1c28831c8281907b3b9e62c1897adf72dc96d253eac75246cadc8139e
-EBUILD PyQt5-sip-4.19.23.ebuild 2153 BLAKE2B 5d6c9245a3db34b81ac48bfc4662af00413ae10f873ab6754d33afee233e08868daecfe793824182f2b5cb6807605a1417d4c097c18b26c2bb7e1494ce65656a SHA512 3b67f2da95af4cc32c82723c533ad28a163c4be2169a2d9032e04da491e66e2601e887441e46e72fe59e04365576cab95fa1f72941b19949d5907c5a009d67e5
+DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
+EBUILD PyQt5-sip-4.19.22-r1.ebuild 2053 BLAKE2B 0925192dce6fab7d8106f83ec522c8f1a9828f5a4a8a654370adf75e82c427453a3345ec9c6f005b5dc861c5b60a92c909077624a87a455839e5db5b13fbf6bd SHA512 d12679262992b88569f41a66b1df7c38c4330f0fde21fdf874081066459581131ac6ddd883473268cf797502f36a7f4f14bfe870abc042d61cc1450cb9099db4
+EBUILD PyQt5-sip-4.19.23-r1.ebuild 2057 BLAKE2B 11461c7345631242eabc7a8f234cfcf6effefb678d7104278e8b13ef194bcb85522121e19ffae23c980a6ecf0bf7de1593fcccda00c8ff67e548e6d7c4fea32c SHA512 e846c688c4732add0fed0bb4b971c880becbcea2728e4a510f9d7dc6de906a0ca743405a060866c56b6f0ac2d04e9a089b7ec17419a16600f366a14b38775c3d
+EBUILD PyQt5-sip-4.19.24.ebuild 2054 BLAKE2B e211951d238a5d4878875f6337fa4c7541e79d5dfe35d8b198cc0f64fbd132e10f2a1a5ba787862523db88b8365a07d67c0f1f41be5bb2e6fb947f29a6554d42 SHA512 eb91552a1fadb4e0c4e1f1a4a6ae29014323735e8e81f0e2f3baef6792fe643ff4958b50a10f64846c8763a80bf408e543ceb69fc3555bc26f8c71d039ab0daf
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
index a69499758b4f..9313ec901ef5 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
index 2c211f51a220..c61529a6f32a 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
new file mode 100644
index 000000000000..d5d6640ea134
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Private sip module for PyQt5"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!<dev-python/PyQt5-5.12.2
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
+			--no-tools
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}