--- xmltv.old/xmltv-0.5.57.ebuild	2013-10-28 15:00:38.000000000 +0100
+++ xmltv/xmltv-0.5.64.ebuild	2014-01-06 16:06:40.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.57.ebuild,v 1.1 2013/10/28 14:00:38 pinkbyte Exp $
 
@@ -14,8 +14,10 @@
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
 
-IUSE="ar ch dtvla uk_rt uk_bleb is it na_dd na_icons fi es_laguiatv es_miguiatv ee re huro dk se_swedb hr no_gf fr pt eu_epg tv_combiner tv_pick_cgi tv_check na_dtv
-za nl in il"
+IUSE="ar ch uk_rt uk_bleb uk_guardian uk_tvguide uk_atlas is it na_dd fi es_laguiatv huro se_swedb hr no_gf fr pt eu_epg tv_combiner tv_pick_cgi tv_check na_dtv
+za il eu_egon se_tvzon fr_kazer"
+# removed upstream due to source site changes:
+# na_icons in es_miguiatv nl dk ee re dtvla
 
 # NOTE: you can customize the xmltv installation by
 #       defining USE FLAGS (custom ones in
@@ -47,31 +49,33 @@
 	>=dev-lang/perl-5.6.1
 	dev-perl/XML-LibXML"
 DEPEND="${RDEPEND}
-	nl? ( dev-perl/HTML-Tree )
-	na_icons? ( dev-perl/HTML-TableExtract >=dev-perl/WWW-Mechanize-1.02 )
-	dk? ( dev-perl/HTML-Tree dev-perl/DateTime dev-perl/Parse-RecDescent )
 	fi? ( dev-perl/HTML-Tree )
 	fr? ( >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree )
 	huro? ( dev-perl/HTML-Tree )
 	it? ( dev-perl/XML-Simple )
-	is? ( dev-perl/XML-LibXSLT )
+	is? ( dev-perl/XML-LibXSLT dev-perl/XML-DOM )
 	na_dd? ( dev-perl/SOAP-Lite dev-perl/TermReadKey )
 	no_gf? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
-	pt? ( dev-perl/HTML-Tree dev-perl/Unicode-UTF8simple )
-	eu_epg? ( dev-perl/Archive-Zip )
+	pt? ( dev-perl/HTML-Tree dev-perl/Unicode-UTF8simple dev-perl/DateTime )
+	eu_epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime )
 	se_swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
 	hr? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
-	uk_rt? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy )
+	uk_rt? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/DateTime dev-perl/DateTime-TimeZone )
 	uk_bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy )
-	ee? ( dev-perl/IO-stringy )
-	re? ( dev-perl/Lingua-EN-Numbers-Ordinate )
+	uk_atlas? ( dev-perl/DateTime )
+	uk_guardian? ( dev-perl/DateTime )
+	uk_tvguide? ( dev-perl/DateTime )
 	tv_combiner? ( dev-perl/XML-LibXML )
 	tv_check? ( dev-perl/perl-tk dev-perl/Tk-TableMatrix )
 	tv_pick_cgi? ( virtual/perl-CGI dev-perl/Lingua-EN-Numbers-Ordinate )
-	na_dtv? ( >=dev-perl/WWW-Mechanize-1.02 dev-perl/TimeDate dev-perl/IO-stringy dev-perl/XML-LibXML )
+	na_dtv? ( >=dev-perl/WWW-Mechanize-1.02 dev-perl/TimeDate dev-perl/IO-stringy dev-perl/XML-LibXML dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 )
 	"
-
-REQUIRED_USE="na_icons? ( na_dd )"
+#	na_icons? ( dev-perl/HTML-TableExtract >=dev-perl/WWW-Mechanize-1.02 )
+#	nl? ( dev-perl/HTML-Tree )
+#	dk? ( dev-perl/HTML-Tree dev-perl/DateTime dev-perl/Parse-RecDescent )
+#	ee? ( dev-perl/IO-stringy )
+#	re? ( dev-perl/Lingua-EN-Numbers-Ordinate )
+#REQUIRED_USE="na_icons? ( na_dd )"
 
 PREFIX="/usr"
 
@@ -100,11 +104,17 @@
 		# Enable Switzerland Search
 		usex ch
 		# Enable Latin America
-		usex dtvla
-		# Enable Alternate Brittain
+		#usex dtvla
+		# Enable UK and Ireland (Radio Times)
 		usex uk_rt
-		# Enable Alternate Brittain 2
+		# Enable Fast alternative grabber for the UK
 		usex uk_bleb
+		# Enable Fast grabber for UK and Ireland using Atlas database
+		usex uk_atlas
+		# Enable grabber for UK and Ireland using The Guardian website
+		usex uk_guardian
+		# Enable grabber for UK and Ireland using TV Guide website
+		usex uk_tvguide
 		# Enable Belgium and Luxemburg
 		#use be && echo "yes" || echo "no"
 		#Enable Iceland
@@ -114,11 +124,11 @@
 		# Enable Italy from DVB-S stream
 		echo "no" # missing Linux::DVB
 		# Enable India (experimental)
-		usex in
+		#usex in
 		# Enable North America using DataDirect
 		usex na_dd
 		# Enable North America channel icons
-		usex na_icons
+		#usex na_icons
 		# Enable Finland
 		usex fi
 		# Enable Israel
@@ -132,15 +142,15 @@
 		#echo "no"
 		# Enable Spain Alternatives
 		usex es_laguiatv
-		usex es_miguiatv
+		#usex es_miguiatv
 		# Enable Netherlands
-		usex nl
+		#usex nl
 		# Enable Alternate Netherlands
 		#use nl_wolf  && echo "yes" || echo "no"
 		# Enable Hungary and Romania
 		usex huro
 		# Enable Denmark
-		usex dk
+		#usex dk
 		# Enable Japan
 		#use jp  && echo "yes" || echo "no"
 		# Enable Sweden
@@ -149,8 +159,14 @@
 		usex hr
 		# Enable Norway Gfeed
 		usex no_gf
+		# Enable German speaking area (Egon zappt)
+		usex eu_egon
+		# Enable Grabber for Sweden (tvzon.se)
+		usex se_tvzon
 		# Enable France
 		usex fr
+		# Enable France (Kazer)
+		usex fr_kazer
 		# Enable Norway
 		#use no  && echo "yes" || echo "no"
 		# Enable Portugal
@@ -166,9 +182,9 @@
 		# Enable CGI support
 		usex tv_pick_cgi
 		# Enable Estonia
-		usex ee
+		#usex ee
 		# Enable Reunion Island
-		usex re
+		#usex re
 		# Enable Caledonie Island
 		#use nc && echo "yes" || echo "no"
 		# Enable North America DirecTV