Add patch enforcing the python binary used for internal pinspect calls; drop 0.7...

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

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index de4eb1ceb22b6e47dc30792ae1b44fa2c52cbcf1..06c3a5a9a7b45a52ff52971e54de68c5ac88f07b 100644 (file)
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,12 @@
 # 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.129 2011/11/09 03:59:42 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.130 2011/11/10 00:56:45 ferringb Exp $
+
+*pkgcore-0.7.5-r1 (10 Nov 2011)
+
+  10 Nov 2011; Brian Harring <ferringb@gentoo.org> -pkgcore-0.7.5.ebuild,
+  +pkgcore-0.7.5-r1.ebuild, +files/pkgcore-0.7.5-force-python-binary.patch:
+  Add patch enforcing the python binary used for internal pinspect calls
 
   09 Nov 2011; Brian Harring <ferringb@gentoo.org> pkgcore-0.7.5.ebuild:
   bug 389925; if generating docs, require pyparsing

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f863cfffa657e4c41fbb863eb587a696ddd2dd06..46825c13c51d0235573cc40ae052fedb17bfe85b 100644 (file)
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pkgcore-0.7.5-force-python-binary.patch 1238 RMD160 dc03e2dca5222268d63f6a63b9bd4ec8ac49f50f SHA1 82e1ecb996020c519bdf8e24077a40e1d98aafa8 SHA256 0186632d3758ee2f625de16b8287042d9c937af274ea56b2f99d83770d7007c4
 DIST pkgcore-0.7.2.tar.bz2 426679 RMD160 1a8773336bc804e58aec5ca6d3e4ee895f60e8cc SHA1 38d4343fda8b9c19ab427cd21b7c8ddfcb70727c SHA256 44a9b2d2768573313b7e6869892f091412a7972f86b570ccd662dfc105c60cfd
 DIST pkgcore-0.7.4.tar.bz2 429202 RMD160 ec71f1ef838409a6fbc6513f60d50e818813786f SHA1 245249b626acf7420eb10d09bec47c9668c330f7 SHA256 e62a1777ee1952d2cb5add9ac95b432ed8b1222c185310cfd0490484b944d75c
 DIST pkgcore-0.7.5.tar.bz2 429564 RMD160 08f24ccab29d8e9b319cd1eadc62c3bdf25731e0 SHA1 645dcd292d6cb832671cd7d0884fe33bcfef00a1 SHA256 9d6172ce5eef9c5818946dd52ddc3be61b59e57df227d6d76fb918653ab5daf2
 EBUILD pkgcore-0.7.2.ebuild 1763 RMD160 66d259f83d823b417eb71dd9b727a91346c17265 SHA1 379b33b550d626bc58dfc2873dd94a688902750d SHA256 e5ab494e04959280de7275d5d79764fbedd5bc1cb4c5df4f0e5f6eaca51b9eed
 EBUILD pkgcore-0.7.4.ebuild 1726 RMD160 a8561165cbf2c6bb249296557f53bfe5d9c0cfcc SHA1 d6764f09cdad276b9221ca4068db429d1488f38f SHA256 56f8ea246617ff3106780ab795f8fcd62a85b040ce38cef8b8d320e13c239769
-EBUILD pkgcore-0.7.5.ebuild 1747 RMD160 19fb7d2fb8da1fc033a4095ee97771a6aa9fa676 SHA1 150d85555cbc4e5354f1c3fd4b90e5266c3b726d SHA256 3d03b50daae53782efa2958fba4b749e0799991c14912ca313408786bdf31ec7
+EBUILD pkgcore-0.7.5-r1.ebuild 1830 RMD160 8dbe3a814e30490781bd4d8ac6f86cd796e99f10 SHA1 67852fbc68beb69d12a9fcfd71cfa7dde75455ef SHA256 28756c6999d1d8ae0195e44961ebd77809aa41f2d103cc8d0d710fc8742cc99c
 EBUILD pkgcore-9999.ebuild 1754 RMD160 f2a8ee71d586cd40f8b86abf466ae13ddf55652b SHA1 02611d7e616b6ab902264e903a0a8b4767b5fe90 SHA256 edb16c565f7f5feb52486c5f07d1d7b47ad98c0c1c48190e4609ff71153b6417
