* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: qemu-kvm-0.11.0.ebuild ChangeLog
@ 2009-11-22 23:31 Doug Goldstein (cardoe)
0 siblings, 0 replies; 2+ messages in thread
From: Doug Goldstein (cardoe) @ 2009-11-22 23:31 UTC (permalink / raw
To: gentoo-commits
cardoe 09/11/22 23:31:48
Modified: qemu-kvm-0.11.0.ebuild ChangeLog
Log:
fix auto-magical depend against sasl
(Portage version: 2.1.7.6/cvs/Linux x86_64)
Revision Changes Path
1.2 app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild?r1=1.1&r2=1.2
Index: qemu-kvm-0.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-kvm-0.11.0.ebuild 22 Nov 2009 23:30:04 -0000 1.1
+++ qemu-kvm-0.11.0.ebuild 22 Nov 2009 23:31:47 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild,v 1.1 2009/11/22 23:30:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild,v 1.2 2009/11/22 23:31:47 cardoe Exp $
EAPI="2"
@@ -14,7 +14,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa bluetooth esd gnutls ncurses pulseaudio +sdl vde"
+IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde"
COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc \
ppc64 sh4 sh4eb sparc"
@@ -41,6 +41,7 @@
gnutls? ( net-libs/gnutls )
ncurses? ( sys-libs/ncurses )
pulseaudio? ( media-sound/pulseaudio )
+ sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11[X] )
vde? ( net-misc/vde )
!app-emulation/qemu-softmmu
@@ -121,6 +122,7 @@
use sdl || conf_opts="$conf_opts --disable-sdl"
use vde || conf_opts="$conf_opts --disable-vde"
use bluetooth || conf_opts="$conf_opts --disable-bluez"
+ use sasl || conf_opts='$conf_opts --disable-vnc-sasl"
conf_opts="--disable-darwin-user --disable-bsd-user"
# audio options
1.2 app-emulation/qemu-kvm/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.1&r2=1.2
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 22 Nov 2009 23:30:04 -0000 1.1
+++ ChangeLog 22 Nov 2009 23:31:47 -0000 1.2
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.1 2009/11/22 23:30:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.2 2009/11/22 23:31:47 cardoe Exp $
+
+ 22 Nov 2009; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.11.0.ebuild:
+ fix auto-magical depend against sasl
*qemu-kvm-0.11.0 (22 Nov 2009)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: qemu-kvm-0.11.0.ebuild ChangeLog
@ 2009-11-22 23:58 Doug Goldstein (cardoe)
0 siblings, 0 replies; 2+ messages in thread
From: Doug Goldstein (cardoe) @ 2009-11-22 23:58 UTC (permalink / raw
To: gentoo-commits
cardoe 09/11/22 23:58:44
Modified: qemu-kvm-0.11.0.ebuild ChangeLog
Log:
fix bug #291007 and install the ifup and ifdown scripts in the correct locations
(Portage version: 2.1.7.6/cvs/Linux x86_64)
Revision Changes Path
1.5 app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild?r1=1.4&r2=1.5
Index: qemu-kvm-0.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qemu-kvm-0.11.0.ebuild 22 Nov 2009 23:49:48 -0000 1.4
+++ qemu-kvm-0.11.0.ebuild 22 Nov 2009 23:58:44 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild,v 1.4 2009/11/22 23:49:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild,v 1.5 2009/11/22 23:58:44 cardoe Exp $
EAPI="2"
@@ -94,6 +94,8 @@
src_configure() {
local conf_opts audio_opts softmmu_targets user_targets
+ filter-flags -fpie -fstack-protector
+
for target in ${IUSE_SOFTMMU_TARGETS} ; do
use "qemu_softmmu_targets_${target}" && \
softmmu_targets="${softmmu_targets} ${target}-softmmu"
@@ -142,40 +144,16 @@
|| die "configure failed"
}
-src_compile() {
- local mycc=$(cat config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
- filter-flags -fpie -fstack-protector
-
- # If using gentoo's compiler set the SPEC to non-hardened
- if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
- local myccver=$(${mycc} -dumpversion)
- local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
- #Is this a SPEC for the right compiler version?
- myspec="${GCC_SPECS/${gccver}/${myccver}}"
- if [ "${myspec}" == "${GCC_SPECS}" ]; then
- shopt -s extglob
- GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
- shopt -u extglob
- else
- unset GCC_SPECS
- fi
- fi
-
- emake || die "emake failed"
-}
-
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
insinto /etc/udev/rules.d/
doins kvm/scripts/65-kvm.rules
- insinto /etc/kvm/
+ insinto /etc/qemu/
insopts -m0755
- newins kvm/scripts/qemu-ifup kvm-ifup
- newins kvm/scripts/qemu-ifdown kvm-ifdown
+ doins kvm/scripts/qemu-ifup
+ doins kvm/scripts/qemu-ifdown
dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
newdoc pc-bios/README README.pc-bios || die
1.3 app-emulation/qemu-kvm/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 22 Nov 2009 23:31:47 -0000 1.2
+++ ChangeLog 22 Nov 2009 23:58:44 -0000 1.3
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.2 2009/11/22 23:31:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.3 2009/11/22 23:58:44 cardoe Exp $
+
+ 22 Nov 2009; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.11.0.ebuild:
+ fix bug #291007 and install the ifup and ifdown scripts in the correct
+ locations
22 Nov 2009; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.11.0.ebuild:
fix auto-magical depend against sasl
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-22 23:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-22 23:58 [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: qemu-kvm-0.11.0.ebuild ChangeLog Doug Goldstein (cardoe)
-- strict thread matches above, loose matches on Subject: below --
2009-11-22 23:31 Doug Goldstein (cardoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox