Version bump. drop old version

Package-Manager: portage-2.2_rc60-r1/cvs/Linux x86_64

4 files changed, 67 insertions, 42 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 78f77eb31231..0ae3cb7e3250 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2009/12/18 17:42:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.7 2009/12/21 14:10:27 tommy Exp $
+
+*qemu-kvm-0.12.1 (21 Dec 2009)
+
+  21 Dec 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -qemu-kvm-0.11.0.ebuild, +qemu-kvm-0.12.1.ebuild,
+  +files/qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch:
+  Version bump, drop old version
 
   18 Dec 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   qemu-kvm-0.11.1.ebuild:
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 05068188967c..eb92c40a428c 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -2,18 +2,19 @@
 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
+AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff
 DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b
-EBUILD qemu-kvm-0.11.0.ebuild 5567 RMD160 28bbf24a3ac5a602f543999d681c309b4985c89a SHA1 a688fe148ecc3be81de4980981e54b67042fdc8c SHA256 75ce972723c9342ba8ea0607e607118a094fab264a317730e62ac46ef07dd3a8
+DIST qemu-kvm-0.12.1.tar.gz 4712004 RMD160 f2c7842301e5c68e91f291bb3d74e2019bb7ee3c SHA1 0c2a8bb7dd98a5214bbad5bc954ae3111646c8cd SHA256 c65c5afc43176b3031b52b664704269a79e40e9acdc0c1aae2bcc46875d3051a
 EBUILD qemu-kvm-0.11.1.ebuild 5682 RMD160 a16161e7671b31eaf21d729360a1e559166a5011 SHA1 faa910b330daba597afe4caf363c0dc3fb291610 SHA256 94ec5101929f2b1ad90d60aebc3173086f2e8d8e7032a8fc3ac1a38adb2f7ac0
-MISC ChangeLog 1097 RMD160 068941008f65419446da7de666d86590bda40bb5 SHA1 a4790628bccdfbe99597e8d8a674f6b6ef90d61c SHA256 fceeba300fe7fe3359145a08704d9cd2751ea45a849ff7148bac93dd4a26b0f4
+EBUILD qemu-kvm-0.12.1.ebuild 5730 RMD160 e4d65cd90e508c59fd5fef83f5aa84eea3c84a36 SHA1 f087e10aaea7f8223ede6675d9cef08aa3840553 SHA256 870c4bb17b893c8ac51aecee1542416a7635c2941dfbc8f67c6f502507a08e29
+MISC ChangeLog 1334 RMD160 b6367070a5314242d48e8c0cc655f301d5d1777e SHA1 99424533dfa74231ff4daedb1366afea02e0e6e6 SHA256 dcaf056a7e2ae00336419c5dfa3dc43818259900023bb4498b359e5a95d2796c
 MISC metadata.xml 628 RMD160 3274758ab8e30cf48bb5e16759dfd30abc039933 SHA1 21d528a3fd94af360e4a7211276cb9be702790c8 SHA256 104ada2ea4839934b904bdc57309985eb7f2a82125b0c1ffd5e0d68c0ce88a73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iJwEAQECAAYFAksrvxsACgkQG7kqcTWJkGeKBAP+LLZI0vZ5XktEddRRzhGurg47
