gentoo resync : 12.05.2022

5 files changed, 3 insertions, 25 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 0692298bc248..7f3a96c38a86 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 687a79e30322..70b24eb29fcc 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -14,5 +14,5 @@ DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819
 DIST mythtv-32.0.tar.gz 115960698 BLAKE2B 3be4106fa2c4fcb95fd5414b347fd6256658566bbb9775ed32cb9686e4a61ecf89e7c684db8d3408292c3737ae6090771862aa65ac0d5d467e90c3a110484898 SHA512 6a1472c954b929319a570d76769ababad43d086d53b6679c9d6da91446677f04b71918b326bb4ff0fc16fbaf7d9a447a86f623a6f1399f9ed29ca86a9782396c
 EBUILD mythtv-31.0-r7.ebuild 12374 BLAKE2B 6c600b224133332d4de4fd514c24fdeac16a3d1da45fd4d9c85a7ce513df68d82454ab1f1cf2fcf472ca73360edbc9bb55bd01522e30b3630c2154b885502fdd SHA512 a6f0dc3c43434779caba73cdd4febd1d579d533607cb9b7088a3c75f6090bb9d2bdf8b6a28552b63055c42cd1f47a255b6ced79da59e4ad7b980a6f2c8a93e4a
 EBUILD mythtv-31.0_p20210731-r2.ebuild 12483 BLAKE2B 447bd3ffe16676ccd8da114e94436f359cc522a6a25334a5548e263e6fe949f6b09e5ef1ba2c95b5b42e81279a18a024c906eb5dbdb3e4ae5f6c95b93e5aa7b4 SHA512 cc3bc0bbae0dc41b56b000cd35a601ba2a3e449c7c2a546af89e004cbb6e88dcfbf165cacc2fcbc4d871dad0bbf6cd44d04bf23a90a0435aa6d15c138a298b6e
-EBUILD mythtv-32.0-r1.ebuild 12193 BLAKE2B f79bd0a85fbfc717ec1183fb751abf850f5b012b1dd803d990ae6cbc981c826c25009c62c5f1ffff0350f57dd771aa7b6ebab258435b9f19c6c5ea504452ad64 SHA512 ffbf9181e489caf35e0147501864ec51bed43ca56fadd1815980af2957fe345adb08873c100a18f35f029b65e112daa6206cb76c1957b2a18cd5519b767eefd7
+EBUILD mythtv-32.0-r2.ebuild 12192 BLAKE2B e2be66287c7385db08c81cd108c4270d1c2bbb100ccd9f5cd7a421247d989a8f6c994968246639a4eab07dd6f023870c99b31c95c0fceeac5dd7a8921b812351 SHA512 6516854cf09f9784b5b751d95923d5d7b3cdb505fdf9e98cdfd6d0e83cf70014fcfef6e116cdf5560659449090fa10cf0c3805a04d168376addc6f0ac2d9f213
 MISC metadata.xml 2239 BLAKE2B b8b2c890bec1edfdc46ed53ddfc694af63ed762996759b7dd0a03c0d743874256deb0cae4cad36f9ce28388f349a023528536f828e86e51b93ffdc50597d55d6 SHA512 1b6abf1bafa4a34cc91209b23d8b8957852f7efda3013f2868086faf3d14f28b8c9e84edc1a07f09e952723dc406c5ea8be809935f45750be7155970d165c421
diff --git a/media-tv/mythtv/mythtv-32.0-r1.ebuild b/media-tv/mythtv/mythtv-32.0-r2.ebuild
index 9ba5a6d58bfa..fdb61c967c44 100644
--- a/media-tv/mythtv/mythtv-32.0-r1.ebuild
+++ b/media-tv/mythtv/mythtv-32.0-r2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
 
 DESCRIPTION="Open Source DVR and media center hub"
 HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
@@ -77,7 +77,6 @@ RDEPEND="
 		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
-	java? ( dev-java/ant-core )
 	lame? ( media-sound/lame )
 	lcd? ( app-misc/lcdproc )
 	libass? ( media-libs/libass:= )
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index 8433efafca1b..db2c93324d51 100644
--- a/media-tv/tvnamer/Manifest
+++ b/media-tv/tvnamer/Manifest
@@ -1,5 +1,3 @@
-DIST tvnamer-2.5.tar.gz 46030 BLAKE2B 4bad31df673b11671c8fb57c8e5d4ec8e7513ac63df6bf09d02943e06acab1c8d5f4d40f1d56b5e6a489ab27810aa85f82257df0b795a3ad5fdc4f63fcf5d976 SHA512 56233576a4f6e0b93535667f7d4e823cccba2bce785aaaed10415f5da1a3883fc29396a20fbffdca367fb9d3d748c6efa5b670eee43eece2631b28d640a5c180
 DIST tvnamer-3.0.2.tar.gz 47662 BLAKE2B a6a472e6258563d0929a4abd678b161728efb84d1b072a9b7d5684e031a3dfb4c999a8252504ee8d9a6a94638dba5273eaabe4761ea979ff2e25781512c8b43d SHA512 c4ee5573b759450f65fa75d7a28f0cf1f44a8d794fc1565291b15272243bb157525a369e0067ca8c10860374209ad2ddfe54ad2c70dcfb570bf636da9357b383
-EBUILD tvnamer-2.5.ebuild 496 BLAKE2B 3a78b7c95e94fd14d37e252cb10896d2727bcb937aa41eb28146bb4a968b7b7890f8581adb75137f2b18db81b854447fbe752e8c2e705f1007dfd05a52e54f37 SHA512 bc7e424e20b99f31bd45afa9ec5fba49a0a7e8e7d8326918729bf8fce4fbdc0ac700872ebde5fac64edc3ba1ab53c7a399ff04ba433d5c7ddd2ea1210bac2720
 EBUILD tvnamer-3.0.2.ebuild 444 BLAKE2B 3dd003e6c0bae89c5a36365a13267874c69f82cfa9796654f762a0fc1c890e545ab3295739c5124ca373f5ba9e726d19bc37098f193099681c2330afed64b31a SHA512 030b69941f8e276f9194ae2221a36f7e57f6e5a47c8588af8d863e8fdf9aafe7ab7a30da3c0fdd4fa90d78b4b0f7f3e4e94390d7483f865a56f0233a8215289c
 MISC metadata.xml 296 BLAKE2B 4d1e1e79d36ede4f4109b89fbe4eb35f28e341692bfb812d69c5a2bd3e4dd65644544fb0b6fb5feb8f27e54cd033aab3b833507b87692c271db6ca3d86c27ef8 SHA512 75b8211378be35137c9d8c3694dd468ca990d2b377dbcca5d07b1ec1a38fc6958d83a7d27f06cb3cd7b4198612600984326a2a5ab0bd0ef685bf62066b56bedf
diff --git a/media-tv/tvnamer/tvnamer-2.5.ebuild b/media-tv/tvnamer/tvnamer-2.5.ebuild
deleted file mode 100644
index c563a05b9650..000000000000
--- a/media-tv/tvnamer/tvnamer-2.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
-HOMEPAGE="https://github.com/dbr/tvnamer"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/tvdb_api-1.10_pre[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"