refactor: amend dependencies; update to 2.085

Only took me something like five hours, this is fine .-.

5 files changed, 148 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05a4575faf67..231168b1d05c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,47 @@
 pkgbase = perl-pdl
-	pkgdesc = The Perl Data Language, a perl extension designed for scientific and bulk numeric data processing and display
-	pkgver = 2.081
+	pkgdesc = The Perl Data Language
+	pkgver = 2.085
 	pkgrel = 1
-	url = http://search.cpan.org/dist/PDL
+	url = https://metacpan.org/release/PDL
 	arch = i686
 	arch = x86_64
-	license = PerlArtistic
 	license = GPL
-	checkdepends = perl-test-warn
+	license = PerlArtistic
 	checkdepends = perl-test-exception
-	checkdepends = perl-test-deep
-	makedepends = fftw2
-	makedepends = hdf4
-	makedepends = plplot
-	makedepends = perl-extutils-f77
-	makedepends = proj
-	makedepends = perl-extutils-parsexs
+	checkdepends = perl-test-warn
 	makedepends = perl-devel-checklib
-	makedepends = perl-pod-parser
 	makedepends = perl-extutils-depends
-	makedepends = perl-pgplot
+	makedepends = gcc-fortran
+	depends = perl
+	depends = perl-file-which
+	depends = perl-pod-parser
+	depends = sharutils
 	depends = perl-file-map
+	depends = perl-term-readkey
 	depends = perl-inline
 	depends = perl-inline-c
-	depends = perl-term-readkey
-	depends = perl-text-balanced>=2.05
+	depends = perl-term-readline-gnu
+	depends = perl-sys-sigaction
+	depends = proj
+	depends = perl-alien-proj
+	depends = perl-opengl
 	depends = perl-opengl-glut
+	depends = pgplot
+	depends = perl-pgplot
+	depends = xgterm-bin
 	depends = gsl
-	optdepends = fftw2: for PDL::FFTW support
-	optdepends = hdf4: for HDF files support
-	optdepends = perl-astro-fits-header: improved FITS files support
-	optdepends = plplot: for PDL::Graphics::PLplot support
-	optdepends = proj: for PDL::GIS::Proj and PDL::Transform::Proj4 support
-	optdepends = perl-sys-sigaction: Ctrl-C handling in shells
+	depends = perl-astro-fits-header
+	depends = gd
+	depends = hdf4
+	depends = perl-alien-hdf4
+	depends = netpbm
+	depends = ffmpeg
+	depends = perl-extutils-f77
 	options = !emptydirs
-	source = https://cpan.metacpan.org/authors/id/E/ET/ETJ/PDL-2.081.tar.gz
+	options = purge
+	source = https://cpan.metacpan.org/authors/id/E/ET/ETJ/PDL-2.085.tar.gz
 	source = perldl.conf
-	source = Makefile.patch
-	md5sums = 848bfcc0e232f7a549d04e8ea1428d78
-	md5sums = ac56f2a88b89d359a0dc80063d31cf59
-	md5sums = e2b2dff48643a5051a8f7d1ee9dc4ea9
+	sha256sums = 8425595db6def04762fa6ee6b92485ea762914a2b1d694f9b7607f4e51e0b2c1
+	sha256sums = SKIP
 
 pkgname = perl-pdl
diff --git a/.gitignore b/.gitignore
index e6b6b4b8077d..c906e75958f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-*.tar.gz
-*.tar.bz2
-*.tar.xz
-*.tar.lz
-src/
-pkg/
\ No newline at end of file
+/pkg/
+/src/
+*.tar.*
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 7ebf50fb2def..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /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 1d9c87baa3ac..eaea01c1f0ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Michał Wojdyła < micwoj9292 at gmail dot com >
+# Maintainer: Elias Elwyn <a@jthv.ai>
+# Contributor: Michał Wojdyła < micwoj9292 at gmail dot com >
 # Contributor: Ordoban <dirk.langer@vvovgonik.de>
 # Contributor: Anton Leontiev <bunder /at/ t-25.ru>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,68 +7,123 @@
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=perl-pdl
-_pkgname=PDL
-pkgver=2.081
+pkgver=2.085
 pkgrel=1
