Bump to version 0.5.30. Clean up dependencies. Add support for 4 extra grabbers. Cleanup antiquated versions.

11 files changed, 165 insertions, 629 deletions

diff --git a/media-tv/xmltv/ChangeLog b/media-tv/xmltv/ChangeLog
index 06baf3f26a71..61edffa9a7c2 100644
--- a/media-tv/xmltv/ChangeLog
+++ b/media-tv/xmltv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xmltv
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.16 2004/03/09 00:43:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.17 2004/03/10 03:33:26 max Exp $
+
+*xmltv-0.5.30 (09 Mar 2004)
+
+  09 Mar 2004; Max Kalika <max@gentoo.org> xmltv-0.5.30.ebuild:
+  Bump to version 0.5.30. Clean up dependencies. Add support for 4 extra
+  grabbers.
 
   09 Mar 2004; David Holm <dholm@gentoo.org> xmltv-0.5.29.ebuild:
   Added to ~ppc.
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.24 b/media-tv/xmltv/files/digest-xmltv-0.5.24
deleted file mode 100644
index 9b575e9c1322..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b80155b9ae056c5ea98446b0e82df841 xmltv-0.5.24.tar.bz2 407895
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.25 b/media-tv/xmltv/files/digest-xmltv-0.5.25
deleted file mode 100644
index c778c5f529f7..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f254392570c99d77550d93abc770ac4f xmltv-0.5.25.tar.bz2 404386
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.27 b/media-tv/xmltv/files/digest-xmltv-0.5.27
deleted file mode 100644
index 0d70ca771a6e..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.27
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dada85a413642f636f941483e3fbcbbc xmltv-0.5.27.tar.bz2 410759
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.28 b/media-tv/xmltv/files/digest-xmltv-0.5.28
deleted file mode 100644
index f88a314df630..000000000000
--- a/media-tv/xmltv/files/digest-xmltv-0.5.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 029d2668c08b06b6ed779904c28efa46 xmltv-0.5.28.tar.bz2 388854
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.30 b/media-tv/xmltv/files/digest-xmltv-0.5.30
new file mode 100644
index 000000000000..5c12fbeba50f
--- /dev/null
+++ b/media-tv/xmltv/files/digest-xmltv-0.5.30
@@ -0,0 +1 @@
+MD5 af5e700791543a8cd86d3a2ed49595f2 xmltv-0.5.30.tar.bz2 409142
diff --git a/media-tv/xmltv/xmltv-0.5.24.ebuild b/media-tv/xmltv/xmltv-0.5.24.ebuild
deleted file mode 100644
index c5c6f8f1159c..000000000000
--- a/media-tv/xmltv/xmltv-0.5.24.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 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.24.ebuild,v 1.2 2004/01/16 17:19:38 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-Parser-2.34
-	>=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/Storable-2.04
-	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 (disabled currently)
-	#[ "`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.25.ebuild b/media-tv/xmltv/xmltv-0.5.25.ebuild
deleted file mode 100644
index bc673618e893..000000000000
--- a/media-tv/xmltv/xmltv-0.5.25.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 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.25.ebuild,v 1.3 2004/01/16 17:19:38 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 (disabled)
-#  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 (disabled)
-#  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-Parser-2.34
-	>=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/Storable-2.04
-	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-3.34"
-# for tv_grab_sn (disabled)
-#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 (disabled)
-	#[ "`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 (disabled)
-	#[ "`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.27.ebuild b/media-tv/xmltv/xmltv-0.5.27.ebuild
deleted file mode 100644
index 3ca4a12f3bd5..000000000000
--- a/media-tv/xmltv/xmltv-0.5.27.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2004 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.27.ebuild,v 1.1 2004/01/16 17:19:38 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 (disabled)
-#  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 (disabled)
-#  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-Parser-2.34
-	>=dev-perl/XML-Twig-3.09
-	>=dev-perl/XML-Writer-0.4.1
-	>=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/Storable-2.04
-	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-3.34"
-# for tv_grab_sn (disabled)
-#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 (disabled)
-	#[ "`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 (disabled)
-	#[ "`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
-}
diff --git a/media-tv/xmltv/xmltv-0.5.28.ebuild b/media-tv/xmltv/xmltv-0.5.28.ebuild
deleted file mode 100644
index a52506074909..000000000000
--- a/media-tv/xmltv/xmltv-0.5.28.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2004 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.28.ebuild,v 1.3 2004/03/07 23:48:04 avenj 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"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-# 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_uk_rt:   Alternate Britain listings grabber
-#  tv_grab_it:      Italy listings grabber
-#  tv_grab_na:      North America 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-Parser-2.34
-	>=dev-perl/XML-Twig-3.09
-	>=dev-perl/XML-Writer-0.4.1
-	>=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/Storable-2.04
-	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-3.34"
-# 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 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 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
-}
diff --git a/media-tv/xmltv/xmltv-0.5.30.ebuild b/media-tv/xmltv/xmltv-0.5.30.ebuild
new file mode 100644
index 000000000000..441af26e7c9a
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.30.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2004 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.30.ebuild,v 1.1 2004/03/10 03:33:26 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 ~amd64"
+
+# 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_uk_rt:      Alternate Britain listings grabber
+#  tv_grab_it:         Italy listings grabber
+#  tv_grab_na:         North America 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_hu:         Hungary 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_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, New Zealand and Italy grabbers
+#   XMLTV_OPTS="tv_check tv_grab_nz tv_grab_it"
+
+RDEPEND=">=dev-lang/perl-5.8.1
+	>=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
+	>=dev-perl/XML-Twig-3.09
+	>=dev-perl/XML-Writer-0.4.6
+	>=dev-perl/DateManip-5.42a
+	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"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.50-r1
+	>=sys-apps/sed-4"
+
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_uk_rt ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} >=dev-perl/HTML-Parser-3.34"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_na ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} >=dev-perl/HTML-Parser-3.34"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_nz ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} >=dev-lang/python-1.5.1"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_fi ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_es ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_es_digital ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_nl ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_nl_wolf ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_hu ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_dk ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_jp ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/HTML-Tree dev-perl/Text-Kakasi"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_de_tvtoday ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_se ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/XML-LibXML"
+[ -z "${XMLTV_OPTS}" ] || has tv_grab_fr ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree"
+[ -z "${XMLTV_OPTS}" ] || has tv_check ${XMLTV_OPTS} \
+	&& DEPEND="${DEPEND} dev-perl/perl-tk dev-perl/Tk-TableMatrix"
+
+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 Alternate Brittain
+	has tv_grab_uk_rt ${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
+	has tv_grab_na ${XMLTV_OPTS}         >&/dev/null && echo "yes" || echo "no"
+	# Enable New Zealand
+	has tv_grab_nz ${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 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
+	has tv_grab_hu ${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 France
+	has tv_grab_fr ${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"
+}
+
+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
+
+	[ -z "${XMLTV_OPTS}" ] || has tv_pick_cgi ${XMLTV_OPTS} && {
+		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
+	}
+}