[master] add new version 2.017

6 files changed, 56 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9af2f3e763a..a62c67b141fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = perl-pdl
 	pkgdesc = The Perl Data Language, a perl extension designed for scientific and bulk numeric data processing and display
-	pkgver = 2.007
+	pkgver = 2.017
 	pkgrel = 1
 	url = http://search.cpan.org/dist/PDL
 	changelog = ChangeLog
@@ -26,9 +26,9 @@ pkgbase = perl-pdl
 	optdepends = plplot: for PDL::Graphics::PLplot support
 	optdepends = proj: for PDL::GIS::Proj and PDL::Transform::Proj4 support
 	options = !emptydirs
-	source = http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-2.007.tar.gz
+	source = https://cpan.metacpan.org/authors/id/C/CH/CHM/PDL-2.017.tar.gz
 	source = perldl.conf
-	md5sums = ea343d3569ce02dbeadf1f58d700656f
+	md5sums = 9966447f0a61625e3ea871f731adf1
 	md5sums = 8e1f6285ce4ee9439dc1088709cfec18
 
 pkgname = perl-pdl
diff --git a/ChangeLog b/ChangeLog
index 723981a1e84d..4b9be39917c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-01-04	Ordoban <dirk.langer@vvovgonik.de>
+
+	* 2.017-1 :
+	New upstream release
+
+	* perldl.conf :
+	Remove WITH_PLPLOT => 1
+
+	* Makefile.patch :
+	remove doc_install from install
+
 2014-01-02	Anton Leontiev	<bunder /at/ t-25.ru>
 
 	* 2.007-1 :
diff --git a/Makefile.patch b/Makefile.patch
new file mode 100644
index 000000000000..7ebf50fb2def
--- /dev/null
+++ b/Makefile.patch
@@ -0,0 +1,12 @@
+--- /home/ordoban/workspace/Perl/perl-pdl/PDL-2.017/Makefile
++++ /home/ordoban/workspace/Perl/perl-pdl/PDL-2.017/Makefile.2
+@@ -909,7 +909,7 @@
+ 
+ # --- MakeMaker install section:
+ 
+-install :: pure_install doc_install
++install :: pure_install
+ 	$(NOECHO) $(NOOP)
+ 
+ install_perl :: pure_perl_install doc_perl_install
+
diff --git a/PKGBUILD b/PKGBUILD
index fd261cf2b2d8..1c9c1c035855 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # CPAN Name  : PDL
+# Maintainer : Ordoban <dirk.langer@vvovgonik.de>
 # Contributor: Anton Leontiev <bunder /at/ t-25.ru>
-# Generator  : CPANPLUS::Dist::Arch 1.28
-
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: carltonf <xiong[c05]@gmail.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=perl-pdl
-pkgver=2.007
+_pkgname=PDL
+pkgver=2.017
 pkgrel=1
 pkgdesc='The Perl Data Language, a perl extension designed for scientific and bulk numeric data processing and display'
 arch=('i686' 'x86_64')
@@ -41,24 +41,28 @@ optdepends=(
 	'proj: for PDL::GIS::Proj and PDL::Transform::Proj4 support'
 )
 
-source=(http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-2.007.tar.gz perldl.conf)
+source=(https://cpan.metacpan.org/authors/id/C/CH/CHM/${_pkgname}-${pkgver}.tar.gz perldl.conf Makefile.patch)
 changelog='ChangeLog'
 options=(!emptydirs)
-md5sums=('ea343d3569ce02dbeadf1f58d700656f' '8e1f6285ce4ee9439dc1088709cfec18')
+md5sums=('9966447f0afd61625e3ea871f731adf1'
+         'ac56f2a88b89d359a0dc80063d31cf59'
+         'e2b2dff48643a5051a8f7d1ee9dc4ea9')
 
 build() {
-	cd PDL-2.007
-	F77LIBS='-lgfortran -lm' PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor PDLCONF=$srcdir/perldl.conf
-	make
+	cd "${_pkgname}-${pkgver}"
+	F77LIBS='-lgfortran -lm' PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor PDLCONF=${srcdir}/perldl.conf
+  patch < "${srcdir}/Makefile.patch"
+  make
 }
 
 check() {
-	cd PDL-2.007
+	cd "${_pkgname}-${pkgver}"
 	make test
 }
 
 package() {
-	cd PDL-2.007
-	make install DESTDIR="$pkgdir"
-	find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+	cd "${_pkgname}-${pkgver}"
+	make install DESTDIR="${pkgdir}"
+  make doc_install DESTDIR="${pkgdir}"
+	find "${pkgdir}" -name .packlist -o -name perllocal.pod -delete
 }
diff --git a/PKGBUILD.tt b/PKGBUILD.tt
index 982d8a75ee0a..e0fd89406625 100644
--- a/PKGBUILD.tt
+++ b/PKGBUILD.tt
@@ -1,12 +1,12 @@
 # CPAN Name  : PDL
-# Contributor: [% packager %]
-# Generator  : CPANPLUS::Dist::Arch [% version %]
-
+# Maintainer : Ordoban <dirk.langer@vvovgonik.de>
+# Contributor: Anton Leontiev <bunder /at/ t-25.ru>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: carltonf <xiong[c05]@gmail.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=[% pkgname %]
+_pkgname=PDL
 pkgver=[% pkgver %]
 pkgrel=[% pkgrel %]
 pkgdesc='The Perl Data Language, a perl extension designed for scientific and bulk numeric data processing and display'
@@ -41,14 +41,18 @@ optdepends=(
 	'proj: for PDL::GIS::Proj and PDL::Transform::Proj4 support'
 )
 
-source=([% source %] perldl.conf)
+source=([% source %] perldl.conf Makefile.patch)
 changelog='ChangeLog'
 options=(!emptydirs)
-md5sums=('[% md5sums %]' '8e1f6285ce4ee9439dc1088709cfec18')
+md5sums=('[% md5sums %]'
+         'ac56f2a88b89d359a0dc80063d31cf59'
+         'e2b2dff48643a5051a8f7d1ee9dc4ea9')
+
 
 build() {
 	cd [% distdir %]
-	F77LIBS='-lgfortran -lm' PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor PDLCONF=$srcdir/perldl.conf
+	F77LIBS='-lgfortran -lm' PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor PDLCONF=${srcdir}/perldl.conf
+  patch < "${srcdir}/Makefile.patch"
 	make
 }
 
@@ -59,6 +63,7 @@ check() {
 
 package() {
 	cd [% distdir %]
-	make install DESTDIR="$pkgdir"
-	find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+	make install DESTDIR="${pkgdir}"
+  make doc_install DESTDIR="${pkgdir}"
+	find "${pkgdir}" -name .packlist -o -name perllocal.pod -delete
 }
diff --git a/perldl.conf b/perldl.conf
index 5f578d0f7b99..417d1ef37545 100644
--- a/perldl.conf
+++ b/perldl.conf
@@ -5,5 +5,5 @@
 	# Fix building on x86_64 with GCC 4.8
 	# For more info see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701335
 	OPTIMIZE => "$Config{optimize} -fno-aggressive-loop-optimizations",
-	WITH_PLPLOT => 1
+	#WITH_PLPLOT => 1
 );