Fix parallel install, this time for real, bug 171348

Package-Manager: portage-2.1.2.2

diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog
index 80ad3506f22405501ef6fb6d7bd68927bc3a5524..129d66a50fa4cf7a94cab63455cedbf64468d04e 100644 (file)
--- a/dev-util/dialog/ChangeLog
+++ b/dev-util/dialog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/dialog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.67 2007/03/19 14:14:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.68 2007/03/19 15:39:15 armin76 Exp $
+
+  19 Mar 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/dialog-1.0.20060221-mkdirs.patch, +files/dialog-mkdirs.patch,
+  dialog-1.0.20060221.ebuild, dialog-1.1.20070227.ebuild:
+  Fix parallel install, this time for real, bug 171348
 
   19 Mar 2007; Raúl Porcel <armin76@gentoo.org> dialog-1.1.20070227.ebuild:
   Fix SRC_URI

diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 1ffbeaf731d1c4be0725d64c4f91c43cfb3c485d..cf7ae019d2240bb234742112eb2ee3755e4a0b1b 100644 (file)
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -2,10 +2,10 @@ AUX dialog-1.0.20051107-mouseselect.patch 664 RMD160 422e308751482678a3eed19a00b
 MD5 516258483f8caafb1bbad3ca633b2a74 files/dialog-1.0.20051107-mouseselect.patch 664
 RMD160 422e308751482678a3eed19a00bfce77cbcec4be files/dialog-1.0.20051107-mouseselect.patch 664
 SHA256 1bcb116de16edc96ac32271917ec105f0ca97a3777871e4975accf704d1a95e6 files/dialog-1.0.20051107-mouseselect.patch 664
-AUX dialog-1.0.20060221-mkdirs.patch 353 RMD160 a40b16936c759de1b0482c767220453e1c654490 SHA1 bd8e529ef8a8d41c06aa7f6945a9561901bb3a9b SHA256 df2ca182890a62a63c04970caff7189679269750a6c8b07c6e521b04ad1541a1
-MD5 72f192631db599b11bf21326cd1a136a files/dialog-1.0.20060221-mkdirs.patch 353
-RMD160 a40b16936c759de1b0482c767220453e1c654490 files/dialog-1.0.20060221-mkdirs.patch 353
-SHA256 df2ca182890a62a63c04970caff7189679269750a6c8b07c6e521b04ad1541a1 files/dialog-1.0.20060221-mkdirs.patch 353
+AUX dialog-mkdirs.patch 551 RMD160 5c39e4d96210e5265fe3603b1915ab2c5633c613 SHA1 ffcbc8c50891dce7d466b0f2ae46100891a5e060 SHA256 570eb3f040afa05951e2d9f481528bf0e27e98e10c20afb70fe9ccf936bb00dc
+MD5 051488cec34024c5e94f39d2b65ed45c files/dialog-mkdirs.patch 551
+RMD160 5c39e4d96210e5265fe3603b1915ab2c5633c613 files/dialog-mkdirs.patch 551
+SHA256 570eb3f040afa05951e2d9f481528bf0e27e98e10c20afb70fe9ccf936bb00dc files/dialog-mkdirs.patch 551
 DIST dialog-1.1-20070227.tgz 363972 RMD160 90a52a8016cf833863b9d590bb9de27b28d10a36 SHA1 c70c5d2c4544f5fd7a11a514b16eb5cd58b8cbc6 SHA256 e276e3a6c153ad9fbaf7658507a6cbb2e37cc957801eb3eb2d6423e53964eb2a
 DIST dialog_1.0-20050206.orig.tar.gz 299742 RMD160 f3b9b17fef6e8c45aa795b6999398f174e800ff4 SHA1 c6398dca40a6aa8ed6b8a99ed6024bdc8b4a4274 SHA256 e8ffb794d5de1e7e5301bdbbc0afe6b92f988e90b781753c82980afc50c78f26
 DIST dialog_1.0-20050306.orig.tar.gz 300067 RMD160 a584601ff2fd778456e3a54bd4192f9139c30d29 SHA1 c99418b18e0dae9d446b6392bc4804b11d600e3a SHA256 e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976
