gentoo resync : 25.11.2020

3 files changed, 50 insertions, 5 deletions

diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index bc8c3018cf6f..9838fc149845 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,4 @@
-DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
-EBUILD owslib-0.17.1-r1.ebuild 921 BLAKE2B 12d28b134d2d7596bfb464e7bb3e268a826028156553aa7ec8adf82ec817f65665bb54dbac99e819b71dffbdcbc7ce846ca63a79645610f69cc45b55c49c2bed SHA512 4b3a4890b46b58559f2dd6c66638871f4f235aac40ca1ec2303729a939d97592b1b37a1564a8a61c3f70dd8ac10aa403a816c7c5c24963cd1a43d59889573a83
+AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
+DIST owslib-0.20.0.tar.gz 912319 BLAKE2B 9f6e44f76554d67756839bfad1cdce6e2e7a4db6c3517ed308256745a3ea1df77488718f307bcd59dfcae7bab7801ba1974131f358db1bd070846640ccf08ada SHA512 c30e14d0a310617d2dbcca436f38d4a942b8c5efb96506554e650b20b34580fd0119ae6bf17892bb09ceff7141b9cbfd32deb582d14d81b6518dbbc223116d07
+EBUILD owslib-0.20.0.ebuild 1013 BLAKE2B 476f226768e360f66397b0d768395709f1e9f336bac49390641478829897f2fa9427d385b42f20a55123dad00531d91c221f38601d0de715e78511e11985fa02 SHA512 4204654aa5d97de0eeba8e7cf605a69afb68d3afe2891b345a442c6bcc9ecd22a63f7c137ad7442f5e2499c5b88427c4dc74d6531ab495c00bbfd0792ae70416
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch b/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch
new file mode 100644
index 000000000000..45bcb8b38d18
--- /dev/null
+++ b/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch
@@ -0,0 +1,41 @@
+Description: Fix privacy breaches.
+Author: Johan Van de Wauw <johan@vandewauw.be>
+
+--- a/docs/en/index.rst
++++ b/docs/en/index.rst
+@@ -5,11 +5,7 @@ OWSLib |release| documentation
+ .. toctree::
+    :maxdepth: 2
+ 
+-.. image:: https://www.openhub.net/p/owslib/widgets/project_partner_badge.gif
+-   :width: 193px
+-   :height: 33px
+-   :alt: OWSLib
+-   :target: https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge
++`OpenHUB <https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge>`_
+ 
+ :Author: Tom Kralidis
+ :Contact: tomkralidis at gmail.com
+--- a/docs/_templates/layout.html
++++ b/docs/_templates/layout.html
+@@ -3,20 +3,6 @@
+ {%- block extrahead %}
+ {{ super() }}
+ 
+-<script type="text/javascript">
+-
+-  var _gaq = _gaq || [];
+-  _gaq.push(['_setAccount', 'UA-32866201-1']);
+-  _gaq.push(['_trackPageview']);
+-
+-  (function() {
+-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+-  })();
+-
+-</script>
+-
+ {% endblock %}
+ 
+ {% block relbar1 %}
diff --git a/dev-python/owslib/owslib-0.17.1-r1.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index 139f916e3d47..b34690b142dc 100644
--- a/dev-python/owslib/owslib-0.17.1-r1.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -3,24 +3,27 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
 HOMEPAGE="https://geopython.github.io/OWSLib"
 SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/OWSLib-${PV}"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pyproj[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -32,7 +35,7 @@ DEPEND="
 
 RESTRICT="test" # tests require WAN access
 
-S="${WORKDIR}/OWSLib-${PV}"
+PATCHES=( "${FILESDIR}/${P}-no-privacybreach.patch" )
 
 python_test() {
 	"${EPYTHON}" "${S}/setup.py" test || die