Added patch to fix chroot location.

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

4 files changed, 62 insertions, 2 deletions

diff --git a/dev-util/mock/ChangeLog b/dev-util/mock/ChangeLog
index e14bd4d0a269..da21c8c6a0b0 100644
--- a/dev-util/mock/ChangeLog
+++ b/dev-util/mock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/mock
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/ChangeLog,v 1.3 2009/03/27 16:03:38 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/ChangeLog,v 1.4 2009/03/27 16:48:31 deathwing00 Exp $
+
+*mock-0.9.10-r2 (27 Mar 2009)
+
+  27 Mar 2009; Ioannis Aslanidis <iaslanidis@gentoo.org>
+  +files/mock-0.9.10-chroot-fix.patch, +mock-0.9.10-r2.ebuild:
+  Added patch so that chroot is looked for in /usr/bin instead of /usr/sbin.
 
 *mock-0.9.10-r1 (27 Mar 2009)
 
diff --git a/dev-util/mock/Manifest b/dev-util/mock/Manifest
index 4f57f33dce8f..257e814bc65f 100644
--- a/dev-util/mock/Manifest
+++ b/dev-util/mock/Manifest
@@ -1,5 +1,7 @@
+AUX mock-0.9.10-chroot-fix.patch 591 RMD160 815bf6040991348244a9fa71927371142d699a81 SHA1 0949f45a47cb8c1f36bb52532b01786be45dec10 SHA256 1af4b45640aa957cb02675bf2fa29ecb2a5cbf7aeeb69fe12a90106a2701a06e
 DIST mock-0.9.10.tar.gz 147687 RMD160 b7705f75de43f5c2f3ed3f599aac074da27bde21 SHA1 317ac3ad9cb03f71923b3d7e91738dbe150482d9 SHA256 5d9919435310e86c5a91acd22726a3091eea7705470e8b7d903ebd8413fd3839
 EBUILD mock-0.9.10-r1.ebuild 813 RMD160 7ddaf121e90329b60902865fe568ab3c1c7570c4 SHA1 4c7623e6202e2d3041b06718f806fd5cfb2d3a0b SHA256 911554ea1eb44b9e1237eeff88ce77435657060a458fe0f7dae2323aa4f81bb1
+EBUILD mock-0.9.10-r2.ebuild 918 RMD160 ebb8a15ac0f263499d586daf3d569c20b1b609b5 SHA1 9e8c6624f5ff0aea124071b30a7eb52a2f1316bb SHA256 3db6f8e44bfed81d613820639ef21bb009ef46f8aab751df1780dc65764509f3
 EBUILD mock-0.9.10.ebuild 800 RMD160 3027b225a7776e4319039058a722c1095b81c1fb SHA1 11cff0fb786eca086da63c5bebbb9e4a683cf144 SHA256 309dbac198746c2f1a6f598bbabe7f9b61b8e8dfbdda2ef33254a4f09b249bf8
-MISC ChangeLog 637 RMD160 2038594f4c1fe89d04e5e317b1dcefaf85b279e6 SHA1 b9237050ce08d6ce4738a60b765343b9c5e55c2e SHA256 5216ee4ef6045e304a29815fbe8c6bba2c1db0b4b534e63228b170f8f67f8d4e
+MISC ChangeLog 866 RMD160 6f96fc376d46302d8a6fee72cc785a753add096c SHA1 9de68ebe43b07ea9b2ea412cb441fbdfde21f519 SHA256 ec55970be4afad9f74ae60f9a99cb651f3ab28e7c020561a4291656903a46830
 MISC metadata.xml 235 RMD160 06854dc2a2e06f88932c77bdd6026bb1f62ae6c6 SHA1 1021188b5c7f92491a8b31a630a04d9e7522e352 SHA256 7544db04a9b8a0dcbf1c6cb4290d663b049abeba3c6d553606bd3cca4a41d6fd
diff --git a/dev-util/mock/files/mock-0.9.10-chroot-fix.patch b/dev-util/mock/files/mock-0.9.10-chroot-fix.patch
new file mode 100644
index 000000000000..bb24a3b20dc9
--- /dev/null
+++ b/dev-util/mock/files/mock-0.9.10-chroot-fix.patch
@@ -0,0 +1,13 @@
+diff -Nutr mock-0.9.10.old/py/mock.py mock-0.9.10/py/mock.py
+--- mock-0.9.10.old/py/mock.py  2008-05-20 16:41:20.000000000 +0200
++++ mock-0.9.10/py/mock.py  2009-03-27 17:40:15.223434449 +0100
+@@ -522,7 +522,7 @@
+         try:
+             chroot._mountall()
+             cmd = ' '.join(args)
+-            status = os.system("PS1='mock-chroot> ' /usr/sbin/chroot %s %s" % (chroot.makeChrootPath(), cmd))
++            status = os.system("PS1='mock-chroot> ' /usr/bin/chroot %s %s" % (chroot.makeChrootPath(), cmd))
+             ret['exitStatus'] = os.WEXITSTATUS(status)
+ 
+         finally:
+
diff --git a/dev-util/mock/mock-0.9.10-r2.ebuild b/dev-util/mock/mock-0.9.10-r2.ebuild
new file mode 100644
index 000000000000..61afdb9d4214
--- /dev/null
+++ b/dev-util/mock/mock-0.9.10-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10-r2.ebuild,v 1.1 2009/03/27 16:48:31 deathwing00 Exp $
+
+inherit eutils
+
+DESCRIPTION="Mock creates chroots and builds packages in them for Fedora and
+RedHat."
+HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock"
+SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+EAPI="2"
+
+DEPEND=""
+RDEPEND="sys-apps/yum
+	dev-python/decoratortools"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/${P}-chroot-fix.patch"
+}
+
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}
+
+pkg_postinst() {
+	if ! [[ $(grep -q mock /etc/group && echo $?) ]]; then
+		einfo "Creating group 'mock'"
+		groupadd mock
+	fi
+}
+