Bump to new stable version 0.5.23 and new experimental version 0.5.24 which requires new XML-Parser-2.34. Cleanup no-longer working versions.

19 files changed, 9 insertions, 913 deletions

diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 37133314c299..a396a7243b85 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,22 +1,6 @@
-MD5 8ff5f8fd491d8708340ce050ca28fce7 xmltv-0.5.20.ebuild 6058
-MD5 e10012ed6cd43ce34db3677505a0b12d xmltv-0.5.16.ebuild 6010
-MD5 b3b42f622dfbf3d3e64c9b44dbb3268b xmltv-0.5.18.ebuild 6010
-MD5 5b1a72c4c4ee198ae1d4fd732af20200 xmltv-0.5.24.ebuild 6087
-MD5 521c3182317904eba7c1bc9df9a2d2f3 xmltv-0.5.14-r1.ebuild 6106
-MD5 ef74379737bef00dfb5335c2228ae6c9 xmltv-0.5.21.ebuild 6058
-MD5 71cc081ccda8111262b3bc85ebf32ae7 xmltv-0.5.17.ebuild 6010
-MD5 30bceafae7039aae5606fe58ce210514 ChangeLog 4652
+MD5 7601529043af413db63e1e2f5dce9963 xmltv-0.5.24.ebuild 6087
+MD5 7eb0f5ddfbd22ad6ee0fc9762dc35df5 ChangeLog 5131
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 ef74379737bef00dfb5335c2228ae6c9 xmltv-0.5.23.ebuild 6058
-MD5 bd04019238e115c29655ba82137defb1 xmltv-0.5.19.ebuild 6218
-MD5 fdac3cb914cbd57d6e7cc4d75a9b32e7 files/digest-xmltv-0.5.16 65
-MD5 911e0dbfda6b923eda72868a99bff4b1 files/digest-xmltv-0.5.17 65
-MD5 336f6161c2a3fcd603317dfc65af7971 files/digest-xmltv-0.5.18 65
-MD5 2ac54f2548b19a80a48d7116da974ea6 files/digest-xmltv-0.5.19 65
-MD5 11cec115a93950b209a6a74bd758fb12 files/digest-xmltv-0.5.20 65
-MD5 7406ee0d7571ad00811569c0c016e35d files/digest-xmltv-0.5.21 65
+MD5 ddac7baf10aa9e6cf24552f2566b2245 xmltv-0.5.23.ebuild 6058
 MD5 dc434592be0863ac2e405460f0eb5819 files/digest-xmltv-0.5.23 65
 MD5 e0dabb09f6e6c5045c7db7004e3f333f files/digest-xmltv-0.5.24 65
