gentoo resync : 18.05.2019

6 files changed, 20 insertions, 195 deletions

diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 63ab50c3acbb..68b462ca2326 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,14 +1,9 @@
-AUX setuptools_scm-3.1.0-test-failures.patch 4040 BLAKE2B c256db00c9e98623d5274a1815cc86abef6c42fd501bf58675a1982ded7305500777595ff8df3099d5ac1608f987d3a415a3aa964178a6946b11ead720f4ddf8 SHA512 e8901a796dd54ae51d11dfb47f389d098d68adc6551789bb893034c6e264d91c9fc8af1f9f2b394d229051f2fda25f79e81b95734d93b7083dc2c6914c218d65
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
-DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13
-DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185f98b735451c03651b875051e514eab287b20ee382a9576841b6f1283b9d1bf3dcbd0aabc41d2f1143cf960b856c8492 SHA512 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8
-DIST setuptools_scm-3.1.0.tar.gz 35585 BLAKE2B 7ecbdf325467cb3e5217150c548b99603e1bb851a3bc8c694acf3aeb0da798ec853d13b29ad0537bdf5c1010834576786e0dde3965d61991554a12cf206ba7e0 SHA512 bd84bb02900ddc7de2f02dd7cb62bafdea7040ebdc2506b72d05f2c6a6d16be903321e576f63a04f2aa13d8c75b1834dec7d9ea8444e8330281f8e586a3d6426
 DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
+DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1354 BLAKE2B 3edb6f41ae5e11e6eafce2795b49776206340b1f8c637cd33a661a21c41c3fb1acf9d50c6e502e9630d29287fe83b53a022ba909795d25d39e41d52708545dfa SHA512 e43291aa02e92328970431c641492e46b40b9c0619384c4acd15d8bb1ed6368a54b774049ffca2dbd6ce56abe1f0440e4f6e22d5ccc959644864928c41d18b12
 EBUILD setuptools_scm-1.15.7.ebuild 1478 BLAKE2B 06655a6e5a4337ba5bc488d0e4751fde18fc8b130b83f06813452e2a929e4ec4b5283e81fb2a8d16f0697cafb0b7be4c1664fdfcfdb0f967f1a6c000bfe88d04 SHA512 226ffc6926f636a954eddbe8833cb4c41124c0ea880849047f080bb04b4dd25a77fc6dbc1263ea58b8894f82d529dca7af30f646378caee51e02dd282874e8c0