@@ -23,18 +23,18 @@ EBUILD dialog-1.0.20051107.ebuild 1499 RMD160 a73dfe3c0e4aefeb43154b8e1f4341b6c6
 MD5 ce59babfedc45e9b862649c565cf1365 dialog-1.0.20051107.ebuild 1499
 RMD160 a73dfe3c0e4aefeb43154b8e1f4341b6c628e981 dialog-1.0.20051107.ebuild 1499
 SHA256 93f3f282c4c57d0e561c1451aad8830d907be895eb559eb2b2965c330104bcc3 dialog-1.0.20051107.ebuild 1499
-EBUILD dialog-1.0.20060221.ebuild 1480 RMD160 30aa16847a566d2ef559af87bfc6216432692c8d SHA1 f77e97083e983f4af24f8041e1791cad2b040eb5 SHA256 907b369b631031a2f6d77719a3ca0dd13d67f3e2255adb755af383fe96fbd00d
-MD5 35be1f106242752402e897a53f59a5ac dialog-1.0.20060221.ebuild 1480
-RMD160 30aa16847a566d2ef559af87bfc6216432692c8d dialog-1.0.20060221.ebuild 1480
-SHA256 907b369b631031a2f6d77719a3ca0dd13d67f3e2255adb755af383fe96fbd00d dialog-1.0.20060221.ebuild 1480
-EBUILD dialog-1.1.20070227.ebuild 1492 RMD160 d244f4e35606e1013fa3ec0bbc895aeebb449445 SHA1 4f0a84116d2b8b94f3544c1594d3e69543275ca3 SHA256 1dd791aaa28dac7443d9a72ca257228752cd73d4ba9e75df44a06c338ee9e7e3
-MD5 f8cf39be364034d15d6cc3a39f61415f dialog-1.1.20070227.ebuild 1492
-RMD160 d244f4e35606e1013fa3ec0bbc895aeebb449445 dialog-1.1.20070227.ebuild 1492
-SHA256 1dd791aaa28dac7443d9a72ca257228752cd73d4ba9e75df44a06c338ee9e7e3 dialog-1.1.20070227.ebuild 1492
-MISC ChangeLog 9886 RMD160 178d4d5121230fa3d14abe42b40d7d1a15384e18 SHA1 2dd0de63a7ed7322aaa480e1c87fcc2b73b42e23 SHA256 8ae6c174e4e64df848f9d4140a86d7e80d5d01d16949384242d975381d704599
-MD5 0419c839baa35c87f2d0f848905ac1ec ChangeLog 9886
-RMD160 178d4d5121230fa3d14abe42b40d7d1a15384e18 ChangeLog 9886
-SHA256 8ae6c174e4e64df848f9d4140a86d7e80d5d01d16949384242d975381d704599 ChangeLog 9886
+EBUILD dialog-1.0.20060221.ebuild 1482 RMD160 0f23cd0e3911a93e89be5af6f4f57dd831fd9480 SHA1 8873a3f939a34bb20f7e25a88622d419a9a2aca2 SHA256 876e00cd8c0d4b63f444b2a66c0bf718af90913e4a7f331451aa1d84c667178e
+MD5 5ac1f33ea62ddbca4e2a4440ff87a3cc dialog-1.0.20060221.ebuild 1482
+RMD160 0f23cd0e3911a93e89be5af6f4f57dd831fd9480 dialog-1.0.20060221.ebuild 1482
+SHA256 876e00cd8c0d4b63f444b2a66c0bf718af90913e4a7f331451aa1d84c667178e dialog-1.0.20060221.ebuild 1482
+EBUILD dialog-1.1.20070227.ebuild 1479 RMD160 e2a792c29e5af135c4fe295c11804ccd0075162a SHA1 74f82eed925a4ed476deb30aa40fc9a2c2095561 SHA256 2135c9b00f564c898f5d4669e25966286e28505bf187c3b16a4d519f9186739d
+MD5 9965dbb5e40901737b13157fde4fe8b8 dialog-1.1.20070227.ebuild 1479
+RMD160 e2a792c29e5af135c4fe295c11804ccd0075162a dialog-1.1.20070227.ebuild 1479
+SHA256 2135c9b00f564c898f5d4669e25966286e28505bf187c3b16a4d519f9186739d dialog-1.1.20070227.ebuild 1479
+MISC ChangeLog 10120 RMD160 22da01ec9f9f9e653d9a981a065a41e62af762a9 SHA1 bc8a4d77a64d9728e718e0601817f38baab130d9 SHA256 e0e7fa7073b55f3abd2892286f73d87c4f7c1818f50d61085cf50b18b9e42280
+MD5 7013b4b2c0c016ac14c56c6fa4eed063 ChangeLog 10120
+RMD160 22da01ec9f9f9e653d9a981a065a41e62af762a9 ChangeLog 10120
+SHA256 e0e7fa7073b55f3abd2892286f73d87c4f7c1818f50d61085cf50b18b9e42280 ChangeLog 10120
 MD5 9f12ac6b963f3ad49deb2f03ec9ec062 files/digest-dialog-1.0.20050206 274
 RMD160 8e54a8c9b4530db1a24b7ed3ca5b145915713d89 files/digest-dialog-1.0.20050206 274
 SHA256 424cca2235342251c7c983426c9bc8f76c5ff5e2f2285803f9458655309865d6 files/digest-dialog-1.0.20050206 274

