Remove old versions referencing removed patches; bug #236890

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64)

3 files changed, 5 insertions, 358 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index 045205a38125..7e793b9446fb 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.13 2008/08/23 00:26:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.14 2008/09/09 14:11:05 dang Exp $
+
+  09 Sep 2008; Daniel Gryniewicz <dang@gentoo.org> -kvm-70.ebuild,
+  -kvm-70-r1.ebuild:
+  Remove old versions referencing removed patches; bug #236890
 
   23 Aug 2008; Daniel Gryniewicz <dang@gentoo.org> kvm-73.ebuild:
   Fix some whitespace
diff --git a/app-emulation/kvm/kvm-70-r1.ebuild b/app-emulation/kvm/kvm-70-r1.ebuild
deleted file mode 100644
index 1992e92fa3ec..000000000000
--- a/app-emulation/kvm/kvm-70-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-70-r1.ebuild,v 1.2 2008/07/15 18:13:12 dang Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-# Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel ncurses sdl test"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-QA_TEXTRELS="usr/bin/kvm"
-
-pkg_setup() {
-	# check kernel version
-	if use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure you have a compatible kernel on your own."
-	elif kernel_is lt 2 6 22; then
-		eerror "the kvm in your kernel requires an older version of"
-		eerror "kvm as shown in :"
-		eerror "  http://kvm.qumranet.com/kvmwiki/Downloads"
-		die "kvm version not compatible"
-	fi
-
-	# check for kvm support
-	if use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure your kernel has KVM support enable on your own"
-	elif ! linux_chkconfig_present KVM; then
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	epatch \
-		"${FILESDIR}"/kvm-45-qemu-configure.patch \
-		"${FILESDIR}"/kvm-61-qemu-kvm.patch \
-		"${FILESDIR}"/kvm-57-qemu-kvm-cmdline.patch \
-		"${FILESDIR}"/kvm-57-kernel-longmode.patch \
-		"${FILESDIR}"/kvm-68-libkvm-no-kernel.patch \
-		"${FILESDIR}"/kvm-69-qemu-no-blobs.patch \
-		"${FILESDIR}"/kvm-69-qemu-ifup_ifdown.patch \
-		"${FILESDIR}"/kvm-70-qemu-kvm-doc.patch \
-		"${FILESDIR}"/kvm-70-block-rw-range-check.patch
-}
-
-src_compile() {
-	local mycc conf_opts
-
-	use alsa && conf_opts="$conf_opts --enable-alsa"
-	use esd && conf_opts="$conf_opts --enable-esd"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-
-	./configure ${conf_opts} || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/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
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-70.ebuild b/app-emulation/kvm/kvm-70.ebuild
deleted file mode 100644
index 122502959781..000000000000
--- a/app-emulation/kvm/kvm-70.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-70.ebuild,v 1.3 2008/07/15 18:13:12 dang Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-# Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel ncurses sdl test"
-RESTRICT="mirror test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-QA_TEXTRELS="usr/bin/kvm"
-
-pkg_setup() {
-	# check kernel version
-	if use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure you have a compatible kernel on your own."
-	elif kernel_is lt 2 6 22; then
-		eerror "the kvm in your kernel requires an older version of"
-		eerror "kvm as shown in :"
-		eerror "  http://kvm.qumranet.com/kvmwiki/Downloads"
-		die "kvm version not compatible"
-	fi
-
-	# check for kvm support
-	if use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure your kernel has KVM support enable on your own"
-	elif ! linux_chkconfig_present KVM; then
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	epatch \
-		"${FILESDIR}"/kvm-45-qemu-configure.patch \
-		"${FILESDIR}"/kvm-61-qemu-kvm.patch \
-		"${FILESDIR}"/kvm-57-qemu-kvm-cmdline.patch \
-		"${FILESDIR}"/kvm-57-kernel-longmode.patch \
-		"${FILESDIR}"/kvm-68-libkvm-no-kernel.patch \
-		"${FILESDIR}"/kvm-69-qemu-no-blobs.patch \
-		"${FILESDIR}"/kvm-69-qemu-ifup_ifdown.patch \
-		"${FILESDIR}"/kvm-70-qemu-kvm-doc.patch
-}
-
-src_compile() {
-	local mycc conf_opts
-
-	use alsa && conf_opts="$conf_opts --enable-alsa"
-	use esd && conf_opts="$conf_opts --enable-esd"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-
-	./configure ${conf_opts} || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/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
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/kvm."
-	echo
-}