h2ph fix

4 files changed, 33 insertions, 26 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 14f13b565e07..17293880bf8c 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.40 2003/10/14 23:51:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.41 2003/10/20 23:14:27 mcummings Exp $
+
+  20 Oct 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.1-r1.ebuild,
+  perl-5.8.1-r2.ebuild:
+  Changed how h2ph grabs its list of files; relying on h2ph to efficiently
+  recurse was resulting a looping condition when there is a symlink in
+  /usr/include/* (libxml was the sample case - thanks DarkSpecter!). Using find
+  isolates the list to only .h files.
 
   14 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild:
   Allow building even when db-1 is not present, but let ndbm_file use it if it's
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index fca05f362292..a9d15d7a7653 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,36 +1,36 @@
+MD5 cb31daaa448fd8b358af06e93b6ab3d2 ChangeLog 20018
+MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666
+MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141
 MD5 5e2ced5e0d331faea9122a21c49957b0 perl-5.6.1-r12.ebuild 7089
-MD5 d26bc7eb5e1baa52c15368a7d80d6cc9 perl-5.8.1-r1.ebuild 8698
 MD5 51da78b2203cbf4e81dafb6e24dd2e22 perl-5.8.0-r10.ebuild 14009
-MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534
-MD5 220bd838139aaf17ec8f8f6cc1a37c61 perl-5.8.0-r12.ebuild 10316
-MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141
-MD5 27e108adf1e79befb9971fdb29e6e7b0 perl-5.8.1-r2.ebuild 9291
-MD5 9427ef50e11c8d3d6203653530108f65 ChangeLog 19646
 MD5 31f5ae7d2343aa4819b892820b0ccaf7 perl-5.8.0-r11.ebuild 9890
+MD5 220bd838139aaf17ec8f8f6cc1a37c61 perl-5.8.0-r12.ebuild 10316
+MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc2-reorder-INC.patch 2211
+MD5 e9f1963cc2b1473703a5f446bdd5cee5 perl-5.8.1-r1.ebuild 8728
+MD5 e3bf81fc54c7e7c231d4f43b98ddac1f perl-5.8.1-r2.ebuild 9321
+MD5 8605f033c451df987f4631bbf9d7b481 files/digest-perl-5.8.0-r10 64
+MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
+MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
+MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch 379
 MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
+MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
+MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
+MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
 MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
 MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
 MD5 9f290d90a6928f0b9662b20c1426c48a files/digest-perl-5.6.1-r12 198
-MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
-MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
-MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
-MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch 379
-MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292
-MD5 8605f033c451df987f4631bbf9d7b481 files/digest-perl-5.8.0-r10 64
+MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r11 188
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r12 188
+MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc1-reorder-INC.patch 2211
+MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch 379
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc2-reorder-INC.patch 2211
+MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch 379
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.1-prelink-lpthread.patch 476
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
-MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
-MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1-reorder-INC.patch 2211
 MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r1 64
 MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r2 64
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1-reorder-INC.patch 2211
-MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
-MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/perl-5.8.1-r1.ebuild b/dev-lang/perl/perl-5.8.1-r1.ebuild
index 9a4f974c3f4e..9278357f8a5e 100644
--- a/dev-lang/perl/perl-5.8.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r1.ebuild,v 1.1 2003/09/29 22:19:04 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r1.ebuild,v 1.2 2003/10/20 23:14:27 mcummings Exp $
 
 inherit eutils flag-o-matic
 
@@ -267,7 +267,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph -r -l .
+		cd /usr/include; find ./ -name "*.h" -exec h2ph {} \;
 	fi
 
 	eerror ""
diff --git a/dev-lang/perl/perl-5.8.1-r2.ebuild b/dev-lang/perl/perl-5.8.1-r2.ebuild
index cbb2069ffdd0..249b41c1c2ae 100644
--- a/dev-lang/perl/perl-5.8.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r2.ebuild,v 1.2 2003/10/14 23:51:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r2.ebuild,v 1.3 2003/10/20 23:14:27 mcummings Exp $
 
 inherit eutils flag-o-matic
 
@@ -286,7 +286,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph -r -l .
+		cd /usr/include; find ./ -name "*.h" -exec h2ph {} \;
 	fi
 
 	eerror ""