gentoo resync : 20.10.2021

4 files changed, 3 insertions, 300 deletions

diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index df1a4b6b95e7..ff2671f133d6 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,3 @@
-DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 DIST xmltv-1.0.0.tar.gz 780014 BLAKE2B dd39f77ebbaf321450db525b0c58401728ac1fece8e31e71a3d917fc72b914fbf9a471c2a77258f46a72913b2f86a84164576878dc28b38d3a77bdb9dab03494 SHA512 72df61cbcdfa7ba31d899b37e7f5308e845d263d8b9402c067bbd5761a7502ad7d272604a1d132337041a4d6bb2afa58a93b324239879294431108c1ac0ef09b
-EBUILD xmltv-0.6.1-r1.ebuild 5972 BLAKE2B 4e089470ce4aee09b85f8b2dca3f4df9da81b9ec352d92522e840622bd2a85a91c7d8b377188ae43e9ccf77c5ca75284bda30bfc0deb88260caa7c1724263239 SHA512 1375ca63cf2e18b9d23182dcd5799bce6e22e2dd843bf72f79cd8d6c1e8e0cfa3b07670fda72d2228e2e9e023eb0cb55d73700468bba5b64c330baa1091bd43e
-EBUILD xmltv-1.0.0.ebuild 5124 BLAKE2B db2598ed40dae82faa872c3052a3223405c980830da19794fcd702aa05bebddd2e3cb05e88d4d58620c52a1fcca49897f8922ed66e2a56e70968d3c94feb8804 SHA512 ff0053b3f96405064df7a9c4e637f06559b07c401adfc33f5ecf3723fd35b2036f94e9fd5920c9b5186ae5f7dc5cbe96e3094f8620918657275125e49e2b592c
-MISC metadata.xml 2443 BLAKE2B 9b757f8cc44780d11b7d046fb8013ff67292e6c1c92a49b4c58e8ab27e7daef58239f5d001bce5c76f3d41878c2bdcc2ce09a42d109e2adc08816adf3922c2af SHA512 f71f22fcf50da36cf2d80d9721511e18c8e3aaece46093d217b807147577b9e079a1eb8442762749f09e22a816e87f109dbdb858728e5bf6dc23bec8fdbe767c
+EBUILD xmltv-1.0.0.ebuild 5120 BLAKE2B da86471227e37128487b41916dae7a67cbe1da9fc30f8e0d5b5cb92ceb4a45cf918750f5c6a35e46e33313d23c86061b70c5eb743c119252907def07157e2d83 SHA512 ab35739c3cb5ccdc74087fcaa304094cb351a3108abcfaf39a5dacb277112db3e1a29a07cd7424fc670b85fe0fb783bafbaa6c080eb0d88fb3d01699813508f5
+MISC metadata.xml 1958 BLAKE2B eb4fe6e760882f5953097d65028dc105d65f70e6524cf30bdd484a083a955b5f6c85a7dece17290d0c9e5f1311cbd27bbac7e4be6787eadc0e4c46c6f444c056 SHA512 142aee0f79acc9dc26c206d5eb6b0ca9e764d567ab4e0876c0a00d2d1eb24430b95f07068e064098a2258b7db32d086443ea546c362ae4110e926cf40dc4ff40
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index a0f91caa55d6..700de9f2614c 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -12,31 +12,23 @@
 	<use>
 		<flag name="ar">Argentina tv listing grabber</flag>
 		<flag name="ch-search">Grabber for Switzerland</flag>
-		<flag name="dk">Denmark tv listing grabber</flag>
-		<flag name="dtvla">Latin America digital tv listing grabber</flag>
-		<flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
 		<flag name="eu-epgdata">include fanart URLs for some European countries.</flag>
 		<flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag>
 		<flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag>
 		<flag name="fi-sv">Grabber for Finland (Swedish)</flag>
 		<flag name="fr">France tv listing grabber</flag>
 		<flag name="huro">Hungarian tv listing grabber</flag>
-		<flag name="il">Israel tv listing grabber</flag>
 		<flag name="is">Iceland tv listing grabber</flag>
 		<flag name="it">Italy tv listing grabber (RUV)</flag>
 		<flag name="it-dvb">Italy tv listing grabber</flag>
 		<flag name="na-dd">North America tv listing grabber</flag>
 		<flag name="na-dtv">North America Direct TV grabber</flag>
 		<flag name="na-tvmedia">Grabber for North America (TVMedia)</flag>
