summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-01-25 03:31:49 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-01-25 03:31:49 +0000
commitbb720d017a7188f79a0b76d2f58bb4614dabf11b (patch)
tree5f107b021f677a2f7b573a1297739e2e525bb0a6 /sys-apps/vgabios
parentUnmask 0.6c based version so we can test it and stabilize it. (diff)
downloadgentoo-2-bb720d017a7188f79a0b76d2f58bb4614dabf11b.tar.gz
gentoo-2-bb720d017a7188f79a0b76d2f58bb4614dabf11b.tar.bz2
gentoo-2-bb720d017a7188f79a0b76d2f58bb4614dabf11b.zip
Add blockers for qemu and qemu-kvm since they previously provided these files.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/vgabios')
-rw-r--r--sys-apps/vgabios/ChangeLog7
-rw-r--r--sys-apps/vgabios/vgabios-0.6c.ebuild5
-rw-r--r--sys-apps/vgabios/vgabios-0.7a.ebuild8
3 files changed, 13 insertions, 7 deletions
diff --git a/sys-apps/vgabios/ChangeLog b/sys-apps/vgabios/ChangeLog
index 125b9582ba3f..c70277f1c21a 100644
--- a/sys-apps/vgabios/ChangeLog
+++ b/sys-apps/vgabios/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/vgabios
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/ChangeLog,v 1.3 2012/01/25 03:29:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/ChangeLog,v 1.4 2012/01/25 03:31:49 cardoe Exp $
+
+ 25 Jan 2012; Doug Goldstein <cardoe@gentoo.org> vgabios-0.6c.ebuild,
+ vgabios-0.7a.ebuild:
+ Add blockers for qemu and qemu-kvm since they previously provided these
+ files.
25 Jan 2012; Doug Goldstein <cardoe@gentoo.org> vgabios-0.6c.ebuild:
Unmask 0.6c based version so we can test it and stabilize it.
diff --git a/sys-apps/vgabios/vgabios-0.6c.ebuild b/sys-apps/vgabios/vgabios-0.6c.ebuild
index 7643b5837142..3ec41bb104f2 100644
--- a/sys-apps/vgabios/vgabios-0.6c.ebuild
+++ b/sys-apps/vgabios/vgabios-0.6c.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/vgabios-0.6c.ebuild,v 1.4 2012/01/25 03:29:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/vgabios-0.6c.ebuild,v 1.5 2012/01/25 03:31:49 cardoe Exp $
# Can't really call them backports when they're fixes that upstream
# won't carry
@@ -21,7 +21,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="sys-devel/dev86"
-RDEPEND=""
+RDEPEND="!app-emulation/qemu
+ !<=app-emulation/qemu-kvm-1.0"
src_prepare() {
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
diff --git a/sys-apps/vgabios/vgabios-0.7a.ebuild b/sys-apps/vgabios/vgabios-0.7a.ebuild
index ce9652c323fa..96d14eb5444a 100644
--- a/sys-apps/vgabios/vgabios-0.7a.ebuild
+++ b/sys-apps/vgabios/vgabios-0.7a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/vgabios-0.7a.ebuild,v 1.2 2012/01/25 03:28:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/vgabios-0.7a.ebuild,v 1.3 2012/01/25 03:31:49 cardoe Exp $
# Can't really call them backports when they're fixes that upstream
# won't carry
@@ -17,12 +17,12 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tgz
LICENSE="LGPL-2.1"
SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="sys-devel/dev86"
-RDEPEND=""
+RDEPEND="!app-emulation/qemu
+ !<=app-emulation/qemu-kvm-1.0"
src_prepare() {
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \