Fix warnings caused by paludis written environment on vdb unmerge

Package-Manager: portage-2.1.2.2

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 12883936ae4a47745f1ba3e6c0096e6644ef1e5c..d4c52355ba869b0c24d09401b0b41132755976c5 100644 (file)
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2007/03/30 18:33:52 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.27 2007/04/01 15:44:50 masterdriverz Exp $
+
+*pkgcore-0.2.13-r1 (01 Apr 2007)
+
+  01 Apr 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/pkgcore-0.2.13-tweak_intercepts.patch, +pkgcore-0.2.13-r1.ebuild:
+  Fix warnings caused by paludis written environment on vdb unmerge
 
 *pkgcore-0.2.13 (30 Mar 2007)
 

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 1fcd6e2664c80b19f50ac1ff42e381ed8d32adda..6e180f7540dc2e51f5ed78ef9519ec665e3d2a4a 100644 (file)
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,10 +1,11 @@
------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
 SHA256 0647ced79db1dbc3b28b9217f6ee6593b6b9b9f5e76ebc69aef61fa25363840b files/pkgcore-0.2-hppa-disable-filter-env.patch 679
+AUX pkgcore-0.2.13-tweak_intercepts.patch 573 RMD160 844196783b46d5c53dab6d99f7a969ef174be716 SHA1 0070e3116252387270bbaf6950aa6a6a20a084df SHA256 79a4c939071881bf27cfd5316f2dcd807d07802c595565d2ce244df0581e423d
+MD5 4259f21f99a98852b66da61797c9c48b files/pkgcore-0.2.13-tweak_intercepts.patch 573
+RMD160 844196783b46d5c53dab6d99f7a969ef174be716 files/pkgcore-0.2.13-tweak_intercepts.patch 573
+SHA256 79a4c939071881bf27cfd5316f2dcd807d07802c595565d2ce244df0581e423d files/pkgcore-0.2.13-tweak_intercepts.patch 573
 DIST pkgcore-0.1.4.tar.bz2 389388 RMD160 a4eadddfc55afad5c82277ae18d751e9b8e21a2a SHA1 6ebe98b4c0e7f37f6a9a3d0b5568e9b87712f46c SHA256 0c9cbe841d189924502ad17a52a0c3336862464c796c8c9f6fbde15915163b53
 DIST pkgcore-0.2.12.tar.bz2 562501 RMD160 197aede719a5ec229a8503b52b25b02469e38479 SHA1 119b97522100583171cc3b5d5098b05f12d3cab3 SHA256 2d0fc5cd9b223053b9832266f9378363218022cf5d1d7af0472b433107071013
 DIST pkgcore-0.2.13.tar.bz2 563424 RMD160 a5c7b87af67bd0458950a21905df492256dcb68e SHA1 11a66e65965aea738dc8d08089333c8df47f61fb SHA256 b173588dbcd0f4f9a847d8162f4709daa4f453531315db6d7a7f292bea10f78e
@@ -16,14 +17,18 @@ EBUILD pkgcore-0.2.12.ebuild 1682 RMD160 cdbc9017be7f927b9f5dc0898b0f1e6c1c116ac
 MD5 90561b88a40466d15554cc7ca0ebfe74 pkgcore-0.2.12.ebuild 1682
 RMD160 cdbc9017be7f927b9f5dc0898b0f1e6c1c116ac9 pkgcore-0.2.12.ebuild 1682
 SHA256 e671802ce222d96de3426c69ab507447871f6468a56b453b4bcffbde7d7e893b pkgcore-0.2.12.ebuild 1682
+EBUILD pkgcore-0.2.13-r1.ebuild 1741 RMD160 f5ef6f786f95d74ae0f908968884be90944bd851 SHA1 d914a016e43673fa4766bc1a0d42da25f8b60b8e SHA256 d9d64a605925b719b7bb0aad96e308bd441fe7aed478823cee38e14490460eaa
+MD5 fe28844257f1377516f32676c42b7778 pkgcore-0.2.13-r1.ebuild 1741
+RMD160 f5ef6f786f95d74ae0f908968884be90944bd851 pkgcore-0.2.13-r1.ebuild 1741
+SHA256 d9d64a605925b719b7bb0aad96e308bd441fe7aed478823cee38e14490460eaa pkgcore-0.2.13-r1.ebuild 1741
 EBUILD pkgcore-0.2.13.ebuild 1682 RMD160 6080c98dd4f27899e60728b8d2a52f0bdfa0de50 SHA1 9d64ccbfec1580c81a56213da2a01eeb755f9c6c SHA256 928ab83151a47b74d0304c0ef5a19b70c39e876c6e7676d4eecd8a53838996e6
 MD5 039719701efc79dc1eab27e3c1020f9e pkgcore-0.2.13.ebuild 1682
 RMD160 6080c98dd4f27899e60728b8d2a52f0bdfa0de50 pkgcore-0.2.13.ebuild 1682
 SHA256 928ab83151a47b74d0304c0ef5a19b70c39e876c6e7676d4eecd8a53838996e6 pkgcore-0.2.13.ebuild 1682