-		<flag name="pt-meo">Grabber for Portugal (MEO)</flag>
 		<flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag>
-		<flag name="se-swedb">Sweden tv listing grabber</flag>
-		<flag name="se-tvzon">Sweden (tvzon.se) tv listing grabber</flag>
 		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
 		<flag name="tv-check">enable GUI checking</flag>
 		<flag name="tv-combiner">enable grabbers combiner</flag>
 		<flag name="tv-pick-cgi">enable CGI support</flag>
-		<flag name="uk-bleb">Britain tv listing grabber</flag>
 		<flag name="uk-tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
 		<flag name="zz-sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
 		<flag name="zz-sdjson-sqlite">Grabber for schedulesDirect.org SD-JSON service (sqlite DB)</flag>
diff --git a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild b/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
deleted file mode 100644
index b88c635fc279..000000000000
--- a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
-HOMEPAGE="http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv"
-SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~x86-linux"
-
-IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
-huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
-tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Date-Manip
-	dev-perl/File-Slurp
-	dev-perl/JSON
-	dev-perl/libwww-perl
-	dev-perl/Lingua-Preferred
-	dev-perl/PerlIO-gzip
-	dev-perl/Term-ProgressBar
-	dev-perl/TermReadKey
-	dev-perl/XML-Parser
-	dev-perl/XML-TreePP
-	dev-perl/XML-Twig
-	dev-perl/XML-Writer
-	dev-perl/Unicode-String
-	virtual/perl-Memoize
-	virtual/perl-Storable
-	virtual/perl-IO-Compress
-	ar? (
-		dev-perl/DateTime
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cookies
-	)
-	ch-search? (
-		dev-perl/HTML-Tree
-		dev-perl/HTML-Parser
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	dk? (
-		dev-perl/DateTime
-		dev-perl/IO-stringy
-	)
-	dtvla? (
-		dev-perl/DateTime
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cookies
-	)
-	eu-dotmedia? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-	)
-	eu-epgdata? (
-		dev-perl/Archive-Zip
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-Strptime
-		dev-perl/HTML-Parser
-		dev-perl/HTTP-Message
-	)
-	eu-xmltvse? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-	)
-	fi? (
-		dev-perl/HTML-Tree
-		dev-perl/LWP-Protocol-https
-		dev-perl/URI
-	)
-	fi-sv? (
-		dev-perl/DateTime
-		dev-perl/HTML-Tree
-		dev-perl/IO-stringy
-	)
-	fr? (
-		dev-perl/DateTime
-		dev-perl/DateTime-TimeZone
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-	)
-	huro? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-	)
-	il? ( dev-perl/DateTime )
-	is? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/URI
-		dev-perl/XML-DOM
-		dev-perl/XML-LibXSLT
-	)
-	it? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/URI
-	)
-	na-dd? ( dev-perl/SOAP-Lite )
-	na-dtv? (
-		dev-perl/DateTime
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	 )
-	na-tvmedia? ( dev-perl/XML-LibXML )
-	pt-meo? (
-		dev-perl/DateTime
-		dev-perl/XML-LibXML
-	)
-	pt-vodafone? (
-		dev-perl/DateTime
-		dev-perl/URI
-		dev-perl/XML-LibXML
-	)
-	se-swedb? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-		dev-perl/XML-LibXML
-	)
-	se-tvzon? (
-		dev-perl/XML-LibXML
-		dev-perl/IO-stringy
-		dev-perl/HTTP-Cache-Transparent
-	)
-	tr? (
-		dev-perl/DateTime
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	uk-bleb? (
-		dev-perl/Archive-Zip
-		dev-perl/IO-stringy
-	)
-	uk-tvguide? (
-		dev-perl/DateTime
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	zz-sdjson? (
-		dev-lang/perl
-		dev-perl/DateTime
-		virtual/perl-Digest-SHA
-		dev-perl/HTTP-Message
-		dev-perl/LWP-Protocol-https
-		dev-perl/Try-Tiny
-		dev-perl/XML-LibXML
-	)
-	zz-sdjson-sqlite? (
-		dev-lang/perl
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/DateTime-Format-SQLite
-		dev-perl/DateTime-TimeZone
-		dev-perl/DBD-SQLite
-		dev-perl/DBI
-		virtual/perl-Digest-SHA
-		dev-perl/File-HomeDir
-		dev-perl/File-Which
-		dev-perl/List-MoreUtils
-		dev-perl/LWP-UserAgent-Determined
-		dev-perl/XML-LibXML
-	)
-	tv-check? (
-		dev-perl/Tk
-		dev-perl/Tk-TableMatrix
-	)
-	tv-combiner? ( dev-perl/XML-LibXML )
-	tv-pick-cgi? ( dev-perl/CGI )
-"
-
-PREFIX="/usr"
-
-pkg_setup() {
-	# Uses Data::Manip in various places which can fail
-	# if TZ is still set to Factory as it is in stock gentoo
-	# install media
-	export TZ=UTC
-}
-
-src_prepare() {
-	default
-	# Add revision number to version info.
-	# Remove the doc/COPYING file from documentation.
-	sed -i \
-		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
-		-e "/^@docs/s:doc/COPYING ::" \
-		Makefile.PL || die
-}
-
-src_configure() {
-	# Must match the order of elements in @opt_components in Makefile.PL
-	make_config() {
-		# Never except default configuration
-		echo "no"
-
-		# Enable Agentina
-		usex ar
-		# Enable Switzerland Search
-		usex ch-search
-		# Enable Denmark
-		usex dk
-		# Enable Latin America
-		usex dtvla
-		# Enable Europe (DEPRECATED, xmltv.se / dotmedia)
-		usex eu-dotmedia
-		# Enable EU epgdata.com including fanart
-		usex eu-epgdata
-		# Enable Europe (xmltv.se / xmltvse)
-		usex eu-xmltvse
-		# Enable Finland
-		usex fi
-		# Enable Swedish listings in Finland
-		usex fi-sv
-		# Enable France
-		usex fr
-		# Enable Hungary and Romania
-		usex huro
-		# Enable Israel
-		usex il
-		# Enable Iceland
-		usex is
-		# Enable Italy
-		usex it
-		# Enable Italy from DVB-S stream
-		echo "no" # missing Linux::DVB
-		# Enable North America using DataDirect
-		usex na-dd
-		# Enable North America from directv.com
-		usex na-dtv
-		# Enable North America XMLTVListings.com
-		usex na-tvmedia
-		# Enable Portugal EPG from sappo.pt
-		usex pt-meo
-		# Enable Portugal EPG from Vodafone
-		usex pt-vodafone
-		# Enable Sweden
-		usex se-swedb
-		# Enable Sweeden Alternative (Repace with eu_xmltvse)
-		usex se-tvzon
-		# Enable Turkey
-		usex tr
-		# Enable UK fast alternative grabber
-		usex uk-bleb
-		# Enable UK/Ireland TV Guide
-		usex uk-tvguide
-		# Enable Schedules Direct JSON
-		usex zz-sdjson
-		# Enable Schedules Direct JSON (SQLite version)
-		usex zz-sdjson-sqlite
-		# rules to improve episode numbering
-		usex tv-check
-		# Enable combiner
-		usex tv-combiner
-		# Enable CGI support
-		usex tv-pick-cgi
-	}
-
-	pm_echovar=`make_config`
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	if use tv-pick-cgi; then
-		dobin choose/tv_pick/tv_pick_cgi
-	fi
-}
-
-pkg_postinst() {
-	if use tv-pick-cgi; then
-		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		elog "to where the ScriptAlias directive is configured."
-	fi
-}
diff --git a/media-tv/xmltv/xmltv-1.0.0.ebuild b/media-tv/xmltv/xmltv-1.0.0.ebuild
index b7f0b18388fb..9e11263f40e9 100644
--- a/media-tv/xmltv/xmltv-1.0.0.ebuild
+++ b/media-tv/xmltv/xmltv-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc x86 ~x86-linux"
 
 IUSE="ar ch-search eu-epgdata eu-xmltvse fi fi-sv fr
 huro is it it-dvb na-dd na-dtv na-tvmedia pt-vodafone tr