gentoo resync : 05.02.2020

4 files changed, 104 insertions, 4 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3c5ea86af08d..d4ece68b5443 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,9 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 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
-EBUILD sip-4.19.17.ebuild 2375 BLAKE2B 385500583860ba528d43c2a663e3934dc9109315ef78b9813d760a9effd46dbbe15b31fc5eaa2f0e98e69f17d4913f1ec1cb0ecc04a16943faa8a66bba6b89e9 SHA512 4c98e2048ae74f5ed10e0d83c3d13c7eed4030c251b3db27492af4075c37b0a11ddba37bf4c52c782686c38c060fd7f8079a59903eaf09889105c9cfea60c13e
-EBUILD sip-4.19.19.ebuild 2380 BLAKE2B 9c2ce5da73c9463f28a85c53c5b4348469509f22b7fb2ffb3e903d2e6854354c39ee404758babd76702ff8b490d9cf7f703cd7542c9be601929d6029dbe5cdb3 SHA512 b74a3fd0ad0a840bc8dcc445289aec28ded48985fd8a1d11f3e8ab163d65bb06b95787870212228443cbfa755d90eedead0aa6baf410d8c67174b4d7da195712
+DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
+EBUILD sip-4.19.17.ebuild 2376 BLAKE2B d27a7a14e2cb975008683583f6d3535eb80e52202d751d9f6ddec45742bb0c695500322b2abe3ce5ff85be319d55b7e4fa9a75dd8fa1c2a24f3e65baf472db29 SHA512 d8c0f913233c5dd88e30156b6445fe839b783071f79b2e8022c04c23b0e5e753763472f3696ead1d8a8d59ce4ab3be61f22829df85617b16550498042027511b
+EBUILD sip-4.19.19.ebuild 2379 BLAKE2B a5fe6207583ba7860dad96b75ef0a5a01738a6458dcf7712d2d553c71c46a3fd44044cc1428c674e401c6c170ea1dee40611661bb1cc0ffddc7b4b570557521c SHA512 b6d5ce1166c1d5ed83cf9195bc5883623273fc29b5fd303fa14cedea9fa7330a27a7f1a34ad1e2de3a7aa8ac408391f4368e67e73abd7ca08b89521aeee36203
 EBUILD sip-4.19.20.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
+EBUILD sip-4.19.21.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index 50fb73dc27dc..d5fe18b33934 100644
--- a/dev-python/sip/sip-4.19.17.ebuild
+++ b/dev-python/sip/sip-4.19.17.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="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.19.ebuild b/dev-python/sip/sip-4.19.19.ebuild
index 5d7a76a0304b..84d9e60fd106 100644
--- a/dev-python/sip/sip-4.19.19.ebuild
+++ b/dev-python/sip/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="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.21.ebuild b/dev-python/sip/sip-4.19.21.ebuild
new file mode 100644
index 000000000000..320cc98ec4f1
--- /dev/null
+++ b/dev-python/sip/sip-4.19.21.ebuild
@@ -0,0 +1,98 @@
+# 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,8} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+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 incdir=$(python_get_includedir)
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sysroot="${ESYSROOT}/usr"
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="${incdir#${SYSROOT}}"
+			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_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+}