gentoo resync : 02.08.2019

3 files changed, 57 insertions, 51 deletions

diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 0240a12ea60f..b32b7ac076d4 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
 DIST rst.linker-1.10.tar.gz 8820 BLAKE2B 3615353dcce16652aa3528985997467e1501161b012fad44203fd98cc5e91dc32acf6c8492f0797ae748a87c008e5f3437833b435c5cbd85845340b91665e664 SHA512 5541d0ba5299a6efee444ed3c4fb4f108bcdd7c84e4be0b0a44f71c9f13e18d5b5c4c38328a542fe5666d435e1e04c35c0db5535706a45932dc01590813a85cc
-DIST rst.linker-1.7.tar.gz 6798 BLAKE2B d4d5129bd79534cbc58f287a60876153325cde3142b3e516e3a75f22827f78c85edbd8eb2777263e6bf3c04f6ebabc78441647df3ed23950982ebd7ebe156632 SHA512 380cd1b36a1153a6512144b7c83be75dfa95ce397437d34cb76c4c41de6266c77cf1f811f4fb0576838e10bd78e1f46394df11b0f7dc5e3fafeef36b6e8c9ba0
+DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 EBUILD rst-linker-1.10.ebuild 1450 BLAKE2B 2a35ac52674c3e3c05de9d613f4ba6de62325375122572674dde7ed97350f295286bee3d7e05f65d78c55e88835d944775cc350aa9c3a439f4816ba1b9bddec5 SHA512 4da5bfdf262e26a657898e89383cecaf8e4d3edd8af05cb7017f170fb71c620cbc84cb42d801efcf6adfc3176760ca8e18fb6ee700af40684ddf7118c530cea1
-EBUILD rst-linker-1.7.ebuild 1193 BLAKE2B 253a1f658600b89f25238b5d6fb2b58e95586cd633755dd3a5e31efd611c045391a02cd072d4c61baca6540e54566340e90179c45d36651f262782b5282031cd SHA512 75df4d18c2d98986d40abee47119ba0ea82341c4bcf6aa2cd7c769ef29614256e0e47d297b5d055b9dac43a7e48b1392728fd8e3d7d0a9fea63f1654a0663891
+EBUILD rst-linker-1.11.ebuild 1499 BLAKE2B 2af78fa80d34372e6c96d88d5b8ffe460635e99bfd908a856701858dd4d5bd9b6b4cae16691947f7c56810c0318c823c0b940e00580ddc52eb20330c3411b165 SHA512 58ed8fd14467a1b6359cb72aa240b3de97aee76d45fdf4b028cde19c418abf2c50cbd616ce6961b0f6ee2749b5b142aa19d9daccfbe760b07b41100018ac1e3a
 EBUILD rst-linker-1.9-r1.ebuild 1384 BLAKE2B 91b5b4ebcb375c07c021d7c3aff1c2f3c50fc180aa9917004ca4fbbe9b8addbabb50bd425d6e2fbcad2aa2691953d600545bbd21bb5a45e4e3fc10d159324f42 SHA512 217ca0094dbc59fa4d7e84050ba69a5b7b0f3c78f27ba06f476e308911c72b27bd2abe8d8eb0b8db0fd8aae147950eb32d4d7acbf7523b96e2501e74593e3df9
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
new file mode 100644
index 000000000000..e49b066b8218
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/path-py[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
+	# Otherwise, ImportMismatchError may occur
+	# https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
+	# Override pytest options to skip flake8
+	py.test -v --ignore=rst --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rst-linker/rst-linker-1.7.ebuild b/dev-python/rst-linker/rst-linker-1.7.ebuild
deleted file mode 100644
index ebac84504507..000000000000
--- a/dev-python/rst-linker/rst-linker-1.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	py.test --ignore=rst || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}