gentoo resync : 16.09.2020

3 files changed, 3 insertions, 63 deletions

diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 5c57c6023940..4af46f3450fc 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20200628.tar.gz 61748 BLAKE2B 1de2d426e8d871aef8d9ad1ee896b28cc79601bd13712a9e646a313ec52cdb2e2e979b74ea612fdab0c309a8fa37e3c1226bac29461410dbc85f976b1277e1ca SHA512 0f6880779392a1f47138a3757cbd08158d6832b35dff15193faa8937338ef791e03f4e5308f71fe0b6f4515092f681f9dad6a41a9ed32254757a44af34486070
 DIST yle-dl-20200807.tar.gz 62699 BLAKE2B 9f92e8e37385c8936f39443179251f60fa01fcb2ad623852cebb4bc26aa111689d8132ca1871e914162399c26ea575d02a7811fcb6b55e27b1d942db428377cc SHA512 fa38e0acb84fe968086a831c9d090a1a1387e58db0ca753aa25af65e42928542ea71b6a22988dd5e6a728b31de1da4d7dde02d2836bddec0bf52ec6dcbfa72ff
-EBUILD yle-dl-20200628.ebuild 1539 BLAKE2B ec0d0738979a614405e007e710ae832f6500945dcf071a9af867dcad1fd83d71e9f3a071ad9f7fc81d5399795fd7d7cfcc1990535c2bb20c168ed15c9e4a148b SHA512 14734f17e080adab3b92993afd2cb37fdf671a3c40ba9ee4d967d15cecfd2b6be5ff7ea1b1f43a4d2c0cbe8794ab461232ebe1cfe1ba72ecb936af37de4d926c
-EBUILD yle-dl-20200807.ebuild 1502 BLAKE2B 1bff58765f8bacf8731f05a2dd4d7edc7f96942141701af8050979a9eed4a2630984c51d2923de87ca52ea0c0624c999650c3c0d75f69a3005b880bfd1d8342c SHA512 81f71b82c7f6d19b05c034f33d014efdefe8f31368383018704e11e3f6aee694d62605c38f46bf722697b97c2c401c5c910a2daa11c8d989ded53e09f3fce80f
+EBUILD yle-dl-20200807.ebuild 1504 BLAKE2B dd1290e5214a5a70b24ac935912e3a846ff2570560e330494af1b58373a76f9737ff295c56e5a1b5b035eedc431809eaa320bf0af817939037dc8e1925a4d31d SHA512 312b6f70da4b9f95e17857233e2aac9689c8c8462091730d6988249d50c7ada6115fe1da653789dd27511bf9732ae522bdc7fd93801adfa9dd96a1594f1d0530
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/yle-dl/yle-dl-20200628.ebuild b/media-video/yle-dl/yle-dl-20200628.ebuild
deleted file mode 100644
index a05358a9a89d..000000000000
--- a/media-video/yle-dl/yle-dl-20200628.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 eutils
-
-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="${PYTHON_DEPS}
-	media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mini-amf[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-BDEPEND="${PYTHON_DEPS}"
-
-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 ""
-	elog "Optional download engines: "
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/media-video/yle-dl/yle-dl-20200807.ebuild b/media-video/yle-dl/yle-dl-20200807.ebuild
index 1f7adb750bb5..97fd2cbc3981 100644
--- a/media-video/yle-dl/yle-dl-20200807.ebuild
+++ b/media-video/yle-dl/yle-dl-20200807.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Download media files from Yle Areena"
 HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
@@ -14,7 +14,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}"