-MISC ChangeLog 4184 RMD160 36ce7a85226299e0a5c8989aa79206e60a656e43 SHA1 b9417311c25fb5a4431a96f06d97f2c57322c9c3 SHA256 1d590ec72e88bb31e6a0b80fc2d6ea51d4de75cbe02c2150c1d5fc5337be03e4
-MD5 86e1ec288bbba7f1b1296e985e171bb5 ChangeLog 4184
-RMD160 36ce7a85226299e0a5c8989aa79206e60a656e43 ChangeLog 4184
-SHA256 1d590ec72e88bb31e6a0b80fc2d6ea51d4de75cbe02c2150c1d5fc5337be03e4 ChangeLog 4184
+MISC ChangeLog 4427 RMD160 21e1c7e07e5f7c3ca4ec4580b043e32262572270 SHA1 69ab771133c75e50741e444f14fb41a787700944 SHA256 4c1779815569de1a0517feaf11f107dc4ad1d637afd149be2205833dc215664f
+MD5 9bd7aa3dff8346fc2c26ff3f63d808bc ChangeLog 4427
+RMD160 21e1c7e07e5f7c3ca4ec4580b043e32262572270 ChangeLog 4427
+SHA256 4c1779815569de1a0517feaf11f107dc4ad1d637afd149be2205833dc215664f ChangeLog 4427
 MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
@@ -37,10 +42,6 @@ SHA256 d979adefffa21632ea671b5537382dc09d926681d7e1c50f7ffaeb8c92a200b2 files/di
 MD5 d75e7d36619b76eb4c39f38b16a42183 files/digest-pkgcore-0.2.13 247
 RMD160 b544ede540f94f33cd7bab939318be56752d6537 files/digest-pkgcore-0.2.13 247
 SHA256 048b8f38680d0fd146b8740a5546eef08f0c939164fa7d24927e02d08756bd49 files/digest-pkgcore-0.2.13 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGDVhEUElL7eJpfEQRAsUFAJ9KegKOtJ15rY1E774bVU7x25dlAgCeLvJk
-YSp19zCdMlVIwc2V/iH6qSI=
-=JKmi
------END PGP SIGNATURE-----
+MD5 d75e7d36619b76eb4c39f38b16a42183 files/digest-pkgcore-0.2.13-r1 247
+RMD160 b544ede540f94f33cd7bab939318be56752d6537 files/digest-pkgcore-0.2.13-r1 247
+SHA256 048b8f38680d0fd146b8740a5546eef08f0c939164fa7d24927e02d08756bd49 files/digest-pkgcore-0.2.13-r1 247

diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.13-r1 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.13-r1
new file mode 100644 (file)
index 0000000..6954718
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.2.13-r1
@@ -0,0 +1,3 @@
+MD5 15100146996accc508c697ab5291f0a9 pkgcore-0.2.13.tar.bz2 563424
+RMD160 a5c7b87af67bd0458950a21905df492256dcb68e pkgcore-0.2.13.tar.bz2 563424
+SHA256 b173588dbcd0f4f9a847d8162f4709daa4f453531315db6d7a7f292bea10f78e pkgcore-0.2.13.tar.bz2 563424

diff --git a/sys-apps/pkgcore/files/pkgcore-0.2.13-tweak_intercepts.patch b/sys-apps/pkgcore/files/pkgcore-0.2.13-tweak_intercepts.patch
new file mode 100644 (file)
index 0000000..f788bb2
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.2.13-tweak_intercepts.patch
@@ -0,0 +1,17 @@
+=== modified file 'pkgcore/bin/ebuild-env/ebuild.sh'
+--- pkgcore/bin/ebuild-env/ebuild.sh   2007-03-29 16:27:43 +0000
++++ pkgcore/bin/ebuild-env/ebuild.sh   2007-04-01 15:08:43 +0000
+@@ -350,10 +350,10 @@
+             fi
+         };
+         function export() {
+-            PKGCORE_ATTRS_EXPORTED="${PKGCORE_ATTRS_EXPORTED} $*"
++            declare -x "$@"
+         };
+         function readonly() {
+-            PKGCORE_ATTRS_READONLY="${PKGCORE_ATTRS_READONLY} $*"
++            declare -r "$@"
+         };
+         function shopt() {
+             if [ "$1" == "-s" ]; then
+

diff --git a/sys-apps/pkgcore/pkgcore-0.2.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.2.13-r1.ebuild
new file mode 100644 (file)
index 0000000..b336a5b
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.2.13-r1.ebuild
@@ -0,0 +1,70 @@
+# 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.2.13-r1.ebuild,v 1.1 2007/04/01 15:44:50 masterdriverz Exp $
+
+inherit distutils
+
+DESCRIPTION="pkgcore package manager"
+HOMEPAGE="http://www.pkgcore.org"
+SRC_URI="http://www.pkgcore.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/python-2.4"
+RDEPEND=">=dev-lang/python-2.4
+       || ( >=dev-lang/python-2.5 dev-python/pycrypto )
+       >=app-shells/bash-3.0
+       doc? ( >=dev-python/docutils-0.4 )"
+
+DOCS="AUTHORS NEWS"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       use hppa && epatch "${FILESDIR}/${PN}-0.2-hppa-disable-filter-env.patch"
+       epatch "${FILESDIR}/${P}-tweak_intercepts.patch"
+}
+
+src_compile() {
+       distutils_src_compile
+
+       if use doc; then
+               ./build_docs.py || die "doc building failed"
+       fi
+}
+
+src_install() {
+       distutils_src_install
+
+       if use doc; then
+               dohtml -r doc dev-notes
+               doman man/*.1
+       fi
+
+       dodoc doc/*.rst man/*.rst
+       docinto dev-notes
+       dodoc dev-notes/*.rst
+}
+
+pkg_postinst() {
+       distutils_pkg_postinst
+       echo "updating pkgcore plugin cache"
+       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, so you can remove it now."
+       fi
+
+       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"
+       elog "using pkgcore, file a bug in pkgcore.org trac instead of complaining"
+       elog "to the layman or overlay maintainer."
+}
+
+src_test() {
+       "${python}" setup.py test || die "testing returned non zero"
+}