Fixing test failure, patch by Brian Harring. Fixes #216942

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 110 insertions, 5 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index f6f6db0527f0..7c1d76cd4b62 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.75 2009/01/30 04:31:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.76 2009/01/31 12:30:07 patrick Exp $
+
+*pkgcore-0.4.7.15-r1 (31 Jan 2009)
+
+  31 Jan 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/pkgcore-sandbox.patch, +pkgcore-0.4.7.15-r1.ebuild:
+  Fixing test failure, patch by Brian Harring. Fixes #216942
 
   30 Jan 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -pkgcore-0.4.7.13.ebuild:
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 5b2338c1bc7d..1ffc8560b058 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,8 @@
+AUX pkgcore-sandbox.patch 886 RMD160 d6de5aef0bc8b2434d3435dcb0cebd924885aa89 SHA1 19fdb4d6400b8ea8f5a6f70f5664680196dc28cb SHA256 5a6676592828930274662cfaeed2763f6828716001d11c961f79a1447634071e
 DIST pkgcore-0.4.7.14.tar.bz2 593431 RMD160 ef3550916f5bd4e81d721be6a948fac9da582141 SHA1 f55e6582d10ded53bc042943399c4f6b13311321 SHA256 d1963429721c8ba23c073ee5ee4ab38fdb94b04116c213041079a1978aef4c10
 DIST pkgcore-0.4.7.15.tar.bz2 594381 RMD160 ba27da0dc88b9c79dfcfddc1ff8fbe08061c9572 SHA1 92c852c73e0a75d5f3b33df6730a200bcc9320d1 SHA256 37bd637cbfe3cd5324d5f9c8cce881ea4fcc46bcae3a91a120beec52be2eb106
-EBUILD pkgcore-0.4.7.14.ebuild 1801 RMD160 a3c960f959950a1d9fad99a8de64ab4d5c29b9e7 SHA1 b97009d2650bd30614eaf32d872a3c60d3c440e6 SHA256 8034b171b2cd991835116bdb8535bf095db03a57fdaedb071e64bdd24fd8dd88
+EBUILD pkgcore-0.4.7.14.ebuild 1801 RMD160 ebfb96b1fd4e8b9dbb506a979894a3469646fca9 SHA1 242572bb38ded64c4809778d2fa6d0479845f9a3 SHA256 cac1f6be823ea17d8c1c6d52a12130f5c7bbdbebff0483a2811769342acc6ff5
+EBUILD pkgcore-0.4.7.15-r1.ebuild 1858 RMD160 13a7c14898ee6114d75ce7f1fa333bfed9b636f6 SHA1 cc53546c7b84ad6eba3ab1b8c669b0e75b448bb9 SHA256 0cd92acaadf5ca7b7608debac111b7976ec7e9eb0dbab5da710e4f6d89346ea2
 EBUILD pkgcore-0.4.7.15.ebuild 1805 RMD160 5bf05c7c7fa021f82e3f99dea09826e01a5cf89c SHA1 533595ce2867fdf43345d0417a0d3278618c10e2 SHA256 8721872fdaf7f431acf2a9ddf18bff0495cb2b10d845ad30bbfa4a13943e0fd7
-MISC ChangeLog 11946 RMD160 12d334437a6cc7bd327566cbf8a8e471c34ed009 SHA1 a7ac0c56243ea668217c1873f5c803d92059448d SHA256 6d55a1fd429d4f9c1436361d1e69ae454ad8bce542f28fbf37232ee25ad32dc6
+MISC ChangeLog 12151 RMD160 15e3bfc194a4650cf8c7d38c4e1c5d9acf37cfd2 SHA1 9eaeaaf717a24155d169ca362b66ed5ddf4edb7b SHA256 c1b75301e8a2623a849506f2a2272f795ef84e416e2b133a8fd47011cf4c9e24
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/sys-apps/pkgcore/files/pkgcore-sandbox.patch b/sys-apps/pkgcore/files/pkgcore-sandbox.patch
new file mode 100644
index 000000000000..f40e8570719d
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-sandbox.patch
@@ -0,0 +1,22 @@
+=== modified file 'pkgcore/test/test_spawn.py'
+--- pkgcore/test/test_spawn.py	2008-08-12 23:39:01 +0000
++++ pkgcore/test/test_spawn.py	2009-01-31 03:16:51 +0000
+@@ -78,7 +78,7 @@
+         self.assertTrue(ret[1], msg="no output; exit code was %s; script "
+             "location %s" % (ret[0], fp))
+         self.assertIn("libsandbox.so", [os.path.basename(x.strip()) for x in
+-            ret[1][0].split(":")])
++            ret[1][0].split()])
+         os.unlink(fp)
+ 
+ 
+@@ -102,7 +102,7 @@
+             os.rmdir(dpath)
+             self.assertIn("libsandbox.so", [os.path.basename(x.strip()) for x in
+                 spawn.spawn_get_output(
+-                fp, spawn_type=spawn.spawn_sandbox, chdir='/')[1][0].split(":")])
++                fp, spawn_type=spawn.spawn_sandbox, chdir='/')[1][0].split()])
+             os.unlink(fp)
+         finally:
+             if cwd is not None:
+
diff --git a/sys-apps/pkgcore/pkgcore-0.4.7.14.ebuild b/sys-apps/pkgcore/pkgcore-0.4.7.14.ebuild
index e4d55a1cc20c..f0b9f6061ed5 100644
--- a/sys-apps/pkgcore/pkgcore-0.4.7.14.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.4.7.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.4.7.14.ebuild,v 1.1 2008/12/20 01:36:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.4.7.14.ebuild,v 1.2 2009/01/31 12:30:07 patrick Exp $
 
 inherit distutils eutils
 
diff --git a/sys-apps/pkgcore/pkgcore-0.4.7.15-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.4.7.15-r1.ebuild
new file mode 100644
index 000000000000..c7f797cb92c1
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.4.7.15-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.4.7.15-r1.ebuild,v 1.1 2009/01/31 12:30:07 patrick Exp $
+
+inherit distutils eutils base
+
+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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=dev-python/snakeoil-0.2
+	>=app-shells/bash-3.0
+	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/docutils-0.4 )"
+
+DOCS="AUTHORS NEWS"
+
+PATCHES=( "${FILESDIR}/pkgcore-sandbox.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
+	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}"usr/$(get_libdir)/python${PYVER}/site-packages/pkgcore/plugins/plugincache
+}
+
+pkg_postrm() {
+	python_version
+	# Careful not to remove this on up/downgrades.
+	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"
+	fi
+	distutils_pkg_postrm
+}
+
+src_test() {
+	"${python}" setup.py test || die "testing returned non zero"
+}