fix for bug #44712 by Michael Sterret <mr_bones_@gentoo.org>

3 files changed, 37 insertions, 27 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index cc79430db6f8..830b22d9ad63 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.123 2004/03/03 19:53:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.124 2004/03/17 09:16:40 seemant 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
 
+  17 Mar 2004; Seemant Kulleen <seemant@gentoo.org>
+  baselayout-1.8.6.13-r1.ebuild:
+  fix for bug #44712 by Michael Sterret <mr_bones_@gentoo.org>
+
   03 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
   Add gcc2.x compat patch #43097 by Tristan Henderson.
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 472ad84ff0de..8e413d2708b8 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,23 +1,24 @@
-MD5 82a6b016b1380adea0d8bb850f9328c3 baselayout-1.8.6.13.ebuild 20615
 MD5 006919fa7aeb0246d01bb51c3cfb104d baselayout-1.8.6.8-r1.ebuild 19205
-MD5 59cf9dc3042536882072bd496cb46558 baselayout-1.8.5.9.ebuild 15442
-MD5 e800cf271f3d96ca9de6ddeaaed263f2 baselayout-1.8.6.13-r1.ebuild 16724
-MD5 32577a3f6fa0f6566b1dab0ffba5e287 baselayout-1.8.6.10-r1.ebuild 19915
-MD5 53ba0b1432aa7c35f0a360c00319543c ChangeLog 23180
+MD5 9b5c6d9d34ccc79936be56d0d94c36d7 baselayout-1.8.6.12-r3.ebuild 20537
 MD5 1fc3ffdb03670a6c96196c7093a260a0 baselayout-1.8.6.12-r5.ebuild 20586
+MD5 32577a3f6fa0f6566b1dab0ffba5e287 baselayout-1.8.6.10-r1.ebuild 19915
+MD5 82a6b016b1380adea0d8bb850f9328c3 baselayout-1.8.6.13.ebuild 20615
+MD5 59cf9dc3042536882072bd496cb46558 baselayout-1.8.5.9.ebuild 15442
 MD5 c1c42f7f3211e5a4f619c7a27370aa68 baselayout-1.8.6.12-r2.ebuild 20537
-MD5 9b5c6d9d34ccc79936be56d0d94c36d7 baselayout-1.8.6.12-r3.ebuild 20537
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e5798bcad0eec8ece1397805ec0a82d6 baselayout-1.8.6.13-r1.ebuild 16890
 MD5 f315eafc41bfe9ca8d1e29a575b6e3ce baselayout-1.8.6.12-r4.ebuild 20902
-MD5 8fb224d887d827b02d97b992c9e9b0c9 files/digest-baselayout-1.8.6.13 136
-MD5 aff1a583bcfc0f32587751f415f3d0b2 files/digest-baselayout-1.8.6.12-r3 138
-MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138
+MD5 43d35babfe98181a6c1d7d3d8164d08d ChangeLog 23438
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397
-MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 f2639d72920b26007c346d83866928bc files/digest-baselayout-1.8.6.12-r4 138
 MD5 791058728d722586ebd7f7d93efac22f files/digest-baselayout-1.8.5.9 134
 MD5 a6c521e030d8c87b9617f701fa1ec0f8 files/digest-baselayout-1.8.6.8-r1 136
 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
+MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138
+MD5 aff1a583bcfc0f32587751f415f3d0b2 files/digest-baselayout-1.8.6.12-r3 138
+MD5 f2639d72920b26007c346d83866928bc files/digest-baselayout-1.8.6.12-r4 138
 MD5 a79ff80121eeb9d089a142a8c1f4c7b9 files/digest-baselayout-1.8.6.12-r5 138
 MD5 bc5cddad26537c7b58702798556754c6 files/digest-baselayout-1.8.6.13-r1 138
+MD5 8fb224d887d827b02d97b992c9e9b0c9 files/digest-baselayout-1.8.6.13 136
diff --git a/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild
index 0d725e1d5cd2..578c584c7d60 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild,v 1.5 2004/03/03 19:53:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.13-r1.ebuild,v 1.6 2004/03/17 09:16:40 seemant Exp $
 
 IUSE="bootstrap build livecd static selinux"
 
@@ -149,7 +149,12 @@ keepdir_mount() {
 }
 
 create_dev_nodes() {
-	export PATH="${D}/sbin:${PATH}"
+
+	if [ -z "${DEST}" ]; then
+		DEST=${D}
+	fi
+
+	export PATH="${DEST}/sbin:${PATH}"
 
 	case ${ARCH} in
 		amd64)
@@ -158,43 +163,43 @@ create_dev_nodes() {
 			# up erroring out, because MAKEDEV internally doesn't know what
 			# to use
 			einfo "Using generic-i386 to make amd64 device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
+			${DEST}/sbin/MAKEDEV generic-i386
 			;;
 		x86)
 			einfo "Using generic-i386 to make device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
+			${DEST}/sbin/MAKEDEV generic-i386
 			;;
 		ppc)
 			einfo "Using generic-powerpc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-powerpc
+			${DEST}/sbin/MAKEDEV generic-powerpc
 			;;
 		ppc64)
 			einfo "Using generic-powerpc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-powerpc
+			${DEST}/sbin/MAKEDEV generic-powerpc
 			;;
 		sparc)
 			einfo "Using generic-sparc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-sparc
+			${DEST}/sbin/MAKEDEV generic-sparc
 			;;
 		mips)
 			einfo "Using generic-mips to make device nodes..."
-			${D}/sbin/MAKEDEV generic-mips
+			${DEST}/sbin/MAKEDEV generic-mips
 			;;
 		arm)
 			einfo "Using generic-arm to make device nodes..."
-			${D}/sbin/MAKEDEV generic-arm
+			${DEST}/sbin/MAKEDEV generic-arm
 			;;
 		hppa)
 			einfo "Using generic-hppa to make device nodes..."
-			${D}/sbin/MAKEDEV generic-hppa
+			${DEST}/sbin/MAKEDEV generic-hppa
 			;;
 		*)
 			einfo "Using generic to make device nodes..."
-			${D}/sbin/MAKEDEV generic
+			${DEST}/sbin/MAKEDEV generic
 			;;
 	esac
 
-	${D}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+	${DEST}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
 }
 
 src_install() {
@@ -524,7 +529,7 @@ pkg_postinst() {
 			else
 				# devices.tar.bz2 will not exist with binary packages ...
 				cd ${ROOT}/dev
-				D="${ROOT}" create_dev_nodes
+				DEST="${ROOT}" create_dev_nodes
 			fi
 		fi
 	fi