From 1895e201af738475b26d3c397b8cedcf84c2d25c Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Sun, 13 Jan 2013 02:53:28 +0000 Subject: Rebase backport patchset to fix a glaringly obvious mistake I made when backporting the arm boot patch. bug #451598 (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) --- app-emulation/qemu/ChangeLog | 6 +++++- app-emulation/qemu/qemu-1.2.2.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'app-emulation') diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index c129c2ca139b..e1d7f511f4bd 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.167 2013/01/12 23:38:58 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.168 2013/01/13 02:53:28 cardoe Exp $ + + 13 Jan 2013; Doug Goldstein qemu-1.2.2.ebuild: + Rebase backport patchset to fix a glaringly obvious mistake I made when + backporting the arm boot patch. bug #451598 *qemu-1.3.0 (12 Jan 2013) diff --git a/app-emulation/qemu/qemu-1.2.2.ebuild b/app-emulation/qemu/qemu-1.2.2.ebuild index 8386344e3268..c095ee161ee6 100644 --- a/app-emulation/qemu/qemu-1.2.2.ebuild +++ b/app-emulation/qemu/qemu-1.2.2.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/qemu/qemu-1.2.2.ebuild,v 1.6 2013/01/12 23:32:20 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.7 2013/01/13 02:53:28 cardoe Exp $ EAPI="4" @@ -9,7 +9,7 @@ MY_P=${MY_PN}-1.2.0 PYTHON_DEPEND="2" inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev -BACKPORTS=49a7da83 +BACKPORTS=b6773f5e if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" -- cgit v1.2.3-65-gdbad