-EBUILD setuptools_scm-1.16.1.ebuild 1367 BLAKE2B d7d05d6b6d6fb9825bb3d1c4fb3b43ebbb236f39fbaf90dd8573cc751cb87f08d53b071471c1bed767112d8bbd4b14f3d934a6a285053e31fddc8a68f37ce188 SHA512 4b3e4a135cd4de0f2dd57865f4bbdb5a014fe9390da7b559d8122589ee78ede0390516f8d8e7c9e22f0666d82b2112cd748e2f41f61a8c2bba4d942d9538b5f7
-EBUILD setuptools_scm-2.1.0.ebuild 1068 BLAKE2B 17848c18da1ec9149a74bec35988a319a75d6462287ed47e3226f27f0c8c237d4657e71662e1079c5a2c3cee29caa9025ad7e0a17e74e01210d12de7680fb223 SHA512 8b81de2dac351eadfd2cb7adca0ba7184da2c154ab4371d2a30889d5bf4794d974f55939320e7baba3d27082ca7397c8c36e2205db32bafaf93d1a4af702ffbe
-EBUILD setuptools_scm-3.1.0.ebuild 1173 BLAKE2B 74d8b7a2530742d43f988d323f45262ef92c517cd94a04b4ab03b5428bfab83d607b69c932717e7aa4b71fd5c455226127e6cecd9705fbc643699a3625a58c1a SHA512 c595337f6c5a0a594b68072ba1002058de8571d47bf7230575ce3d40fa2ba0ecb78fb0e4eb0aacf5cbfc1b0f60a65c0999911b55a1794cbc403c57df6065aec8
-EBUILD setuptools_scm-3.2.0.ebuild 1095 BLAKE2B d58557a09375e07e05b31b4ed9db0580f971c55d0928a86dac5ed794cfcfffb944a40ecdbfc38276741e4f3e86950b32aceb93e8401c230d8ed773871f24b325 SHA512 50bd2f74c4df8c5d5f572878dcdbe550dbea5e5e277be9052f59b95f4f35b74a0b200d27bb727e6069d6337e83f0b2080b3d398d1808094f93cc53a968eab808
+EBUILD setuptools_scm-3.2.0.ebuild 1315 BLAKE2B 567b3673ce8d21436cfc24eab1ec351cc2d0686cec0d109c86b7542137fc647ff8ee834458f95b0ccd3874e83ce6e11ccbb8b737d745d516d0963259debcb15f SHA512 aeaf940ddefdaf28f713c43e5e3c0e9fad9b9cdcbce5fb741008165fdbe5a4bcd825f69f923f9d02ff277013df829be6441c2ee9d1893b25be2cfea5a4fafcc2
+EBUILD setuptools_scm-3.3.1.ebuild 1318 BLAKE2B 5e628c70571b727c27ae06c1537fcf890d06a24ad5998077c095bdc3ca41ce9a5e123f4a5e31908b11aa688167ac95dec0fae5ae38d34d44eed4b76b0ef321be SHA512 b608962363a546fdd2db76f688449bc2dc407b5cbcc5287adaeeee7842590c388c6e79af3f1273e254c823b7aee8acd646b244ad480f837cdd57c786a83cae9f
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch
deleted file mode 100644
index 420bd6828b42..000000000000
--- a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/src/setuptools_scm/hg.py b/src/setuptools_scm/hg.py
-index 972f493..8fedd68 100644
---- a/src/setuptools_scm/hg.py
-+++ b/src/setuptools_scm/hg.py
-@@ -13,7 +13,7 @@ def _hg_tagdist_normalize_tagcommit(config, tag, dist, node, branch):
-         "(branch(.)"  # look for revisions in this branch only
-         " and tag({tag!r})::."  # after the last tag
-         # ignore commits that only modify .hgtags and nothing else:
--        " and (merge() or file('re:^(?!\.hgtags).*$'))"
-+        " and (merge() or file('re:^(?!\\.hgtags).*$'))"
-         " and not tag({tag!r}))"  # ignore the tagged commit itself
-     ).format(
-         tag=tag
-@@ -70,7 +70,9 @@ def parse(root, config=None):
- 
- def get_latest_normalizable_tag(root):
-     # Gets all tags containing a '.' (see #229) from oldest to newest
--    cmd = ["hg", "log", "-r", "ancestors(.) and tag('re:\.')", "--template", "{tags}\n"]
-+    cmd = [
-+        "hg", "log", "-r", "ancestors(.) and tag('re:\\.')", "--template", "{tags}\n"
-+    ]
-     outlines = do(cmd, root).split()
-     if not outlines:
-         return "null"
-diff --git a/testing/test_functions.py b/testing/test_functions.py
-index 14d8961..c3d78b6 100644
---- a/testing/test_functions.py
-+++ b/testing/test_functions.py
-@@ -8,6 +8,8 @@ from setuptools_scm.version import (
-     format_version,
-     tag_to_version,
- )
-+
-+from setuptools_scm.config import Configuration
- from setuptools_scm.utils import has_command
- 
- PY3 = sys.version_info > (2,)
-@@ -33,12 +35,14 @@ def test_next_tag(tag, expected):
-     assert guess_next_version(version) == expected
- 
- 
-+c = Configuration()
-+
- VERSIONS = {
--    "exact": meta("1.1", distance=None, dirty=False),
--    "zerodistance": meta("1.1", distance=0, dirty=False),
--    "dirty": meta("1.1", distance=None, dirty=True),
--    "distance": meta("1.1", distance=3, dirty=False),
--    "distancedirty": meta("1.1", distance=3, dirty=True),
-+    "exact": meta("1.1", distance=None, dirty=False, config=c),
-+    "zerodistance": meta("1.1", distance=0, dirty=False, config=c),
-+    "dirty": meta("1.1", distance=None, dirty=True, config=c),
-+    "distance": meta("1.1", distance=3, dirty=False, config=c),
-+    "distancedirty": meta("1.1", distance=3, dirty=True, config=c),
- }
- 
- 
-diff --git a/testing/test_version.py b/testing/test_version.py
-index be940ef..a287a0d 100644
---- a/testing/test_version.py
-+++ b/testing/test_version.py
-@@ -3,33 +3,36 @@ from setuptools_scm.config import Configuration
- from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions
- 
- 
-+c = Configuration()
-+
-+
- @pytest.mark.parametrize(
-     "version, expected_next",
-     [
--        pytest.param(meta("1.0.0"), "1.0.0", id="exact"),
--        pytest.param(meta("1.0"), "1.0.0", id="short_tag"),
-+        pytest.param(meta("1.0.0", config=c), "1.0.0", id="exact"),
-+        pytest.param(meta("1.0", config=c), "1.0.0", id="short_tag"),
-         pytest.param(
--            meta("1.0.0", distance=2, branch="default"),
-+            meta("1.0.0", distance=2, branch="default", config=c),
-             "1.0.1.dev2",
-             id="normal_branch",
-         ),
-         pytest.param(
--            meta("1.0", distance=2, branch="default"),
-+            meta("1.0", distance=2, branch="default", config=c),
-             "1.0.1.dev2",
-             id="normal_branch_short_tag",
-         ),
-         pytest.param(
--            meta("1.0.0", distance=2, branch="feature"),
-+            meta("1.0.0", distance=2, branch="feature", config=c),
-             "1.1.0.dev2",
-             id="feature_branch",
-         ),
-         pytest.param(
--            meta("1.0", distance=2, branch="feature"),
-+            meta("1.0", distance=2, branch="feature", config=c),
-             "1.1.0.dev2",
-             id="feature_branch_short_tag",
-         ),
-         pytest.param(
--            meta("1.0.0", distance=2, branch="features/test"),
-+            meta("1.0.0", distance=2, branch="features/test", config=c),
-             "1.1.0.dev2",
-             id="feature_in_branch",
-         ),
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
deleted file mode 100644
index dd01bd8e1182..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="git mercurial test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x -k testing/test_basic_api.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_functions.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_main.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_regressions.py || die "tests failed under ${EPYTHON}"
-	if use git; then
-		py.test -v -v -x -k testing/test_git.py || die "tests failed under ${EPYTHON}"
-	fi
-	if use mercurial; then
-		py.test -v -v -x -k testing/test_mercurial.py || die "tests failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
deleted file mode 100644
index 290e271e0500..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 7ea05108202a..1bf03fdf621c 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,11 +29,18 @@ python_prepare_all() {
 	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
 	# all fetch specific setuptools versions
 	rm testing/test_setuptools_support.py || die
+	# remove self-dependency
+	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
+		-e "/__main__/i del sys.path[0]" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	distutils_install_for_testing
+	PYTHONPATH= distutils_install_for_testing
 	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+	PYTHONPATH= distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
index 46e4533a38d2..bd949c207fb6 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
@@ -25,19 +25,22 @@ DEPEND="
 		dev-vcs/mercurial )"
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/setuptools_scm-3.1.0-test-failures.patch
-	)
-
 	# network access
 	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
 	# all fetch specific setuptools versions
 	rm testing/test_setuptools_support.py || die
+	# remove self-dependency
+	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
+		-e "/__main__/i del sys.path[0]" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	distutils_install_for_testing
+	PYTHONPATH= distutils_install_for_testing
 	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+	PYTHONPATH= distutils-r1_python_install
+}