Add hardlink for /etc/portage/profiles/package.mask -> /etc/portage/package.mask

2 files changed, 12 insertions, 15 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 45f45c58da87..052e16dd3700 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,7 +3,7 @@ MD5 0b56de13046811303d92eb986f72f1d2 portage-2.0.49_pre12.ebuild 9480
 MD5 6b0a70b3fb889be81ae0a165acc4cd94 portage-2.0.48-r3.ebuild 9172
 MD5 4a5ea0277cc7f436cb4bbed94397c941 portage-2.0.49_pre11.ebuild 9480
 MD5 4b443b79502a2b4789b217c120b9e71a ChangeLog 618
-MD5 1c15e22dec59608966f65c129ab28f18 portage-2.0.48-r4.ebuild 9172
+MD5 49ba88dfd6370b63276e0b3bfa19763d portage-2.0.48-r4.ebuild 8732
 MD5 97099c94293452dd800dfcf1def48130 files/digest-portage-2.0.49_pre11 73
 MD5 dd8af9e19384d41b3a19c904c105331c files/digest-portage-2.0.49_pre12 73
 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
diff --git a/sys-apps/portage/portage-2.0.48-r4.ebuild b/sys-apps/portage/portage-2.0.48-r4.ebuild
index a3b8613da5df..1fd6c1152b32 100644
--- a/sys-apps/portage/portage-2.0.48-r4.ebuild
+++ b/sys-apps/portage/portage-2.0.48-r4.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r4.ebuild,v 1.1 2003/07/18 18:13:20 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r4.ebuild,v 1.2 2003/07/18 18:48:40 carpaski Exp $
 
 IUSE="build"
 
@@ -150,29 +150,26 @@ pkg_postinst() {
 		rm -f /var/cache/edb/mtimes
 	fi
 
+	if [ ! -f "/etc/portage/package.mask" ]; then
+	  if [ -f "/etc/portage/profiles/package.mask" ]; then
+			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
+		fi
+	fi
+
 	echo
 	eerror "NOTICE: PLEASE *REPLACE* your make.globals. All user changes to variables"
 	eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
 	echo
-	eerror "NOTICE: The wheel group requirement for non-root users has been changed to"
-	eerror "group portage. Group portage must be a valid group for user to use portage."
-	echo
 	einfo "Feature additions are noted in help and make.conf descriptions. Update"
 	einfo "them using 'etc-update' please. Maintaining current configs for portage"
 	einfo "and other system packages is fairly important for the continued health"
 	einfo "of your system."
 	echo
-	einfo "A worldfile rebuilding script is available to regenerate entries that"
-	einfo "should be in your worldfile but were removed by a recently discovered"
-	einfo "'-e bug' or if you deleted it: run 'regenworld' as root."
-	echo
-	eerror "The late 2.0.48 portages contains Manifest files which contain all"
-	eerror "the files and ebuilds used, not just the archives extracted. This is to"
-	eerror "help discovering corruption and increasing security and should require"
-	eerror "no extra work from end-users. If portage reports a bad file that is not"
-	eerror "in the distfiles directory, after you've deleted it an re-sync'd, report it."
+	einfo "/etc/portage/profiles/package.mask has been moved to /etc/portage/package.mask"
+	einfo "a hardlink has been created to the new location if the file exists in profiles"
+	einfo "already."
 	echo
-	if [ -z $PORTAGE_TEST ]; then
+	if [ -z "$PORTAGE_TEST" ]; then
 		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
 		echo -ne "\a" ; sleep 1
 		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null