drop old plugincache wiping code that is now invalidly causing issues; >0.7.6.1 will...

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index fba1fc09c02c173ea7b0263bd520a2c07e47bf9b..146d7e9f4631c5a28a6bbf9230a48d76941e3e8e 100644 (file)
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.133 2011/12/01 09:21:28 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.134 2011/12/01 12:55:24 ferringb Exp $
+
+  01 Dec 2011; Brian Harring <ferringb@gentoo.org> pkgcore-9999.ebuild:
+  drop old plugincache wiping code that now is causing issues
 
 *pkgcore-0.7.6.1 (01 Dec 2011)
 

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index ae9d647bb8ed6d95e423c1330eda23772f3c842e..d1a52018c7473af2535018584e247b9986f9bde9 100644 (file)
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -7,13 +7,13 @@ DIST pkgcore-0.7.5.tar.bz2 429564 RMD160 08f24ccab29d8e9b319cd1eadc62c3bdf25731e
 DIST pkgcore-0.7.6.1.tar.bz2 431625 RMD160 a82e211415eb583f89897efb4e05cdb07dabdf0f SHA1 eb5b850bbc801e2f5865a7e79a8f86c86b2b14fa SHA256 d0a91f5f97c8fe121735dda056fe8d0a208099e72e8258b3a3b1cf1fc26328d2
 EBUILD pkgcore-0.7.5-r2.ebuild 1870 RMD160 948037c5bd6ad9e75b4253c11a530bc036ce4862 SHA1 00dcf7567987eab28a1de1f1cd73d52946bbf55f SHA256 ae59abec5f538230e4742873275231fd3a151806f831b009f0cdf7f4b93f2028
 EBUILD pkgcore-0.7.6.1.ebuild 1756 RMD160 fd649053252b869717313b2b994d2ba020eb0a87 SHA1 078898c38a66047c18679a3e8d70d0a022f12289 SHA256 a1e5716a11d4de33539033a3d9915acac946d7bec63d5efa8ae646e4ed5ac8d3
-EBUILD pkgcore-9999.ebuild 1754 RMD160 f2a8ee71d586cd40f8b86abf466ae13ddf55652b SHA1 02611d7e616b6ab902264e903a0a8b4767b5fe90 SHA256 edb16c565f7f5feb52486c5f07d1d7b47ad98c0c1c48190e4609ff71153b6417
-MISC ChangeLog 22030 RMD160 fd2ff4235a13e88a1c53561c63c515c09e2c3d73 SHA1 6a919867281259603f09327766ad1e404fc91881 SHA256 fb421da555edcdea13bcc7cd4c450db51a8b66734690a9a09ddc80b14c9925e7
+EBUILD pkgcore-9999.ebuild 1121 RMD160 acf273eb4026c2c2d1b9b604bd59d15e827d681d SHA1 94c3b68fa16f1c58519148e666786a0c7ad534a8 SHA256 34b47c6b52282e6e6bef8f42b1b123bcc9a70accf6b6b4f602649866fc74e95e
+MISC ChangeLog 22165 RMD160 4e41f3f11a012e69a93df108714ab1a3a7145017 SHA1 a821f5defeb4f9bfbb508636a64fc997bff8db22 SHA256 476aea25074b2966867748cf0aa9cd91cef46ad6ecf7e9e6d8d8e5b305c80ef3
 MISC metadata.xml 234 RMD160 7f7e4ec7da60203d4fc0d59ea9b7001ca84fd88c SHA1 fc54601f1382d43dd16625b242d7a52ff36f3782 SHA256 f036ed153de912a1bb1466478e9ce0c9d4ecae55929f6b13490c3f47a242fc0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7XRx4ACgkQsiLx3HvNzgeblQCgvmVNelRYBjUE7nzhz0B3hpj2
-++EAoIKgYNIl30zb/ClSe+G459ssTm4l
-=vY/6
+iEYEARECAAYFAk7XeUIACgkQsiLx3HvNzgcieQCeKJSvkcZPvjjpj2LnRsx+ChYW
++fQAnRBQahAZzqNDMnpzE9QNSKl7fD8k
+=xH9z
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 9c1d873a15d3a67553cef9b3e3415314d617f946..845ef311544a278af2d02eebfb123d0ced0cae82 100644 (file)
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.3 2011/09/20 02:53:25 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.4 2011/12/01 12:55:24 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
@@ -52,23 +52,4 @@ src_install() {
 pkg_postinst() {
        distutils_pkg_postinst
        pplugincache
-
-       if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then
-               elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1."
-               elog "It is unused by pkgcore >= 0.2, remove it now."
-               die "remove /etc/pkgcore/plugins from pkgcore 0.1"
-       fi
-
-       # This is left behind by pkgcore 0.2.
-       rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache
-}
-
-pkg_postrm() {
-       # Careful not to remove this on up/downgrades.
-       local sitep="${ROOT}"$(python_get_sitedir)/site-packages
-       if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
-               ! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
-               rm "${sitep}/pkgcore/plugins/plugincache2"
-       fi
-       distutils_pkg_postrm
 }