Dont run install -d if the directory already exists since it will reset permissions #116293 by Joel.

Package-Manager: portage-2.0.53

7 files changed, 59 insertions, 32 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index cdeade1c4245..c2b47617a2e8 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.288 2005/12/20 18:05:14 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.289 2005/12/22 04:07:40 vapier Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  22 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.13-r1.ebuild, baselayout-1.11.13-r2.ebuild,
+  baselayout-1.11.14.ebuild, baselayout-1.12.0_pre11-r3.ebuild,
+  baselayout-1.12.0_pre12.ebuild:
+  Dont run install -d if the directory already exists since it will reset
+  permissions #116293 by Joel.
+
 *baselayout-1.12.0_pre12 (20 Dec 2005)
 
   20 Dec 2005; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 18ddaedd8f27..d154a48467c4 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,9 +1,12 @@
-MD5 b292f27b10221e560a9daacb43f87526 ChangeLog 65762
-MD5 f51ce492513c3ccfaf25109ef2447727 baselayout-1.11.13-r1.ebuild 18880
-MD5 1504d26e7455237817c4aad741fd5043 baselayout-1.11.13-r2.ebuild 18950
-MD5 b6f321c2612e170ab128a71144c4b1da baselayout-1.11.14.ebuild 18912
-MD5 80d1bb7f2c880c9ab2a121fafcdda95f baselayout-1.12.0_pre11-r3.ebuild 19256
-MD5 668a403ad5ccf34c21241a4694a10319 baselayout-1.12.0_pre12.ebuild 19112
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1147b550501eb06bad2dd9c2bb3b6611 ChangeLog 66076
+MD5 3d38b01f86231bff6a3bd32e77c98459 baselayout-1.11.13-r1.ebuild 18925
+MD5 5891c2fd87689647af9b0f8c701ce53b baselayout-1.11.13-r2.ebuild 18995
+MD5 ed3196ad145dba520cb6b3de148d8cfb baselayout-1.11.14.ebuild 18957
+MD5 572cf854f2b57c589112f3fad9436b27 baselayout-1.12.0_pre11-r3.ebuild 19298
+MD5 7aadd4f166ca6146ac3a881ffe39be00 baselayout-1.12.0_pre12.ebuild 19155
 MD5 8d10a229861f862fca52cd8e3bc655d9 files/baselayout-1.11.0-split-out-udev.patch 7413
 MD5 77dc2a72d57122a7640b01ace6f1698b files/baselayout-1.12.0_pre11-net.patch 2448
 MD5 64e4c5a9eb4e57025a4e58e53221bcbc files/baselayout-1.12.0_pre11-net2.patch 9464
@@ -15,3 +18,10 @@ MD5 6d158e9a0e9b32c05e6633a68b39b4cc files/digest-baselayout-1.11.14 70
 MD5 b00dcec856d229fc320f8a14dbc47936 files/digest-baselayout-1.12.0_pre11-r3 76
 MD5 6848b6fd4fa543af99e952bb2c15f88a files/digest-baselayout-1.12.0_pre12 76
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDqibA2+ySkm8kpY0RAncxAJ9nUUCCYGG8MuEQtgp7XUivZaZwbwCgtVaA
+RRibSFxSVaFoLmTLqfCRWa8=
+=Dv84
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
index 83963ad0dbe9..7f32297364d6 100644
--- a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.3 2005/10/07 00:00:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.4 2005/12/22 04:07:40 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -98,10 +98,12 @@ kdir() {
 		if [[ $d == /* ]]; then
 			install -d "${args[@]}" "${D}/${d}"
 			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+		|| ewarn "  can't create ${d}"
+	touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+		|| ewarn "  can't create ${d}/.keep"
+fi
 EOF
 		else
 			args=("${args[@]}" "${d}")
diff --git a/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
index b66e3be61ad9..84ba6d9bb5a3 100644
--- a/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild,v 1.1 2005/11/08 11:03:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild,v 1.2 2005/12/22 04:07:40 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -100,10 +100,12 @@ kdir() {
 		if [[ $d == /* ]]; then
 			install -d "${args[@]}" "${D}/${d}"
 			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+		|| ewarn "  can't create ${d}"
+	touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+		|| ewarn "  can't create ${d}/.keep"
+fi
 EOF
 		else
 			args=("${args[@]}" "${d}")
diff --git a/sys-apps/baselayout/baselayout-1.11.14.ebuild b/sys-apps/baselayout/baselayout-1.11.14.ebuild
index 879fc0672fa9..2f0370a5c6f5 100644
--- a/sys-apps/baselayout/baselayout-1.11.14.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14.ebuild,v 1.2 2005/12/08 23:53:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14.ebuild,v 1.3 2005/12/22 04:07:40 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -99,10 +99,12 @@ kdir() {
 		if [[ $d == /* ]]; then
 			install -d "${args[@]}" "${D}/${d}"
 			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+		|| ewarn "  can't create ${d}"
+	touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+		|| ewarn "  can't create ${d}/.keep"
+fi
 EOF
 		else
 			args=("${args[@]}" "${d}")
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild
index 649c4e74a9e3..c6bc3ef6d771 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild,v 1.2 2005/12/16 13:14:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre11-r3.ebuild,v 1.3 2005/12/22 04:07:40 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -111,10 +111,12 @@ kdir() {
 		if [[ $d == /* ]]; then
 			install -d "${args[@]}" "${D}/${d}"
 			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+		|| ewarn "  can't create ${d}"
+	touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+		|| ewarn "  can't create ${d}/.keep"
+fi
 EOF
 		else
 			args=("${args[@]}" "${d}")
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild
index efc58863f319..44ae82532af5 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild,v 1.1 2005/12/20 18:05:14 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre12.ebuild,v 1.2 2005/12/22 04:07:40 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -106,10 +106,12 @@ kdir() {
 		if [[ $d == /* ]]; then
 			install -d "${args[@]}" "${D}/${d}"
 			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+		|| ewarn "  can't create ${d}"
+	touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+		|| ewarn "  can't create ${d}/.keep"
+fi
 EOF
 		else
 			args=("${args[@]}" "${d}")