diff --git a/dev-util/dialog/dialog-1.0.20060221.ebuild b/dev-util/dialog/dialog-1.0.20060221.ebuild
index f135aa895ce0e9b7d0f185d097268b127ddcd833..f6c2a2b70a18b9c9d327705959868bfe898d9f1f 100644 (file)
--- a/dev-util/dialog/dialog-1.0.20060221.ebuild
+++ b/dev-util/dialog/dialog-1.0.20060221.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-util/dialog/dialog-1.0.20060221.ebuild,v 1.5 2007/03/18 20:57:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.0.20060221.ebuild,v 1.6 2007/03/19 15:39:15 armin76 Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}"/${P}-mkdirs.patch #171348
+       epatch "${FILESDIR}"/${PN}-mkdirs.patch #171348
 }
 
 src_compile() {

diff --git a/dev-util/dialog/dialog-1.1.20070227.ebuild b/dev-util/dialog/dialog-1.1.20070227.ebuild
index 060e823d1b370ae5b3fd36c63321ecd118719bc4..e32870d572553e533c2a57408853f6bd2a73ea57 100644 (file)
--- a/dev-util/dialog/dialog-1.1.20070227.ebuild
+++ b/dev-util/dialog/dialog-1.1.20070227.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-util/dialog/dialog-1.1.20070227.ebuild,v 1.2 2007/03/19 14:14:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20070227.ebuild,v 1.3 2007/03/19 15:39:15 armin76 Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}"/${PN}-1.0.20060221-mkdirs.patch #171348
+       epatch "${FILESDIR}"/${PN}-mkdirs.patch #171348
 }
 
 src_compile() {

diff --git a/dev-util/dialog/files/dialog-1.0.20060221-mkdirs.patch b/dev-util/dialog/files/dialog-mkdirs.patch
similarity index 50%
rename from dev-util/dialog/files/dialog-1.0.20060221-mkdirs.patch
rename to dev-util/dialog/files/dialog-mkdirs.patch
index 268e37e15b4dc0266718ba9a4989ee19f8b1edb7..70bdcef40cae3bc7342a54cd1b18b6a6c373bed5 100644 (file)
--- a/dev-util/dialog/files/dialog-1.0.20060221-mkdirs.patch
+++ b/dev-util/dialog/files/dialog-mkdirs.patch
@@ -1,8 +1,6 @@
-http://bugs.gentoo.org/171348
-
---- mkdirs.sh
-+++ mkdirs.sh
-@@ -21,7 +21,7 @@
+--- mkdirs.sh.orig     2007-03-19 16:28:39.000000000 +0100
++++ mkdirs.sh  2007-03-19 16:28:56.000000000 +0100
+@@ -21,11 +21,11 @@
       esac
  
       if test ! -d "$pathcomp"; then
@@ -11,3 +9,8 @@ http://bugs.gentoo.org/171348
          case "$pathcomp" in
            [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
                  ;;               # DOSISH systems
+-          * )          mkdir "$pathcomp" || errstatus=$? ;;
++          * )          mkdir -p "$pathcomp" || errstatus=$? ;;
+         esac
+      fi
+