-pkgdesc='The Perl Data Language, a perl extension designed for scientific and bulk numeric data processing and display'
-arch=('i686' 'x86_64')
-url='http://search.cpan.org/dist/PDL'
-license=('PerlArtistic' 'GPL')
+pkgdesc='The Perl Data Language'
+_dist=PDL
+arch=(i686 x86_64)
+url="https://metacpan.org/release/$_dist"
+license=(GPL PerlArtistic)
 depends=(
-	'perl-file-map'
-	'perl-inline'
-	'perl-inline-c'
-	'perl-term-readkey'
-	'perl-text-balanced>=2.05' #this is because perl provides only 2.04
-	'perl-opengl-glut'
-	'gsl'
+  perl
+  perl-file-which
+  perl-pod-parser
+  #--- PDL::IO::Dumper
+  sharutils # replaces Convert::UU
+  #--- PDL::IO::FastRaw, PDL::IO::FlexRaw
+  perl-file-map
+
+  # NOTE: the following dependencies are optional, you may comment any
+  # section - BEFORE RUNNING MAKEPKG - that you'd like to do without
+  # The related modules likely will not be very useful without these
+  # dependencies
+  #
+  # See https://metacpan.org/release/ETJ/PDL-2.085/source/DEPENDENCIES
+  # for more information
+
+  #-- Uncategorised
+  perl-term-readkey
+
+  #--- Inline::Pdlpp
+  perl-inline
+  perl-inline-c
+
+  #--- pdl2, perldl
+  # perl-devel-repl # pdl2 shell alternative backend
+  perl-term-readline-gnu # XS performance for perldl
+  perl-sys-sigaction
+
+  #--- PDL::GIS::Proj, PDL::Transform::Proj
+  # WARN: if this is commented, also comment PROJ_* in perldl.conf
+  proj
+  perl-alien-proj
+
+  #--- PDL::Graphics::TriD
+  perl-opengl
+  perl-opengl-glut
+
+  #--- PDL::Graphics::PGPLOT
+  pgplot
+  perl-pgplot
+
+  #--- PDL::Graphics::IIS (pick only one package)
+  xgterm-bin
+  # ds9
+  # ds9-bin
+
+  #--- PDL::GSL
+  gsl
+
+  #--- PDL::IO::FITS
+  perl-astro-fits-header
+
+  #--- PDL::IO::GD
+  gd
+
+  #--- PDL::IO::HDF
+  # WARN: if this is commented, also comment HDF_* in perldl.conf
+  hdf4
+  perl-alien-hdf4
+
+  #--- PDL::IO::Pic
+  netpbm
+  ffmpeg
+
+  #--- PDL::Slatec (used by other modules)
+  #--- PDL::Minuit
+  perl-extutils-f77
 )
 makedepends=(
-	'fftw2'
-	'hdf4'
-	'plplot'
-	'perl-extutils-f77'
-	'proj'
-	'perl-extutils-parsexs'
-	'perl-devel-checklib'
-	'perl-pod-parser'
-	'perl-extutils-depends'
-	'perl-pgplot'
+  perl-devel-checklib
+  perl-extutils-depends
+
+  # NOTE: the following dependencies are optional, you may comment any
+  # section - BEFORE RUNNING MAKEPKG - that you'd like to do without
+
+  #--- PDL::Slatec (used by other modules)
+  #--- PDL::Minuit
+  gcc-fortran
 )
 checkdepends=(
-	'perl-test-warn'
-	'perl-test-exception'
-	'perl-test-deep'
+  perl-test-exception
+  perl-test-warn
 )
-optdepends=(
-	'fftw2: for PDL::FFTW support'
-	'hdf4: for HDF files support'
-	'perl-astro-fits-header: improved FITS files support'
-	'plplot: for PDL::Graphics::PLplot support'
-	'proj: for PDL::GIS::Proj and PDL::Transform::Proj4 support'
-	'perl-sys-sigaction: Ctrl-C handling in shells'
-)
-source=(https://cpan.metacpan.org/authors/id/E/ET/ETJ/${_pkgname}-${pkgver}.tar.gz perldl.conf Makefile.patch)
-options=(!emptydirs)
-md5sums=('848bfcc0e232f7a549d04e8ea1428d78'
-         'ac56f2a88b89d359a0dc80063d31cf59'
-         'e2b2dff48643a5051a8f7d1ee9dc4ea9')
+options=('!emptydirs' purge)
+source=("https://cpan.metacpan.org/authors/id/E/ET/ETJ/$_dist-$pkgver.tar.gz"
+        perldl.conf)
+sha256sums=(8425595db6def04762fa6ee6b92485ea762914a2b1d694f9b7607f4e51e0b2c1
+            SKIP)
 
 build() {
-	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
+  cd "$srcdir/$_dist-$pkgver"
+  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
+  /usr/bin/perl Makefile.PL PDLCONF="$srcdir/perldl.conf"
+  make
 }
 
 check() {
-	cd "${_pkgname}-${pkgver}"
-	make test
+  cd "$srcdir/$_dist-$pkgver"
+  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
+  export PERL_MM_USE_DEFAULT=1
+  make test
 }
 
 package() {
-	cd "${_pkgname}-${pkgver}"
-	make install DESTDIR="${pkgdir}"
-        make doc_install DESTDIR="${pkgdir}"
-	find "${pkgdir}" -name .packlist -o -name perllocal.pod -delete
+  # Fixes first builds: "No such file or directory at blib/lib/PDL/Doc.pm line 741"
+  mkdir --parents "$pkgdir/usr/lib/perl5/5.38/vendor_perl/$_dist"
+
+  cd "$srcdir/$_dist-$pkgver"
+  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
+  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
 }
diff --git a/perldl.conf b/perldl.conf
index 417d1ef37545..bb8c0872a46d 100644
--- a/perldl.conf
+++ b/perldl.conf
@@ -2,8 +2,13 @@
 # -*-perl-*-
 
 %PDL_CONFIG = (
-	# 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
+  # Would like to get these settings working and remove the dependencies on
+  # Alien::* but PDL seems to refuse to build the ::HDF and ::Proj without
+  # Alien:: in any case
+  #
+  # HDF_LIBS => '-L/opt/hdf4/lib',
+  # HDF_INC => '-I/opt/hdf4/include',
+  #
+  # PROJ_LIBS => [ '/usr/lib' ],
+  # PROJ_INC  => [ '/usr/include' ],
 );