Bumped to a more updated, useful verion. bug #95166 and #116612 and #94101

(Portage version: 2.1_rc3-r2)

5 files changed, 411 insertions, 1 deletions

diff --git a/media-tv/xmltv/ChangeLog b/media-tv/xmltv/ChangeLog
index e7f14640dcf5..3dc2debe5ddb 100644
--- a/media-tv/xmltv/ChangeLog
+++ b/media-tv/xmltv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xmltv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.41 2006/02/13 14:51:44 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.42 2006/06/01 10:05:53 mattepiu Exp $
+
+  1 Jun 2006; Matteo Azzali <mattepiu@gentoo.org> +xmltv-0.5.43-r3.ebuild,
+  Bumped to a more updated, useful verion. bug #95166 and #116612 and #94101
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org> xmltv-0.5.34.ebuild,
   xmltv-0.5.37-r1.ebuild, xmltv-0.5.39.ebuild:
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.43-r3 b/media-tv/xmltv/files/digest-xmltv-0.5.43-r3
new file mode 100644
index 000000000000..a6c8f082af33
--- /dev/null
+++ b/media-tv/xmltv/files/digest-xmltv-0.5.43-r3
@@ -0,0 +1,3 @@
+MD5 b6a9fc395782125ca66a8e26531aca58 xmltv-0.5.43.tar.bz2 534243
+RMD160 a870c3119ba9ee05bbcab72d0c7a4403ed118caf xmltv-0.5.43.tar.bz2 534243
+SHA256 a0e51a6a43f3a7ccb9c9294f855301a2eb3def01b8b3cd0547dd4c20c94f098d xmltv-0.5.43.tar.bz2 534243
diff --git a/media-tv/xmltv/files/tv_grab_de_tvtoday-0.5.43.diff b/media-tv/xmltv/files/tv_grab_de_tvtoday-0.5.43.diff
new file mode 100644
index 000000000000..6c843a4844b7
--- /dev/null
+++ b/media-tv/xmltv/files/tv_grab_de_tvtoday-0.5.43.diff
@@ -0,0 +1,133 @@
+Index: grab/de_tvtoday/tv_grab_de_tvtoday.in
+===================================================================
+RCS file: /cvsroot/xmltv/xmltv/grab/de_tvtoday/tv_grab_de_tvtoday.in,v
+retrieving revision 1.42
+retrieving revision 1.45
+diff -p -u -r1.42 -r1.45
+--- grab/de_tvtoday/tv_grab_de_tvtoday.in	21 Apr 2006 17:17:21 -0000	1.42
++++ grab/de_tvtoday/tv_grab_de_tvtoday.in	25 May 2006 17:10:18 -0000	1.45
+@@ -99,7 +99,7 @@ at http://sourceforge.net/projects/xmltv
+ 
+ use warnings;
+ use strict;
+-use XMLTV::Version '$Id: tv_grab_de_tvtoday-0.5.43.diff,v 1.1 2006/06/01 10:05:53 mattepiu Exp $ ';
++use XMLTV::Version '$Id: tv_grab_de_tvtoday-0.5.43.diff,v 1.1 2006/06/01 10:05:53 mattepiu Exp $ ';
+ use XMLTV::Capabilities qw/baseline manualconfig cache share/;
+ use XMLTV::Description 'Germany (www.tvtoday.de)';
+ use Date::Manip;
+@@ -138,6 +138,7 @@ BEGIN {
+     else {
+         *t = \&Log::TraceMessages::t;
+         *d = \&Log::TraceMessages::d;
++	#$Log::TraceMessages::On = 1;
+     }
+ }
+ 
+@@ -502,9 +503,10 @@ sub parse_page($$) {
+     }
+ 	
+     #-- extract date of grabbed data from retrieved webpage ...
+-    $_ = $page->look_down('_tag' => 'td', 'class' => 'navigator-hhead-large');
++    $_ = $page->look_down('_tag' => 'span', 'class' => 'text-weiss');
+     die("cannot find date on requested page") 
+       unless($_->as_text() =~ m/([1-3]?[0-9])\.(1?[0-9])\.(20[0-9]{2})/);
++    t "extracted date: $3-$2-$1";
+     $day = ParseDate("$3-$2-$1 00:00:00");
+ 
+     #-- well, now let's scan the table for programme data
+@@ -573,6 +575,7 @@ sub parse_page($$) {
+ 		$show{q(episode-num)} = [ [ $1, "onscreen" ] ];
+ 	    }
+ 
++	    t "show title: $span";
+ 	    $show{title} = [[ $span, $lang ]];
+ 	} 
+ 	elsif (ref($span) eq "HTML::Element" and $span->tag eq "a") {
+@@ -583,7 +586,7 @@ sub parse_page($$) {
+ 	    
+ 	    my $title = ($tag->content_list())[0];
+ 
+-	    $title = convert_cp1252_chars(\$title);
++	    convert_cp1252_chars(\$title);
+ 
+ 	    $title =~ s/\s*\([^\(]+\)\s*$//;
+ 	    if ($title =~ s/\s*(\d+)\.\sTeil//gi) {
+@@ -836,6 +839,7 @@ sub squeeze_out_desc($$) {
+     # try to match <category>, <country> <year>; R: <names>; D: <names> construct
+     # where <country>/<year> or the [RD]: stuff may be missing ...
+     if(my @parts = ($$desc =~ m/^\s*(\(([^\)]*)\))?\s+([^,;0-9]+)(,?\s+([^,;]+)\s+([12][09][0-9]{2}(?:[\/-][0-9]{2})?))?\s*; (?:(?:; )?(Buch\/Regie|R): ([^;]+))?\s*((?:; )?D: (.+))?\s*$/)) {
++        t "split rule: <category>, <country> <year> ...";
+ 	$$desc = "";
+ 
+ 	#-- $parts[1] is the show title in English (doesn't have to be available)
+@@ -887,9 +891,14 @@ sub squeeze_out_desc($$) {
+ 	}
+     } 
+     else {
++        t "split rule: dot splitting";
+ 	my @data = split "·", $$desc;
+ 	s/(^\s|\s$)//g foreach(@data); #CHG#
+ 
++	for(0 .. (scalar(@data) - 1)) {
++	    t "dot-split part $_: " . $data[$_];
++	}
++
+ 	if(scalar(@data) == 3 
+ 	   && not($data[1] =~ m/[\wäöüßÄÖÜ]+:/) #- FIX false positive: tvtoday.de seems to publish "guests: <names>" here some (rare) times :-(  
+ 	   && $data[2] =~ m/^Mit (.*?)$/) {
+@@ -945,15 +954,22 @@ sub squeeze_out_desc($$) {
+ 		    next;
+ 		}
+ 
+-		if (my ($cat, $rest1, $names, $guests, $rest2) = m/^([^,]+?)((?:\s+-\s+..+?)*) - Moderation: (.+?) - Gäste: (..+?)(?:\s+-\s+(.+))?$/) {
++		if (my ($nocat, $cat, $rest1, $names, $guests, $rest2) = m/^(([^,.%^&*();]+?)((?:\s+-\s+..+?)*)|.+) - Moderation: (.+?) - Gäste: (..+?)(?:\s+-\s+(.+))?$/) {
+ 		    my @data = split_up_names($names, $show);
+ 		    push @{$show->{"credits"}{"presenter"}}, @data;
+ 		    my @guest_data = split_up_names($guests, $show);
+ 		    push @{$show->{"credits"}{"guest"}}, @guest_data;
+-		    $show->{"category"} = [[ $cat, $lang ]];
+-		    
+-	            warn "misdetected category: $cat" 
+-		      if($cat =~ m/\d{4}/);
++
++		    if(defined($cat)) {
++			$show->{"category"} = [[ $cat, $lang ]];
++			
++			warn "misdetected category: $cat" 
++			  if($cat =~ m/\d{4}/);
++		    }
++		    else {
++		        t "no-cat match: $nocat";
++			$rest1 = $nocat;
++		    }
+ 		      
+ 		    my @rest; 
+ 		    foreach(defined($rest1) ? split(m/\s+-\s+/, $rest1) : undef, $rest2) {
+@@ -963,14 +979,21 @@ sub squeeze_out_desc($$) {
+ 		    next unless length($_);
+ 		}
+ 
+-		if (my ($cat, $rest1, $names, $rest2) = m/^([^,]+?)((?:\s+-\s+..+?)*) - Moderation: (.+?)(?:\s+-\s+(.+))?$/) {
++		if (my ($nocat, $cat, $rest1, $names, $rest2) = m/^(([^,]+?)((?:\s+-\s+..+?)*)|.+) - Moderation: (.+?)(?:\s+-\s+(.+))?$/) {
+ 		    my @data = split_up_names($names, $show);
+ 		    push @{$show->{"credits"}{"presenter"}}, @data;
+-		    $show->{"category"} = [[ $cat, $lang ]];
+ 
+-	            warn "misdetected category: $cat" 
+-		      if($cat =~ m/\d{4}/);
+-		    
++		    if(defined($cat)) {
++			$show->{"category"} = [[ $cat, $lang ]];
++
++			warn "misdetected category: $cat" 
++			  if($cat =~ m/\d{4}/);
++		    }
++		    else {
++		        t "no-cat match: $nocat";
++			$rest1 = $nocat;
++		    }
++			
+ 		    my @rest; 
+ 		    foreach(defined($rest1) ? split(m/\s+-\s+/, $rest1) : undef, $rest2) {
+ 			push @rest, $_ if(defined($_) && length($_));
+
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index a6b9e38a1b93..cfb282d1a44b 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
+<maintainer>
+	<email>mattepiu@gentoo.org</email>
+	<name>Matteo Azzali </name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-tv/xmltv/xmltv-0.5.43-r3.ebuild b/media-tv/xmltv/xmltv-0.5.43-r3.ebuild
new file mode 100644
index 000000000000..e7e918199833
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.43-r3.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.43-r3.ebuild,v 1.1 2006/06/01 10:05:53 mattepiu Exp $
+
+inherit eutils perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format."
+HOMEPAGE="http://membled.com/work/apps/xmltv/"
+SRC_URI="mirror://sourceforge/xmltv//${P}.tar.bz2"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+PREFIX="/usr"
+
+# NOTE: you can customize the xmltv installation by
+#       defining a XMLTV_OPTS variable which contains
+#       a space-separated list of optional features.
+#       If this variable is unspecified or has an
+#       empty value, everything will be *enabled*.
+#
+#  tv_grab_huro        Alternate Hungarian and Romania grabber
+#  tv_grab_uk_rt:      Alternate Britain listings grabber
+#  tv_grab_uk_bleb:    Fast alternative grabber for the UK
+#  tv_grab_it:         Italy listings grabber
+#  tv_grab_it_lt:      Alternative grabber for Italy
+#  tv_grab_na_icons:   Downloads icons from Zap2IT
+#  tv_grab_na_dd:      Alternate American listings grabber
+#  tv_grab_nz:         New Zealand listings grabber
+#  tv_grab_fi:         Finland listings grabber
+#  tv_grab_es:         Spain listings grabber
+#  tv_grab_es_digital: Spain digital satellite listings grabber
+#  tv_grab_nl:         Netherlands listings grabber
+#  tv_grab_nl_wolf:    Alternate Netherlands listings grabber
+#  tv_grab_dk:         Denmark listings grabber
+#  tv_grab_jp:         Japan listings grabber
+#  tv_grab_de_tvtoday: Germany listings grabber
+#  tv_grab_se:         Sweden listings grabber
+#  tv_grab_se_swedb:   New grabber for Sweden
+#  tv_grab_fr:         France listings grabber
+#  tv_check:           Graphical front-end for listings data
+#  tv_pick_cgi:        CGI front-end for listings data
+
+# EXAMPLES:
+# enable just North American grabber
+#   XMLTV_OPTS="tv_grab_na"
+#
+# enable graphical front-end, Italy grabber
+#   XMLTV_OPTS="tv_check tv_grab_it"
+
+
+RDEPEND=">=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
+	>=dev-perl/XML-Twig-3.10
+	>=dev-perl/DateManip-5.42
+	>=dev-perl/XML-Writer-0.4.6
+		|| ( >=dev-lang/perl-5.8.7 perl-core/Memoize )
+		|| ( >=dev-lang/perl-5.8.8 perl-core/Storable )
+	dev-perl/Lingua-EN-Numbers-Ordinate
+	>=dev-perl/Lingua-Preferred-0.2.4
+	>=dev-perl/Term-ProgressBar-2.03
+	dev-perl/Compress-Zlib
+	dev-perl/Unicode-String
+	dev-perl/TermReadKey
+	>=dev-lang/perl-5.6.1"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.50-r1
+	>=sys-apps/sed-4
+	"
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_uk_rt ${XMLTV_OPTS} ; then
+	newdepend \>=dev-perl/HTML-Parser-3.34
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_bleb ${XMLTV_OPTS} ; then
+	newdepend dev-perl/Archive-Zip dev-perl/IO-stringy
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_na_dd ${XMLTV_OPTS} ; then
+	newdepend dev-perl/SOAP-Lite dev-perl/TermReadKey
+	newdepend \<dev-perl/Class-MethodMaker-2
+else
+	newdepend \>=dev-perl/Class-MethodMaker-2
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_na_icons ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-TableExtract \>=dev-perl/WWW-Mechanize-1.02
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_fi ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_es ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+#if [ -z "${XMLTV_OPTS}" ] || has tv_grab_es_digital ${XMLTV_OPTS} ; then
+#	newdepend dev-perl/HTML-Tree
+#fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_nl ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_nl_wolf ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_huro ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_dk ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_jp ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree dev-perl/Text-Kakasi
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_de_tvtoday ${XMLTV_OPTS} ; then
+	newdepend \>=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree
+fi
+
+#if [ -z "${XMLTV_OPTS}" ] || has tv_grab_se ${XMLTV_OPTS} ; then
+#	newdepend dev-perl/XML-LibXML
+#fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_se_swedb ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTTP-Cache-Transparent
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_fr ${XMLTV_OPTS} ; then
+	newdepend \>=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_no ${XMLTV_OPTS} ; then
+	newdepend \>=dev-perl/HTML-Parser-3.34 dev-perl/HTML-TableExtract dev-perl/HTML-LinkExtractor
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_pt ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTML-Tree
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_check ${XMLTV_OPTS} ; then
+	newdepend dev-perl/perl-tk dev-perl/Tk-TableMatrix
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_pick_cgi ${XMLTV_OPTS} ; then
+	newdepend virtual/perl-CGI
+fi
+
+if [ -z "${XMLTV_OPTS}" ] || has tv_grab_se_swedb ${XMLTV_OPTS} ; then
+	newdepend dev-perl/HTTP-Cache-Transparent
+fi
+
+
+make_config() {
+	if [ -z "${XMLTV_OPTS}" ] ; then
+	# No customization needed, build everything (default)
+		echo "yes"
+	return
+	else
+		# Need to specify custom settings, do not accept defaults
+		echo "no"
+	fi
+
+	# Enable Australian
+	#has tv_grab_au ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Brazil
+	has tv_grab_br ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Brazil Cable
+	has tv_grab_brnet ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Switzerland
+	has tv_grab_ch ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Alternate Brittain
+	has tv_grab_uk_rt ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Alternate Brittain 2
+	has tv_grab_bleb ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Belgium and Luxemburg 
+	has tv_grab_uk_be ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	#Enable Iceland
+	has tv_grab_is ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Italy
+	has tv_grab_it ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable North America using DataDirect
+	has tv_grab_na_dd ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable North America channel icons
+	has tv_grab_na_icons  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Finland
+	has tv_grab_fi  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Spain
+	has tv_grab_es  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Spain Digital
+	# has tv_grab_es_digital ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Israel
+	has tv_grab_il ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Netherlands
+	has tv_grab_nl  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Alternate Netherlands
+	has tv_grab_nl_wolf  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Hungary and Romania
+	has tv_grab_huro  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Denmark
+	has tv_grab_dk ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Japan
+	has tv_grab_jp  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Germany
+	has tv_grab_de_tvtoday ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Sweden
+	#has tv_grab_se  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Sweden 2
+	has tv_grab_se_swedb  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable France
+	has tv_grab_fr  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Norway
+	has tv_grab_no  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Portugal
+	has tv_grab_pt  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable South Africa
+	has tv_grab_za  ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable GUI checking.
+	has tv_check ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable CGI support
+	has tv_pick_cgi ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	# Enable Estonia
+	has tv_grab_ee ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+	#Enable Reunion Island
+	has tv_grab_re ${XMLTV_OPTS}      >&/dev/null && echo "yes" || echo "no"
+}
+
+src_unpack() {
+	unpack "${A}"
+
+	cd "${S}"
+	epatch "${FILESDIR}/tv_grab_de_tvtoday-0.5.43.diff"
+}
+
+src_compile() {
+	sed -i "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" Makefile.PL || die
+	make_config | perl Makefile.PL PREFIX=/usr
+}
+
+src_install() {
+	make
+	make test
+	make DESTDIR=${D} install
+#perl-module_src_install
+
+	for i in `grep -rl "${D}" "${D}"` ; do
+		sed -e "s:${D}::g" -i "${i}"
+	done
+
+	if [ -z "${XMLTV_OPTS}" ] || has tv_pick_cgi ${XMLTV_OPTS} ; then
+		dobin choose/tv_pick/tv_pick_cgi
+	fi
+}
+
+pkg_postinst() {
+	if [ -z "${XMLTV_OPTS}" ] || has tv_pick_cgi ${XMLTV_OPTS} ; then
+		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+		einfo "to where the ScriptAlias directive is configured."
+	fi
+}
+