/mnt/floppy and /mnt/cdrom are only installed when USE flag build is set

fixes 88835
Package-Manager: portage-2.0.51.19

4 files changed, 28 insertions, 19 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index b2d4c69c0080..c80e626c12a3 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # 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.232 2005/04/20 22:15:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.233 2005/04/21 06:43:00 uberlord 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
 
+  21 Apr 2005; Roy Marples <uberlord@gentoo.org> baselayout-1.11.11.ebuild,
+  baselayout-1.12.0_alpha2.ebuild:
+  /mnt/floppy and /mnt/cdrom are only installed when USE flag build is set
+  fixes 88835
+
 *baselayout-1.11.11 (20 Apr 2005)
 
   20 Apr 2005; Roy Marples <uberlord@gentoo.org> +baselayout-1.11.11.ebuild,
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 5299c442a773..973c2b09a1d2 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,13 +1,13 @@
-MD5 26fb826e9ac29ef403a145ea880b4ec2 ChangeLog 53231
+MD5 d2abf21e39e495e3f62ffbd295dee7e2 ChangeLog 53432
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
-MD5 03bba98bf325318cf9d285d5695da719 baselayout-1.11.11.ebuild 18509
+MD5 dca2cf7245292428f62f1ef4f20dd3d9 baselayout-1.11.11.ebuild 18466
 MD5 b43b02e2955a9d3be867e08e5b180d2d baselayout-1.11.9-r1.ebuild 16921
 MD5 236b15ce274e8f4505bb3f6a0df2b16e baselayout-1.11.10-r3.ebuild 17159
 MD5 c15aa659fc04933159d0232113668401 baselayout-1.11.10-r4.ebuild 17159
 MD5 89053b78fb5c86ec2b3f9fec2bf1984a baselayout-1.11.10-r5.ebuild 17228
 MD5 9aeba85fd4c920074c563373f32f9267 baselayout-1.11.10-r6.ebuild 17384
 MD5 5492ab916eceb3bca70d07d058c348de baselayout-1.11.10-r7.ebuild 17461
-MD5 7d009efeb18e4904737a978e59ad8ca5 baselayout-1.12.0_alpha2.ebuild 18394
+MD5 3e593bad04336cf49c1e7978ce5c103f baselayout-1.12.0_alpha2.ebuild 18459
 MD5 97c0cfe702da6dc46ecd72e0da0b83c7 baselayout-1.12.0_alpha1-r4.ebuild 17487
 MD5 c1996677fc298d37f0b92281ab134d90 baselayout-1.9.4-r6.ebuild 16997
 MD5 f90b7865e3d0207b26c2e1f4bf9e0ca3 baselayout-1.9.4-r7.ebuild 18003
diff --git a/sys-apps/baselayout/baselayout-1.11.11.ebuild b/sys-apps/baselayout/baselayout-1.11.11.ebuild
index 2a1c35cad793..d2c2b53685ce 100644
--- a/sys-apps/baselayout/baselayout-1.11.11.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.11.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.11.ebuild,v 1.1 2005/04/20 22:15:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.11.ebuild,v 1.2 2005/04/21 06:43:00 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -132,7 +132,7 @@ src_install() {
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
 	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
+	if [[ ${SYMLINK_LIB} == "yes" ]]; then
 		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
 	else
 		rcscripts_dir="/lib/rcscripts"
@@ -161,11 +161,14 @@ src_install() {
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
 	kdir /mnt
-	kdir -m 0700 /mnt/cdrom
-	kdir -m 0700 /mnt/floppy
+	# Only install floppy and cdrom when first installing - fixes 88835
+	if use build ; then
+		kdir -m 0700 /mnt/cdrom
+		kdir -m 0700 /mnt/floppy
+	fi
 	kdir /opt
 	kdir -o root -g uucp -m0755 /var/lock
 	kdir /proc
@@ -554,9 +557,7 @@ pkg_postinst() {
 		break
 	done
 
-	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
-		| egrep -q '\<(domain|nameservers|searchdomains)_' \
-		|| sed -e 's/#.*//' ${ROOT}/etc/conf.d/wireless 2>/dev/null \
+	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \
 		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
 			echo
 			ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net"
diff --git a/sys-apps/baselayout/baselayout-1.12.0_alpha2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha2.ebuild
index 2015a2691b3b..aff6e27d8920 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_alpha2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_alpha2.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_alpha2.ebuild,v 1.2 2005/04/20 22:15:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_alpha2.ebuild,v 1.3 2005/04/21 06:43:00 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -131,7 +131,7 @@ src_install() {
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
 	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
+	if [[ ${SYMLINK_LIB} == "yes" ]]; then
 		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
 	else
 		rcscripts_dir="/lib/rcscripts"
@@ -160,11 +160,14 @@ src_install() {
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
 	kdir /mnt
-	kdir -m 0700 /mnt/cdrom
-	kdir -m 0700 /mnt/floppy
+	# Only install floppy and cdrom when first installing - fixes 88835
+	if use build ; then
+		kdir -m 0700 /mnt/cdrom
+		kdir -m 0700 /mnt/floppy
+	fi
 	kdir /opt
 	kdir -o root -g uucp -m0755 /var/lock
 	kdir /proc