summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-03-28 17:24:12 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-03-28 17:24:12 +0000
commitbb0157953386b552c50e55861280efce6cb73f6d (patch)
tree560016fa372a20232ee54fbf74dd0c5736afa147 /app-emulation/qemu-kvm
parentTweak www-client/opera again. (diff)
downloadgentoo-2-bb0157953386b552c50e55861280efce6cb73f6d.tar.gz
gentoo-2-bb0157953386b552c50e55861280efce6cb73f6d.tar.bz2
gentoo-2-bb0157953386b552c50e55861280efce6cb73f6d.zip
Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied upstream.
Fixes bug 310979 - thanks to Jeff Kowalczyk <jtk@yahoo.com>. (Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu-kvm')
-rw-r--r--app-emulation/qemu-kvm/ChangeLog8
-rw-r--r--app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch11
-rw-r--r--app-emulation/qemu-kvm/qemu-kvm-9999.ebuild3
3 files changed, 8 insertions, 14 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index f38878f4620e..9c5608add9e1 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.25 2010/03/19 17:23:17 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.26 2010/03/28 17:24:11 jmbsvicetto Exp $
+
+ 28 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ qemu-kvm-9999.ebuild, -files/qemu-kvm-9999-sysconfigdir.patch:
+ Remove the sysconfigdir patch from qemu-kvm-9999 as the fix was applied
+ upstream.
+ Fixes bug 310979 - thanks to Jeff Kowalczyk <jtk@yahoo.com>.
19 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
qemu-kvm-0.12.2-r2.ebuild, qemu-kvm-0.12.3.ebuild:
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch
deleted file mode 100644
index a42a0efb2e16..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure-old 2010-03-07 00:49:33.889297264 -0100
-+++ configure 2010-03-07 00:54:12.681171878 -0100
-@@ -517,7 +517,7 @@
- static="yes"
- LDFLAGS="-static $LDFLAGS"
- ;;
-- --sysconfdir) sysconfdir="$optarg"
-+ --sysconfdir=*) sysconfdir="$optarg"
- ;;
- --disable-sdl) sdl="no"
- ;;
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index c6345286daae..71e7a8fa151c 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.5 2010/03/07 03:15:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.6 2010/03/28 17:24:11 jmbsvicetto Exp $
EAPI="2"
@@ -108,7 +108,6 @@ src_prepare() {
sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
- epatch "${FILESDIR}/${P}-sysconfigdir.patch"
}
src_configure() {