gentoo resync : 26.12.2017

3 files changed, 72 insertions, 7 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index ffc69cbd1a47..97d6926276c0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -19,6 +19,7 @@ EBUILD botocore-1.5.90.ebuild 1344 BLAKE2B d7760bdbaac7915c853133c85683d73585d5e
 EBUILD botocore-1.5.95.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
 EBUILD botocore-1.6.8.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
 EBUILD botocore-1.7.39.ebuild 1345 BLAKE2B d998d760c2b3bf74346c57f8721344d0cd7cf51ad6f4ec64abc6dc282b3c6a17e7b31dc316cc5509b0b98ae7839d451e0d9de8ef339aee2cb1d60778983af7f4 SHA512 43430d411dae64b9bf389d464253ee13928f01784125ca5524db5614627c4ffa24b459234d11e09f8004f082196fff6e95c67213c4fa89a61d7e9e56dc66a863
-EBUILD botocore-1.8.20.ebuild 1569 BLAKE2B 2d0607b52aaf52b0d3f7d3e558864eb149383e0811ce7c1c1ae7380a311c6897028be44a8b39d14522476ba516c5854d0ef8b86c28bb946389d3902d94bd2c38 SHA512 536139e0b494ea55a1bb85605209a2f806daabcf8050ba03087f9f631469e2bc4f9c168ff0762b7b3c3be3012244dd7c74986ee57a795fa25b8a16cef5e36153
+EBUILD botocore-1.8.20.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
 EBUILD botocore-1.8.6.ebuild 1569 BLAKE2B 2d0607b52aaf52b0d3f7d3e558864eb149383e0811ce7c1c1ae7380a311c6897028be44a8b39d14522476ba516c5854d0ef8b86c28bb946389d3902d94bd2c38 SHA512 536139e0b494ea55a1bb85605209a2f806daabcf8050ba03087f9f631469e2bc4f9c168ff0762b7b3c3be3012244dd7c74986ee57a795fa25b8a16cef5e36153
+EBUILD botocore-9999.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
 MISC metadata.xml 482 BLAKE2B 32f49cb53c6116989ba95b90ce5e6967b870e6fbce0125597f81a97d119b0d0206458e9683f3714f8708bad8b8e3a17bdfae49ed737ce9e8ddab37cedb19ad74 SHA512 bd927bf8ede2a9746b2d91f84e98d9678641662a23a7d43fbc804b4b54fe4adde8efe742d129cbc35e7d33f05dbc5e66d9d03b4268b11902c74aff8be6da9a59
diff --git a/dev-python/botocore/botocore-1.8.20.ebuild b/dev-python/botocore/botocore-1.8.20.ebuild
index 08b1d49616cb..7f976cb95e55 100644
--- a/dev-python/botocore/botocore-1.8.20.ebuild
+++ b/dev-python/botocore/botocore-1.8.20.ebuild
@@ -8,14 +8,19 @@ inherit distutils-r1
 
 DESCRIPTION="Low-level, data-driven core of boto 3."
 HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
-CDEPEND="
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
 	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
@@ -31,12 +36,11 @@ DEPEND="
 		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
 	)
 	test? (
-		${CDEPEND}
+		${RDEPEND}
 		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
-RDEPEND="${CDEPEND}"
 
 PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
 
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
new file mode 100644
index 000000000000..7f976cb95e55
--- /dev/null
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}