Version bump to kvm-49.

svn path=/trunk/; revision=50

4 files changed, 186 insertions, 14 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index 7bddef5..01164dc 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-49.ebuild:
+  Version bump to kvm-49.
+
   21 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/kvm-43-qemu-ifup.patch, +files/kvm-43-qemu-kvm-cmdline.patch,
   +files/kvm-45-qemu-configure.patch, +files/kvm-45-qemu-gcc4.patch,
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index e017f39..3d41e92 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kvm-43-qemu-ifup.patch 661 RMD160 ba81120c30ca29186ee7d3537e72ea2b73f525dc SHA1 4717a6de7ac3d72745377329c349b1fe7601561f SHA256 a827bf7684f70e01202ab7939fe0846f2aaf98eb426832878d9fc6559b9864a9
 MD5 c81dcc1a08bdf0028f093da0d99dda2d files/kvm-43-qemu-ifup.patch 661
 RMD160 ba81120c30ca29186ee7d3537e72ea2b73f525dc files/kvm-43-qemu-ifup.patch 661
@@ -50,14 +47,19 @@ MD5 312822a204c34950cdf0b8f2e350c892 files/kvm-48-kvm.patch 4199
 RMD160 c1adae4599a554efefe0349690e06c0e8e874168 files/kvm-48-kvm.patch 4199
 SHA256 0b2cfaca612318cad2d4b151d6d93ef24db72fd1e4af4d7311986824a27e85fa files/kvm-48-kvm.patch 4199
 DIST kvm-48.tar.gz 3271268 RMD160 cab2b7f99ebea323b903420abde223273ddd2536 SHA1 fbcf04ac87f27c05e7c476058ce5feb4c47e46d5 SHA256 04e410b82b2c6ab2ede4c483774ef11889f1b3ced8bb318c8134d9b2d77e0059
+DIST kvm-49.tar.gz 3280904 RMD160 de744a9c670714bbaf59ae6a0f6258c95756c33b SHA1 8bb0988eda2f8d9833c9c531b0ee1d347f573fbe SHA256 77a246fafd152b58b32cea35449d1d76517ed72872a04b1bcc902af33a6d8756
 EBUILD kvm-48.ebuild 4684 RMD160 96a1302f263f243bf54cc84bbbcdf364637322b1 SHA1 d03d9192e92988e5c92ea702833ddb3000cb2ab6 SHA256 025224f03169458740fefed9680775ae95f9c537e6595ae75fc152d9879d6c67
 MD5 ae3f2b5083f95ff8619d356e75c07c55 kvm-48.ebuild 4684
 RMD160 96a1302f263f243bf54cc84bbbcdf364637322b1 kvm-48.ebuild 4684
 SHA256 025224f03169458740fefed9680775ae95f9c537e6595ae75fc152d9879d6c67 kvm-48.ebuild 4684
-MISC ChangeLog 2601 RMD160 4eb31faa45bca31fb67596da13fdade8d651967f SHA1 04d01cc277ef588e9e3c1414e863fc3198df7d65 SHA256 d0c325c0719c340be1a2a6600130e7ec108d5c71b95632993cbc75c2c0734593
-MD5 cf0a62a49eaf7c3617f77711cf951301 ChangeLog 2601
-RMD160 4eb31faa45bca31fb67596da13fdade8d651967f ChangeLog 2601
-SHA256 d0c325c0719c340be1a2a6600130e7ec108d5c71b95632993cbc75c2c0734593 ChangeLog 2601
+EBUILD kvm-49.ebuild 4684 RMD160 96a1302f263f243bf54cc84bbbcdf364637322b1 SHA1 d03d9192e92988e5c92ea702833ddb3000cb2ab6 SHA256 025224f03169458740fefed9680775ae95f9c537e6595ae75fc152d9879d6c67
+MD5 ae3f2b5083f95ff8619d356e75c07c55 kvm-49.ebuild 4684
+RMD160 96a1302f263f243bf54cc84bbbcdf364637322b1 kvm-49.ebuild 4684
+SHA256 025224f03169458740fefed9680775ae95f9c537e6595ae75fc152d9879d6c67 kvm-49.ebuild 4684
+MISC ChangeLog 2699 RMD160 a6e1da04f14e098c8cd6a3db24dfcfba625e308e SHA1 4030cbf88dcdd75a228b044788b8b09d6480ec21 SHA256 c88446123b801498e667eb1444c0f78e651400c05daee1ab20632c0c461dd838
+MD5 e9fea60f41cb59bb095e835e58412522 ChangeLog 2699
+RMD160 a6e1da04f14e098c8cd6a3db24dfcfba625e308e ChangeLog 2699
+SHA256 c88446123b801498e667eb1444c0f78e651400c05daee1ab20632c0c461dd838 ChangeLog 2699
 MISC metadata.xml 413 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f SHA1 c14660bd6d54594bef13c86f243308fc92687eb0 SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988
 MD5 5c1d1436d6cc39b3b6bf03f9d4b611ec metadata.xml 413
 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f metadata.xml 413
