Merge branch 'testing'

1 files changed, 32 insertions, 21 deletions

diff --git a/abs/core/xmltv/PKGBUILD b/abs/core/xmltv/PKGBUILD
index 144d2ab..b9cf6a0 100644
--- a/abs/core/xmltv/PKGBUILD
+++ b/abs/core/xmltv/PKGBUILD
@@ -1,30 +1,28 @@
-# Maintainer: K. Hampf <k.hampf@gmail.com>
-# Submitter: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
 pkgname=xmltv
-pkgver=0.5.69
-pkgrel=1
+pkgver=0.5.70
+pkgrel=180827
+_pkgver="xmltv"
 pkgdesc="Set of utilities to download tv listings and format them in xml"
 arch=('any')
 url="http://xmltv.org/wiki/"
 license=('GPL')
-depends=('perl-archive-zip' 'perl-datetime' 'perl-date-manip' 
-  'perl-file-slurp' 'perl-datetime-format-strptime' 'perl-datetime-locale' 
+depends=('perl-archive-zip' 'perl-cgi' 'perl-datetime' 'perl-date-manip'
+  'perl-file-homedir'  'perl-file-slurp' 'perl-file-which'
+  'perl-datetime-format-iso8601' 'perl-datetime-format-sqlite'
+  'perl-datetime-format-strptime' 'perl-datetime-locale' 'perl-dbd-sqlite'
   'perl-http-cache-transparent' 'perl-http-response-encoding' 
-  'perl-html-tree' 'perl-io-stringy' 'perl-lingua-en-numbers-ordinate' 
-  'perl-lingua-preferred' 'perl-soap-lite' 'perl-term-progressbar'
-  'perl-term-readkey' 'perl-timedate' 'perl-tk-tablematrix' 
-  'perl-unicode-string' 'perl-unicode-utf8simple' 'perl-www-mechanize'
-  'perl-xml-dom' 'perl-xml-libxml' 'perl-xml-libxslt' 'perl-xml-simple'
-  'perl-xml-twig' 'perl-xml-writer' 'perl-parse-recdescent' 'perl-cgi'
-  'perl-xml-treepp' 'perl-datetime-format-iso8601' 'perl-json')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1b0128f97755e7769177d7930e03ad74')
+  'perl-html-tree' 'perl-io-stringy' 'perl-json'
+  'perl-lingua-en-numbers-ordinate' 'perl-lingua-preferred'
+  'perl-list-moreutils' 'perl-lwp-protocol-https'
+  'perl-lwp-useragent-determined' 'perl-parse-recdescent' 'perl-soap-lite'
+  'perl-term-progressbar' 'perl-term-readkey' 'perl-timedate'
+  'perl-tk-tablematrix' 'perl-unicode-string' 'perl-unicode-utf8simple'
+  'perl-www-mechanize' 'perl-xml-dom' 'perl-xml-libxml' 'perl-xml-libxslt'
+  'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' 'perl-xml-treepp')
+source=("git+https://github.com/XMLTV/xmltv.git")
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgver"
   unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
   export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
   yes | /usr/bin/perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor 
@@ -32,14 +30,14 @@ build() {
 }
 
 check() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgver"
   unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
   export PERL_MM_USE_DEFAULT=1
   make test
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgver"
   unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
   make install DESTDIR="$pkgdir"
 	 
@@ -47,3 +45,16 @@ package() {
   find ${pkgdir} -name perllocal.pod -delete
   find ${pkgdir} -name .packlist -delete
 }
+
+prepare() {
+  # To build corectly with Perl 5.26
+  # see https://sourceforge.net/p/xmltv/mailman/message/36001436/
+  # and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865045
+  sed "s/use POSIX 'tmpnam';//" -i $_pkgver/filter/tv_to_latex
+  sed "s/use POSIX 'tmpnam';//" -i $_pkgver/filter/tv_to_text
+  sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i $_pkgver/grab/it/tv_grab_it.PL
+  sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i $_pkgver/filter/tv_grep.PL
+  sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i $_pkgver/lib/XMLTV.pm.PL
+  sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i $_pkgver/Makefile.PL
+}
+md5sums=('SKIP')