gentoo resync : 27.10.2018

3 files changed, 18 insertions, 55 deletions

diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index b2e3080a3955..e5cd41985a4a 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,9 +1,7 @@
 DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
 DIST urlwatch-2.14.tar.gz 36587 BLAKE2B 6c4115c58cc9aae5ac8c62f7cb360ca38afa9a9ceadc93f3c9d2bccc7808ab1accf912a0f5756d984bb7a33fa448c91c1bb90e841bd45e2f8d34c4d74cae531c SHA512 8c7b479f80973da28e281e8437a30038c6dcdf9036c30cb5e685fdb9460fbb7b90a27e9d5a27290cfe30de1a0f443644b13c8a10740c205ebd58bcb2bb29c888
-DIST urlwatch-2.5.tar.gz 25322 BLAKE2B 637fa254fe565d9a3909fc80879a7b40a72a92e01cdca3a2e95f905c768238e4a2ef7559e32ae4295357d3391109f08149e721564e4c14b6c8be281a416cc45a SHA512 993d2596288d014a3b84ae22c29ce89282c4320dd95b339c9892db07997059fc80a96198cb89ba04d935f68d2d051da96dc981f8e8b3657492443b060d2126a1
-DIST urlwatch-2.6.tar.gz 30412 BLAKE2B 3d9495a418f8180a788db27bec13f9c20d92476851404d0f78dc6fec664a90c4bf9749cbe26323741a31175abf5b6ca01c066da8a8db6e63da73b46bb524e293 SHA512 52d71984972c6888ade01fcc635d33a60c024424b82ac9319554f548438f8a4e2f32a8b7d3047ed86654c8ef67e3b6eac99728f9409b60cdffe7e842fd8fe16c
+DIST urlwatch-2.15.tar.gz 36839 BLAKE2B a474d93adb4ef95ad5c44b7cee4a077dd744caf09c84ec64b2e9f04635505a8ffd422f4ba56cb2069571b5b4b1e1f7df4b7412a716b5738388a0c55ea831e050 SHA512 3390a693656a89e75836f713249261650c03e1dc1d1819d82872d35eead7f29844502073d8674e92e97a32e44180347928e5dfada814798984d11e1ff4f0ac40
 EBUILD urlwatch-2.13.ebuild 1456 BLAKE2B 1d598c7f7ca1176c1d259f214f6fa96ab4fc2f79845837ea9ee50fe353e20bd9c95cb77a05af21648291426c5c13d3a1f523e499b45afdcbbf537091ee0e0b80 SHA512 949c500620ec76076dbe0a7218e95f383b1aedab5799064569efaa1df52818477dbac7a3604e0c0d71582ad171d28f7b2f10dd21a43fba564acf6d80e1bf007d
 EBUILD urlwatch-2.14.ebuild 1493 BLAKE2B fe4c9fdccd55b99d9b8913ec0326b47be7cba8c38fa2eeb19685c3912656495567f4eca82454c09c1e6a05c03caea572c13dba858a1aeb58cda78ba6247d7b36 SHA512 2667e5e93784b44e4e2f65a7b19605105006824e5dfc310901bfd647137930d5aeb30c183083d9a94b3ef1db9f3368f7f5dc01e14a647698b4199cba32a93af4
-EBUILD urlwatch-2.5.ebuild 963 BLAKE2B 6e774d31e763b0d12e8d2c3024892a95e7d1fd5bd22878751ba2f54c774dae9bfb5d12cb6d90ec14c015ba095676b3abb36e4155f2ddce2a651d6f9a1be97559 SHA512 95f43f1ab3f8cac44c123af9281bb81b2af0f249aa51168903a2460d468b7003b06a9f9944bca416998d4bc4db00b18c25325707e1ec8924769c33cc6785d23a
-EBUILD urlwatch-2.6.ebuild 1184 BLAKE2B f92a6c0a5ed70b2e4d931c72854588843be12db4607cb435b6c13968f9151e5867a80685526fc79bfc8613b497611cb631f794aa90768d155c047ce8d4e34247 SHA512 ec414c8118640182470b86594d7e459bc4fbb339ac9b30b05d53df6e4da923a7f955e71c374e8bc76b1317ae74bd2b7782d01121ecfbd894a979e4049c4d73df
+EBUILD urlwatch-2.15.ebuild 1490 BLAKE2B 056ddec4a14a17793044cb1bc8019467ca51d21d370458662cdf4e991d615862aaf7737582b02e6fd41a39e2c557f19a071ac7be54e1e0c4afa4296ad2e79589 SHA512 32131157fa3668eee2ac5fa5eaafd6b0cba532639d6d35151b92926d16b4c84aabb6ece38b246b778c25b4e00f8dfebf174fa75a9a5848bf57c671e1234a73df
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.6.ebuild b/www-misc/urlwatch/urlwatch-2.15.ebuild
index b88f4abf0119..5452ea80508e 100644
--- a/www-misc/urlwatch/urlwatch-2.6.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -14,16 +14,16 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-RESTRICT="test"
 
 RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	|| ( www-client/lynx app-text/html2text )
 "
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
@@ -32,8 +32,10 @@ DEPEND="
 	)
 "
 
+DOCS=( CHANGELOG.md README.md )
+
 python_test() {
-	nosetests test || die "tests failed with ${EPYTHON}"
+	nosetests -v test || die "tests failed with ${EPYTHON}"
 }
 
 pkg_postinst() {
@@ -46,5 +48,11 @@ pkg_postinst() {
 			elog "Install 'dev-python/pushbullet-py' to enable" \
 				"Pushbullet notifications support"
 		fi
+		elog "HTML parsing can be improved by installing one of the following packages"
+		elog "and changing the html2text subfilter parameter:"
+		elog "dev-python/beautifulsoup:4"
+		elog "app-text/html2text"
+		elog "dev-python/html2text"
+		elog "www-client/lynx"
 	fi
 }
diff --git a/www-misc/urlwatch/urlwatch-2.5.ebuild b/www-misc/urlwatch/urlwatch-2.5.ebuild
deleted file mode 100644
index 5cdb1061895f..000000000000
--- a/www-misc/urlwatch/urlwatch-2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	|| ( www-client/lynx app-text/html2text )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests test || die "tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] && \
-		! has_version dev-python/chump; then
-		elog "Install 'dev-python/chump' to enable Pushover" \
-			"notifications support"
-	fi
-}