use get_libdir instead of lib for cleaning stale plugincache files.

Package-Manager: portage-2.1.2.9

3 files changed, 25 insertions, 12 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 0df3892654f0..d84926978af7 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.33 2007/06/07 12:50:13 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.34 2007/06/07 13:20:16 marienz Exp $
+
+  07 Jun 2007; Marien Zwart <marienz@gentoo.org> pkgcore-0.3.ebuild:
+  use get_libdir instead of lib for cleaning stale plugincache files.
 
   07 Jun 2007; Ferris McCormick <fmccor@gentoo.org> pkgcore-0.3.ebuild:
   Add ~sparc --- Bug #181133 --- Builds, reinstalls itself, trial is good.
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index c189ae442f92..1a33a9911aa6 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pkgcore-0.2-hppa-disable-filter-env.patch 679 RMD160 cb3ddbaba39d03cfcb3af8760ebca0e6b19c1151 SHA1 e33e27fb24c746a2e95d2f64b69bcf9361f33796 SHA256 0647ced79db1dbc3b28b9217f6ee6593b6b9b9f5e76ebc69aef61fa25363840b
 MD5 c1b0ae7e4d4c65ef50247ae4d6fce085 files/pkgcore-0.2-hppa-disable-filter-env.patch 679
 RMD160 cb3ddbaba39d03cfcb3af8760ebca0e6b19c1151 files/pkgcore-0.2-hppa-disable-filter-env.patch 679
@@ -35,14 +38,14 @@ EBUILD pkgcore-0.2.14.ebuild 1688 RMD160 10419d21537d2a95690a84b1adf5f5f94bc55c6
 MD5 e012dfda449bde1fb4709f62de79562e pkgcore-0.2.14.ebuild 1688
 RMD160 10419d21537d2a95690a84b1adf5f5f94bc55c68 pkgcore-0.2.14.ebuild 1688
 SHA256 7696a46465ab0404ed8baaa62c8f0cd6f3f286489687c347e2aaece6b3077346 pkgcore-0.2.14.ebuild 1688
-EBUILD pkgcore-0.3.ebuild 2133 RMD160 fb6d22a1fd97089cb35e361aa5bddadbd8bdb5de SHA1 6b31f11d8104351881f88db5488d22b9bfe647fb SHA256 88d1557ac5671a93be4a1e8fb1939dc42b85bd8a89d2174442f87f0b407a99a8
-MD5 0a0b0c01acffb0903b6ae03aab89244f pkgcore-0.3.ebuild 2133
-RMD160 fb6d22a1fd97089cb35e361aa5bddadbd8bdb5de pkgcore-0.3.ebuild 2133
-SHA256 88d1557ac5671a93be4a1e8fb1939dc42b85bd8a89d2174442f87f0b407a99a8 pkgcore-0.3.ebuild 2133
-MISC ChangeLog 5138 RMD160 3a0971a08e93a277c58a5c1e7e8f944043fdfbe7 SHA1 652b47b1824289db3ef43064b3fbeb8b083e8eba SHA256 40463db28152f1f192821a7beef425823a5328b9d7afbdede5ab78270ccd51f5
-MD5 50c17c0ebf6688295b36cf80a2338596 ChangeLog 5138
-RMD160 3a0971a08e93a277c58a5c1e7e8f944043fdfbe7 ChangeLog 5138
-SHA256 40463db28152f1f192821a7beef425823a5328b9d7afbdede5ab78270ccd51f5 ChangeLog 5138
+EBUILD pkgcore-0.3.ebuild 2154 RMD160 22aed059f4f97d49bc9d188f4e190bb92cc66ec3 SHA1 9131dbed143c26519ebcd566449e2001cc189e80 SHA256 8e22f015400bdb70df4a17e800a6ea4265f33cda27c6eb22f8dd1abd5af3e1b8
+MD5 32f6caad4b55016461fb84944be7fc57 pkgcore-0.3.ebuild 2154
+RMD160 22aed059f4f97d49bc9d188f4e190bb92cc66ec3 pkgcore-0.3.ebuild 2154
+SHA256 8e22f015400bdb70df4a17e800a6ea4265f33cda27c6eb22f8dd1abd5af3e1b8 pkgcore-0.3.ebuild 2154
+MISC ChangeLog 5279 RMD160 11df4102ddcd2c7f4c51722f05600dbea920e89f SHA1 41bd7ef8cb1668efb89a4c3d1de6f4283bed1b9b SHA256 db05a5b7d14d9c3791e0c4d91cb0e570c5290be0358dca85e778f4c870ff9d38
+MD5 97913f911fbf2b95cec8b63847937c64 ChangeLog 5279
+RMD160 11df4102ddcd2c7f4c51722f05600dbea920e89f ChangeLog 5279
+SHA256 db05a5b7d14d9c3791e0c4d91cb0e570c5290be0358dca85e778f4c870ff9d38 ChangeLog 5279
 MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
@@ -65,3 +68,10 @@ SHA256 6f33f762b5259ff7fbcd8edfa276839a3bb9f727542b0853baf0c495af8ed8de files/di
 MD5 a9ac0662739fa3d6101b0ded164fe38c files/digest-pkgcore-0.3 238
 RMD160 03a922a5182ebd6049f8b629f89faff09d359e55 files/digest-pkgcore-0.3 238
 SHA256 7aa8a95aae082eb7a5f4d54ea9f96fa030898184646ea576525fc5fad63cf30f files/digest-pkgcore-0.3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGaAZPUElL7eJpfEQRArQYAJ4uGpTdk+z+uIWEHJ71I8NBcRKrEwCeKvXv
+4E7iZx68xgnaPgW+jagjwhU=
+=72fr
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/pkgcore-0.3.ebuild b/sys-apps/pkgcore/pkgcore-0.3.ebuild
index 0691cf120e76..9012ff9e088e 100644
--- a/sys-apps/pkgcore/pkgcore-0.3.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.3.ebuild,v 1.3 2007/06/07 12:50:13 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.3.ebuild,v 1.4 2007/06/07 13:20:16 marienz Exp $
 
 inherit distutils eutils
 
@@ -61,7 +61,7 @@ pkg_postinst() {
 	fi
 
 	# This is left behind by pkgcore 0.2.
-	rm -f "${ROOT}"usr/lib/python${PYVER}/site-packages/pkgcore/plugins/plugincache
+	rm -f "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/pkgcore/plugins/plugincache
 
 	elog "If the new layman sync support causes problems you can disable it"
 	elog "with FEATURES=-layman-sync. If you cannot sync a layman overlay"
@@ -72,7 +72,7 @@ pkg_postinst() {
 pkg_postrm() {
 	python_version
 	# Careful not to remove this on up/downgrades.
-	local sitep="${ROOT}"usr/lib/python${PYVER}/site-packages
+	local sitep="${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages
 	if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
 		! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
 		rm "${sitep}/pkgcore/plugins/plugincache2"