-MD5 35c0ccab3f399ea2ed58bb3c97bfa8e7 files/digest-xmltv-0.5.14-r1 65
-MD5 5dfcbb9237cf2f72592290b184235046 files/xmltv-0.5.19-newer-MM.patch 656
-MD5 e515eee3cdb5c503cd44ddba41527013 files/xmltv-0.5.14-code_500.patch 2320
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.14-r1 b/media-tv/xmltv/files/digest-xmltv-0.5.14-r1
deleted file mode 100644
index 55dff50afa60..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.14-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91c50b044bb8cf9b7e981dd6aed5e16a xmltv-0.5.14.tar.bz2 387495
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.16 b/media-tv/xmltv/files/digest-xmltv-0.5.16
deleted file mode 100644
index e33690c3c3ae..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27408429de35b541f9d608b73320cd4d xmltv-0.5.16.tar.bz2 391577
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.17 b/media-tv/xmltv/files/digest-xmltv-0.5.17
deleted file mode 100644
index 203c2fe2713e..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4274e63de47f2f52bc98494ff5b2196 xmltv-0.5.17.tar.bz2 392100
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.18 b/media-tv/xmltv/files/digest-xmltv-0.5.18
deleted file mode 100644
index 70c8bb05ceb8..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eaa467fb6ea009a1adf13fdd0950b087 xmltv-0.5.18.tar.bz2 398013
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.19 b/media-tv/xmltv/files/digest-xmltv-0.5.19
deleted file mode 100644
index cac8add05a7b..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7df1e4f3c7edb6faa64530a8913b655 xmltv-0.5.19.tar.bz2 398884
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.20 b/media-tv/xmltv/files/digest-xmltv-0.5.20
deleted file mode 100644
index 9f05c822d88e..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf3f8809d4b504858e41c5af44739741 xmltv-0.5.20.tar.bz2 405272
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.21 b/media-tv/xmltv/files/digest-xmltv-0.5.21
deleted file mode 100644
index 1427abdf40d8..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa15d4663e57a8b1a4c0736568a2d447 xmltv-0.5.21.tar.bz2 405588
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.23 b/media-tv/xmltv/files/digest-xmltv-0.5.23
new file mode 100644
index 000000000000..58a39788a880
--- /dev/null
+++ b/media-tv/xmltv/files/digest-xmltv-0.5.23
@@ -0,0 +1 @@
+MD5 41d539fb9ee3551d125e887c0f628a43 xmltv-0.5.23.tar.bz2 406756
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.24 b/media-tv/xmltv/files/digest-xmltv-0.5.24
new file mode 100644
index 000000000000..9b575e9c1322
--- /dev/null
+++ b/media-tv/xmltv/files/digest-xmltv-0.5.24
@@ -0,0 +1 @@
+MD5 b80155b9ae056c5ea98446b0e82df841 xmltv-0.5.24.tar.bz2 407895
diff --git a/media-tv/xmltv/files/xmltv-0.5.14-code_500.patch b/media-tv/xmltv/files/xmltv-0.5.14-code_500.patch
deleted file mode 100644
index dcdbe4ceda62..000000000000
--- a/media-tv/xmltv/files/xmltv-0.5.14-code_500.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- xmltv-0.5.15/grab/na/ZapListings.pm.orig	2003-07-06 12:13:03.000000000 -0700
-+++ xmltv-0.5.15/grab/na/ZapListings.pm	2003-08-11 19:47:27.000000000 -0700
-@@ -913,7 +913,7 @@
-     }
- 
-     my $res=&doRequest($self->{ua}, $req, $self->{Debug});
--    if ( !$res->is_success || $res->content()=~m/your session has timed out/i ) {
-+    if ( !($res->is_success || $res->code eq '500') || $res->content()=~m/your session has timed out/i ) {
- 	# again.
- 	$res=&doRequest($self->{ua}, $req, $self->{Debug});
- 
-@@ -926,7 +926,7 @@
- 	}
-     }
- 
--    if ( !$res->is_success ) {
-+    if ( !($res->is_success || $res->code eq '500') ) {
- 	main::errorMessage("zap2it failed to give us a page: ".$res->code().":".
- 			 HTTP::Status::status_message($res->code())."\n");
- 	main::errorMessage("check postal/zip code or www site (maybe they're down)\n");
-@@ -955,7 +955,7 @@
-     $req = $self->Form2Request($self->{GridForm});
- 
-     $res=&doRequest($self->{ua}, $req, $self->{Debug});
--    if ( !$res->is_success || $res->content()=~m/your session has timed out/i ) {
-+    if ( !($res->is_success || $res->code eq '500') || $res->content()=~m/your session has timed out/i ) {
- 	# again.
- 	$res=&doRequest($self->{ua}, $req, $self->{Debug});
- 
-@@ -968,7 +968,7 @@
- 	}
-     }
- 
--    if ( !$res->is_success ) {
-+    if ( !($res->is_success || $res->code eq '500') ) {
- 	main::errorMessage("zap2it failed to give us a page: ".$res->code().":".
- 			 HTTP::Status::status_message($res->code())."\n");
- 	main::errorMessage("check postal/zip code or www site (maybe they're down)\n");
-@@ -2050,12 +2050,12 @@
- 	# looks like some requests require two identical calls since
- 	# the zap2it server gives us a cookie that works with the second
- 	# attempt after the first fails
--	if ( !$res->is_success || $res->content()=~m/your session has timed out/i ) {
-+	if ( !($res->is_success || $res->code eq '500') || $res->content()=~m/your session has timed out/i ) {
- 	    # again.
- 	    $res=&doRequest($self->{ua}, $req, $self->{Debug});
- 	}
- 
--	if ( !$res->is_success ) {
-+	if ( !($res->is_success || $res->code eq '500') ) {
- 	    main::errorMessage("zap2it failed to give us a page: ".$res->code().":".
- 			     HTTP::Status::status_message($res->code())."\n");
- 	    main::errorMessage("check postal/zip code or www site (maybe they're down)\n");
diff --git a/media-tv/xmltv/files/xmltv-0.5.19-newer-MM.patch b/media-tv/xmltv/files/xmltv-0.5.19-newer-MM.patch
deleted file mode 100644
index 68586a956db5..000000000000
--- a/media-tv/xmltv/files/xmltv-0.5.19-newer-MM.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xmltv-0.5.19/Makefile.PL	2003-09-27 11:21:02.000000000 -0700
-+++ xmltv-0.5.19/Makefile.PL-new	2003-10-06 20:01:50.000000000 -0700
-@@ -37,9 +37,9 @@
- our %extra_constants;
- %extra_constants
-   = (INST_PLAINDOC   => 'blib/doc',
--     INSTALLPLAINDOC => "\$(PREFIX)/share/doc/xmltv-$::VERSION",
-+     INSTALLPLAINDOC => "\$(DESTDIR)\$(PREFIX)/share/doc/xmltv-$::VERSION",
-      INST_SHARE      => 'blib/share',
--     INSTALLSHARE    => '$(PREFIX)/share/xmltv',
-+     INSTALLSHARE    => '$(DESTDIR)$(PREFIX)/share/xmltv',
- 
-      # Manual page constants, shouldn't really be needed, but work
-      # around bugs and make sure this stuff is the same across
diff --git a/media-tv/xmltv/xmltv-0.5.14-r1.ebuild b/media-tv/xmltv/xmltv-0.5.14-r1.ebuild
deleted file mode 100644
index 22366f81e106..000000000000
--- a/media-tv/xmltv/xmltv-0.5.14-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.14-r1.ebuild,v 1.3 2003/11/03 16:47:05 max Exp $
-
-inherit 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/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-# 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*.
-#
-#  none:            Don't enable any of the features below
-#  tv_grab_de:      Germany and Austria listing grabbers
-#  tv_grab_uk:      Britain listings grabber
-#  tv_grab_uk_rt:   Alternate Britain listings grabber
-#  tv_grab_it:      Italy listings grabber
-#  tv_grab_na:      North America listings grabber
-#  tv_grab_sn:      Sweden and Norway listings grabber
-#  tv_grab_nz:      New Zealand listings grabber
-#  tv_grab_fi:      Finland listings grabber
-#  tv_grab_es:      Spain listings grabber
-#  tv_grab_nl:      Netherlands listings grabber
-#  tv_grab_nl_wolf: Alternate Netherlands listings grabber
-#  tv_grab_hu:      Hungary listings grabber
-#  tv_grab_dk:      Denmark 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, New Zealand and Italy grabbers
-#   XMLTV_OPTS="tv_check tv_grab_nz tv_grab_it"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Twig-3.09
-	dev-perl/XML-Writer
-	>=dev-perl/DateManip-5.42
-	dev-perl/Memoize
-	>=dev-perl/Term-ProgressBar-2.03
-	dev-perl/Compress-Zlib
-	dev-perl/Lingua-EN-Numbers-Ordinate
-	dev-perl/Lingua-Preferred
-	dev-perl/Unicode-String"
-
-# for tv_check
-DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-# for tv_grab_na
-DEPEND="${DEPEND} dev-perl/HTML-Parser"
-# for tv_grab_sn
-DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.08"
-# for tv_grab_nz
-DEPEND="${DEPEND} >=dev-lang/python-1.5.2"
-# for tv_grab_fi tv_grab_es tv_grab_nl tv_grab_nl_wolf tv_grab_hu tv_grab_dk
-DEPEND="${DEPEND} dev-perl/HTML-Tree"
-
-### disabled until portage dependecy checker has notions of things
-###  other then incrementals that are in /etc/make.conf
-###  6/13/2003 Max Kalika <max@gentoo.org>
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_na ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Parser"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_sn ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.0.8"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nz ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-lang/python-1.5.1"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_fi ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_es ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_hu ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_dk ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_check ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-
-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 Germany and Austria
-	[ "`has tv_grab_de ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Brittain
-	[ "`has tv_grab_uk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Brittain
-	[ "`has tv_grab_uk_rt ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Italy
-	[ "`has tv_grab_it ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable North America
-	[ "`has tv_grab_na ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Sweden and Norway
-	[ "`has tv_grab_sn ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable New Zealand
-	[ "`has tv_grab_nz ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Finland
-	[ "`has tv_grab_fi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Spain
-	[ "`has tv_grab_es ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Netherlands
-	[ "`has tv_grab_nl ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Netherlands
-	[ "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Hungary
-	[ "`has tv_grab_hu ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Denmark
-	[ "`has tv_grab_dk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable GUI checking.
-	[ "`has tv_check ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable CGI support
-	[ "`has tv_pick_cgi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/xmltv-${PV}-code_500.patch"
-}
-
-src_compile() {
-	make_config | perl-module_src_compile
-}
-
-src_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}" -o "`has tv_pick_cgi ${XMLTV_OPTS}`" ] ; then
-		dobin choose/tv_pick/tv_pick_cgi
-		einfo
-		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		einfo "to where the ScriptAlias directive is configured."
-		einfo
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from < 0.5.10 and you need to use the"
-	ewarn "DE (Germany/Austria), UK or UK_RT (Britain), or IT (Italy)"
-	ewarn "grabbers, please make sure you have the appropriate value"
-	ewarn "specified in your XMLTV_OPTS setting because these grabbers"
-	ewarn "no longer build by default."
-	echo
-}
diff --git a/media-tv/xmltv/xmltv-0.5.16.ebuild b/media-tv/xmltv/xmltv-0.5.16.ebuild
deleted file mode 100644
index d2763797f5e4..000000000000
--- a/media-tv/xmltv/xmltv-0.5.16.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.16.ebuild,v 1.3 2003/11/03 16:47:05 max Exp $
-
-inherit 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/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-# 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*.
-#
-#  none:            Don't enable any of the features below
-#  tv_grab_de:      Germany and Austria listing grabbers
-#  tv_grab_uk:      Britain listings grabber
-#  tv_grab_uk_rt:   Alternate Britain listings grabber
-#  tv_grab_it:      Italy listings grabber
-#  tv_grab_na:      North America listings grabber
-#  tv_grab_sn:      Sweden and Norway listings grabber
-#  tv_grab_nz:      New Zealand listings grabber
-#  tv_grab_fi:      Finland listings grabber
-#  tv_grab_es:      Spain listings grabber
-#  tv_grab_nl:      Netherlands listings grabber
-#  tv_grab_nl_wolf: Alternate Netherlands listings grabber
-#  tv_grab_hu:      Hungary listings grabber
-#  tv_grab_dk:      Denmark 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, New Zealand and Italy grabbers
-#   XMLTV_OPTS="tv_check tv_grab_nz tv_grab_it"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Twig-3.09
-	dev-perl/XML-Writer
-	>=dev-perl/DateManip-5.42
-	dev-perl/Memoize
-	>=dev-perl/Term-ProgressBar-2.03
-	dev-perl/Compress-Zlib
-	dev-perl/Lingua-EN-Numbers-Ordinate
-	dev-perl/Lingua-Preferred
-	dev-perl/Unicode-String"
-
-# for tv_check
-DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-# for tv_grab_na
-DEPEND="${DEPEND} dev-perl/HTML-Parser"
-# for tv_grab_sn
-DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.08"
-# for tv_grab_nz
-DEPEND="${DEPEND} >=dev-lang/python-1.5.2"
-# for tv_grab_fi tv_grab_es tv_grab_nl tv_grab_nl_wolf tv_grab_hu tv_grab_dk
-DEPEND="${DEPEND} dev-perl/HTML-Tree"
-
-### disabled until portage dependecy checker has notions of things
-###  other then incrementals that are in /etc/make.conf
-###  6/13/2003 Max Kalika <max@gentoo.org>
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_na ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Parser"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_sn ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.0.8"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nz ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-lang/python-1.5.1"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_fi ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_es ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_hu ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_dk ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_check ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-
-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 Germany and Austria
-	[ "`has tv_grab_de ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Brittain
-	[ "`has tv_grab_uk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Brittain
-	[ "`has tv_grab_uk_rt ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Italy
-	[ "`has tv_grab_it ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable North America
-	[ "`has tv_grab_na ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Sweden and Norway
-	[ "`has tv_grab_sn ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable New Zealand
-	[ "`has tv_grab_nz ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Finland
-	[ "`has tv_grab_fi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Spain
-	[ "`has tv_grab_es ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Netherlands
-	[ "`has tv_grab_nl ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Netherlands
-	[ "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Hungary
-	[ "`has tv_grab_hu ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Denmark
-	[ "`has tv_grab_dk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable GUI checking.
-	[ "`has tv_check ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable CGI support
-	[ "`has tv_pick_cgi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-}
-
-src_compile() {
-	make_config | perl-module_src_compile
-}
-
-src_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}" -o "`has tv_pick_cgi ${XMLTV_OPTS}`" ] ; then
-		dobin choose/tv_pick/tv_pick_cgi
-		einfo
-		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		einfo "to where the ScriptAlias directive is configured."
-		einfo
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from < 0.5.10 and you need to use the"
-	ewarn "DE (Germany/Austria), UK or UK_RT (Britain), or IT (Italy)"
-	ewarn "grabbers, please make sure you have the appropriate value"
-	ewarn "specified in your XMLTV_OPTS setting because these grabbers"
-	ewarn "no longer build by default."
-	echo
-}
diff --git a/media-tv/xmltv/xmltv-0.5.17.ebuild b/media-tv/xmltv/xmltv-0.5.17.ebuild
deleted file mode 100644
index 5c379bd7de5a..000000000000
--- a/media-tv/xmltv/xmltv-0.5.17.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.17.ebuild,v 1.3 2003/11/03 16:47:05 max Exp $
-
-inherit 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/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-# 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*.
-#
-#  none:            Don't enable any of the features below
-#  tv_grab_de:      Germany and Austria listing grabbers
-#  tv_grab_uk:      Britain listings grabber
-#  tv_grab_uk_rt:   Alternate Britain listings grabber
-#  tv_grab_it:      Italy listings grabber
-#  tv_grab_na:      North America listings grabber
-#  tv_grab_sn:      Sweden and Norway listings grabber
-#  tv_grab_nz:      New Zealand listings grabber
-#  tv_grab_fi:      Finland listings grabber
-#  tv_grab_es:      Spain listings grabber
-#  tv_grab_nl:      Netherlands listings grabber
-#  tv_grab_nl_wolf: Alternate Netherlands listings grabber
-#  tv_grab_hu:      Hungary listings grabber
-#  tv_grab_dk:      Denmark 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, New Zealand and Italy grabbers
-#   XMLTV_OPTS="tv_check tv_grab_nz tv_grab_it"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Twig-3.09
-	dev-perl/XML-Writer
-	>=dev-perl/DateManip-5.42
-	dev-perl/Memoize
-	>=dev-perl/Term-ProgressBar-2.03
-	dev-perl/Compress-Zlib
-	dev-perl/Lingua-EN-Numbers-Ordinate
-	dev-perl/Lingua-Preferred
-	dev-perl/Unicode-String"
-
-# for tv_check
-DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-# for tv_grab_na
-DEPEND="${DEPEND} dev-perl/HTML-Parser"
-# for tv_grab_sn
-DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.08"
-# for tv_grab_nz
-DEPEND="${DEPEND} >=dev-lang/python-1.5.2"
-# for tv_grab_fi tv_grab_es tv_grab_nl tv_grab_nl_wolf tv_grab_hu tv_grab_dk
-DEPEND="${DEPEND} dev-perl/HTML-Tree"
-
-### disabled until portage dependecy checker has notions of things
-###  other then incrementals that are in /etc/make.conf
-###  6/13/2003 Max Kalika <max@gentoo.org>
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_na ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Parser"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_sn ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.0.8"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nz ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-lang/python-1.5.1"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_fi ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_es ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_hu ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_dk ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_check ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-
-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 Germany and Austria
-	[ "`has tv_grab_de ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Brittain
-	[ "`has tv_grab_uk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Brittain
-	[ "`has tv_grab_uk_rt ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Italy
-	[ "`has tv_grab_it ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable North America
-	[ "`has tv_grab_na ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Sweden and Norway
-	[ "`has tv_grab_sn ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable New Zealand
-	[ "`has tv_grab_nz ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Finland
-	[ "`has tv_grab_fi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Spain
-	[ "`has tv_grab_es ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Netherlands
-	[ "`has tv_grab_nl ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Netherlands
-	[ "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Hungary
-	[ "`has tv_grab_hu ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Denmark
-	[ "`has tv_grab_dk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable GUI checking.
-	[ "`has tv_check ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable CGI support
-	[ "`has tv_pick_cgi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-}
-
-src_compile() {
-	make_config | perl-module_src_compile
-}
-
-src_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}" -o "`has tv_pick_cgi ${XMLTV_OPTS}`" ] ; then
-		dobin choose/tv_pick/tv_pick_cgi
-		einfo
-		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		einfo "to where the ScriptAlias directive is configured."
-		einfo
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from < 0.5.10 and you need to use the"
-	ewarn "DE (Germany/Austria), UK or UK_RT (Britain), or IT (Italy)"
-	ewarn "grabbers, please make sure you have the appropriate value"
-	ewarn "specified in your XMLTV_OPTS setting because these grabbers"
-	ewarn "no longer build by default."
-	echo
-}
diff --git a/media-tv/xmltv/xmltv-0.5.18.ebuild b/media-tv/xmltv/xmltv-0.5.18.ebuild
deleted file mode 100644
index 41ab5f262e87..000000000000
--- a/media-tv/xmltv/xmltv-0.5.18.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.18.ebuild,v 1.3 2003/11/03 16:47:05 max Exp $
-
-inherit 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/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-# 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*.
-#
-#  none:            Don't enable any of the features below
-#  tv_grab_de:      Germany and Austria listing grabbers
-#  tv_grab_uk:      Britain listings grabber
-#  tv_grab_uk_rt:   Alternate Britain listings grabber
-#  tv_grab_it:      Italy listings grabber
-#  tv_grab_na:      North America listings grabber
-#  tv_grab_sn:      Sweden and Norway listings grabber
-#  tv_grab_nz:      New Zealand listings grabber
-#  tv_grab_fi:      Finland listings grabber
-#  tv_grab_es:      Spain listings grabber
-#  tv_grab_nl:      Netherlands listings grabber
-#  tv_grab_nl_wolf: Alternate Netherlands listings grabber
-#  tv_grab_hu:      Hungary listings grabber
-#  tv_grab_dk:      Denmark 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, New Zealand and Italy grabbers
-#   XMLTV_OPTS="tv_check tv_grab_nz tv_grab_it"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Twig-3.09
-	dev-perl/XML-Writer
-	>=dev-perl/DateManip-5.42
-	dev-perl/Memoize
-	>=dev-perl/Term-ProgressBar-2.03
-	dev-perl/Compress-Zlib
-	dev-perl/Lingua-EN-Numbers-Ordinate
-	dev-perl/Lingua-Preferred
-	dev-perl/Unicode-String"
-
-# for tv_check
-DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-# for tv_grab_na
-DEPEND="${DEPEND} dev-perl/HTML-Parser"
-# for tv_grab_sn
-DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.08"
-# for tv_grab_nz
-DEPEND="${DEPEND} >=dev-lang/python-1.5.2"
-# for tv_grab_fi tv_grab_es tv_grab_nl tv_grab_nl_wolf tv_grab_hu tv_grab_dk
-DEPEND="${DEPEND} dev-perl/HTML-Tree"
-
-### disabled until portage dependecy checker has notions of things
-###  other then incrementals that are in /etc/make.conf
-###  6/13/2003 Max Kalika <max@gentoo.org>
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_na ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Parser"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_sn ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.0.8"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nz ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-lang/python-1.5.1"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_fi ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_es ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_hu ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_dk ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_check ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-
-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 Germany and Austria
-	[ "`has tv_grab_de ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Brittain
-	[ "`has tv_grab_uk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Brittain
-	[ "`has tv_grab_uk_rt ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Italy
-	[ "`has tv_grab_it ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable North America
-	[ "`has tv_grab_na ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Sweden and Norway
-	[ "`has tv_grab_sn ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable New Zealand
-	[ "`has tv_grab_nz ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Finland
-	[ "`has tv_grab_fi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Spain
-	[ "`has tv_grab_es ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Netherlands
-	[ "`has tv_grab_nl ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Netherlands
-	[ "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Hungary
-	[ "`has tv_grab_hu ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Denmark
-	[ "`has tv_grab_dk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable GUI checking.
-	[ "`has tv_check ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable CGI support
-	[ "`has tv_pick_cgi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-}
-
-src_compile() {
-	make_config | perl-module_src_compile
-}
-
-src_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}" -o "`has tv_pick_cgi ${XMLTV_OPTS}`" ] ; then
-		dobin choose/tv_pick/tv_pick_cgi
-		einfo
-		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		einfo "to where the ScriptAlias directive is configured."
-		einfo
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from < 0.5.10 and you need to use the"
-	ewarn "DE (Germany/Austria), UK or UK_RT (Britain), or IT (Italy)"
-	ewarn "grabbers, please make sure you have the appropriate value"
-	ewarn "specified in your XMLTV_OPTS setting because these grabbers"
-	ewarn "no longer build by default."
-	echo
-}
diff --git a/media-tv/xmltv/xmltv-0.5.19.ebuild b/media-tv/xmltv/xmltv-0.5.19.ebuild
deleted file mode 100644
index 52aa7750a812..000000000000
--- a/media-tv/xmltv/xmltv-0.5.19.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.19.ebuild,v 1.3 2003/11/03 16:47:05 max Exp $
-
-inherit 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/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-# 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*.
-#
-#  none:            Don't enable any of the features below
-#  tv_grab_de:      Germany and Austria listing grabbers
-#  tv_grab_uk:      Britain listings grabber
-#  tv_grab_uk_rt:   Alternate Britain listings grabber
-#  tv_grab_it:      Italy listings grabber
-#  tv_grab_na:      North America listings grabber
-#  tv_grab_sn:      Sweden and Norway listings grabber
-#  tv_grab_nz:      New Zealand listings grabber
-#  tv_grab_fi:      Finland listings grabber
-#  tv_grab_es:      Spain listings grabber
-#  tv_grab_nl:      Netherlands listings grabber
-#  tv_grab_nl_wolf: Alternate Netherlands listings grabber
-#  tv_grab_hu:      Hungary listings grabber
-#  tv_grab_dk:      Denmark 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, New Zealand and Italy grabbers
-#   XMLTV_OPTS="tv_check tv_grab_nz tv_grab_it"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Twig-3.09
-	dev-perl/XML-Writer
-	>=dev-perl/DateManip-5.42
-	dev-perl/Memoize
-	>=dev-perl/Term-ProgressBar-2.03
-	dev-perl/Compress-Zlib
-	dev-perl/Lingua-EN-Numbers-Ordinate
-	dev-perl/Lingua-Preferred
-	dev-perl/Unicode-String"
-
-# for tv_check
-DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-# for tv_grab_na
-DEPEND="${DEPEND} dev-perl/HTML-Parser"
-# for tv_grab_sn
-DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.08"
-# for tv_grab_nz
-DEPEND="${DEPEND} >=dev-lang/python-1.5.2"
-# for tv_grab_fi tv_grab_es tv_grab_nl tv_grab_nl_wolf tv_grab_hu tv_grab_dk
-DEPEND="${DEPEND} dev-perl/HTML-Tree"
-
-### disabled until portage dependecy checker has notions of things
-###  other then incrementals that are in /etc/make.conf
-###  6/13/2003 Max Kalika <max@gentoo.org>
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_na ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Parser"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_sn ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-perl/HTML-TableExtract-1.0.8"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nz ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} >=dev-lang/python-1.5.1"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_fi ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_es ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_hu ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_grab_dk ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
-#[ -z "${XMLTV_OPTS}" -o "`has tv_check ${XMLTV_OPTS}`" ] \
-#	&& DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix dev-perl/XML-Simple"
-
-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 Germany and Austria
-	[ "`has tv_grab_de ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Brittain
-	[ "`has tv_grab_uk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Brittain
-	[ "`has tv_grab_uk_rt ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Italy
-	[ "`has tv_grab_it ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable North America
-	[ "`has tv_grab_na ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Sweden and Norway
-	[ "`has tv_grab_sn ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable New Zealand
-	[ "`has tv_grab_nz ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Finland
-	[ "`has tv_grab_fi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Spain
-	[ "`has tv_grab_es ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Netherlands
-	[ "`has tv_grab_nl ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Alternate Netherlands
-	[ "`has tv_grab_nl_wolf ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Hungary
-	[ "`has tv_grab_hu ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable Denmark
-	[ "`has tv_grab_dk ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable GUI checking.
-	[ "`has tv_check ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-	# Enable CGI support
-	[ "`has tv_pick_cgi ${XMLTV_OPTS}`" ] && echo "yes" || echo "no"
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	if [ "`best_version '>=dev-perl/ExtUtils-MakeMaker-6.11'`" -o "`best_version '>=dev-lang/perl-5.8.1_pre'`" ] ; then
-		epatch "${FILESDIR}/${P}-newer-MM.patch"
-	fi
-}
-
-src_compile() {
-	make_config | perl-module_src_compile
-}
-
-src_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}" -o "`has tv_pick_cgi ${XMLTV_OPTS}`" ] ; then
-		dobin choose/tv_pick/tv_pick_cgi
-		einfo
-		einfo "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		einfo "to where the ScriptAlias directive is configured."
-		einfo
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from < 0.5.10 and you need to use the"
-	ewarn "DE (Germany/Austria), UK or UK_RT (Britain), or IT (Italy)"
-	ewarn "grabbers, please make sure you have the appropriate value"
-	ewarn "specified in your XMLTV_OPTS setting because these grabbers"
-	ewarn "no longer build by default."
-	echo
-}
diff --git a/media-tv/xmltv/xmltv-0.5.20.ebuild b/media-tv/xmltv/xmltv-0.5.23.ebuild
index d685a26bf01e..d432a30b1cf9 100644
--- a/media-tv/xmltv/xmltv-0.5.20.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.20.ebuild,v 1.2 2003/11/08 18:51:26 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.23.ebuild,v 1.1 2003/12/03 07:53:58 max Exp $
 
 inherit perl-module
 
diff --git a/media-tv/xmltv/xmltv-0.5.21.ebuild b/media-tv/xmltv/xmltv-0.5.24.ebuild
index 89361eb5a9b7..7ea7707f60b1 100644
--- a/media-tv/xmltv/xmltv-0.5.21.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.21.ebuild,v 1.1 2003/11/08 18:51:26 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.24.ebuild,v 1.1 2003/12/03 07:53:58 max Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 # NOTE: you can customize the xmltv installation by
 #       defining a XMLTV_OPTS variable which contains
@@ -44,6 +44,7 @@ KEYWORDS="x86"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
 	>=dev-perl/XML-Twig-3.09
 	dev-perl/XML-Writer
 	>=dev-perl/DateManip-5.42