gentoo auto-resync : 10:01:2023 - 18:21:10

6 files changed, 6 insertions, 60 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a573940f87be..e326295230d8 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 54dabc0ceba7..0ad796306e75 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -7,4 +7,4 @@ AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7
 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15
 DIST ushare-1.1a_p20210221.tar.gz 72759 BLAKE2B e5dd79cba08c3c7554fd19eb98ecf9920dc1939e5dfe34a803669628b2d4031ebb6e2f037550e5129a8cc6f0c84a9a8e234c3c9823108f374375405ea16b5263 SHA512 c3038d7e7da13a6adbf52a20ffa0b33ca92a7b03d39c0fa6f9bea98484cb062f0509d655f853f7eafe3dab54b2bd97e3c8a4f571686bfdf13dccaa012b0c8202
 EBUILD ushare-1.1a_p20210221.ebuild 1821 BLAKE2B 59554b910cf00ad5ba2a956660c32c43faaf7d38d438f0ad8d0083c104a1317c8d87dc68094f891be8def8dc3718ac841073b081a829babebb6c5a371f5bc0f4 SHA512 c1fbf9335629c0cd910fa679b6d2204022ee55901a79540dc6e2c29d1970961990a0cc04e92f694c63d05ad1c7dcb15b0015f4c135d2c9ce46ab17af70db3bd4
-MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
+MISC metadata.xml 325 BLAKE2B 36700eedc8cbcbcdeb7795e4e4b6a308f5d0663724eb6f463ee23b86bce2bcf940e733c7acb65aec7c190bb453297ea1cbf9cb1623ebf82b7a2834e99fc899a6 SHA512 145d6d13b2234aeb2efb4048bb2bb04447e687f2122148d3b12ebb17c4f68b35fd8d0a7c0df0c3aafd020bba1ca8dba8a0a7c68047e72dfc2f03a3a00a446b75
diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml
index aa20bff17b1d..68ad4667cefa 100644
--- a/media-video/ushare/metadata.xml
+++ b/media-video/ushare/metadata.xml
@@ -5,4 +5,7 @@
 		<email>bkohler@gentoo.org</email>
 		<name>Ben Kohler</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ddugovic/uShare</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index aee87aed66ca..3b4fea776985 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20221111.tar.gz 74708 BLAKE2B ecd0913ee1f50901932cc1218864157612633dd6490d2a0ebf6dd42e796b0a2bfd5bb07043c6ecf1dcfb936c597ec954c3c2676e7d893b38b2e77c09145a24a8 SHA512 52d8219235d1d17b7f646213afcbda44051af7aec0f0ec05b8162e1e40b1b32ad939f63d45af4d9179f22e2003c9707e7b640099b14e1ec7f3cbc83a747a36d0
 DIST yle-dl-20221231.tar.gz 75559 BLAKE2B 940a7107851ccfee0a93e24fccbac1f58d23a5cd3d6dbdbd5536b2d2c1d797468959453c1727700ae4bbced169e58565384cfbc976b9f89f662447fd51e38daf SHA512 9a08cbbb757cd75a8e2ee61b5c340b9e1bd91f8479f98d434a5e5f716926bfde135f925b5f65a9d043881f6a4e598c4c059aafb1618e5490c46f0f3c6a6dbf2b
-EBUILD yle-dl-20221111.ebuild 1471 BLAKE2B 09ddc9b7e235b343a503fb094fd434fd998d4ba89419b129f6ba71b0974ad2d15e4b3b6a0feeefcddf6cfd534c55049178622aae557a8f34e2e93c735097c49e SHA512 089d3331f7d2037d6dec503f4f170c64980ccdec311291aaedb63071d5deac6e6bc67d5fd40e788a345ca790ecbec1360c0e41642d8d9debf68d71ca70a322fc
-EBUILD yle-dl-20221231.ebuild 1473 BLAKE2B 6dd3a7c2185d320bb44adfa1a8e14e7d537c19e5e418b11e452344e64dff928a594ad855b7fd00f2d27f9a1cda2618ca574a6d4e696f194e4ff077227f98836e SHA512 cd8adc412387321f0febd4dc8a55011d1ad718150984dae4d0c983938da844ae01f3648140b7aa1d8d88c3991f3b8a785f20f38f76408741e772040472de8f28
+EBUILD yle-dl-20221231.ebuild 1471 BLAKE2B a8d8cf17adf0a0337c02da02bfdc383c426980f42517da536d9659ae6d332aad3b3910480009677b7b1b45044db313a281c6d02d3d115783e9354b243f39fb2c SHA512 329d012d6e9068030e49dd458d675a25024e5bf03d057a75d49d6742575edee5226f57fff202702ea8960fddaabd3ee439f1f6baf40101009598e4e818dd211d
 MISC metadata.xml 363 BLAKE2B b27761ed00c4849b5e9a0c51fdf699ab7e1589acc017be236339e8e5044fbe05ad62ad8c7104f6e9e43de0779ad6f9f3fe4144fc57376d87d0304f7c7c3fe7cf SHA512 1b061009279fcf8271bec4958ddb93d93e1455686e42d623a64ef51a65e4f852d23873c59d5e547bbf66d6c596f542fd29f78de5c7b33f484918b01beb76dc92
diff --git a/media-video/yle-dl/yle-dl-20221111.ebuild b/media-video/yle-dl/yle-dl-20221111.ebuild
deleted file mode 100644
index 1e4e786498c3..000000000000
--- a/media-video/yle-dl/yle-dl-20221111.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=flit
-
-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/yle-dl/archive/refs/tags/${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,
-PROPERTIES="test_network"
-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/pip[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-DOCS=( COPYING ChangeLog README.fi.md 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-${PVR}/yledl.conf.sample"
-	elog
-	optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp
-}
diff --git a/media-video/yle-dl/yle-dl-20221231.ebuild b/media-video/yle-dl/yle-dl-20221231.ebuild
index 8fcd38123c16..eca43efc7701 100644
--- a/media-video/yle-dl/yle-dl-20221231.ebuild
+++ b/media-video/yle-dl/yle-dl-20221231.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aajanki/yle-dl/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"