little catalyst fixes

3 files changed, 33 insertions, 13 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fbbd986849a1..e07c9b6e1149 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,16 +1,16 @@
-MD5 dd85f815f3d819d8c243295e6cd84280 ChangeLog 560
 MD5 74418f353cc4bfaf1703fa59f0f772b0 portage-2.0.48-r5.ebuild 8777
+MD5 b4f506d994bf8c55a3c42c5d3db97639 portage-2.0.49-r16.ebuild 10538
 MD5 762ed52392ca515af647ded5838ffe2c portage-2.0.49-r13.ebuild 9743
-MD5 d3e2d791e2bf110f053fd70abb57a3f5 portage-2.0.49-r15.ebuild 9885
-MD5 b4b7db284015612725202453bf0cc9f8 portage-2.0.49-r16.ebuild 10264
-MD5 d4bb71bd3515647145916ba7d6287d20 files/README.RESCUE 1064
-MD5 7fd37ede0f97932165bc4465055d62ab files/digest-portage-2.0.48-r5 70
+MD5 dd85f815f3d819d8c243295e6cd84280 ChangeLog 560
+MD5 37a2cae4ff0c10c90a9192c69f2825c6 portage-2.0.49-r15.ebuild 10159
+MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
+MD5 35519288ced0c9c3a2893d16e666a5cf files/portage-rescue-2.0.49-r3-alpha.tbz2 284986
 MD5 6589ac20a00a2250e125d8bf8492c425 files/digest-portage-2.0.49-r13 71
 MD5 b51c16b3d29c4691c2b6af3b857d4a83 files/digest-portage-2.0.49-r15 71
+MD5 8d1c5ef73f4f968484547852ef777cfd files/digest-portage-2.0.49-r16 71
 MD5 586d338571d2dc83a846b12568dddaa3 files/portage-2.0.49-r13_fixdbmsg.diff.gz 513
-MD5 73094a2d75dca36817b40611589ea226 files/portage-rescue-2.0.44-ppc.tbz2 168027
+MD5 7fd37ede0f97932165bc4465055d62ab files/digest-portage-2.0.48-r5 70
 MD5 0e69f4c26d5511882f92601c55bb960e files/portage-rescue-2.0.47-r10-x86.tbz2 206746
-MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
+MD5 73094a2d75dca36817b40611589ea226 files/portage-rescue-2.0.44-ppc.tbz2 168027
+MD5 d4bb71bd3515647145916ba7d6287d20 files/README.RESCUE 1064
 MD5 e2f7d2797f76d586452705abed1e515e files/portage-rescue-2.0.48-r1-sparc64.tbz2 227569
-MD5 35519288ced0c9c3a2893d16e666a5cf files/portage-rescue-2.0.49-r3-alpha.tbz2 284986
-MD5 8d1c5ef73f4f968484547852ef777cfd files/digest-portage-2.0.49-r16 71
diff --git a/sys-apps/portage/portage-2.0.49-r15.ebuild b/sys-apps/portage/portage-2.0.49-r15.ebuild
index ac97c26ca459..6611a34a38f6 100644
--- a/sys-apps/portage/portage-2.0.49-r15.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r15.ebuild,v 1.3 2003/11/03 07:51:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r15.ebuild,v 1.4 2003/11/06 04:30:15 drobbins Exp $
 
 IUSE="build"
 
@@ -69,7 +69,10 @@ src_install() {
 		doins make.globals make.conf
 		;;
 	esac
-	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
+
+	#This special handling of make.conf is required for catalyst
+	#to function properly.
+	mv ${D}/etc/make.conf ${D}/etc/make.conf.orig
 
 	doins etc-update.conf dispatch-conf.conf
 	#python modules
@@ -135,6 +138,13 @@ src_install() {
 pkg_postinst() {
 	local x
 
+	#Only move make.conf into place if one doesn't exist already.
+	#Special handling required for catalyst.
+	if [ ! -f ${ROOT}etc/make.conf ]
+	then
+		cp -a ${ROOT}etc/make.conf.orig ${ROOT}etc/make.conf
+	fi
+
 	#disable global sandbox if it's active (it's been deprecated)
 	if [ -f /etc/ld.so.preload ] ; then
 		cp /etc/ld.so.preload ${T}
diff --git a/sys-apps/portage/portage-2.0.49-r16.ebuild b/sys-apps/portage/portage-2.0.49-r16.ebuild
index 2fe4cdc617a7..4a1a75c861bf 100644
--- a/sys-apps/portage/portage-2.0.49-r16.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r16.ebuild,v 1.4 2003/11/05 00:56:50 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r16.ebuild,v 1.5 2003/11/06 04:30:15 drobbins Exp $
 
 IUSE="build"
 
@@ -80,7 +80,10 @@ src_install() {
 		doins make.globals make.conf
 		;;
 	esac
-	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
+
+	#This special handling of make.conf is required for catalyst
+	#to function properly.
+	mv ${D}/etc/make.conf ${D}/etc/make.conf.orig
 
 	doins etc-update.conf dispatch-conf.conf
 
@@ -149,6 +152,13 @@ src_install() {
 pkg_postinst() {
 	local x
 
+	#Only move make.conf into place if one doesn't exist already.
+	#Special handling required for catalyst.
+	if [ ! -f ${ROOT}etc/make.conf ]
+	then
+		cp -a ${ROOT}etc/make.conf.orig ${ROOT}etc/make.conf
+	fi
+
 	#disable global sandbox if it's active (it's been deprecated)
 	if [ -f /etc/ld.so.preload ] ; then
 		cp /etc/ld.so.preload ${T}