diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
| commit | 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch) | |
| tree | 753b6b08624c34d1ed8414bbe22c45409f7741b9 /media-video/yle-dl | |
| parent | be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff) | |
| parent | deba8115d2c2af26df42966b91ef04ff4dd79cde (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'media-video/yle-dl')
| -rw-r--r-- | media-video/yle-dl/Manifest | 4 | ||||
| -rw-r--r-- | media-video/yle-dl/yle-dl-20200222.ebuild | 4 | ||||
| -rw-r--r-- | media-video/yle-dl/yle-dl-20200419.ebuild | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest index cae2503fd928..3b431d86bbd7 100644 --- a/media-video/yle-dl/Manifest +++ b/media-video/yle-dl/Manifest @@ -1,5 +1,5 @@ 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 1713 BLAKE2B c6948d5b99001ea73938cb3a79a1b5dc3224bd8d0072b8760eb3c2e7c971a8240e8fc0e1a94cc9d08d8495b886ea766f80b6e78b89b1071420178a7b90d2bda1 SHA512 7e24b218bde4767186d02089202ce55e63d908d432f5cb53fe7f0b46ebde9bed88a24516f997f4bb60959443e2b67bd0928f1065eefcc80bab39f79a616eba51 -EBUILD yle-dl-20200419.ebuild 2011 BLAKE2B d6bb23ecc061d9a73f2701e9fbbc516f6ae5bd2f54e2301f17a304ccab7c3fdb08d0fb13b073742065226d7fc127301976aefaa3657b02b29a2742fdd3c286bb SHA512 d3d46569d76eb1472d6390af7e324c602f2c7281c9027c5bb8f2cb4d86c5287be0694da25518346266d699251570b3eb612b1202991ae503022ba8440fbbd05d +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 diff --git a/media-video/yle-dl/yle-dl-20200222.ebuild b/media-video/yle-dl/yle-dl-20200222.ebuild index 54743cdf09ad..9f7caaad6307 100644 --- a/media-video/yle-dl/yle-dl-20200222.ebuild +++ b/media-video/yle-dl/yle-dl-20200222.ebuild @@ -16,13 +16,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="libav php test +youtube-dl" +IUSE="php test +youtube-dl" # Requires an active internet connection during tests RESTRICT="test" RDEPEND=" - !libav? ( media-video/ffmpeg ) >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] dev-python/future[${PYTHON_USEDEP}] @@ -31,6 +30,7 @@ RDEPEND=" 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] diff --git a/media-video/yle-dl/yle-dl-20200419.ebuild b/media-video/yle-dl/yle-dl-20200419.ebuild index edff6ecff973..51021c5c90a3 100644 --- a/media-video/yle-dl/yle-dl-20200419.ebuild +++ b/media-video/yle-dl/yle-dl-20200419.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="libav test" +IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Requires an active internet connection during tests, @@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" RDEPEND="${PYTHON_DEPS} - !libav? ( media-video/ffmpeg ) + media-video/ffmpeg net-misc/wget $(python_gen_cond_dep ' >=dev-python/attrs-18.1.0[${PYTHON_MULTI_USEDEP}] |