gentoo resync : 16.02.1018

4 files changed, 10 insertions, 130 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d7757d990d95..857696825a73 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,8 +1,6 @@
 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.14.dev1812231555.tar.gz 1020224 BLAKE2B e3df5a8b7829278987c5b368b8b6c28c04fc0b3bb3847451e48411ef9ba5cda932007613ad31f34381446ea02d62281b27ae4951babca5ec8b75f065aa296365 SHA512 decf2f7baacede27c42d359eb875a895c9a92b36a8e8a29f4666b3f98f570d821e80dbb32fd946ce230f726fafc4000af9b167df8cfd188bcd7f85fbc71bd4b1
-DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
+DIST sip-4.19.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
 EBUILD sip-4.19.13.ebuild 2856 BLAKE2B 992b5ea525fd276db4ddeda3b067bafcedd4a603b869c5a847951d6c70050015f78371c66bd60589f5d13411ae35b62cc9cc90d5d82f69a25fb9f5479a76ac71 SHA512 4e75fd5bdad8200a6ffe53de8163cd03cb66a72a22c517dffcaff160b371af8cebdfdd81acb6451c7b0e1697c060adaa6488689f82a6364a97110eddbdd18951
-EBUILD sip-4.19.14_pre1812231555.ebuild 2428 BLAKE2B 4c90ed65cda608b72309fa750ed40b9caef6be7e1fd45dc015f1c141491b962dd2c3d03c62be727bd49adddc2787a1ba4a09cacabb8e84c9f10aed1d3a3fc84c SHA512 97f55007a9bb8b11271a836a0267a24f906e0a87af0b4a2515d6726e6c0270e5ebf996c4a4ee7b2023a8cf1b61d19de67dd2e548fe209835cee725e781a6dfd6
-EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
-MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
+EBUILD sip-4.19.14.ebuild 2428 BLAKE2B 9caeca45fcbd171794a03ad6dcbaba07fd187a3ccfb5f2120c97ba7ea8e6b1cf0d8e676902dd933c1582bd32d7105da27b598dbb86d67e04859e711b743e8a9d SHA512 43befcfad315a2f2d642ae587fe44e8a646bf528baa58b34873509a249d4459d38df905cf0126adb0cc67a64ab262b0ca4f933822ef3f8692451980a063a73a8
+MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index 9b8cb511f250..bac1beb353f3 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -10,9 +10,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/sip/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/sip4/</doc>
 		<remote-id type="pypi">SIP</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sip/sip-4.19.14_pre1812231555.ebuild b/dev-python/sip/sip-4.19.14.ebuild
index 47ab306936cb..e694b38a121f 100644
--- a/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
+++ b/dev-python/sip/sip-4.19.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,18 +9,18 @@ inherit python-r1 toolchain-funcs
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
-MY_P=${P/_pre/.dev}
+MY_P=sip-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${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="debug doc"
+IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -49,12 +49,11 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		local incdir=$(python_get_includedir)
-
 		if ! python_is_python3; then
 			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
 		fi
 
+		local incdir=$(python_get_includedir)
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
@@ -62,7 +61,6 @@ src_configure() {
 			--bindir="${EPREFIX}/usr/bin"
 			--destdir="$(python_get_sitedir)"
 			--incdir="${incdir#${SYSROOT}}"
-			$(usex debug --debug '')
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
 			CFLAGS="${CFLAGS}"
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
deleted file mode 100644
index bd65f8202bbf..000000000000
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-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="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
-	DEPEND+="
-		sys-devel/bison
-		sys-devel/flex
-		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
-	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
-	# 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.in)
-	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
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			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
-}