Bump to version 0.5.18 and mark <= 0.5.17 stable.

7 files changed, 183 insertions, 14 deletions

diff --git a/media-tv/xmltv/ChangeLog b/media-tv/xmltv/ChangeLog
index 336ea1cadb7b..19179753d7fd 100644
--- a/media-tv/xmltv/ChangeLog
+++ b/media-tv/xmltv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xmltv
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.4 2003/09/03 04:51:04 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/ChangeLog,v 1.5 2003/09/16 15:46:27 max Exp $
+
+*xmltv-0.5.18 (16 Sep 2003)
+
+  16 Sep 2003; Max Kalika <max@gentoo.org> xmltv-0.5.18.ebuild:
+  Bump to version 0.5.18 and mark <= 0.5.17 stable.
 
 *xmltv-0.5.17 (02 Sep 2003)
 
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 4d2b956adcd9..fd91d380b144 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,9 +1,11 @@
-MD5 1d8dd134abfa7fc0c682a5b8afbacffe xmltv-0.5.16.ebuild 6014
-MD5 3b8359824986b08e491ab2d4c4831062 xmltv-0.5.14-r1.ebuild 6110
-MD5 9bc08e07baa25ad94e5b230bd338aef9 xmltv-0.5.17.ebuild 6014
-MD5 32465a2c2ffbfdd52e5d36ad496accac ChangeLog 3730
+MD5 75e21efa952fb3c32384c0a2510d918c xmltv-0.5.16.ebuild 6010
+MD5 c7012e3dd8adfcd5859e607e167d4955 xmltv-0.5.18.ebuild 6011
+MD5 eae8d14f26339258cb7d7b43727ac294 xmltv-0.5.14-r1.ebuild 6106
+MD5 71abfbc86eebca3cdb2f478369396441 xmltv-0.5.17.ebuild 6010
+MD5 231317dfe9dad6a6cc371bce62b56360 ChangeLog 3876
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 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 35c0ccab3f399ea2ed58bb3c97bfa8e7 files/digest-xmltv-0.5.14-r1 65
 MD5 e515eee3cdb5c503cd44ddba41527013 files/xmltv-0.5.14-code_500.patch 2320
diff --git a/media-tv/xmltv/files/digest-xmltv-0.5.18 b/media-tv/xmltv/files/digest-xmltv-0.5.18
new file mode 100644
index 000000000000..70c8bb05ceb8
--- /dev/null
+++ b/media-tv/xmltv/files/digest-xmltv-0.5.18
@@ -0,0 +1 @@
+MD5 eaa467fb6ea009a1adf13fdd0950b087 xmltv-0.5.18.tar.bz2 398013
diff --git a/media-tv/xmltv/xmltv-0.5.14-r1.ebuild b/media-tv/xmltv/xmltv-0.5.14-r1.ebuild
index 0ddef1e31444..f96b7e5b4555 100644
--- a/media-tv/xmltv/xmltv-0.5.14-r1.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.14-r1.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.14-r1.ebuild,v 1.1 2003/08/20 05:19:35 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.14-r1.ebuild,v 1.2 2003/09/16 15:46:27 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
@@ -67,7 +67,7 @@ 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@lsit.ucsb.edu>
+###  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}`" ] \
diff --git a/media-tv/xmltv/xmltv-0.5.16.ebuild b/media-tv/xmltv/xmltv-0.5.16.ebuild
index ff2f76b30d7a..182026b82cab 100644
--- a/media-tv/xmltv/xmltv-0.5.16.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.16.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.16.ebuild,v 1.1 2003/08/18 16:00:14 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.16.ebuild,v 1.2 2003/09/16 15:46:27 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
@@ -67,7 +67,7 @@ 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@lsit.ucsb.edu>
+###  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}`" ] \
diff --git a/media-tv/xmltv/xmltv-0.5.17.ebuild b/media-tv/xmltv/xmltv-0.5.17.ebuild
index 6ee23bf7ce5d..bba06e14fb3e 100644
--- a/media-tv/xmltv/xmltv-0.5.17.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.17.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.17.ebuild,v 1.1 2003/09/03 04:51:04 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xmltv/xmltv-0.5.17.ebuild,v 1.2 2003/09/16 15:46:27 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
@@ -67,7 +67,7 @@ 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@lsit.ucsb.edu>
+###  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}`" ] \
diff --git a/media-tv/xmltv/xmltv-0.5.18.ebuild b/media-tv/xmltv/xmltv-0.5.18.ebuild
new file mode 100644
index 000000000000..9c01b0cd700e
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.18.ebuild
@@ -0,0 +1,161 @@
+# 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.1 2003/09/16 15:46:27 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_nl ${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
+}