gentoo resync : 14.05.2020

3 files changed, 82 insertions, 0 deletions

diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 9594701e82fb..1d0759bdb46b 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,4 +1,7 @@
 AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
+AUX urlwatch-2.18-pycodestyle-requirement.patch 766 BLAKE2B d30b074629d0547fcded426ce16cbc4cd3c829ccb817be4ea792273e5a00825e8fb6e332b9169cf7ce228ac592acf4d04f583acda75501f4d20886f9e13c6f55 SHA512 4fd8abdffa63438955ada5910b84548ab22ccba96dd63943a78ac72f17636e6a515b8a7aaef277099e575965bcf4a68fe01c7ee2226def85a2cc1e6a31bbbb8d
 DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
+DIST urlwatch-2.18.tar.gz 48268 BLAKE2B e595a6ed27637463f14f92ecafd123eb0c7cef7102cc35ebbc3334804f7e09cc5f933aa2d54e24acd74a1419d6a8683a0d5fb2456b35ae0797c3d8a12efc33de SHA512 4b44a78fe7f2be6f507487ad5de57d79aa55ee790b29b97f2a364c0f3b58828fea5eb2b08235c15cafd3839b9261a7f148ebc9bceb5bedd1ff8319f7f039bb23
 EBUILD urlwatch-2.17.ebuild 1650 BLAKE2B 01abaf115bbfb7ae572ae850505fd8b17ceb098f5ad4c11e578ec0ac554f77cb4aa689d8fb278028c6841520eb614983beb693c329cca202697e049b465df968 SHA512 b64a3a26d4a0909b85e2316b3e5d79876cb256d3f1be2ec8b820eca9f52fff2304622dc7d69d75c95e587563362fee18b06b8a15a986543893db63080ae5aab1
+EBUILD urlwatch-2.18-r1.ebuild 1811 BLAKE2B 9a42617e89c5a88cdc081b069de209455b9b382de2652493a7990c2dddf6545b8e9e58da65553c4aa64917e2797ee6f50d1e2b061a5f27e494512139d65d8446 SHA512 654098c0d31c1feffb0edf1970f59ab1cfd9b806fd1478aaebc7bfb96486c21655e1db176496de8bebbf239f4a331c31ae362258a79191ba3987f262d8fc7f3c
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch b/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch
new file mode 100644
index 000000000000..587a55ab03c8
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 5f85aaf..7466787 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,9 +17,7 @@ if sys.version_info < (3, 3):
+ m['name'] = 'urlwatch'
+ m['author'], m['author_email'] = re.match(r'(.*) <(.*)>', m['author']).groups()
+ m['description'], m['long_description'] = docs[0].strip().split('\n\n', 1)
+-m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'pycodestyle', 'appdirs', 'lxml', 'cssselect']
+-if sys.version_info < (3, 4):
+-    m['install_requires'].extend(['enum34'])
++m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'appdirs', 'lxml', 'cssselect']
+ if sys.platform == 'win32':
+     m['install_requires'].extend(['colorama'])
+ m['entry_points'] = {"console_scripts": ["urlwatch=urlwatch.cli:main"]}
diff --git a/www-misc/urlwatch/urlwatch-2.18-r1.ebuild b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
new file mode 100644
index 000000000000..d8fcfd698a28
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+# The package uses entry points but setup.py is weird
+# so the eclass doesn't detect it
+DISTUTILS_USE_SETUPTOOLS=manual
+
+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"
+
+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}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+# This will be in the next release
+# https://github.com/thp/urlwatch/commit/44e862282d39a6e23f67c3c0240a93cccbb41a55
+PATCHES=( "${FILESDIR}/${P}-pycodestyle-requirement.patch" )
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests nose
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version dev-python/chump; then
+			elog "Install 'dev-python/chump' to enable Pushover" \
+				"notifications support"
+		fi
+		if ! has_version dev-python/pushbullet-py; then
+			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
+}