Fix syntax error in makedepend.SH

Package-Manager: portage-2.1.3.3

4 files changed, 43 insertions, 10 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 853ce870edd5..b7c325f2debd 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.245 2007/08/06 10:21:33 ian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.246 2007/08/06 16:35:36 truedfx Exp $
+
+  06 Aug 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/perl-5.8.8-makedepend-syntax.patch, perl-5.8.8-r2.ebuild:
+  Fix syntax error in makedepend.SH
 
   06 Aug 2007; Christian Hartmann <ian@gentoo.org> perl-5.8.8-r2.ebuild:
   Bug #187866 - added suggested fix
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index ab99c2dae7ef..35eddf2bda38 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 SHA1 1e7c2f05ffaf8f6aee753ab106a9798e6920ff06 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab
 MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
@@ -38,6 +41,10 @@ AUX perl-5.8.8-links.patch 2925 RMD160 68116f3922d1e4d818cf65965b1886fc55b14faf
 MD5 e1310772583a085881cd30e53546410d files/perl-5.8.8-links.patch 2925
 RMD160 68116f3922d1e4d818cf65965b1886fc55b14faf files/perl-5.8.8-links.patch 2925
 SHA256 aeecee505f05ab0d7336142119f7a3e6d061b8fd2c7bbf9bd88cfb0421323bea files/perl-5.8.8-links.patch 2925
+AUX perl-5.8.8-makedepend-syntax.patch 341 RMD160 8d0ee189b86c7c3b6467512a7be25cf8d1a38e68 SHA1 1b604713de487ada27d177d85755784cd3058397 SHA256 f4ff3678b992774552d9ebc9ca7f3da1ae0144077eb52365e96ddbd0ba9c2606
+MD5 ca8492806c9d5139a65d9588769597b8 files/perl-5.8.8-makedepend-syntax.patch 341
+RMD160 8d0ee189b86c7c3b6467512a7be25cf8d1a38e68 files/perl-5.8.8-makedepend-syntax.patch 341
+SHA256 f4ff3678b992774552d9ebc9ca7f3da1ae0144077eb52365e96ddbd0ba9c2606 files/perl-5.8.8-makedepend-syntax.patch 341
 AUX perl-5.8.8-reorder-INC.patch 3046 RMD160 73bc824bebee8889073656a7b547dc63b35696dc SHA1 ec56010c38cbadce6fccf7ba314cfc7f42f470c6 SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed
 MD5 f6c5dc893c771f72cc183c946628d35e files/perl-5.8.8-reorder-INC.patch 3046
 RMD160 73bc824bebee8889073656a7b547dc63b35696dc files/perl-5.8.8-reorder-INC.patch 3046
@@ -71,14 +78,14 @@ MD5 528fa2521c530d5a47df32b663e629af files/perl-regexp-nossp.patch 460
 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 files/perl-regexp-nossp.patch 460
 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 files/perl-regexp-nossp.patch 460
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.8.8-r2.ebuild 18677 RMD160 a169777ab7496853fea45808dfd6999692a15f60 SHA1 7983639f804ab8ac371e5e30084fee6711fe77b4 SHA256 a21e0d203dfa96f677836d88e90607bbd1152acbe3254917ec7f99d37bdf1eda
-MD5 f076853ecd62df90da5fe279f588560a perl-5.8.8-r2.ebuild 18677
-RMD160 a169777ab7496853fea45808dfd6999692a15f60 perl-5.8.8-r2.ebuild 18677
-SHA256 a21e0d203dfa96f677836d88e90607bbd1152acbe3254917ec7f99d37bdf1eda perl-5.8.8-r2.ebuild 18677
-MISC ChangeLog 55338 RMD160 6e05c80de86af224122062c01fe3b9d492b05407 SHA1 913908a88b07d732039765c652b3a584028e8864 SHA256 dc9fac8ef3730110bfeaad83cc11ed6a829fb355c1f3a8dbfc26008ec8671b3c
-MD5 87aaec1dece43ef052e0d7ed57e2d2d7 ChangeLog 55338
-RMD160 6e05c80de86af224122062c01fe3b9d492b05407 ChangeLog 55338
-SHA256 dc9fac8ef3730110bfeaad83cc11ed6a829fb355c1f3a8dbfc26008ec8671b3c ChangeLog 55338
+EBUILD perl-5.8.8-r2.ebuild 18825 RMD160 01d9b2995fa1f1605a50855616f5238273a66869 SHA1 d52913018de11c7c105984a3ab97010979a69690 SHA256 ef39c7faeb379100123bedc613eb28abedca9159fef21735896359cb10a473db
+MD5 9979b53a06853a64a8da5d40b5da2d13 perl-5.8.8-r2.ebuild 18825
+RMD160 01d9b2995fa1f1605a50855616f5238273a66869 perl-5.8.8-r2.ebuild 18825
+SHA256 ef39c7faeb379100123bedc613eb28abedca9159fef21735896359cb10a473db perl-5.8.8-r2.ebuild 18825
+MISC ChangeLog 55498 RMD160 82fdc053ebaa0f887eecde82218dd90acee56518 SHA1 a680a55b1458e58f65b4366d01fb166699741caf SHA256 2d980e12c783e463bbadf521e9517c1ab62634d558b3868eaad0cf4227cdc5b0
+MD5 641bf0970c5a6df1a9235ffa463a4da1 ChangeLog 55498
+RMD160 82fdc053ebaa0f887eecde82218dd90acee56518 ChangeLog 55498
+SHA256 2d980e12c783e463bbadf521e9517c1ab62634d558b3868eaad0cf4227cdc5b0 ChangeLog 55498
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -86,3 +93,10 @@ SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata
 MD5 750a1b4341f04665c5ce30e14a302f96 files/digest-perl-5.8.8-r2 241
 RMD160 a339ac2a520b2fd2f458daf89cd89eb36a8c98b2 files/digest-perl-5.8.8-r2 241
 SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/digest-perl-5.8.8-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGt038wnQyISwouHwRAsYmAJ4nAPFmRphrQdDYLb5bPfUp9M3D0ACfTR5H
+moh+m+zG4sdynK2b4VWfISY=
+=i+LM
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch b/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch
new file mode 100644
index 000000000000..147d49937b5c
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch
@@ -0,0 +1,11 @@
+--- perl-5.8.8/makedepend.SH
++++ perl-5.8.8/makedepend.SH
+@@ -128,7 +128,7 @@
+     *.y) filebase=`basename $file .y` ;;
+     esac
+     case "$file" in
+-    */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
++    */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;;
+     *)   finc= ;;
+     esac
+     $echo "Finding dependencies for $filebase$_o."
diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index 9af7ab8d5818..e26fcb060bdd 100644
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.36 2007/08/06 10:21:33 ian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.37 2007/08/06 16:35:36 truedfx Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -98,6 +98,10 @@ src_unpack() {
 	# rac 2004.06.09
 	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
 
+	# makedepend.SH contains a syntax error which is ignored by bash but causes
+	# dash to abort
+	epatch ${FILESDIR}/${P}-makedepend-syntax.patch
+
 	# We do not want the build root in the linked perl module's RUNPATH, so
 	# strip paths containing PORTAGE_TMPDIR if its set.  This is for the
 	# MakeMaker module, bug #105054.