gentoo resync : 11.07.2019

3 files changed, 102 insertions, 2 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 38999d2c5222..848b1efbcd90 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
+DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
 EBUILD sip-4.19.13.ebuild 2890 BLAKE2B 7e98f818a312f0f2f7267974687fd565785d55f52766dbc0f7112f8d8e0bb27d7fcee86093f1d791317002009750c9883e1688f56b7275f09046ed07c8b22d18 SHA512 71c635af1a2a9e9e05fe52e125e15e1e52e4e261d868617d0f4f2fd48f3049b138b966e7db13ec952f3efd50d6054fd5841c95ae9169e58c1745e19ddeb6cf59
-EBUILD sip-4.19.17.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
+EBUILD sip-4.19.17.ebuild 2450 BLAKE2B 713045900981e56d541090e9d0a067727372021fe2f4e7fea116fdf379d7565e7d83a853f0007c7ccef860e3694656b4c9f4bb9ee5c307fb19808b8f687377be SHA512 3c5727aac8c0e7bb90211bb9b554600bd2348016cbd55894bf63d4537f4ae5b0c204d4f4c78c8b66ee18366c521b2f36aac07521cdcb87bf5b92f48deaff4d8b
+EBUILD sip-4.19.18.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index cbfa17402c9d..ca5070f83ecf 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.18.ebuild b/dev-python/sip/sip-4.19.18.ebuild
new file mode 100644
index 000000000000..cbfa17402c9d
--- /dev/null
+++ b/dev-python/sip/sip-4.19.18.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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
+}