gentoo resync : 28.04.2019

5 files changed, 32 insertions, 9 deletions

diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 2606411598d8..adbdf2f3ebb9 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,8 @@
+AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
 DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
-DIST urlwatch-2.15.tar.gz 36839 BLAKE2B a474d93adb4ef95ad5c44b7cee4a077dd744caf09c84ec64b2e9f04635505a8ffd422f4ba56cb2069571b5b4b1e1f7df4b7412a716b5738388a0c55ea831e050 SHA512 3390a693656a89e75836f713249261650c03e1dc1d1819d82872d35eead7f29844502073d8674e92e97a32e44180347928e5dfada814798984d11e1ff4f0ac40
 DIST urlwatch-2.16.tar.gz 42713 BLAKE2B bee95c808b8705135112646ed7bf42c6606d716f447394e69fbc3355d38597e44b3e94ac91c6c2304fadcc5eb7d35349e6d54601721319c39268583fa8c7c042 SHA512 ffa9245bc4b8631e3105b1afd4ed3c3f5585bc30cd56c7531f9c2d0e4d61e36b56db3a69d62f851bed5fba9c9c332034b1757d70b32f4a4b0607ae59ed6cf887
-EBUILD urlwatch-2.13.ebuild 1456 BLAKE2B 1d598c7f7ca1176c1d259f214f6fa96ab4fc2f79845837ea9ee50fe353e20bd9c95cb77a05af21648291426c5c13d3a1f523e499b45afdcbbf537091ee0e0b80 SHA512 949c500620ec76076dbe0a7218e95f383b1aedab5799064569efaa1df52818477dbac7a3604e0c0d71582ad171d28f7b2f10dd21a43fba564acf6d80e1bf007d
-EBUILD urlwatch-2.15.ebuild 1490 BLAKE2B 056ddec4a14a17793044cb1bc8019467ca51d21d370458662cdf4e991d615862aaf7737582b02e6fd41a39e2c557f19a071ac7be54e1e0c4afa4296ad2e79589 SHA512 32131157fa3668eee2ac5fa5eaafd6b0cba532639d6d35151b92926d16b4c84aabb6ece38b246b778c25b4e00f8dfebf174fa75a9a5848bf57c671e1234a73df
-EBUILD urlwatch-2.16.ebuild 1530 BLAKE2B 7a200665942d25e0167d1c437c947941bba8d65b16059f9a247af60212a7635ecb98c72f8f4b14acb05865a91814882d6c4cb588bab41393063e0871a10adc50 SHA512 3b540101f4ad8e88016496c94241bdffdd9b4923e79496b6294881ad098eb8c20d77a3431ed02f41be7f944b422c7bf6e37a1fe2c1e1ee2ee8cb43db57fd7330
+DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
+EBUILD urlwatch-2.13.ebuild 1452 BLAKE2B 2079320ef673d4164ef5fe6dc1716caac14a23743081b62460106bb857200d5a14792e940ece3aeacfdcc975fc821f0ad0ff758c4c55a38be47fe6f01f1e5e8c SHA512 0bb97cb1f13d18528a6b1a0c5cf2d2a74e749c4af3f4ea4270fabf400a72b7ef16d7844a8e4632b2fc50bcf4f365bdd1867b04407e9465b6b497b7c85f9c8a62
+EBUILD urlwatch-2.16.ebuild 1533 BLAKE2B 4cc32bb54e9855766e07629ba4a94665fd0c4681cff7070b3a886151dcf1d5b8c7a0805db88ac6b84f57b98e7dba7d1f34ef505c33c275e265275a8747ced38c SHA512 b924226b5839f8db9b6cb3b1224fe304ca87916f461d23034520b9996a846fe6b6dbfa78eccfe6e45d00ad102d152c3785cefbc10a4e6a5601143b9de530e615
+EBUILD urlwatch-2.17.ebuild 1625 BLAKE2B 1cbb5fc13dac5c33a73a7905a2ff9e289a64730bf866b0baa3b0399d950cad8bbc7846bd1a6b26fb2a5a5a72e4540f94af1a554c9f895adfa844e47082b776e3 SHA512 928797d697d8666faf1d3ec8d4ee8fadc5b2150a64d3519e75788b99627fdb00afd6362e12d63392eb6092bf8dd0c76f10e6d9ecc7065bf6b6758f27a5224212
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
new file mode 100644
index 000000000000..c8bd04ae932f
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
@@ -0,0 +1,18 @@
+commit d00041bacd6343cadf29c3d0a98817a7b9fda2a1
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sun Apr 14 14:49:24 2019 +0200
+
+    Fix YAMLLoadWarning in tests
+
+diff --git a/test/test_filters.py b/test/test_filters.py
+index 3402616..da2393b 100644
+--- a/test/test_filters.py
++++ b/test/test_filters.py
+@@ -33,6 +33,6 @@ def test_filters():
+         eq_(result, expected_result)
+ 
+     with open(os.path.join(os.path.dirname(__file__), 'data/filter_tests.yaml'), 'r', encoding='utf8') as fp:
+-        filter_tests = yaml.load(fp)
++        filter_tests = yaml.load(fp, Loader=yaml.SafeLoader)
+     for test_name in filter_tests:
+         yield check_filter, test_name
diff --git a/www-misc/urlwatch/urlwatch-2.13.ebuild b/www-misc/urlwatch/urlwatch-2.13.ebuild
index feaa87c4b5e4..5d7b14fea6ec 100644
--- a/www-misc/urlwatch/urlwatch-2.13.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/www-misc/urlwatch/urlwatch-2.16.ebuild b/www-misc/urlwatch/urlwatch-2.16.ebuild
index be9149902a11..fd8b473177eb 100644
--- a/www-misc/urlwatch/urlwatch-2.16.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.16.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/www-misc/urlwatch/urlwatch-2.15.ebuild b/www-misc/urlwatch/urlwatch-2.17.ebuild
index 5452ea80508e..240d4e646a36 100644
--- a/www-misc/urlwatch/urlwatch-2.15.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ IUSE="test"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
@@ -34,6 +35,9 @@ BDEPEND="
 
 DOCS=( CHANGELOG.md README.md )
 
+# https://github.com/thp/urlwatch/pull/382
+PATCHES=( "${FILESDIR}/${P}-fix-yaml.load.patch" )
+
 python_test() {
 	nosetests -v test || die "tests failed with ${EPYTHON}"
 }