gentoo resync : 12.11.2017

3 files changed, 61 insertions, 22 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 5a0baa32a0c7..149da2a1afbb 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,11 +1,11 @@
 AUX sip-4.18-darwin.patch 1187 SHA256 a4ef0943e992b6313368805f093ffff261697887acae39d4e33a7bfa02c40174 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e WHIRLPOOL 834ef3eb9b75dc887b684ec2b3537668617f183b456b522e2d7a401b2547a4c041d7ebc6201fe6f82b97ae20a3b02bc8539d934f1c8cd28edfe05b4db4fcea79
 DIST sip-4.19.1.tar.gz 1000644 SHA256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf WHIRLPOOL 87deee5786ca5009ca139bf6993e82231b1dd5be9bf7ee1d94eb5c8aabf5bda980f6b0fa4571e838275ac7cd8615757a58d0b9d7e776705834db35a1dc92125d
-DIST sip-4.19.2.tar.gz 1000746 SHA256 432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 SHA512 6f14f387a899130cf15820d2b58d937d134a2eefd53c65a82af060e88a6ca039442b21f822880c4a3742d6f26328853a552239873c55d7b22de62a6cc5037b3e WHIRLPOOL e6a59dfde801b38c5ab2524e8142cf5f87edcd8171512241f88096bdfc43734cc0346d2d6a607ea2a14a41b7f05c820af30aa0b125a3f06be263d65b99c7b239
 DIST sip-4.19.3.tar.gz 1007481 SHA256 740df844f80cc45dcc9b23294a92492923bc403ce88e68c35783f27c177c4b74 SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc WHIRLPOOL 6283491e6baf6b7806a9fd68e77463983c475f7ea721832e573dc86158e226428d5bd9da084a554180ac4308ccf23d98f4c51f9af11fcfb5ecda8bf4dee028f7
+DIST sip-4.19.6.dev1711101252.tar.gz 999851 SHA256 f4152acde96c4cff72cab53004023c40139390a159188e0861ec666c94418d13 SHA512 87478433fb5a093f0f48465455eb731a90ab660d8d9b08f72071cdbe645220f5b923301214d524de90394dd55166e017a66427bed0fcc8731a08866e494c15d5 WHIRLPOOL 793e5a4515af673bc85cfcf11fb19a37f926237b7432c701f6b32f2dfd6a203e4f11f3362f401eb583ffc72e028144c441e79b261274c09705bca5ad07f2baeb
 EBUILD sip-4.19.1.ebuild 2113 SHA256 0fd02f37c4e77038a4027e635ef5cf5aba5512e15696cbd13660114070e204f5 SHA512 ce4a55289b9b1b53d2c48803e4b9ff013fe8c9fc577af73000aa6d39b1bbb0fd5f83d808743d44a86949183d2621bfc7d8ac072eb7ffd341971ad8aae4eef1aa WHIRLPOOL a46fafce6d3758c74d30f1f802efa72a1cfef14d48058ada3bdbf8a6fd53ef673322f5088ebbb09086dd046e03012fa71d304c66c12b2fc777a98fff8730d52a
-EBUILD sip-4.19.2.ebuild 2128 SHA256 0643be8db6bf2685aa02f85628d29de925251d390bc976a51f97c35ce8004121 SHA512 fd5bfc20f613f79a9a57d3cc138864a70cb3c333a719adc7705e854d9bb3354eadc47f341b2246f36ae93ef0203ae45039f88b3d9f795a5ce5ff262b8653ff5c WHIRLPOOL ddcf098b12e490302b0ac55dea40230646f6b66ad44e338a3adcd8fee908922a3255aa01debf730341c428129fdacab635e3caaff3f08b302ccdb39808b7afc6
 EBUILD sip-4.19.3.ebuild 2128 SHA256 0643be8db6bf2685aa02f85628d29de925251d390bc976a51f97c35ce8004121 SHA512 fd5bfc20f613f79a9a57d3cc138864a70cb3c333a719adc7705e854d9bb3354eadc47f341b2246f36ae93ef0203ae45039f88b3d9f795a5ce5ff262b8653ff5c WHIRLPOOL ddcf098b12e490302b0ac55dea40230646f6b66ad44e338a3adcd8fee908922a3255aa01debf730341c428129fdacab635e3caaff3f08b302ccdb39808b7afc6
