[arch-commits] Commit in perl/trunk (PKGBUILD provides.pl)

[Florian Pritz]

    Date: Monday, June 9, 2014 @ 16:54:24
  Author: bluewind
Revision: 214752

upgpkg: perl 5.20.0-3

fix missing provides entry (perl-pathtools)

Modified:
  perl/trunk/PKGBUILD
  perl/trunk/provides.pl

-------------+
 PKGBUILD    |    4 ++--
 provides.pl |   19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-09 14:36:42 UTC (rev 214751)
+++ PKGBUILD	2014-06-09 14:54:24 UTC (rev 214752)
@@ -7,7 +7,7 @@
 
 pkgname=perl
 pkgver=5.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -22,7 +22,7 @@
 md5sums=('20cbecd4e9e880ee7a50a136c8b1484e'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '999c3eea6464860704abbb055a0f0896')
+         '03bec2035cc9b9f91eed5b46126b6623')
 
 # workaround to let the integrity check find the correct provides array
 if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then

Modified: provides.pl
===================================================================
--- provides.pl	2014-06-09 14:36:42 UTC (rev 214751)
+++ provides.pl	2014-06-09 14:54:24 UTC (rev 214752)
@@ -44,10 +44,17 @@
 
 package Dists;
 
+my %RENAME = (
+    'PathTools' => 'Cwd', # perl 5.20 moved dist/Cwd/ to dist/PathTools/
+);
+
 sub maindistfile
 {
     my ($dist, $dir) = @_;
 
+    # Override unguessable main module names.
+    $dist = $RENAME{$dist} if exists $RENAME{$dist};
+
     # libpath is the modern style, installing modules under lib/
     # with dirs matching the name components.
     my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
@@ -63,7 +70,10 @@
     # generated by Makefile.PL. Search through their generating code.
     push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
 
-    for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
+    @paths = map { "$dir/$_" } @paths;
+    for my $path (@paths) {
+        return $path if -f $path;
+    }
     return undef;
 }
 
@@ -271,9 +281,10 @@
 
 package main;
 
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
-                'Text-Tabs' => 'Text-Tabs+Wrap',
-                'Cwd'       => 'PathTools');
+my %CPANNAME = (
+    'List-Util' => 'Scalar-List-Utils',
+    'Text-Tabs' => 'Text-Tabs+Wrap',
+);
 
 my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
 die "$perldir is not a valid directory." unless -d $perldir;