gentoo resync : 31.10.2017

3 files changed, 52 insertions, 45 deletions

diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index e05e1a8b3343..4d071fa520c6 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,10 +1,10 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 SHA256 0c22a6b14ae58031a6454fb41e5966c238ef109cedacfd535fc796109c85280d SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4 WHIRLPOOL 022c20f5b10edf34bf9706e6e6e1e1824cdfcd0c1c477a64f95881f1154070652ff7a11961dc244e751d861b24af91ea476d846946c69c3794dd51a7674bee20
 DIST dulwich-0.17.3.tar.gz 311704 SHA256 0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca SHA512 1cc7950d53b8d8bb98f9206e1ced74857f756d4355813ddb2463cef855419ac57ae411e422e500b736c3e577f71da70d675d1f172140d4cc0645d3d5ab9e6e32 WHIRLPOOL c094224fd8c8f135114a7a91f4bbf509f7c28c24d3cdf8e6af25f8ccbbab6fb1bbe39fae1594429844746f6e006f4a63b9536fa84ecd3d617c6c6f5a2a2d5fe2
 DIST dulwich-0.18.3.tar.gz 328891 SHA256 d34c2628f89a5ac632fa462b2edd5afcfbf512793cfa14452d4c52f786962a8a SHA512 c89ae096407b59b37c2c36e7a429f2162950a0ee93f0ac619ea74c7ce48231ad9af097203dc8d9e2cd59bf1962f9c13325de61e9988c402fd3e212aacd910898 WHIRLPOOL 6d7aa5dd97fbc61d4248dc44626375ff465b132ae7c4ef8b60a473f138e53beb909e23e7a2fa2307a8bf44a8df52ff87f8958a41830ba16783918494d1668e01
-DIST dulwich-0.9.9.tar.gz 270127 SHA256 084e762c8d4d0c0002823249db57b8e735c99c409dacc2849565dd3c0c288496 SHA512 5039e8e80c51b8ee0df2ba0805fa63d9b476a05c86b6bd9eaf9348ac03a83f0f1208e259ae6bcf40fb2c94ffb57c9b45bff852e367b8bee95c10e672d3dc19d5 WHIRLPOOL 2a79d25f1233d9a6a242d064af179486810555eb3c9803c336ae152095318a32eb8588779cb07f84b073a05bf7f083ba3b3d4c8d2b4f8929b2aa3d01c29a0a01
+DIST dulwich-0.18.5.tar.gz 330097 SHA256 838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0 SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035 WHIRLPOOL 7ab826c3d294ca17500de5beeb18e70cd912d468361e9972800ffd54768751d84c9f26e99871e2ba760a91d78397db786f0db7a2c3d16f4c301f8961138b3566
 EBUILD dulwich-0.17.3.ebuild 1092 SHA256 e9b94ee590481f98b70098de750ea8a0836a1c7fa01b461722f474c30ce74ddd SHA512 939f40f9ad38434cc478523124f95d962bcaee47d61d96b29e061dd21322e5c153cbe5113b2edf7d5246f6b4304b1525972e4dd540ad08dac05f7fc2cdce019e WHIRLPOOL e4558d89d2e7168946fa03825556fa2d4e98342a05f422d79ffb05a6f2b5691cd9435927f173d8d2a41fbe59e70c577943bc8612fce8df6a1f461f3d5536c7e9
 EBUILD dulwich-0.18.3.ebuild 1317 SHA256 79ed3c2a37021a04101c82144cfeb6758eb5464435755d5e5f51e0e7e173025a SHA512 d950082e949531b0b147583c21ed64a830cf3af169aabf124e95e14ba79df263f654c84cb1f2baea2b0737e34efc71146169d52e6c79dfbd3bf845bed1623d11 WHIRLPOOL 3f390b430dbc5b94a4c7ddf325b51f12cf5cbafab7ba9309bc594bbdcf5ac6d822d2169ec8f7541936d7d8dead7573ca924d353b40a18bf400de45fbeb19ba63
-EBUILD dulwich-0.9.9.ebuild 1152 SHA256 3c18382d162513aa30640c0f1f99493e36fb7e5cc2297c4b934efceee867919b SHA512 d89285b81edf0d4203d021d436e6cf6b663609d358defa237f385cd5fca794a1a796ed377306725841af63050e143b04e06f47f175c4faf1de5b1659d89e1ab7 WHIRLPOOL 880822cc63b82297285b110a897bac9d662b13db8ee57e820419dc6225b98f430c3b3257fbc2ec961c2f4aa09ebffb8d769ead7643784c7ddfde410998872307
+EBUILD dulwich-0.18.5.ebuild 1325 SHA256 5ff069d37216fc2aef7be7ffb261c54c88e62c1fbad85a8ed583d1c42783df09 SHA512 9b51e78a490ecb8720580ded874c03894fafb581333c85786bed30742dc9d3938819d72ee29442af8ddc86b44c35b871044841d3694716673c9b350d7297f72b WHIRLPOOL 12d24f3ebb26581ec5afe9ade9725a1718a7e4535a71c850a5805ad212116fcb77d4ef30b7d83eab30b878024abfccce8c5c426c0c9bf78815ed9ac24ff6ea5e
 MISC ChangeLog 5566 SHA256 456fe5a3fe54213a797a8719b7bd05269e501dae63561ffc72d8dfdf59a59e52 SHA512 211a71ba199cfbf8747c91115e3238f0d8fe68d9b771aa021918d1a84681e7d0b069fbf010451690fb98f3e295eac8deb4ba515586d143a39a16e18d80e88186 WHIRLPOOL ec2aa403a347a077e8df0c6c9906174871f15895f21388d853801a3083ed81bcee2c182c873d7742ad23b4db30d07a85c109ffda4f2a832133882f72e35bb60f
 MISC ChangeLog-2015 11626 SHA256 8a382497fec7ddea5941387fdd95109637f5907f6bac863f71d1491cc0522704 SHA512 ce06bf2988c44d4792625fdc8005e8ddd965cb24ddc8675ea16cc508879e3ab509d097376bce072480aa615ae1828c0171ea3b6d56f3f904bda16a328615e4df WHIRLPOOL ac50f0042c1d1e69009548ce47309daddf6ffe35243d1f2a409ed94d689a35e80fccd1529af1a93b039553c741dbcd4a21865a82d07d0c6d5b803c366425d9a2
 MISC metadata.xml 555 SHA256 b06e339e494957dad20ecd074e962e13d549cf2aa143b2b7a625a602a4cae2e0 SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353 WHIRLPOOL 3ec89f1f7eb465e8a53d09b7e53e7037fb2f542ae805fb99bf0be77aaab819d623fbc36b1acc87f45215463b547585978c60e1b50c8091163441b37f91cf25b4
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
new file mode 100644
index 000000000000..2a3bf41392d3
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.18.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# One test sometimes fails
+# https://github.com/jelmer/dulwich/issues/541
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake check
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/dulwich-0.9.9.ebuild b/dev-python/dulwich/dulwich-0.9.9.ebuild
deleted file mode 100644
index 6aa147ef4093..000000000000
--- a/dev-python/dulwich/dulwich-0.9.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/gevent[$(python_gen_usedep python2_7)] )"
-RDEPEND=""
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# https://github.com/jelmer/dulwich/issues/196
-	if [[ "${EPYTHON}" == pypy ]]; then
-		"${PYTHON}" -m unittest dulwich.tests.test_suite || die "Tests failed under pypy"
-	else
-		emake check
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}