summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2013-01-11 23:54:15 +0000
committerDoug Goldstein <cardoe@gentoo.org>2013-01-11 23:54:15 +0000
commit19968c0172953495c83330a92a2ab714cf2b2d46 (patch)
tree49d9716497a9939ebb575dec3abd0539f69c2d97
parentMask qemu 1.2.0 due to keyword issues in bug #438780 (diff)
downloadgentoo-2-19968c0172953495c83330a92a2ab714cf2b2d46.tar.gz
gentoo-2-19968c0172953495c83330a92a2ab714cf2b2d46.tar.bz2
gentoo-2-19968c0172953495c83330a92a2ab714cf2b2d46.zip
Fix bad ampersand usage.
(Portage version: 2.2.0_alpha150/cvs/Linux x86_64, unsigned Manifest commit)
-rw-r--r--app-emulation/qemu/ChangeLog7
-rw-r--r--app-emulation/qemu/qemu-1.1.1-r1.ebuild6
-rw-r--r--app-emulation/qemu/qemu-1.1.2-r1.ebuild6
-rw-r--r--app-emulation/qemu/qemu-1.1.2-r2.ebuild4
-rw-r--r--app-emulation/qemu/qemu-1.1.2-r3.ebuild4
-rw-r--r--app-emulation/qemu/qemu-1.2.0.ebuild4
-rw-r--r--app-emulation/qemu/qemu-1.2.1.ebuild4
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild4
8 files changed, 22 insertions, 17 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 2f0448674e6b..d99918247dd5 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
# 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.156 2013/01/10 21:04:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.157 2013/01/11 23:54:15 cardoe Exp $
+
+ 11 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.1.1-r1.ebuild,
+ qemu-1.1.2-r1.ebuild, qemu-1.1.2-r2.ebuild, qemu-1.1.2-r3.ebuild,
+ qemu-1.2.0.ebuild, qemu-1.2.1.ebuild, qemu-9999.ebuild:
+ Fix bad ampersand usage.
10 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+files/qemu-9999-cflags.patch, qemu-9999.ebuild:
diff --git a/app-emulation/qemu/qemu-1.1.1-r1.ebuild b/app-emulation/qemu/qemu-1.1.1-r1.ebuild
index 3ea1a58ee641..2b28aa1df793 100644
--- a/app-emulation/qemu/qemu-1.1.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1.1-r1.ebuild,v 1.8 2012/12/13 20:03:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild,v 1.9 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -340,7 +340,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
diff --git a/app-emulation/qemu/qemu-1.1.2-r1.ebuild b/app-emulation/qemu/qemu-1.1.2-r1.ebuild
index 808bf6dacb45..0c746b7d774d 100644
--- a/app-emulation/qemu/qemu-1.1.2-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1.2-r1.ebuild,v 1.7 2012/12/13 20:03:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild,v 1.8 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -326,7 +326,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
diff --git a/app-emulation/qemu/qemu-1.1.2-r2.ebuild b/app-emulation/qemu/qemu-1.1.2-r2.ebuild
index 77ccb25a4418..497b3c637b5a 100644
--- a/app-emulation/qemu/qemu-1.1.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2-r2.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.1.2-r2.ebuild,v 1.10 2013/01/03 18:26:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild,v 1.11 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -328,7 +328,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
diff --git a/app-emulation/qemu/qemu-1.1.2-r3.ebuild b/app-emulation/qemu/qemu-1.1.2-r3.ebuild
index 5eb72f20cb53..aa316946cf2e 100644
--- a/app-emulation/qemu/qemu-1.1.2-r3.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2-r3.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.1.2-r3.ebuild,v 1.5 2013/01/03 18:26:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r3.ebuild,v 1.6 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -328,7 +328,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Avoid collision with app-emulation/libcacard
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
diff --git a/app-emulation/qemu/qemu-1.2.0.ebuild b/app-emulation/qemu/qemu-1.2.0.ebuild
index 34923e7efa57..f154f5d8a77e 100644
--- a/app-emulation/qemu/qemu-1.2.0.ebuild
+++ b/app-emulation/qemu/qemu-1.2.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/qemu/qemu-1.2.0.ebuild,v 1.12 2013/01/03 18:26:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.13 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -328,7 +328,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Avoid collision with app-emulation/libcacard
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
diff --git a/app-emulation/qemu/qemu-1.2.1.ebuild b/app-emulation/qemu/qemu-1.2.1.ebuild
index 76ff3cf1126f..db098cf4dd5b 100644
--- a/app-emulation/qemu/qemu-1.2.1.ebuild
+++ b/app-emulation/qemu/qemu-1.2.1.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.1.ebuild,v 1.5 2013/01/03 18:26:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.1.ebuild,v 1.6 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -328,7 +328,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Avoid collision with app-emulation/libcacard
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 01aa99103f99..d24ac1848c00 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.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-9999.ebuild,v 1.39 2013/01/10 21:04:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.40 2013/01/11 23:54:15 cardoe Exp $
EAPI="4"
@@ -324,7 +324,7 @@ src_install() {
dohtml qemu-doc.html qemu-tech.html || die
fi
- use python & dobin scripts/kvm/kvm_stat
+ use python && dobin scripts/kvm/kvm_stat
# Avoid collision with app-emulation/libcacard
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"