Previous patch ineffective, this one modifies mkinstalldirs to be parallel safe instead.

Package-Manager: portage-2.1.1

3 files changed, 37 insertions, 19 deletions

diff --git a/dev-libs/libelf/ChangeLog b/dev-libs/libelf/ChangeLog
index ec190b0dc6b3..090248615c59 100644
--- a/dev-libs/libelf/ChangeLog
+++ b/dev-libs/libelf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libelf
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.20 2007/06/29 18:09:30 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.21 2007/06/29 19:46:07 kanaka Exp $
+
+  29 Jun 2007; Joel Martin <kanaka@gentoo.org>
+  files/libelf-0.8.9-parallelmakefix.patch:
+  After discussion with maintainer, change mkinstalldirs to be
+  more parallel safe.
 
   29 Jun 2007; Joel Martin <kanaka@gentoo.org>
   files/libelf-0.8.9-parallelmakefix.patch:
@@ -12,13 +17,13 @@
 
 *libelf-0.8.9 (17 Jun 2007)
 
-  17 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> +libelf-0.8.9.ebuild:
+  17 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> +libelf-0.8.9.ebuild:
   Version bump.
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -libelf-0.8.5.ebuild:
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index 1b1587a349e8..70845ba52998 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -5,10 +5,10 @@ AUX libelf-0.8.6-parallelmakefix.patch 434 RMD160 68cae02abef54527218bda519fdf77
 MD5 3c0f3c3f7a83bccbf1ad988e5d35ae48 files/libelf-0.8.6-parallelmakefix.patch 434
 RMD160 68cae02abef54527218bda519fdf77dc5e598fdf files/libelf-0.8.6-parallelmakefix.patch 434
 SHA256 b8c19ff6457e9f8bc4b814df789c3678e770460a42d97804d2675ad12c3b29b0 files/libelf-0.8.6-parallelmakefix.patch 434
-AUX libelf-0.8.9-parallelmakefix.patch 1299 RMD160 5976834b28c70050b9922e2e402e4da328a0f374 SHA1 f9d7b6163b17560510a6c3655f7d854c7579b1e0 SHA256 2c3e53fc8c681aa4227ef41076dbe4385f8c35dd03745b9315f3ddedf9b3bd3c
-MD5 54edab2267a9fb9baa591dd27e4d661a files/libelf-0.8.9-parallelmakefix.patch 1299
-RMD160 5976834b28c70050b9922e2e402e4da328a0f374 files/libelf-0.8.9-parallelmakefix.patch 1299
-SHA256 2c3e53fc8c681aa4227ef41076dbe4385f8c35dd03745b9315f3ddedf9b3bd3c files/libelf-0.8.9-parallelmakefix.patch 1299
+AUX libelf-0.8.9-parallelmakefix.patch 1778 RMD160 399939567dc8d7a0e74fd3bb8772b681d1ad50c6 SHA1 b12e2e452baaa5c827c7332ae9bd18ba0fdda412 SHA256 e7d833d1b4694cdb7c5456d3ded583f9402224bf37bbaf33cfd7ad617b5699f1
+MD5 cc100af3ab5ff49c27e49596b1c824ec files/libelf-0.8.9-parallelmakefix.patch 1778
+RMD160 399939567dc8d7a0e74fd3bb8772b681d1ad50c6 files/libelf-0.8.9-parallelmakefix.patch 1778
+SHA256 e7d833d1b4694cdb7c5456d3ded583f9402224bf37bbaf33cfd7ad617b5699f1 files/libelf-0.8.9-parallelmakefix.patch 1778
 DIST libelf-0.8.4.tar.gz 128313 RMD160 765c17439acdd50f95fa92324630d215602649bb SHA1 2d9d9a22aabf9c446cbd4cb627eedfc5ae1f74b8 SHA256 8022ccbd568c02e0b36331e533f78eeb3d0d1fa5637adac9b8b816d1ea358ebf
 DIST libelf-0.8.6.tar.gz 144198 RMD160 f8fadd79d27f083d39c31a5b3a72655d4c0842d2 SHA1 1e865a331f37cc47b5ea96e50449ed93442ecbf0 SHA256 6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499
 DIST libelf-0.8.9.tar.gz 146250 RMD160 66a5df89729ba8270c5a83f63af09983aeb1bd0f SHA1 9a91f9a3e43476c95a1b6024c09d84d00310f0a4 SHA256 9eafb75460233a354012a6e7f2af54fe7e569dadb6bb532ffaa59df22d36ba18
@@ -24,10 +24,10 @@ EBUILD libelf-0.8.9.ebuild 979 RMD160 19afbde280c9806e2a2e50046f274df279a86366 S
 MD5 b0662eceec6ba4571516abdd4e74a412 libelf-0.8.9.ebuild 979
 RMD160 19afbde280c9806e2a2e50046f274df279a86366 libelf-0.8.9.ebuild 979
 SHA256 bdf68edc58c587f8e0588ff65644d8f3bb170190283b8a7036a862c3a536ec1a libelf-0.8.9.ebuild 979
-MISC ChangeLog 2639 RMD160 f3d7513a6aca15e3c20d4b82a59b17219147fa70 SHA1 f1bcfdab8781a1bf81426db0cb4c909a743d972e SHA256 ca7df5ac3bc3a93b08e16f78400c282d7ba0ebebf6519e0cb3ddea6dceb3a894
-MD5 0bfe2f212ea51a1289991143a5fa5fe9 ChangeLog 2639
-RMD160 f3d7513a6aca15e3c20d4b82a59b17219147fa70 ChangeLog 2639
-SHA256 ca7df5ac3bc3a93b08e16f78400c282d7ba0ebebf6519e0cb3ddea6dceb3a894 ChangeLog 2639
+MISC ChangeLog 2820 RMD160 526298c17d63c8b183c1c42122261e40dac9845c SHA1 2e1c6351688cd621e0851796aaa48fe757dc002a SHA256 644da890c18bf018a1c90753da735fda2ace68c948b5cdb0a5af37de52773857
+MD5 b5baa23e0b4440acd4202015f8465ce2 ChangeLog 2820
+RMD160 526298c17d63c8b183c1c42122261e40dac9845c ChangeLog 2820
+SHA256 644da890c18bf018a1c90753da735fda2ace68c948b5cdb0a5af37de52773857 ChangeLog 2820
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -44,7 +44,7 @@ SHA256 2406b505e38abf0b3987f7176e3211ce09bc721767fac27177936e7fbd4b3d41 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFGhUrjbaW+3NC9cLgRAlpDAJwJgZMYsFuXVPlbJkju4hrLG7H/KgCeJTvB
-Ngcc4aDhdxb/Ayc1FQP7NAM=
-=598x
+iD8DBQFGhWGLbaW+3NC9cLgRAtKBAJ4lTVfyZLWFG7NsfzHDShWDxaxeqgCeP/Y6
+zv0oFSv87XtLsLKpyTX81NU=
+=wU7r
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch b/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch
index 67e36f76b67c..6a0eddfd0474 100644
--- a/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch
+++ b/dev-libs/libelf/files/libelf-0.8.9-parallelmakefix.patch
@@ -1,10 +1,6 @@
 --- libelf-0.8.9/lib/Makefile.in.orig	2007-06-29 00:09:41.876160240 -0400
 +++ libelf-0.8.9/lib/Makefile.in	2007-06-29 00:10:13.601337280 -0400
-@@ -171,10 +171,11 @@ installdirs: $(top_srcdir)/mkinstalldirs
- 
- installdirs: $(top_srcdir)/mkinstalldirs
- 	dirs="$(installdirs)"; for dir in $$dirs; do \
-+	    if test -d $(distsubdir); then continue; fi; \
+@@ -174,7 +174,7 @@ installdirs: $(top_srcdir)/mkinstalldirs
  	    $(SHELL) $(top_srcdir)/mkinstalldirs $(instroot)$$dir; \
  	done
  
@@ -31,3 +27,20 @@
  	files="$(HDRS)"; for file in $$files; do \
  	  if test -f $(instroot)$(includedir)/$$file; then true; else \
  	    echo "#include <libelf/$$file>" > $(instroot)$(includedir)/$$file; \
+--- libelf-0.8.9/mkinstalldirs.orig	2007-06-29 15:22:54.048886832 -0400
++++ libelf-0.8.9/mkinstalldirs	2007-06-29 15:31:49.261522144 -0400
+@@ -23,7 +23,13 @@ for file in ${1+"$@"} ; do 
+ 
+      if test ! -d "${pathcomp}"; then
+         echo "mkdir $pathcomp" 1>&2
+-        mkdir "${pathcomp}" || errstatus=$?
++        mkdir "${pathcomp}"
++        tmpstatus=$?
++        if test "${tmpstatus}" != 0; then
++           # If there was an error but the dir exists 
++           # then a race happened so ignore the error
++           test -d "${pathcomp}" || errstatus=${tmpstatus}
++        fi
+      fi
+ 
+      pathcomp="${pathcomp}/"