make ROOT var more robust for postinst() - for stage building

3 files changed, 34 insertions, 29 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 25db5ef46b4a..7566803cb5fd 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.67 2004/01/12 01:52:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.68 2004/01/18 01:43:57 liquidx Exp $
+
+  18 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  make ROOT var more robust during postinst()
 
   12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> python-2.2.3-r5.ebuild:
   Marked ppc
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c88b73090f01..2d134fa1a9e5 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,33 +1,33 @@
-MD5 a10403c6d9c56940c483e886672338ac python-2.3.3.ebuild 5421
-MD5 e1f163ef92e80940f820c7759c8abb46 python-2.2.3-r5.ebuild 4347
-MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
-MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
-MD5 999045b60de5feb40e64f9bc6d368378 ChangeLog 12802
+MD5 e144b422988cff6b9f3771a5cffd5764 ChangeLog 12919
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
+MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
 MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
-MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
+MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
 MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293
+MD5 e1f163ef92e80940f820c7759c8abb46 python-2.2.3-r5.ebuild 4347
+MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
 MD5 2c2982b56f6b0bf767766e14bb001d23 python-2.3.2-r2.ebuild 5424
-MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
-MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
-MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
-MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
-MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
-MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r2 62
+MD5 7ccf6cd7576dd9ea4c043602cfa7521b python-2.3.3.ebuild 5475
+MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
+MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
+MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
+MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
+MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r2 62
+MD5 b5dba91179081cfa904412c11e41fbdd files/digest-python-2.3.3 62
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
+MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
+MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
+MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
+MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
 MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
-MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
+MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
 MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
-MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
-MD5 b5dba91179081cfa904412c11e41fbdd files/digest-python-2.3.3 62
-MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62
-MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
-MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
-MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
-MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
+MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
diff --git a/dev-lang/python/python-2.3.3.ebuild b/dev-lang/python/python-2.3.3.ebuild
index a82ee1d246a9..5d40138f4140 100644
--- a/dev-lang/python/python-2.3.3.ebuild
+++ b/dev-lang/python/python-2.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.1 2004/01/04 20:42:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.2 2004/01/18 01:43:57 liquidx Exp $
 
 inherit flag-o-matic python
 
@@ -146,9 +146,12 @@ pkg_postrm() {
 }
 
 pkg_postinst() {
+	local myroot
+	myroot=$(echo $ROOT | sed 's:/$::')
+
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${ROOT}usr/lib/python${PYVER}
+	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
 
 	echo
 	ewarn
@@ -168,5 +171,4 @@ pkg_postinst() {
 	echo -ne "\a"; sleep 1
 	echo -ne "\a"; sleep 1
 	echo -ne "\a"; sleep 1
-
 }