@@ -65,10 +67,6 @@ SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988 metadata
 MD5 49cbf4c3314ac84e87feaf967bd1dd08 files/digest-kvm-48 223
 RMD160 8ba958293bef0df33c74bbe75a135ff288227bf5 files/digest-kvm-48 223
 SHA256 51848ee3a58296c789174135e608a98f7c949349cb12fc90beb0f67d53a00391 files/digest-kvm-48 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHG5kICkvF58q80IkRArW1AKCtwPVypoKyzAdj7DK/gwUrWr5fpQCdGIjk
-+Ejibn8i3vEg/olX0K76u34=
-=1yjx
------END PGP SIGNATURE-----
+MD5 4764847cc171e0c5055a795f7eb54d34 files/digest-kvm-49 223
+RMD160 81fb13780d7a411c5d146c85d0781791ce50da61 files/digest-kvm-49 223
+SHA256 9ca954b0bc9a5e5d2805619287a3dc0377798ae2bbfa2d53b108fa669bd9da30 files/digest-kvm-49 223
diff --git a/app-emulation/kvm/files/digest-kvm-49 b/app-emulation/kvm/files/digest-kvm-49
new file mode 100644
index 0000000..6db5140
--- /dev/null
+++ b/app-emulation/kvm/files/digest-kvm-49
@@ -0,0 +1,3 @@
+MD5 0bc726353911ccdb27e0023c398b5b81 kvm-49.tar.gz 3280904
+RMD160 de744a9c670714bbaf59ae6a0f6258c95756c33b kvm-49.tar.gz 3280904
+SHA256 77a246fafd152b58b32cea35449d1d76517ed72872a04b1bcc902af33a6d8756 kvm-49.tar.gz 3280904
diff --git a/app-emulation/kvm/kvm-49.ebuild b/app-emulation/kvm/kvm-49.ebuild
new file mode 100644
index 0000000..eaff84f
--- /dev/null
+++ b/app-emulation/kvm/kvm-49.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 2007/10/02 19:00:00 philantrop Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)"
+HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="alsa gcc4 gnutls kvm qemu sdl"
+
+DEPEND="sdl? ( >=media-libs/libsdl-1.2.11 )
+		alsa? ( >=media-libs/alsa-lib-1.0.13 )
+		!gcc4? ( =sys-devel/gcc-3.4.6-r2 )
+		gnutls? ( net-libs/gnutls )
+		app-text/texi2html
+		>=sys-fs/e2fsprogs-1.39"
+
+RDEPEND="${DEPEND}
+		sys-apps/usermode-utilities
+		qemu? ( app-emulation/qemu-softmmu )
+		!qemu? ( !app-emulation/qemu-softmmu )
+		dev-lang/python"
+
+RESTRICT="strip"
+
+BUILD_TARGETS="all"
+
+QA_TEXTRELS="usr/bin/kvm"
+QA_EXECSTACK="usr/share/kvm/openbios-sparc32"
+QA_WX_LOAD="usr/share/kvm/openbios-sparc32"
+
+pkg_setup() {
+	if kernel_is lt 2 6 22 && ! use kvm; then
+		eerror "the module in your kernel requires an older version of"
+		eerror "kvm as shown in :"
+		eerror "  http://kvm.qumranet.com/kvmwiki/Downloads"
+		die "kvm module not compatible, downgrade kvm or USE='kvm'"
+	fi
+
+	# Don't continue if the KVM modules can't be found
+	if ! linux_chkconfig_present KVM  && ! use kvm; then
+		eerror "kvm module not found on your kernel"
+		eerror "USE='kvm' or enable KVM and the kvm module for your CPU"
+		die "kvm module missing in kernel"
+	fi
+
+	MODULE_NAMES="kvm(misc:${S}/kernel)
+				kvm-intel(misc:${S}/kernel)
+				kvm-amd(misc:${S}/kernel)"
+
+	if use kvm; then
+		linux-mod_pkg_setup
+	else
+		ewarn "using the kernel provided module"
+		ewarn "some features may only be available in newer releases"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/kvm-47-configure-qemu.patch"
+	epatch "${FILESDIR}/kvm-45-qemu-configure.patch"
+	epatch "${FILESDIR}/kvm-45-qemu-kvm.patch"
+	epatch "${FILESDIR}/kvm-45-qemu-kvm-doc.patch"
+	epatch "${FILESDIR}/kvm-43-qemu-kvm-cmdline.patch"
+	epatch "${FILESDIR}/kvm-48-kvm.patch"
+	epatch "${FILESDIR}/kvm-43-qemu-ifup.patch"
+	epatch "${FILESDIR}/kvm-45-user-no-kernel.patch"
+
+	if use qemu; then
+		epatch "${FILESDIR}/kvm-45-qemu-no-img.patch"
+	fi
+
+	if use gcc4; then
+		epatch "${FILESDIR}/kvm-45-qemu-gcc4.patch"
+	else
+		epatch "${FILESDIR}/kvm-47-qemu-gcc3.patch"
+	fi
+}
+
+src_compile() {
+	# fix make install to not install modules
+	sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile"
+
+	conf_opts="--prefix=/usr"
+
+	if use alsa; then
+		conf_opts="$conf_opts --enable-alsa"
+	fi
+
+	if ! use gnutls; then
+		conf_opts="$conf_opts --disable-vnc-tls"
+	fi
+
+	if ! use sdl; then
+		conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
+	fi
+
+	if use gcc4; then
+		conf_opts="$conf_opts --disable-gcc-check"
+	fi
+
+	# Hand-crafted configure script. econf doesn't work.
+	./configure ${conf_opts} || die "./configure failed"
+
+	emake user qemu || die "emake failed"
+
+	if use kvm; then
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	# fix make install to not install modules
+	sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile"
+
+	if use kvm; then
+		linux-mod_src_install
+	fi
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	exeinto /etc/kvm/utils/
+	doexe "${S}/kvm" "${S}/kvm_stat"
+	mv "${D}/usr/share/man/man1/qemu.1" "${D}/usr/share/man/man1/kvm.1"
+
+	insinto /etc/udev/rules.d/
+	doins "${WORKDIR}/${P}/scripts/65-kvm.rules"
+
+	insinto /etc/kvm/
+	insopts -m0755
+	doins "${WORKDIR}/${P}/scripts/qemu-ifup"
+	doins "${WORKDIR}/${P}/config.mak"
+}
+
+pkg_postinst() {
+	if use kvm; then
+		linux-mod_pkg_postinst
+	fi
+	enewgroup kvm
+
+	elog "If you don't have kvm compiled into the kernel, make sure you have the kernel"
+	elog "module loaded before running kvm. The easiest way to ensure that the kernel"
+	elog "module is loaded is to load it on boot:"
+	elog "For AMD CPUs:"
+	elog "echo kvm-amd >> /etc/modules.autoload.d/kernel-2.6"
+	elog "For Intel CPUs:"
+	elog "echo kvm-intel >> /etc/modules.autoload.d/kernel-2.6"
+	echo
+	elog "Make sure your user is in the 'kvm' group"
+	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+	echo
+	elog "If qemu complains about not having a 1024hz timer, run this:"
+	elog "echo dev.rtc.max-user-freq=1024 >> /etc/sysctl.conf"
+	echo
+	elog "If you want network support in the guest OS, you'll need to make"
+	elog "sure you compile in support for 802.1d Ethernet Bridging in the"
+	elog "kernel, set up a bridge network interface and make sure you"
+	elog "compile Universal TUN/TAP device driver support as a kernel module"
+	elog "and make it load on boot:"
+	elog "echo tun >> /etc/modules.autoload.d/kernel-2.6"
+}