-MISC ChangeLog 21104 RMD160 c4e34930da188990b8f01fa49eebea2bd619ebaf SHA1 1b17449ed2ae06a840e6fbc6f6535312f39dca8f SHA256 58830a56de36e55e3c07aae6f2aaf39949c646c5067bbb715c563493ce7dc5b6
+MISC ChangeLog 21361 RMD160 f42b839bacd87fb99c7ee49246449c6d3f91250d SHA1 213b9168bb255d05b2cd7f7cfe96e90876a9c409 SHA256 3fea3f3b695496c3ac7369ae463f56309dfa50590ed5f3f427baef787c797baa
 MISC metadata.xml 234 RMD160 7f7e4ec7da60203d4fc0d59ea9b7001ca84fd88c SHA1 fc54601f1382d43dd16625b242d7a52ff36f3782 SHA256 f036ed153de912a1bb1466478e9ce0c9d4ecae55929f6b13490c3f47a242fc0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk65+rMACgkQsiLx3HvNzgcpUACg3lsPOGNHXGknF4uSDk2LV/zR
-ko0AnRG7TfrCm2ftkuFwycLu0wPNuQ8Y
-=/5//
+iEYEARECAAYFAk67IVIACgkQsiLx3HvNzgesHACfaz4isnFeiGC92w2J+JsZbF+G
+RSkAoIL1KMMsci80BHvhZe90me6OQG3r
+=/2sr
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch b/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch
new file mode 100644 (file)
index 0000000..625d0d4
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch
@@ -0,0 +1,28 @@
+From d0320842a1b749612b3cdb6f30617760c29ced75 Mon Sep 17 00:00:00 2001
+From: Brian Harring <ferringb@gmail.com>
+Date: Wed, 9 Nov 2011 15:28:32 -0800
+Subject: [PATCH] force python binary used for pinspect calls.
+
+---
+ .../ebuild/eapi-bash/ebuild-default-functions.lib  |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib b/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
+index 3ee5e99..cff5405 100644
+--- a/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
++++ b/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
+@@ -13,8 +13,9 @@ portageq() {
+       # being snagged by the sandbox
+       local portageq_str=portageq
+       ${PKGCORE_DISABLE_COMPAT-false} && portageq_str=query
+-      SANDBOX_on=0 PYTHONPATH="$PKGCORE_PYTHONPATH" "${PKGCORE_BIN_PATH}/pinspect" ${portageq_str} "${command}" \
+-          --eapi "${EAPI:--1}" --use "${USE}" "$@"
++      SANDBOX_on=0 PYTHONPATH="$PKGCORE_PYTHONPATH" "${PKGCORE_PYTHON_BINARY}" \
++              "${PKGCORE_BIN_PATH}/pinspect" ${portageq_str} "${command}" \
++                      --eapi "${EAPI:--1}" --use "${USE}" "$@"
+       local ret="$?"
+       [ "$ret" == 127 ] && die "pinspect couldn't be found; broken pkgcore installation?"
+       return $(( $ret ))
+-- 
+1.7.8.rc1
+

diff --git a/sys-apps/pkgcore/pkgcore-0.7.5.ebuild b/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild
similarity index 91%
rename from sys-apps/pkgcore/pkgcore-0.7.5.ebuild
rename to sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild
index 1fba2452dbc18a7b1fb07be9f767b268be222f9c..4260aabd48ef072f99d4a3487fb85f5a396a6abf 100644 (file)
--- a/sys-apps/pkgcore/pkgcore-0.7.5.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild
@@ -1,11 +1,11 @@
 # 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-0.7.5.ebuild,v 1.2 2011/11/09 03:59:42 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild,v 1.1 2011/11/10 00:56:45 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="pkgcore package manager"
 HOMEPAGE="http://pkgcore.googlecode.com/"
@@ -30,6 +30,10 @@ pkg_setup() {
        python_pkg_setup
 }
 
+src_prepare() {
+       epatch "$FILESDIR/"$PN-$PV-force-python-binary.patch
+}
+
 src_compile() {
        distutils_src_compile