gentoo resync : 30.05.2020

4 files changed, 3 insertions, 77 deletions

diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 3b431d86bbd7..82badbd4e894 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20200222.tar.gz 87059 BLAKE2B 25d645505d67d71b3662589c77c30f905ded81e2d64874cf6036dcaf0738e521e96650543a78c18031a4477fc3bcf121e7497c980d22c84e21bebc2bd7cb154a SHA512 2b4a98c19a12812bc3c00de6173d50c78c981de0186c29021c8d88349ae88759a4987f6488d758ee5397d2b0992cd03029680bb08a4882cb2280a28807d4bf14
 DIST yle-dl-20200419.tar.gz 87267 BLAKE2B 2637620758c1a083502eb9468bbe5e7353855051c3379d448f6a4b9adcf8113293e4a7a8887138df68fcfd16938ab3846034a8f57cb9d366467a22c23b53ebaa SHA512 3d064e080e0c9172e15134eaa179ae96240ed9fc74a7a8a9a9aa18049397e0fea62465f5768db488928f23af1fa1195d78a8a4a6bbafcab4bcda6d05cda70ccf
-EBUILD yle-dl-20200222.ebuild 1695 BLAKE2B 25884cea797340b5796c15f591fad21fc0af4f5b2afe32465659baf6d9ea2768a97db8a07691a5a5e8a93502a7702d7ce08d57a2fb67de1c591022dcc91bc52a SHA512 43c9c542c50bd715dc0ebb0c41a85cd220dbf50698233a2d9c74ce9379b1c7f982469a3da2391703e9e2355f889cf671b83b9246826403abfbe9b64743a20dbd
-EBUILD yle-dl-20200419.ebuild 1993 BLAKE2B 0e7ad46255054a3a764f52ea85a865bdf6cb5bd14ee10273c8342e7177f98985186252020c40fb99d5cc6424fe504d2b064928a6be132926265b03b898725b88 SHA512 ef9791616b96f526a66d57f70f95da4fc3c133a28970a59b6687d3e5b991e4f12e77bf461f4fc490c984abea582c1128ed3b70f0f5e43fdf9fff95013ae8dc4c
-MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90
+EBUILD yle-dl-20200419.ebuild 1991 BLAKE2B 45b62f2c5c0edc407c076bba5d0124b738d9cb6122c559ddaa9cefdfd5ef44cbd9522d609c9230ff0aa641896414f387a95287b6d1d469a31bdf166a26119fe7 SHA512 19c6ebad053e90841f3ab6132cc702da9d6685e421b6b2af59955e5c7a27c383811850c02c40ad58952788426d9e94c38572510b007e5fa5f41cca0f24380e17
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/yle-dl/metadata.xml b/media-video/yle-dl/metadata.xml
index 025d4dde75df..6b0a0fb3a729 100644
--- a/media-video/yle-dl/metadata.xml
+++ b/media-video/yle-dl/metadata.xml
@@ -5,8 +5,4 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
-  <use>
-    <flag name='php'>Use a PHP script as download backend</flag>
-    <flag name='youtube-dl'>Use youtube-dl script as a download backend</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-video/yle-dl/yle-dl-20200222.ebuild b/media-video/yle-dl/yle-dl-20200222.ebuild
deleted file mode 100644
index 9f7caaad6307..000000000000
--- a/media-video/yle-dl/yle-dl-20200222.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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="php test +youtube-dl"
-
-# Requires an active internet connection during tests
-RESTRICT="test"
-
-RDEPEND="
-	>=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/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-	net-misc/wget
-	php? (
-		dev-lang/php:*[bcmath,cli,curl,simplexml]
-		>=dev-libs/openssl-1.0.2:0=
-		media-video/rtmpdump
-	)
-	youtube-dl? ( net-misc/youtube-dl[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_prepare() {
-	default
-
-	# Gentoo doesn't ship pycryptodomex with pycryptodome
-	sed -i 's/pycryptodomex/pycryptodome/g' setup.py || die
-}
-
-python_test() {
-	# For tests to run succesfully, you need to disable network stricting
-	# feature first.
-	#  FEATURES="-network-sandbox test" emerge -a yle-dl
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed in "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample.bz2"
-}
diff --git a/media-video/yle-dl/yle-dl-20200419.ebuild b/media-video/yle-dl/yle-dl-20200419.ebuild
index 51021c5c90a3..8cc058141422 100644
--- a/media-video/yle-dl/yle-dl-20200419.ebuild
+++ b/media-video/yle-dl/yle-dl-20200419.ebuild
@@ -15,7 +15,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}"