Add /usr/lib/portage/bin to the list of directories to clean *.pyo files from during the preinst phase. This fixes bug #153905.

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 20 insertions, 16 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index f371cc36e8a0..a5fbaeb1feec 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.286 2006/11/02 23:59:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.287 2006/11/03 11:01:00 zmedico Exp $
 
-  02 Nov 2006; <zmedico@gentoo.org> portage-2.0.51.22-r3.ebuild,
+  03 Nov 2006; Zac Medico <zmedico@gentoo.org> portage-2.1.2_rc1-r3.ebuild:
+  Add /usr/lib/portage/bin to the list of directories to clean *.pyo files
+  from during the preinst phase. This fixes bug #153905.
+
+  02 Nov 2006; Zac Medico <zmedico@gentoo.org> portage-2.0.51.22-r3.ebuild,
   portage-2.1-r2.ebuild, portage-2.1.1.ebuild, portage-2.1.1-r1.ebuild,
   portage-2.1.2_rc1-r1.ebuild, portage-2.1.2_rc1-r2.ebuild,
   portage-2.1.2_rc1-r3.ebuild:
@@ -10,7 +14,7 @@
 
 *portage-2.1.2_rc1-r3 (02 Nov 2006)
 
-  02 Nov 2006; <zmedico@gentoo.org> +portage-2.1.2_rc1-r3.ebuild:
+  02 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc1-r3.ebuild:
   2.1.2_rc1-r3 revbump.  This fixes bugs #42115, #116616, #129670, and #153764.
 
 *portage-2.1.2_rc1-r2 (01 Nov 2006)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5478d9c9a960..bc8d6e01c9e0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -48,14 +48,14 @@ EBUILD portage-2.1.2_rc1-r2.ebuild 6179 RMD160 c9e1dee3c8fe0731c0e7dbc2275f30d79
 MD5 fb28e2192fb00549a271e64ad7bada0d portage-2.1.2_rc1-r2.ebuild 6179
 RMD160 c9e1dee3c8fe0731c0e7dbc2275f30d79abf2b89 portage-2.1.2_rc1-r2.ebuild 6179
 SHA256 3e0aa5ae1bad77a4a4fe2bd579bee2a7986a2ea18f132de2f9293c9dec867277 portage-2.1.2_rc1-r2.ebuild 6179
-EBUILD portage-2.1.2_rc1-r3.ebuild 6179 RMD160 19781965c4db50fad94be6f2c3fb6540b4425f26 SHA1 a89202e8da0d56e1a9f0e1bb5fbfc977d181d626 SHA256 bcafe4d91eb1f74e1c941f4589c3ac37ebcb6101ddccc1e208f528f77f88e57d
-MD5 9f580f5221a0e9764ecd03635e6cec97 portage-2.1.2_rc1-r3.ebuild 6179
-RMD160 19781965c4db50fad94be6f2c3fb6540b4425f26 portage-2.1.2_rc1-r3.ebuild 6179
-SHA256 bcafe4d91eb1f74e1c941f4589c3ac37ebcb6101ddccc1e208f528f77f88e57d portage-2.1.2_rc1-r3.ebuild 6179
-MISC ChangeLog 19789 RMD160 b1dc79231268759fb85c0c99a961b8b3d33e6df5 SHA1 862cf24738a6c14ff037b15a3dbfcf692d4f082e SHA256 de4d7b3308732d9bde9e0de66e8a5f36235dba188b85430b1f5ce2a5a0ebc01f
-MD5 930e59e7f9d5ebc9f82b1021f41eb958 ChangeLog 19789
-RMD160 b1dc79231268759fb85c0c99a961b8b3d33e6df5 ChangeLog 19789
-SHA256 de4d7b3308732d9bde9e0de66e8a5f36235dba188b85430b1f5ce2a5a0ebc01f ChangeLog 19789
+EBUILD portage-2.1.2_rc1-r3.ebuild 6183 RMD160 22b32aece5ad7d29e53c718ddc677847a57c79b7 SHA1 69161f608558d070bad4ff9e5b4a0f22b173ae71 SHA256 6d33b5e5171081a16e6363390875743b2960097eed8dae722880e477d48e9dc9
+MD5 79b8c7a64af59c763317942d144fd0c6 portage-2.1.2_rc1-r3.ebuild 6183
+RMD160 22b32aece5ad7d29e53c718ddc677847a57c79b7 portage-2.1.2_rc1-r3.ebuild 6183
+SHA256 6d33b5e5171081a16e6363390875743b2960097eed8dae722880e477d48e9dc9 portage-2.1.2_rc1-r3.ebuild 6183
+MISC ChangeLog 20020 RMD160 bd2899d10bed47e5f1e2358fde691a2c070d9ebe SHA1 2d7b8b54ec366a8580f7e8533a23ff8776956b78 SHA256 ee90899a7a16d9169ce8596182c88a74fab8a7066f49b3165ece932331df101e
+MD5 accd90f4df5776a28935e86de44c5b43 ChangeLog 20020
+RMD160 bd2899d10bed47e5f1e2358fde691a2c070d9ebe ChangeLog 20020
+SHA256 ee90899a7a16d9169ce8596182c88a74fab8a7066f49b3165ece932331df101e ChangeLog 20020
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -84,7 +84,7 @@ SHA256 a083d2fa28221fb8e4ffe64e8daca7baa5fda6310df2f5fc43c11876d39bf3d7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFSoZV/ejvha5XGaMRAv1WAKCbj6S2js0W/SpGigUjToC1LYzvBgCePQxt
-wjOOs0UBlj7hXuN5BsujBs4=
-=3ho+
+iD8DBQFFSyBH/ejvha5XGaMRAnfIAJ9rhkcsQYENqXk3B56qE5I+XTEhUQCgvp8b
+Qk4ZQWMcZDPbRsCIxm8lwWI=
+=0fGn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild b/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild
index 876396f15980..88c6fb6116d3 100644
--- a/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild
+++ b/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild,v 1.2 2006/11/02 23:59:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild,v 1.3 2006/11/03 11:01:00 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -174,7 +174,7 @@ pkg_preinst() {
 		rm -rf "${IMAGE}"/${portage_base}/bin/*
 		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
 	else
-		for mydir in pym pym/cache pym/elog_modules; do
+		for mydir in bin pym pym/cache pym/elog_modules; do
 			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
 			rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
 		done