fix bug #291007 and install the ifup and ifdown scripts in the correct locations

Package-Manager: portage-2.1.7.6/cvs/Linux x86_64

3 files changed, 16 insertions, 34 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 3db2231b4cbc..03855cbfe193 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -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
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index a7fcc5d2453e..dcd61a9f394c 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 DIST qemu-kvm-0.11.0.tar.gz 4382897 RMD160 84cf42c2f6b26f888ed10655f7b15561e8355d31 SHA1 ff054bbabff2a8d71d56b79f5978288c1a285c4b SHA256 647071f3a754f3b09ba8a633cfabf42f794bbfff8080b18f7211893295049dc9
-EBUILD qemu-kvm-0.11.0.ebuild 6179 RMD160 2aed016e23e7f917d4834f6d1747af6a29afebdf SHA1 82941f7ee80d223945104a408f21d2172b0b7e35 SHA256 24137b2974650276f22d2d666fdb733bc6f77dd7b85f8a8b16147f90ccb10dee
-MISC ChangeLog 540 RMD160 618854a54397fcf5d6c28bcc1158c14c887061d4 SHA1 23e4e2511f005927d4e9ca7dbcbdd46189cd0093 SHA256 de7d4966c196fe92ed630f1902ae671aa38b13c28144911eca1dca6f90770edb
+EBUILD qemu-kvm-0.11.0.ebuild 5567 RMD160 28bbf24a3ac5a602f543999d681c309b4985c89a SHA1 a688fe148ecc3be81de4980981e54b67042fdc8c SHA256 75ce972723c9342ba8ea0607e607118a094fab264a317730e62ac46ef07dd3a8
+MISC ChangeLog 700 RMD160 776bb43fbba3adf55dff4d43e519e947531a0f18 SHA1 24f21a1943c6e512e225ad10050b6d33a2d9f74f SHA256 87f496a3dd41b1945368b4cf74c116e6998e070a3b20973dd23f440b566c2127
 MISC metadata.xml 880 RMD160 77117ba0bd94a7d868e63f279f1d1155588ca6f6 SHA1 d04766dd4f67d127ec25d79a25464b34fe0c905e SHA256 b9dfc2efdb67be66bbcc0953fe9378a7411e2b82995447fdbe8667473488b8b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksJzjAACgkQoeSe8B0zEfxdnACfbSH1dZZPpR8DEk8UDVduBcvX
-JswAn00vvmDyoIN5eG3MXL1Tq9mE+OSV
-=1QXN
+iEYEARECAAYFAksJ0DoACgkQoeSe8B0zEfwo+gCeMmb9mXGQlslWLmtuVbAnnCIN
+kn4Ani+89H8P6FmOahZdy2KZkEiOCP2p
+=v9JA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild
index 34a64b89e5c3..cabd5009b098 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild
@@ -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_prepare() {
 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 @@ src_configure() {
 		|| 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