Fixed less than stellar profile handling of PATH.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 148 insertions, 2 deletions

diff --git a/sys-apps/baselayout-darwin/ChangeLog b/sys-apps/baselayout-darwin/ChangeLog
index 9e7fc9a1978a..2ec7340735ec 100644
--- a/sys-apps/baselayout-darwin/ChangeLog
+++ b/sys-apps/baselayout-darwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/baselayout-darwin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/ChangeLog,v 1.2 2005/05/13 20:14:16 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/ChangeLog,v 1.3 2005/08/07 00:39:17 josejx Exp $
+
+*baselayout-darwin-1.11.11-r1 (07 Aug 2005)
+
+  07 Aug 2005; Joseph Jezak <josejx@gentoo.org>
+  +files/dont-destroy-path.patch, +baselayout-darwin-1.11.11-r1.ebuild:
+  Fixed less than stellar profile handling of PATH.
 
   13 May 2005; <gongloo@gentoo.org> baselayout-darwin-1.11.11.ebuild:
   Fixed xargs command-line argument (--null to -0).
diff --git a/sys-apps/baselayout-darwin/Manifest b/sys-apps/baselayout-darwin/Manifest
index c7d37507ec44..3e2a50d7caf9 100644
--- a/sys-apps/baselayout-darwin/Manifest
+++ b/sys-apps/baselayout-darwin/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a4e2561f4befc5e7701a8d6264079451 ChangeLog 727
 MD5 74582a2b01f982b22695517175786d31 baselayout-darwin-1.11.11.ebuild 2194
 MD5 fc76b60032187aa3e2029ee04b00e773 metadata.xml 156
-MD5 b5eb4ad1af9d6d9932e681f842b22e92 ChangeLog 510
+MD5 d589f6f3e2aea56d03862a0ceb494ee0 baselayout-darwin-1.11.11-r1.ebuild 2303
 MD5 195cf81f844cac1211a1b29cb1528bde files/digest-baselayout-darwin-1.11.11 76
+MD5 195cf81f844cac1211a1b29cb1528bde files/digest-baselayout-darwin-1.11.11-r1 76
+MD5 6dcd5d21a9f7a57cd54aa8f0ae4835a1 files/dont-destroy-path.patch 1253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC9Vh0csIHjyDViGQRAurkAJ4hdK+w89lbbg0kVnrKlLEWa4p/tACg0yBs
+wf11dnnUivXXDCBq7UK9ESM=
+=hUCl
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild b/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild
new file mode 100644
index 000000000000..d7e67fe3c0c3
--- /dev/null
+++ b/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild,v 1.1 2005/08/07 00:39:17 josejx Exp $
+
+inherit eutils
+
+DESCRIPTION="Baselayout and init scripts (eventually)"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://dev.gentoo.org/~josejx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc-macos"
+IUSE=""
+DEPEND=""
+RDEPEND="sys-apps/coreutils-darwin"
+
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/etc/
+	epatch "${FILESDIR}/dont-destroy-path.patch"
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	local dir libdirs libdirs_env rcscripts_dir
+
+	dodir /etc/env.d
+	dodir /etc/init.d
+
+	#
+	# Setup files in /etc
+	#
+	insopts -m0644
+	insinto /etc
+	doins -r "${S}"/etc/*
+
+	insinto /etc/env.d
+	doins ${S}/etc/env.d/*
+	insinto /etc/skel
+	find ${S}/etc/skel -maxdepth 1 -type f -print0 | xargs -0 doins
+
+	#
+	# Setup files in /sbin
+	#
+	cd ${S}/sbin
+	into /
+	# These moved from /etc/init.d/ to /sbin to help newb systems
+	# from breaking
+	dosbin functions.sh
+
+	# Compat symlinks between /etc/init.d and /sbin
+	# (some stuff have hardcoded paths)
+	dosym /sbin/functions.sh /etc/init.d/functions.sh
+
+	# We can only install new, fast awk versions of scripts
+	# if 'build' or 'bootstrap' is not in USE.  This will
+	# change if we have sys-apps/gawk-3.1.1-r1 or later in
+	# the build image ...
+	#if ! use build; then
+		# This is for new depscan.sh and env-update.sh
+		# written in awk
+		#cd ${S}/sbin
+		#into /
+		#dosbin env-update.sh
+		#insinto ${rcscripts_dir}/awk
+		#doins ${S}/src/awk/*.awk
+	#fi
+}
+
+pkg_postinst() {
+	if [ -f /etc/profile ] && ! grep profile.gentoo /etc/profile > /dev/null; then
+		einfo "Adding /etc/profile.gentoo to /etc/profile"
+		echo "source /etc/profile.gentoo" >> /etc/profile
+	fi
+	if [ -f /etc/bashrc ] && ! grep skel /etc/bashrc > /dev/null; then
+		einfo "Adding /etc/skel/.bashrc to /etc/bashrc"
+		echo ". /etc/skel/.bashrc" >> /etc/bashrc
+	fi
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!  You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	echo
+}
diff --git a/sys-apps/baselayout-darwin/files/digest-baselayout-darwin-1.11.11-r1 b/sys-apps/baselayout-darwin/files/digest-baselayout-darwin-1.11.11-r1
new file mode 100644
index 000000000000..23aee387330f
--- /dev/null
+++ b/sys-apps/baselayout-darwin/files/digest-baselayout-darwin-1.11.11-r1
@@ -0,0 +1 @@
+MD5 03800363f730958bde5bc1539a5c6ee0 baselayout-darwin-1.11.11.tar.gz 11999
diff --git a/sys-apps/baselayout-darwin/files/dont-destroy-path.patch b/sys-apps/baselayout-darwin/files/dont-destroy-path.patch
new file mode 100644
index 000000000000..62e118228ed6
--- /dev/null
+++ b/sys-apps/baselayout-darwin/files/dont-destroy-path.patch
@@ -0,0 +1,32 @@
+--- /var/tmp/portage/baselayout-darwin-1.11.11/work/baselayout-darwin-1.11.11/etc/profile.gentoo	Wed May 11 22:35:20 2005
++++ /etc/profile.gentoo	Sat Aug  6 17:06:36 2005
+@@ -4,6 +4,8 @@
+ # That this file is used by any Bourne-shell derivative to setup the
+ # environment for login shells.
+ 
++SAVEPATH=${PATH}
++
+ # Load environment settings from profile.env, which is created by
+ # env-update from the files in /etc/env.d
+ if [ -e "/etc/profile.env" ]; then
+@@ -13,19 +15,7 @@
+ # 077 would be more secure, but 022 is generally quite realistic
+ umask 022
+ 
+-# Set up PATH depending on whether we're root or a normal user.
+-# There's no real reason to exclude sbin paths from the normal user,
+-# but it can make tab-completion easier when they aren't in the
+-# user's PATH to pollute the executable namespace.
+-#
+-# It is intentional in the following line to use || instead of -o.
+-# This way the evaluation can be short-circuited and calling whoami is
+-# avoided.
+-if [ "$EUID" = 0 ] || [ "`/usr/bin/whoami`" = 'root' ]; then
+-	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+-else
+-	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+-fi
++PATH="/usr/local/sbin:/usr/local/bin:${SAVEPATH}:${PATH}"
+ export PATH
+ unset ROOTPATH
+