-EBUILD sip-4.9999.ebuild 2275 SHA256 283f411de6357a250a7d3685a20a9159e629408a134e0ff4f5ef7719e0c7b121 SHA512 6f682b3254e4abf899d0d8ff02f6b32676771171170aed2562ce6de2224261839c992681b6f561040308f622d2a9198c036465f1ad0149851a79c38d41f0b9e8 WHIRLPOOL c11d4ef865da8c6c253981655fdbb380e2bb51b617de2744a1825b528ec5acaebe0deeca5dd6df98527b65b5994d20e81c89e1350f7d1710be97e4400073ac8d
+EBUILD sip-4.19.6_pre1711101252.ebuild 2776 SHA256 41dc3f17cb79274ab607f523215c818441f2c1999227e94a4b29199b3841083a SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff WHIRLPOOL 1d86da2de6d937b5d12e155288186d152ccdd692f8fecf45066e73eb270f43c1fd2901ec07154b05dc74e3ece30e820809d3ddd0cc8f3eabbaeb66d0caaee7ad
+EBUILD sip-4.9999.ebuild 2648 SHA256 dd36b3cfd801da5090013ee7b15855208f023f2ab5246556084f402609bb4ea9 SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7 WHIRLPOOL 28f4fdc54fbcece6805d53ddb5e1270e6e7a9f2e4ebf5bd7c643ee6e860ea80f2a301f3e7cfc16839079986406467de82a46943560640c79f3f165b38b03d1b7
 MISC ChangeLog 6672 SHA256 6456ef04eb08319575ff464d5a2836c75ea7f7e7efadbbdb9c349f06dc4d6c4a SHA512 220d43de36be4829a2dfa23b7239cc68070d0033c9bef9444890c5b3d51f685a8fb54949e2eff61fe85742cc95d32b57ea11ef99162351783a588da668eddd2c WHIRLPOOL ee02f69254fd24504598b76fa0506e3998857f8eb5a7d238718a703759a999742d70226cb02c281457c45f633bc10c90cba1bd7ea65d4dae58dae78757055bda
 MISC ChangeLog-2015 37462 SHA256 4472562d9fb77fa3bd61325e5e038b7d155b9854c055efe54460cbd70e50204f SHA512 d73800b8fc3e163f77b895284eea54b07b6eb17a8494d3bb9d2c0da223815b372382e7b7238544421ddab6a8d999c6dc2e91c8be672519142c426bcbdce58d28 WHIRLPOOL 24b6a8684791c6faed989cd4f46042c57231a2ffe0bf226059c9c87506337c80b11cc8f7dd0aedaab1dd3f877cb85572f7606d6210a1094bf11ce3b42e2719a3
 MISC metadata.xml 593 SHA256 dc36f709f65a14b880b37ba425adcf21670e319b130c2e33cadba4935b18fa6d SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5 WHIRLPOOL 51ef4d0340bd324a2364c5f70b6822c512204dd658ff89b9ba53ff49434bf08d294a3853f8e5dd50ceedf1f1c1662e3899bba5a951c1b7743b18d616f5f391ab
diff --git a/dev-python/sip/sip-4.19.2.ebuild b/dev-python/sip/sip-4.19.6_pre1711101252.ebuild
index de3979095c5c..8782d5f10654 100644
--- a/dev-python/sip/sip-4.19.2.ebuild
+++ b/dev-python/sip/sip-4.19.6_pre1711101252.ebuild
@@ -9,7 +9,17 @@ inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+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"
@@ -19,14 +29,29 @@ 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}
-"
+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)
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 04bf7478ce7f..8605ad96cf08 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -5,11 +5,21 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-inherit python-r1 toolchain-funcs mercurial
+inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
+
+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"
@@ -18,24 +28,28 @@ KEYWORDS=""
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
+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}
-	|| ( $(python_gen_useflags 'python2*') )
-"
+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() {
-	python_setup 'python2*'
-	"${PYTHON}" build.py prepare || die
-	if use doc; then
-		"${PYTHON}" build.py doc || die
+	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