Merge updates from master

dev-python/hstspreload/Manifest

@@ -1 +1 @@
-DIST hstspreload-2020.6.30.tar.gz 905177 BLAKE2B 28063d90b630caaa74625c4d49beaeed1f576df14df353ec85f272d42b9373c28b18806138cf79cbdaf9a2563278c732d115425cc41e11f28f9988c53d4b6d37 SHA512 1a9b6114443602e532ce5f0acb9a2af8a5d07dcccafd2663386cffdf4f653265c8e908feedd12efb52208d41cd3b2d9c18e51c6e43dd51df7f6bb85dc064ca9f
+DIST hstspreload-2020.7.15.tar.gz 914343 BLAKE2B 9473d3e588b950a5dfe69b1a734234a80a5be6379cd09f9eaad0ba8501f8d9e225d4a1dca1c4847224731e958e0dbc329072a31ef4e3e5193456c731fddea739 SHA512 328f69d437ba52002284ced4a0837fe19550c73e98140cb18c2dff5771ac4c7f7c82b095825632bb15299832764e1fb27205a9d9e91e7b1d79f9941ab89e850d

dev-python/pydantic/Manifest

@@ -1 +1,2 @@
 DIST pydantic-1.5.1.tar.gz 233727 BLAKE2B ef41cf8d65d2839444e6457b6f48442d1d1ddee506cc7a75f79dd173e7cf9908c7d2ef1d4f70ddfdf7ba00ad7af7c81697a3e3e03cf058a0494b7d2c5fb874a7 SHA512 beadba0f57bd669ac97f4d7288cdf9598f6c791f46258ba75a3ec93361ebba010d7b1784e8b50534b12f9fb3606e8cc0cbbc7a9321a1d9a6a29e1e73a057f9c4
+DIST pydantic-1.6.1.tar.gz 244677 BLAKE2B 0a1d6986858ab753cbc4dd262bd268b2a365c241a7de106a7bf21714c6c499c7dbacaea095789d3503507965ca50106da32545be670ed0261827f1fe0316ff67 SHA512 b0442f78a661f56d29697da7e27393261420bdb0f08473d2f7872145a49a18de8c17c903d0899a44263bcd8229e8790161da032dd5a3d5f2dae347c66bd6a567

dev-python/pydantic/pydantic-1.6.1.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DOCBUILDER="mkdocs"
+DOCDEPEND="
+	dev-python/mkdocs-material
+	dev-python/mkdocs-exclude
+	dev-python/markdown-include
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+SRC_URI="https://github.com/samuelcolvin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+distutils_enable_tests pytest
+
+BDEPEND="dev-python/cython"
+
+DEPEND="test? (
+	dev-python/mypy[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+)"
+
+RDEPEND="
+	>=dev-python/devtools-0.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
+"
+
+python_prepare_all() {
+	# AssertionError: assert 'pydantic-1.5.1.tar.gz' == 'config a'
+	sed -i -e 's:test_config_file_settings_nornir:_&:' \
+		tests/test_settings.py || die
+
+	distutils-r1_python_prepare_all
+}

dev-python/pytest-isort/Manifest

@@ -1 +1 @@
-DIST pytest-isort-1.0.0.tar.gz 6880 BLAKE2B d7157206504210a18e355aeccbcd51ec025dfa8dcd2f438bd47193edd269b4fc55fb1807ef6bbedfa1bc95b15724d7534dbd05867c17a9d3d61bcc649f205342 SHA512 e28a5c184c014b24131e02d9786c77f55281333a30a0a27c0b9227495929f216dfbacaf59e11b027ea8bb4b8be665058659cd454098facf978687fbc0580a2d8
+DIST pytest-isort-1.1.0.tar.gz 6958 BLAKE2B 2aa6a6a89494eb159a12a8edd26518db11ea82c04673ee8d62e9c64d85a4d9426d8bc4edc57744794c7539863d4e80f327c1942a4d4c5edba2d84b3880f05958 SHA512 bd510c0296f464f0cb3c136011022f9fbcbe974e5dd8f7f79304b3d05185c303c79925e432b161524c023686de6316830cf4e45e9ab6b361ff878f6403af9e5d

dev-python/python-mpv/Manifest

@@ -1 +1 @@
-DIST python-mpv-0.4.6.tar.gz 202369 BLAKE2B 9d1eea88c6fc829d026712a45241bc4584f65c40aa882d14774ccae7c70e95285541f27e040d8592d0b165277806b732dcf86414dcc409c96df15b19c22c62fc SHA512 a2a2f3c889796aaf3f45f1b2bb55febdb2de3b9be6bd99705ef4f6b5765e0ac6ea4e8b1a39ef0577d47c5fe66164f4eae68a02d714c8bb4c5f61df3cd83258dd
+DIST python-mpv-0.4.7.tar.gz 203161 BLAKE2B a67189a09554d0e3fcbc40f76553dfc8171a009a912b6fbdfa2a916356f4cdcda7c9adad2ff5c54e46696c08dcc13d56d2f5edb665835a504765ae7b6a01918e SHA512 0c2abef871aadeec433a871418c463e82a570a4e2224f36151ba7e20bed4a5a7c3d13528805454fe445b857a6980cac494e65396dd4eb9e8bb813a4321c214ba

dev-python/python-mpv/python-mpv-0.4.7.ebuild

@@ -15,15 +15,10 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# XIO:  fatal IO error 0 (Success) on X server ":1114323366"
-# looks like upstream changed the test suite to use xvfbwrapper
-# but there are still some bugs, tests pass okay, but still get
-# the above error
-RESTRICT="test"
-
 RDEPEND="
 	media-video/mpv[libmpv]
-	dev-python/pillow[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
 
@@ -48,7 +43,6 @@ python_prepare_all() {
 			mpv-test.py || die
 
 	distutils-r1_python_prepare_all
-
 }
 
 python_test() {

games-action/technic-launcher/Manifest

@@ -1,2 +1,2 @@
-DIST technic-launcher-4.568.jar 5723051 BLAKE2B 78f9d1bb73b207764d6515ed4819c69e7646cda6764495817e9ab8cc701e87f411577056fcb36a6e3c431b3639a5e6f1e3d347fbac0c13453607b7e7e16bb474 SHA512 77a53cbc11dada1a7db7bd1ae53dfa5d68ece688e3017813a8c559787ec2edf5829e3261e75fe8b7a1463b32215aca3b0325a50a2059c585a1ad259184c1f66c
+DIST technic-launcher-4.583.jar 5714518 BLAKE2B c96052879d0cae648e431e601e85d2c824b2a1e85d5c2efbb993684d41fa94b6ea87182f528663ec0e0b074fc5f9107a6fed9f8628ba9e657a65cd4f1434a6a2 SHA512 7c48442cf10b847d6a41a5621791150fc564301894dbe27096e5a868f4d502226507c4a8062175ef9127793042f8e080dfecec270b2cd8399ce233e73a8fffec
 DIST technic-launcher.ico 15086 BLAKE2B 4f5be0661bfbdca971cf022767618acef1e912b60c3f0574f383a8bd0281a6d66ca1b8b105412ec9579f3999514a471412fb16da66d937acfb4d3236b8f99663 SHA512 c109113a0e1be10bc013bfb79b742396a768fa683860a83d734e158b709e66b9e21067e1791ae5f7a854ccd21b1bf9adf6eeb27bc33d9da03f902dfe5d8be710