summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2013-07-30 06:34:52 +0000
committerIan Delaney <idella4@gentoo.org>2013-07-30 06:34:52 +0000
commitd079d72e77b388d0c6ce8de66a66cccd5c5882f1 (patch)
tree58ce51ad0653a3faf825f3d5df48207f7af50e16 /app-emulation
parentVersion bump. (diff)
downloadgentoo-2-d079d72e77b388d0c6ce8de66a66cccd5c5882f1.tar.gz
gentoo-2-d079d72e77b388d0c6ce8de66a66cccd5c5882f1.tar.bz2
gentoo-2-d079d72e77b388d0c6ce8de66a66cccd5c5882f1.zip
previous mentioned fix to #445986 appears not to have gone through, repeat + applied to 4.2.2-r4
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen-tools/ChangeLog7
-rw-r--r--app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild5
-rw-r--r--app-emulation/xen-tools/xen-tools-4.3.0.ebuild4
3 files changed, 12 insertions, 4 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index b083d285e711..07f99c4b6271 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/xen-tools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.183 2013/07/27 17:33:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.184 2013/07/30 06:34:52 idella4 Exp $
+
+ 30 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.2-r4.ebuild,
+ xen-tools-4.3.0.ebuild:
+ previous mentioned fix to #445986 appears not to have gone through, repeat +
+ applied to 4.2.2-r4
27 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
Add dep markdown, make dep transfig unconditional, sed statement to correct
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
index 207e746b9088..e5fdeae24b69 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.2 2013/07/21 16:09:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.3 2013/07/30 06:34:52 idella4 Exp $
EAPI=5
@@ -228,6 +228,9 @@ src_prepare() {
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-i Config.mk || die
+ # Bug 445986
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
epatch_user
}
diff --git a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild b/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
index 32b98dd8d902..c9e9db4e29d8 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.14 2013/07/27 17:33:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.15 2013/07/30 06:34:52 idella4 Exp $
EAPI=5
@@ -221,7 +221,7 @@ src_prepare() {
use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C &:' -i tools/firmware/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
epatch_user
}