gentoo resync : 31.12.2018

3 files changed, 14 insertions, 33 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 8506158821f5..75372eb2513a 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,7 +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.14.dev1812231555.tar.gz 1020224 BLAKE2B e3df5a8b7829278987c5b368b8b6c28c04fc0b3bb3847451e48411ef9ba5cda932007613ad31f34381446ea02d62281b27ae4951babca5ec8b75f065aa296365 SHA512 decf2f7baacede27c42d359eb875a895c9a92b36a8e8a29f4666b3f98f570d821e80dbb32fd946ce230f726fafc4000af9b167df8cfd188bcd7f85fbc71bd4b1
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.13.ebuild 2862 BLAKE2B 75d9a395c0dc7af9816c5952f6c3ba686c5cff2805452169de03509b9fc266fbff1f531ca5fb8a53bee0902d1810175fbf75c590aeb0b514154f883857f06f0d SHA512 1fc425205511259a8d71a9674b75b5d3478044e3a8255fe13d8a1dfcd4a0f33fed13e1c5414438c4867a6d40e566f4545022a58ab80f748151a06adab7ce90bf
+EBUILD sip-4.19.13.ebuild 2858 BLAKE2B a9f0cd4edc7e2a9e287a0b7762985ee21dfad17eca813cc12c5266cbe0ac9be01aac63676952048552202d76faf6e49f9a2b77b2b88c8868be0d48c5b6a2f292 SHA512 be40e5200dba5920ef234363cfa01728652228bb23e4e9715691a7faf55026b142a7d29f39bb7a549fa1c56812cb21832be2d2986fecc7a97577c4e706fd71cb
+EBUILD sip-4.19.14_pre1812231555.ebuild 2360 BLAKE2B 8d00c681dc40c1e28100c798bb6f25117d6875914bfcdb347d5c4f6a1ec372e99520680ae8059a07fceb247018ae60143d7e1980920d0d13a0614953479fa355 SHA512 1ede6d67eb419644ee2af81766f071d2651ffab06f6e0c1ae8c0c67e7ee2632609e83b07f0ea513787032b1a0f23eb596242ca09aec24f9b43d452c2f766ccf4
 EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
-EBUILD sip-4.9999.ebuild 2734 BLAKE2B b2a2544bde99d02ee2a8d4381969c602338debbee3f1763d4be5f688a0c0a84e981e641e04292765d4338753c826b64f62057680ebeba13a227b1beb361429e2 SHA512 a58f2ff74967dd2eb605d3e99ff0418e419626612fc4d4da18dbdf211f92050dffabdde949aa5b78807efb51ce3c9d33fb9c2da1ac8b2a2f30b3a20f6ba713eb
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index 3313a4fac4da..4dc04120bc73 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -24,7 +24,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="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
index 4df03eb6f4e8..294e56df9f49 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
@@ -1,57 +1,37 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{4,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"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
+MY_P=${P/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
 	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"
+	SRC_URI="mirror://sourceforge/pyqt/${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=""
+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
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
 
 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 || die)