summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-03-07 03:15:31 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-03-07 03:15:31 +0000
commit2fcd5d5f7851aea3752640caca29f6a5de33d70a (patch)
tree8fff8ac576e4911145bb2b04c7387c734abe3d35 /app-emulation
parentmake_desktop_entry: call `die` if `doins` failed #305165 (diff)
downloadgentoo-2-2fcd5d5f7851aea3752640caca29f6a5de33d70a.tar.gz
gentoo-2-2fcd5d5f7851aea3752640caca29f6a5de33d70a.tar.bz2
gentoo-2-2fcd5d5f7851aea3752640caca29f6a5de33d70a.zip
Added a patch to fix the support for --sysconfdir and updated src_configure to prevent the default $prefix/etc.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/qemu-kvm/ChangeLog7
-rw-r--r--app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch11
-rw-r--r--app-emulation/qemu-kvm/qemu-kvm-9999.ebuild6
3 files changed, 22 insertions, 2 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 6db46bca9856..7fc96dcbc78e 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,11 @@
# 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.20 2010/03/02 16:56:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.21 2010/03/07 03:15:30 jmbsvicetto Exp $
+
+ 07 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ qemu-kvm-9999.ebuild, +files/qemu-kvm-9999-sysconfigdir.patch:
+ Added a patch to fix the support for --sysconfdir and updated
+ src_configure to prevent the default $prefix/etc.
*qemu-kvm-0.12.3 (02 Mar 2010)
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch
new file mode 100644
index 000000000000..a42a0efb2e16
--- /dev/null
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-9999-sysconfigdir.patch
@@ -0,0 +1,11 @@
+--- 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 43f487cacce2..c6345286daae 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.4 2010/03/02 16:56:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.5 2010/03/07 03:15:30 jmbsvicetto Exp $
EAPI="2"
@@ -108,6 +108,7 @@ 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() {
@@ -140,6 +141,9 @@ src_configure() {
# Add support for static builds
use static && conf_opts="${conf_opts} --static"
+ # Fix the $(prefix)/etc issue
+ conf_opts="${conf_opts} --sysconfdir=${D}/etc"
+
#config options
conf_opts="${conf_opts} $(use_enable aio linux-aio)"
use bluetooth || conf_opts="${conf_opts} --disable-bluez"