-XQUafdB1aVL+btqRDrpYM+fDRYuN+SCFJQ0MpxHX3QYj8MR7voMyWl4EizzKpZ1U
-irxB/+JjJ/XpWvhiBCLO+5nA7JDvFGxG0cBVrcxwUhhEndCNvariTYe0iknblnDI
-VH4T9/Ss6loBItVerg0=
-=JgsH
+iJwEAQECAAYFAksvgdkACgkQG7kqcTWJkGfGsgP/b9vMKVuV+0PL+di4CTga2dpa
+uzXzKXK0yjbTqVEn3+ZNVnBji9fcIdU/74i/qrUOltpwOguYo0qQC/E7FipD35ty
+ve+T6+g8drLM4GHoJP14itio3TyPeg+2pj4M6yDm/OmMLjerEK30uQDd44yo2VZ6
+cq1ICXeY1luFc0G4TT0=
+=B5AG
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch b/app-emulation/qemu-kvm/files/qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch
new file mode 100644
index 000000000000..3fb87f3ddac0
--- /dev/null
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch
@@ -0,0 +1,20 @@
+--- monitor.c	2009-12-20 17:21:40.000000000 +0100
++++ monitor.c.new	2009-12-21 11:47:30.000000000 +0100
+@@ -677,7 +677,7 @@
+         mon_set_cpu(0);
+     }
+     cpu_synchronize_state(cur_mon->mon_cpu);
+-    kvm_save_mpstate(cur_mon->mon_cpu);
++//    kvm_save_mpstate(cur_mon->mon_cpu);
+     return cur_mon->mon_cpu;
+ }
+ 
+@@ -780,7 +780,7 @@
+         QObject *obj;
+ 
+         cpu_synchronize_state(env);
+-        kvm_save_mpstate(env);
++//        kvm_save_mpstate(env);
+ 
+         obj = qobject_from_jsonf("{ 'CPU': %d, 'current': %i, 'halted': %i }",
+                                  env->cpu_index, env == mon->mon_cpu,
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.ebuild
index cabd5009b098..0ef4d53330f5 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.11.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.ebuild
@@ -1,12 +1,12 @@
 # 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.5 2009/11/22 23:58:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.ebuild,v 1.1 2009/12/21 14:10:27 tommy Exp $
 
 EAPI="2"
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
-SRC_URI="mirror://sourceforge/kvm/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
 HOMEPAGE="http://www.linux-kvm.org"
@@ -14,13 +14,12 @@ HOMEPAGE="http://www.linux-kvm.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde"
+IUSE="alsa bluetooth esd gnutls hardened ncurses pulseaudio sasl +sdl vde"
 
-COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc \
-ppc64 sh4 sh4eb sparc"
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
 
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
 	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@@ -73,29 +72,28 @@ pkg_setup() {
 
 src_prepare() {
 	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure
+	sed -i -e 's:fdt="yes":fdt="no":' configure || die
 	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
 	# Alter target makefiles to accept CFLAGS set via flag-o
 	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target
+		Makefile Makefile.target || die
 	[[ -x /sbin/paxctl ]] && \
 		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
+			Makefile.target || die
 	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak
+	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
 
 	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules
+	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
 
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" \
+		"${FILESDIR}"/${P}-kvm_save_mpstate-workaround.patch
 }
 
 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"
@@ -118,26 +116,26 @@ src_configure() {
 	fi
 
 	#config options
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	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"
+	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
+	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
+	use hardened && conf_opts="${conf_opts} --enable-user-pie"
+	use ncurses || conf_opts="${conf_opts} --disable-curses"
+	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
+	use sdl || conf_opts="${conf_opts} --disable-sdl"
+	use vde || conf_opts="${conf_opts} --disable-vde"
+	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
 
 	# audio options
 	audio_opts="oss"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use esd && audio_opts="esd ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
 	./configure --prefix=/usr \
 		--disable-strip \
 		--disable-xen \
 		${conf_opts} \
-		--audio-drv-list="$audio_opts" \
+		--audio-drv-list="${audio_opts}" \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc=$(tc-getCC) \
 		--host-cc=$(tc-getCC) \
@@ -148,16 +146,15 @@ src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	insinto /etc/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules
+	doins kvm/scripts/65-kvm.rules || die
 
 	insinto /etc/qemu/
 	insopts -m0755
-	doins kvm/scripts/qemu-ifup
-	doins kvm/scripts/qemu-ifdown
+	doins kvm/scripts/qemu-ifup || die
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
 	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html
+	dohtml qemu-doc.html qemu-tech.html || die
 }
 
 pkg_postinst() {