gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 100 deletions

diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 84d883ad902f..6b785370eac3 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,9 +1,7 @@
-DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
 DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
 DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
-EBUILD PyQt5-sip-4.19.17.ebuild 2145 BLAKE2B 1547a2e0c2fb8add669fe31b82e630a90633ecbf365518429f2f0ebce6279f8d6fbb27e467b9abaaaec69cb7f8aee1984962a6386678f365c5b1b91f6683c1bf SHA512 942d43df7bb3fb0b591cab2a0979abfad951b6fed1ea976ab195c6ef7595217085057239b39d83c24b28375131ec4504940d5ec94abbdef7d13d4f9554e022ac
-EBUILD PyQt5-sip-4.19.19.ebuild 2148 BLAKE2B 2ddc7b8b2350431218b9591c657d7bf00f2e0a787ea6766060377300f475aa87a554feaf739d9b7fe308f60d56e67218ef9b2f286021bfb133fc0a737abb34a4 SHA512 56b09bf701770e2763b6e0ae4b372c4f52cbb2ce1b29f2f8468fc23c059a0c641a45dd5ea5d763c0921d8990886999a73dfa0a968fbe1e55372fc1e40894e80c
+EBUILD PyQt5-sip-4.19.19.ebuild 2147 BLAKE2B cf0e4cc4301306bfc89014714b4eccb4a991cc1f3a8521ca9b02d4ceeb9bad72746c9c56356642ff9846310e95492c68198bf2d91370ac75f52ab8eb65840c0b SHA512 41eb65292ab0649f41181ae333fd62848592ffbf2d88da22bc570e4f3f49f40c4bceb9c5f237fff97bf76397f9438c60acce16ab47d648bd9c2d1df6439cefee
 EBUILD PyQt5-sip-4.19.20.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
-EBUILD PyQt5-sip-4.19.21.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
+EBUILD PyQt5-sip-4.19.21.ebuild 2149 BLAKE2B 83b49f3f691236c11425a6ac44d7a103df7984be01f50f6f8063fdd6d6d28db5b977231fd8c7cbde4acd97590f15e658d3d546ffe52002092b053e8c430845b1 SHA512 60ad3994701a0444a41a135b2a001ff53df9597c046be6588ed3f3df0ea95f590766dc2c3e0fb0d4e955b988915259f1d17fd70d1ea484328cf5bc917e25d320
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
deleted file mode 100644
index b5622576b38b..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-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() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		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
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
index 2ee9efa4ded4..f6f210bf7330 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
index a5b7820e1a9d..c381a44d8150 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"