From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73BB5139368 for ; Wed, 11 Aug 2021 01:18:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DA50E0870; Wed, 11 Aug 2021 01:18:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A5FDE0870 for ; Wed, 11 Aug 2021 01:18:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 454D5342E92 for ; Wed, 11 Aug 2021 01:18:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C2427BD for ; Wed, 11 Aug 2021 01:18:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1628644521.261f895e84d41b2991bd9c766747cd52183c906d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/xmltv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/xmltv/Manifest media-tv/xmltv/metadata.xml media-tv/xmltv/xmltv-0.5.70.ebuild media-tv/xmltv/xmltv-0.6.1-r1.ebuild media-tv/xmltv/xmltv-0.6.1.ebuild X-VCS-Directories: media-tv/xmltv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 261f895e84d41b2991bd9c766747cd52183c906d X-VCS-Branch: master Date: Wed, 11 Aug 2021 01:18:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da85ddb2-ca00-459b-933a-65fb0fbd9629 X-Archives-Hash: 63de8bbc24f7ab328fd05258ae6b2f67 commit: 261f895e84d41b2991bd9c766747cd52183c906d Author: Sam James gentoo org> AuthorDate: Wed Aug 11 01:15:21 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 11 01:15:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261f895e Revert "media-tv/xmltv: Add missing (r)depend" Reverting so we can drop the old ebuild in a separate commit. This reverts commit ffc55f29d83232149165f9f9f9a80bb6a647b60d. Signed-off-by: Sam James gentoo.org> media-tv/xmltv/Manifest | 1 + media-tv/xmltv/metadata.xml | 5 + media-tv/xmltv/xmltv-0.5.70.ebuild | 182 +++++++++++++++++++++ .../{xmltv-0.6.1-r1.ebuild => xmltv-0.6.1.ebuild} | 2 - 4 files changed, 188 insertions(+), 2 deletions(-) diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest index e63e390d3ef..09547613c2b 100644 --- a/media-tv/xmltv/Manifest +++ b/media-tv/xmltv/Manifest @@ -1 +1,2 @@ +DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2 diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml index 3d9b2b74ca5..56cd4daa47d 100644 --- a/media-tv/xmltv/metadata.xml +++ b/media-tv/xmltv/metadata.xml @@ -14,12 +14,15 @@ Grabber for Switzerland Denmark tv listing grabber Latin America digital tv listing grabber + Spain alternative grabber Grabber for Europe (xmltv.se / dotmedia) + EPG grabber for some European countries. include fanart URLs for some European countries. Grabbber for Europe [replaces eu-dotmedia and se-tvzon] Finland tv listing grabber (0.6.1 add ampparit telsu) Grabber for Finland (Swedish) France tv listing grabber + France (Kazer) tv listing grabber Hungarian tv listing grabber Israel tv listing grabber Iceland tv listing grabber @@ -27,6 +30,8 @@ North America tv listing grabber North America Direct TV grabber Grabber for North America (TVMedia) + Netherlands tv listing grabber [REMOVED 0.6.1] + Norway Gfeed tv listing grabber Grabber for Portugal (MEO) Grabber for Portugal (Vodafone) Sweden tv listing grabber diff --git a/media-tv/xmltv/xmltv-0.5.70.ebuild b/media-tv/xmltv/xmltv-0.5.70.ebuild new file mode 100644 index 00000000000..73301898cf4 --- /dev/null +++ b/media-tv/xmltv/xmltv-0.5.70.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit perl-module + +DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format" +HOMEPAGE="http://xmltv.org" +SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc x86 ~x86-linux" + +IUSE="ar ch-search dk dtvla es-laguiatv eu-dotmedia eu-epg fi fi-sv +fr fr-kazer huro il is it na-dd na-dtv na-tvmedia nl no-gf pt-meo se-swedb +se-tvzon tr uk-bleb uk-tvguide tv-check tv-combiner tv-pick-cgi zz-sdjson" + +RDEPEND=">=dev-perl/libwww-perl-5.65 + >=dev-perl/XML-Parser-2.34 + >=dev-perl/XML-Twig-3.10 + >=dev-perl/Date-Manip-5.42 + >=dev-perl/XML-Writer-0.6 + virtual/perl-Memoize + virtual/perl-Storable + >=dev-perl/Lingua-Preferred-0.2.4 + >=dev-perl/Term-ProgressBar-2.03 + virtual/perl-IO-Compress + dev-perl/Unicode-String + dev-perl/TermReadKey + dev-perl/File-Slurp + >=dev-lang/perl-5.6.1 + dev-perl/XML-LibXML + dev-perl/XML-TreePP +" +DEPEND="${RDEPEND} + ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate ) + ch-search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 ) + dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime ) + dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate ) + es-laguiatv? ( dev-perl/HTML-Tree ) + eu-dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) + eu-epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 dev-perl/IO-stringy ) + fi? ( dev-perl/HTML-Tree ) + fi-sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime ) + fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 ) + huro? ( dev-perl/HTML-Tree ) + is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT ) + na-dd? ( dev-perl/SOAP-Lite ) + na-dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies ) + na-tvmedia? ( dev-perl/XML-LibXML ) + nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate ) + pt-meo? ( dev-perl/XML-LibXML dev-perl/DateTime ) + se-swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) + se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) + tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate ) + uk-bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip ) + uk-tvguide? ( dev-perl/HTML-Tree dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate ) + zz-sdjson? ( dev-perl/DateTime-Format-ISO8601 virtual/perl-Digest-SHA dev-perl/JSON dev-perl/List-MoreUtils dev-perl/libwww-perl virtual/perl-Storable dev-perl/Try-Tiny ) + tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) + tv-combiner? ( dev-perl/XML-LibXML ) +" + +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 + + sed -i \ + -e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \ + -e "/^@docs/s:doc/COPYING ::" \ + Makefile.PL || die +} + +src_configure() { + 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 Spain + usex es-laguiatv + # Enable EU xmltv.se + usex eu-dotmedia + # Enable EU epgdata.com + usex eu-epg + # Enable Finland + usex fi + # Enable Swedish listings in Finland + usex fi-sv + # Enable France + usex fr + # Enable France EPG from kazer.org + usex fr-kazer + # 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 Netherlands + usex nl + # Enable Portugal EPG from sappo.pt + usex pt-meo + # Enable Sweden + usex se-swedb + # Enable Sweeden Alternative + 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) + echo "no" # TODO + # Enable GUI checking. + 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() { + # actually make test should be unneeded, but if non na grabbers + # start to not install remove comment below + #make test + #make + + # to bypass build issue + #make DESTDIR=${D} install || die "error installing" + + perl-module_src_install + + local i + for i in $(grep -rl "${D}" "${D}"); do + sed -e "s:${D}::g" -i "${i}" || die + done + + 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-0.6.1-r1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild similarity index 99% rename from media-tv/xmltv/xmltv-0.6.1-r1.ebuild rename to media-tv/xmltv/xmltv-0.6.1.ebuild index b88c635fc27..ded091d096e 100644 --- a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild +++ b/media-tv/xmltv/xmltv-0.6.1.ebuild @@ -155,7 +155,6 @@ RDEPEND=" dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny - dev-perl/XML-LibXML ) zz-sdjson-sqlite? ( dev-lang/perl @@ -170,7 +169,6 @@ RDEPEND=" dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined - dev-perl/XML-LibXML ) tv-check? ( dev-perl/Tk