gentoo resync : 12.07.2021

3 files changed, 2 insertions, 58 deletions

diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index fe0e79b5e3c5..6f78bfdd7d6b 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20210502.tar.gz 65149 BLAKE2B 26beded2ccee1d1ee077fd0e15b44f8bc849acc9103eb5fa0c5030b4fcd7c4a6d41a0d9636fdf6a1298e56357dfefec1935b12047edf97f9e7ca6307ef81a5fb SHA512 8e8a7d97c6a13a46dfc0573eaed5b8c5d3c2dd8ca12eac4d25c98908d7c802dfb12b6efa293b969c35ae480d8cb4898e90af9fb452ee0cd5d4d1b6556a6b9b1c
 DIST yle-dl-20210704.tar.gz 65583 BLAKE2B f347bf8198a0e645dc960fa4e7a6bc5f90081b9936f8462d0b13c92fcf7005e31837b01d8a830b17c1f962e6f7b4afbdc18a3227c6caa5d2eb3389f7fcbe66de SHA512 fd91960221476ed4e1d5de79132687da88ff19e66d1f75e940e8aa00e742139ff4b2d0d67b32f86f6b7bd326520d0287f3495607f68a7f1f3634493d63282c55
-EBUILD yle-dl-20210502.ebuild 1462 BLAKE2B 98d93097000e870959cbc04cc3b898bd7ab6d9ccec50c28da0523f96f7c8d1a9badda6e7005cbfe8c54bfb3705c956f5a7c33b75eb78fad5488e369010653069 SHA512 6bd5465392690f7c0790e09e9d64b4b698fb3356f189f82a8cd8ad118b0d5d5ac34f910bb8f667b6a90a3c76eb5c8f46dde50f0645d0f0f24a87fa1506aa8569
-EBUILD yle-dl-20210704.ebuild 1416 BLAKE2B d22cb38e3f7903dc4407baaf374a97a382f2527f85ddfa2f75f01b1c6c1549fb6fd1d443fb0211d48c93d6f2b90acabfea2211f493240e48132cbfa562bf2166 SHA512 82be8925becfda4dc1c0edb2aa880e3cd31cf79f2058c28d459776ec1125287ff63c7cbc39a6ec32546b0f3a99160a2e11ab898473c5ad4aab4a82e0015549ba
+EBUILD yle-dl-20210704.ebuild 1414 BLAKE2B 4157eb69cb5642359805db076beda2cdec1ee6329a342d47cb1c05b8862273dae4ae667c24b53042717eb5e2d88225942341db79d0fdb1e4b3bd06400daf00e9 SHA512 3f2b3714ed04f2c76a8f2149c425f4f2a425725e13b3fe348af227676515a1b3c9ccf91570cef601bf11873c5819cbb6e1de784b054c8ab48a9b1365e9d09a24
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20210502.ebuild b/media-video/yle-dl/yle-dl-20210502.ebuild
deleted file mode 100644
index 125985473641..000000000000
--- a/media-video/yle-dl/yle-dl-20210502.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-# FEATURES="-network-sandbox" to test.
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# Use 'pytest --geoblocked' to only test using non-geo restricted videos.
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
-	elog
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/media-video/yle-dl/yle-dl-20210704.ebuild b/media-video/yle-dl/yle-dl-20210704.ebuild
index 7d880102b117..9dd81dc7d3b9 100644
--- a/media-video/yle-dl/yle-dl-20210704.ebuild
+++ b/media-video/yle-dl/yle-dl-20210704.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"