From fec80e72d9ca7421c2bd9fca2f69990f985188d9 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 12 May 2019 22:15:57 +0000
Subject: [PATCH] =?UTF-8?q?update=20to=20yle-dl-20190502,=20from=20maintai?=
 =?UTF-8?q?ner=20Timo=20Myyr=C3=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 multimedia/yle-dl/Makefile               | 10 +++++-----
 multimedia/yle-dl/distinfo               |  4 ++--
 multimedia/yle-dl/patches/patch-setup_py | 18 ------------------
 multimedia/yle-dl/pkg/PLIST              | 20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 28 deletions(-)
 delete mode 100644 multimedia/yle-dl/patches/patch-setup_py

diff --git a/multimedia/yle-dl/Makefile b/multimedia/yle-dl/Makefile
index 87fd2a49607..2ae6a73f346 100644
--- a/multimedia/yle-dl/Makefile
+++ b/multimedia/yle-dl/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2018/10/17 14:15:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2019/05/12 22:15:57 sthen Exp $
 
 GH_ACCOUNT =		aajanki
 GH_PROJECT =		yle-dl
-GH_TAGNAME =		2.34
+GH_TAGNAME =		20190502
 MODPY_EGG_VERSION =	${GH_TAGNAME}
-REVISION =		0
 
 COMMENT =		download videos from YLE Areena
 
@@ -20,15 +19,15 @@ MODULES =		lang/python \
 			lang/php
 
 TEST_DEPENDS =		${RUN_DEPENDS}
+TEST_ENV =		HOME=/tmp
 
 RUN_DEPENDS =		devel/py-attrs \
+			devel/py-configargparse \
 			devel/py-future \
-			devel/py-progress \
 			net/rtmpdump \
 			security/py-cryptodome \
 			www/py-requests \
 			lang/php/${MODPHP_VERSION},-curl \
-			net/py-socks \
 			net/wget \
 			textproc/py-lxml \
 			converters/py-mini-amf
@@ -38,5 +37,6 @@ MODPHP_BUILDDEP =	No
 
 pre-configure:
 	@sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/io.py
+	@sed -i -e "s,'pycryptodomex','pycryptodome',g" ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/multimedia/yle-dl/distinfo b/multimedia/yle-dl/distinfo
index 1c9ef28ee84..b754513d354 100644
--- a/multimedia/yle-dl/distinfo
+++ b/multimedia/yle-dl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-2.34.tar.gz) = ngNLq0ED+/c+3ppJQGpuoedmKgOj5VxdK7Wf2XwzNO0=
-SIZE (yle-dl-2.34.tar.gz) = 76310
+SHA256 (yle-dl-20190502.tar.gz) = 7OHTB4pLmuj/35pkXNuhyZm+bsrx7Nh9BrJ2BChI7ho=
+SIZE (yle-dl-20190502.tar.gz) = 83560
diff --git a/multimedia/yle-dl/patches/patch-setup_py b/multimedia/yle-dl/patches/patch-setup_py
deleted file mode 100644
index b2a69709448..00000000000
--- a/multimedia/yle-dl/patches/patch-setup_py
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2018/08/09 19:57:55 sthen Exp $
-
-Ports uses cryptodome (with Crypto prefix) rather than cryptodomex
-(with Cryptodome prefix). This is referenced in yledl/extractors.py which
-tries with both prefixes.
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -38,7 +38,7 @@ setup(
-     packages=['yledl'],
-     include_package_data=True,
-     install_requires=[
--        'pycryptodomex', 'requests', 'lxml', 'future', 'PySocks', 'mini-amf',
-+        'pycryptodome', 'requests', 'lxml', 'future', 'PySocks', 'mini-amf',
-         'attrs >= 17.4.0'
-     ] + ssl_sni_requires,
-     extras_require = {
diff --git a/multimedia/yle-dl/pkg/PLIST b/multimedia/yle-dl/pkg/PLIST
index 6522b0a5beb..2362fef2a58 100644
--- a/multimedia/yle-dl/pkg/PLIST
+++ b/multimedia/yle-dl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/08/09 19:57:55 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.7 2019/05/12 22:15:57 sthen Exp $
 bin/yle-dl
 lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -19,16 +19,30 @@ lib/python${MODPY_VERSION}/site-packages/yledl/exitcodes.py
 lib/python${MODPY_VERSION}/site-packages/yledl/exitcodes.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/extractors.py
 lib/python${MODPY_VERSION}/site-packages/yledl/extractors.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/geolocation.py
+lib/python${MODPY_VERSION}/site-packages/yledl/geolocation.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/hds.py
 lib/python${MODPY_VERSION}/site-packages/yledl/hds.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/http.py
 lib/python${MODPY_VERSION}/site-packages/yledl/http.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/io.py
 lib/python${MODPY_VERSION}/site-packages/yledl/io.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.py
+lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/localization.py
+lib/python${MODPY_VERSION}/site-packages/yledl/localization.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/rtmp.py
+lib/python${MODPY_VERSION}/site-packages/yledl/rtmp.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.py
 lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.pyc
-lib/python${MODPY_VERSION}/site-packages/yledl/streams.py
-lib/python${MODPY_VERSION}/site-packages/yledl/streams.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/streamflavor.py
+lib/python${MODPY_VERSION}/site-packages/yledl/streamflavor.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/subtitles.py
+lib/python${MODPY_VERSION}/site-packages/yledl/subtitles.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/timestamp.py
+lib/python${MODPY_VERSION}/site-packages/yledl/timestamp.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/titleformatter.py
+lib/python${MODPY_VERSION}/site-packages/yledl/titleformatter.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/utils.py
 lib/python${MODPY_VERSION}/site-packages/yledl/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/version.py