diff options
author | 2010-10-15 14:21:09 +0000 | |
---|---|---|
committer | 2010-10-15 14:21:09 +0000 | |
commit | 83ebbaae47a49c9691c9718ed3eb49c8e8d510b1 (patch) | |
tree | adbc86f4ed32cba18f6bb2424cde53abfa987a63 /app-emulation/qemu | |
parent | Marking louie-1.1 ~ppc for bug 311825 (diff) | |
download | gentoo-2-83ebbaae47a49c9691c9718ed3eb49c8e8d510b1.tar.gz gentoo-2-83ebbaae47a49c9691c9718ed3eb49c8e8d510b1.tar.bz2 gentoo-2-83ebbaae47a49c9691c9718ed3eb49c8e8d510b1.zip |
Belated spring cleaning of ebuilds and files; this also re-sync the ppc keyword with the qemu-softmmu package which this is just an alias of.
(Portage version: 2.2_rc96/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r-- | app-emulation/qemu/ChangeLog | 10 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-0.10.3-nopl-fix.patch | 32 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.10.0.ebuild | 17 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.10.1.ebuild | 17 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.10.3.ebuild | 148 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.10.4.ebuild | 148 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.10.5.ebuild | 150 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.10.6.ebuild | 149 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.11.0.ebuild | 150 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.9.0.ebuild | 16 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-0.9.1.ebuild | 6 |
11 files changed, 12 insertions, 831 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index dfd72d9dbb2f..758f4514e553 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.78 2010/06/30 21:46:32 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.79 2010/10/15 14:21:09 flameeyes Exp $ + + 15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> -qemu-0.9.0.ebuild, + qemu-0.9.1.ebuild, -qemu-0.10.0.ebuild, -qemu-0.10.1.ebuild, + -qemu-0.10.3.ebuild, -files/qemu-0.10.3-nopl-fix.patch, + -qemu-0.10.4.ebuild, -qemu-0.10.5.ebuild, -qemu-0.10.6.ebuild, + -qemu-0.11.0.ebuild: + Belated spring cleaning of ebuilds and files; this also re-sync the ppc + keyword with the qemu-softmmu package which this is just an alias of. 30 Jun 2010; Harald van Dijk <truedfx@gentoo.org> qemu-0.10.3.ebuild, qemu-0.10.4.ebuild, qemu-0.10.5.ebuild, qemu-0.10.6.ebuild, diff --git a/app-emulation/qemu/files/qemu-0.10.3-nopl-fix.patch b/app-emulation/qemu/files/qemu-0.10.3-nopl-fix.patch deleted file mode 100644 index bdef0efc3516..000000000000 --- a/app-emulation/qemu/files/qemu-0.10.3-nopl-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- i386-dis.c 2009-03-22 00:05:48.000000000 +0100 -+++ i386-dis_new.c 2009-04-21 08:31:08.000000000 +0200 -@@ -784,13 +784,13 @@ - { "movhpX", EX, XM, SIMD_Fixup, 'l' }, - /* 18 */ - { GRP14 }, -- { "(bad)", XX, XX, XX }, -- { "(bad)", XX, XX, XX }, -- { "(bad)", XX, XX, XX }, -- { "(bad)", XX, XX, XX }, -- { "(bad)", XX, XX, XX }, -- { "(bad)", XX, XX, XX }, -- { "(bad)", XX, XX, XX }, -+ { "nopQ", Ev, XX, XX }, -+ { "nopQ", Ev, XX, XX }, -+ { "nopQ", Ev, XX, XX }, -+ { "nopQ", Ev, XX, XX }, -+ { "nopQ", Ev, XX, XX }, -+ { "nopQ", Ev, XX, XX }, -+ { "nopQ", Ev, XX, XX }, - /* 20 */ - { "movL", Rm, Cm, XX }, - { "movL", Rm, Dm, XX }, -@@ -1072,7 +1072,7 @@ - /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ - /* ------------------------------- */ - /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */ -- /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */ -+ /* 10 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 1f */ - /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */ - /* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */ - /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */ diff --git a/app-emulation/qemu/qemu-0.10.0.ebuild b/app-emulation/qemu/qemu-0.10.0.ebuild deleted file mode 100644 index 6e6f2238ca33..000000000000 --- a/app-emulation/qemu/qemu-0.10.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.0.ebuild,v 1.1 2009/03/09 09:54:50 lu_zero Exp $ - -DESCRIPTION="qemu emulator and abi wrapper meta ebuild" -HOMEPAGE="http://fabrice.bellard.free.fr/qemu/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~ppc64" -IUSE="" - -DEPEND="" -RDEPEND="~app-emulation/qemu-softmmu-${PV} - ~app-emulation/qemu-user-${PV} - !<=app-emulation/qemu-0.7.0" diff --git a/app-emulation/qemu/qemu-0.10.1.ebuild b/app-emulation/qemu/qemu-0.10.1.ebuild deleted file mode 100644 index 9b4b3a39f79d..000000000000 --- a/app-emulation/qemu/qemu-0.10.1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.1.ebuild,v 1.1 2009/03/22 23:27:12 lu_zero Exp $ - -DESCRIPTION="qemu emulator and abi wrapper meta ebuild" -HOMEPAGE="http://fabrice.bellard.free.fr/qemu/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~ppc64" -IUSE="" - -DEPEND="" -RDEPEND="~app-emulation/qemu-softmmu-${PV} - ~app-emulation/qemu-user-${PV} - !<=app-emulation/qemu-0.7.0" diff --git a/app-emulation/qemu/qemu-0.10.3.ebuild b/app-emulation/qemu/qemu-0.10.3.ebuild deleted file mode 100644 index e26b78fc9314..000000000000 --- a/app-emulation/qemu/qemu-0.10.3.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.3.ebuild,v 1.5 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" -SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu kvm" - -COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc" - -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" -done - -RDEPEND="!app-emulation/qemu-softmmu - !app-emulation/qemu-user - !<app-emulation/qemu-0.10.3 - sys-libs/zlib - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - esd? ( media-sound/esound ) - pulseaudio? ( media-sound/pulseaudio ) - gnutls? ( net-libs/gnutls ) - ncurses? ( sys-libs/ncurses ) - sdl? ( >=media-libs/libsdl-1.2.11 ) - vde? ( net-misc/vde ) - kvm? ( >=sys-kernel/linux-headers-2.6.29 ) - kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )" -# fdt? ( sys-apps/dtc ) - -DEPEND="${RDEPEND} - gnutls? ( dev-util/pkgconfig ) - app-text/texi2html" - -src_prepare() { - # avoid fdt till an updated release appears - sed -i -e 's:fdt="yes":fdt="no":' configure - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target tests/Makefile - [[ -x /sbin/paxctl ]] && \ - sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ - Makefile.target - # avoid strip - sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \ - Makefile Makefile.target */Makefile - epatch "${FILESDIR}/${P}-nopl-fix.patch" -} - -src_configure() { - local mycc conf_opts audio_opts softmmu_targets user_targets target_list - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - conf_opts="--disable-darwin-user --disable-bsd-user" - - if test ! -z "${softmmu_targets}" ; then - einfo "Building following softmmu targets: ${softmmu_targets}" - 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" - use vde || conf_opts="$conf_opts --disable-vde" - use kqemu || conf_opts="$conf_opts --disable-kqemu" - use kvm || conf_opts="$conf_opts --disable-kvm" - - 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" - else - einfo "Disabling softmmu emulation (no softmmu targets specified)" - conf_opts="$conf_opts --disable-system --disable-vnc-tls \ - --disable-curses --disable-gfx-check --disable-sdl --disable-vde \ - --disable-kqemu --disable-kvm" - fi - - if test ! -z "${user_targets}" ; then - einfo "Building following user targets: ${user_targets}" - conf_opts="$conf_opts --enable-linux-user" - else - einfo "Disabling usermode emulation (no usermode targets specified)" - conf_opts="$conf_opts --disable-linux-user" - fi - -# use fdt || conf_opts="$conf_opts --disable-fdt" - - conf_opts="$conf_opts --prefix=/usr --disable-bluez" - - target_list="${softmmu_targets} ${user_targets}" - - filter-flags -fpie -fstack-protector - - ./configure ${conf_opts} \ - --audio-drv-list="$audio_opts" \ - --kerneldir="${KV_DIR}" \ - --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \ - --target-list="${target_list}" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/qemu - doexe \ - "${FILESDIR}/qemu-ifup" \ - "${FILESDIR}/qemu-ifdown" \ - || die "qemu interface scripts failed" - - dodoc pc-bios/README - dodoc qemu-doc.html - dodoc qemu-tech.html -} - -pkg_postinst() { - 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/qemu." - echo -} diff --git a/app-emulation/qemu/qemu-0.10.4.ebuild b/app-emulation/qemu/qemu-0.10.4.ebuild deleted file mode 100644 index 4034586c6ee8..000000000000 --- a/app-emulation/qemu/qemu-0.10.4.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.4.ebuild,v 1.5 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" -SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu kvm" - -COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc" - -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" -done - -RDEPEND="!app-emulation/qemu-softmmu - !app-emulation/qemu-user - !<app-emulation/qemu-0.10.3 - sys-libs/zlib - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - esd? ( media-sound/esound ) - pulseaudio? ( media-sound/pulseaudio ) - gnutls? ( net-libs/gnutls ) - ncurses? ( sys-libs/ncurses ) - sdl? ( >=media-libs/libsdl-1.2.11 ) - vde? ( net-misc/vde ) - kvm? ( >=sys-kernel/linux-headers-2.6.29 ) - kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )" -# fdt? ( sys-apps/dtc ) - -DEPEND="${RDEPEND} - gnutls? ( dev-util/pkgconfig ) - app-text/texi2html" - -src_prepare() { - # avoid fdt till an updated release appears - sed -i -e 's:fdt="yes":fdt="no":' configure - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target tests/Makefile - [[ -x /sbin/paxctl ]] && \ - sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ - Makefile.target - # avoid strip - sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \ - Makefile Makefile.target */Makefile - epatch "${FILESDIR}/qemu-0.10.3-nopl-fix.patch" -} - -src_configure() { - local mycc conf_opts audio_opts softmmu_targets user_targets target_list - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - conf_opts="--disable-darwin-user --disable-bsd-user" - - if test ! -z "${softmmu_targets}" ; then - einfo "Building following softmmu targets: ${softmmu_targets}" - 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" - use vde || conf_opts="$conf_opts --disable-vde" - use kqemu || conf_opts="$conf_opts --disable-kqemu" - use kvm || conf_opts="$conf_opts --disable-kvm" - - 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" - else - einfo "Disabling softmmu emulation (no softmmu targets specified)" - conf_opts="$conf_opts --disable-system --disable-vnc-tls \ - --disable-curses --disable-gfx-check --disable-sdl --disable-vde \ - --disable-kqemu --disable-kvm" - fi - - if test ! -z "${user_targets}" ; then - einfo "Building following user targets: ${user_targets}" - conf_opts="$conf_opts --enable-linux-user" - else - einfo "Disabling usermode emulation (no usermode targets specified)" - conf_opts="$conf_opts --disable-linux-user" - fi - -# use fdt || conf_opts="$conf_opts --disable-fdt" - - conf_opts="$conf_opts --prefix=/usr --disable-bluez" - - target_list="${softmmu_targets} ${user_targets}" - - filter-flags -fpie -fstack-protector - - ./configure ${conf_opts} \ - --audio-drv-list="$audio_opts" \ - --kerneldir="${KV_DIR}" \ - --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \ - --target-list="${target_list}" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/qemu - doexe \ - "${FILESDIR}/qemu-ifup" \ - "${FILESDIR}/qemu-ifdown" \ - || die "qemu interface scripts failed" - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html || die -} - -pkg_postinst() { - 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/qemu." - echo -} diff --git a/app-emulation/qemu/qemu-0.10.5.ebuild b/app-emulation/qemu/qemu-0.10.5.ebuild deleted file mode 100644 index 8ae08c1406f9..000000000000 --- a/app-emulation/qemu/qemu-0.10.5.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.5.ebuild,v 1.3 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" -SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa bluetooth esd gnutls ncurses pulseaudio +sdl vde kqemu kvm" - -COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc" - -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" -done - -RDEPEND="!app-emulation/qemu-softmmu - !app-emulation/qemu-user - !<app-emulation/qemu-0.10.3 - sys-libs/zlib - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - esd? ( media-sound/esound ) - pulseaudio? ( media-sound/pulseaudio ) - gnutls? ( net-libs/gnutls ) - ncurses? ( sys-libs/ncurses ) - sdl? ( >=media-libs/libsdl-1.2.11 ) - vde? ( net-misc/vde ) - kvm? ( >=sys-kernel/linux-headers-2.6.29 ) - bluetooth? ( net-wireless/bluez ) - kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )" -# fdt? ( sys-apps/dtc ) - -DEPEND="${RDEPEND} - gnutls? ( dev-util/pkgconfig ) - app-text/texi2html" - -src_prepare() { - # avoid fdt till an updated release appears - sed -i -e 's:fdt="yes":fdt="no":' configure - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target tests/Makefile - [[ -x /sbin/paxctl ]] && \ - sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ - Makefile.target - # avoid strip - sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \ - Makefile Makefile.target */Makefile - epatch "${FILESDIR}/qemu-0.10.3-nopl-fix.patch" -} - -src_configure() { - local mycc conf_opts audio_opts softmmu_targets user_targets target_list - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - conf_opts="--disable-darwin-user --disable-bsd-user" - - if test ! -z "${softmmu_targets}" ; then - einfo "Building following softmmu targets: ${softmmu_targets}" - 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" - use vde || conf_opts="$conf_opts --disable-vde" - use bluetooth || conf_opts="$conf_opts --disable-bluez" - use kqemu || conf_opts="$conf_opts --disable-kqemu" - use kvm || conf_opts="$conf_opts --disable-kvm" - - 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" - else - einfo "Disabling softmmu emulation (no softmmu targets specified)" - conf_opts="$conf_opts --disable-system --disable-vnc-tls \ - --disable-curses --disable-gfx-check --disable-sdl --disable-vde \ - --disable-kqemu --disable-kvm" - fi - - if test ! -z "${user_targets}" ; then - einfo "Building following user targets: ${user_targets}" - conf_opts="$conf_opts --enable-linux-user" - else - einfo "Disabling usermode emulation (no usermode targets specified)" - conf_opts="$conf_opts --disable-linux-user" - fi - -# use fdt || conf_opts="$conf_opts --disable-fdt" - - conf_opts="$conf_opts --prefix=/usr" - - target_list="${softmmu_targets} ${user_targets}" - - filter-flags -fpie -fstack-protector - - ./configure ${conf_opts} \ - --audio-drv-list="$audio_opts" \ - --kerneldir="${KV_DIR}" \ - --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \ - --target-list="${target_list}" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/qemu - doexe \ - "${FILESDIR}/qemu-ifup" \ - "${FILESDIR}/qemu-ifdown" \ - || die "qemu interface scripts failed" - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html || die -} - -pkg_postinst() { - 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/qemu." - echo -} diff --git a/app-emulation/qemu/qemu-0.10.6.ebuild b/app-emulation/qemu/qemu-0.10.6.ebuild deleted file mode 100644 index 1f05be8e2ab8..000000000000 --- a/app-emulation/qemu/qemu-0.10.6.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.6.ebuild,v 1.3 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" -SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa bluetooth esd gnutls ncurses pulseaudio +sdl vde kqemu kvm" - -COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc" - -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" -done - -RDEPEND="!app-emulation/qemu-softmmu - !app-emulation/qemu-user - !<app-emulation/qemu-0.10.3 - sys-libs/zlib - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - esd? ( media-sound/esound ) - pulseaudio? ( media-sound/pulseaudio ) - gnutls? ( net-libs/gnutls ) - ncurses? ( sys-libs/ncurses ) - sdl? ( >=media-libs/libsdl-1.2.11 ) - vde? ( net-misc/vde ) - kvm? ( >=sys-kernel/linux-headers-2.6.29 ) - bluetooth? ( net-wireless/bluez ) - kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )" -# fdt? ( sys-apps/dtc ) - -DEPEND="${RDEPEND} - gnutls? ( dev-util/pkgconfig ) - app-text/texi2html" - -src_prepare() { - # avoid fdt till an updated release appears - sed -i -e 's:fdt="yes":fdt="no":' configure - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target tests/Makefile - [[ -x /sbin/paxctl ]] && \ - sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ - Makefile.target - # avoid strip - sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \ - Makefile Makefile.target */Makefile - epatch "${FILESDIR}/qemu-0.10.3-nopl-fix.patch" -} - -src_configure() { - local mycc conf_opts audio_opts softmmu_targets user_targets target_list - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - conf_opts="--disable-darwin-user --disable-bsd-user" - - if test ! -z "${softmmu_targets}" ; then - einfo "Building following softmmu targets: ${softmmu_targets}" - 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" - use vde || conf_opts="$conf_opts --disable-vde" - use bluetooth || conf_opts="$conf_opts --disable-bluez" - use kqemu || conf_opts="$conf_opts --disable-kqemu" - use kvm || conf_opts="$conf_opts --disable-kvm" - - 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" - else - einfo "Disabling softmmu emulation (no softmmu targets specified)" - conf_opts="$conf_opts --disable-system --disable-vnc-tls \ - --disable-curses --disable-gfx-check --disable-sdl --disable-vde \ - --disable-kqemu --disable-kvm" - fi - - if test ! -z "${user_targets}" ; then - einfo "Building following user targets: ${user_targets}" - conf_opts="$conf_opts --enable-linux-user" - else - einfo "Disabling usermode emulation (no usermode targets specified)" - conf_opts="$conf_opts --disable-linux-user" - fi - -# use fdt || conf_opts="$conf_opts --disable-fdt" - - conf_opts="$conf_opts --prefix=/usr" - - target_list="${softmmu_targets} ${user_targets}" - - filter-flags -fpie -fstack-protector - - ./configure ${conf_opts} \ - --audio-drv-list="$audio_opts" \ - --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \ - --target-list="${target_list}" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/qemu - doexe \ - "${FILESDIR}/qemu-ifup" \ - "${FILESDIR}/qemu-ifdown" \ - || die "qemu interface scripts failed" - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html || die -} - -pkg_postinst() { - 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/qemu." - echo -} diff --git a/app-emulation/qemu/qemu-0.11.0.ebuild b/app-emulation/qemu/qemu-0.11.0.ebuild deleted file mode 100644 index 593f90093eff..000000000000 --- a/app-emulation/qemu/qemu-0.11.0.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild,v 1.7 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" -SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde kqemu kvm" - -COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc" - -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" -done - -RDEPEND="!app-emulation/qemu-softmmu - !app-emulation/qemu-user - !<app-emulation/qemu-0.10.3 - sys-libs/zlib - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - esd? ( media-sound/esound ) - pulseaudio? ( media-sound/pulseaudio ) - gnutls? ( net-libs/gnutls ) - ncurses? ( sys-libs/ncurses ) - sasl? ( dev-libs/cyrus-sasl ) - sdl? ( >=media-libs/libsdl-1.2.11 ) - vde? ( net-misc/vde ) - kvm? ( >=sys-kernel/linux-headers-2.6.29 ) - bluetooth? ( net-wireless/bluez ) - kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )" -# fdt? ( sys-apps/dtc ) - -DEPEND="${RDEPEND} - gnutls? ( dev-util/pkgconfig ) - app-text/texi2html" - -src_prepare() { - # avoid fdt till an updated release appears - sed -i -e 's:fdt="yes":fdt="no":' configure - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target tests/Makefile - [[ -x /sbin/paxctl ]] && \ - sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ - Makefile.target - # Append CFLAGS while linking - sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak - epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" -} - -src_configure() { - local mycc conf_opts audio_opts softmmu_targets user_targets target_list - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - conf_opts="--disable-darwin-user --disable-bsd-user --disable-strip" - - if test ! -z "${softmmu_targets}" ; then - einfo "Building following softmmu targets: ${softmmu_targets}" - use gnutls || conf_opts="$conf_opts --disable-vnc-tls" - 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" - use bluetooth || conf_opts="$conf_opts --disable-bluez" - use kqemu || conf_opts="$conf_opts --disable-kqemu" - use kvm || conf_opts="$conf_opts --disable-kvm" - - 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" - else - einfo "Disabling softmmu emulation (no softmmu targets specified)" - conf_opts="$conf_opts --disable-system --disable-vnc-tls \ - --disable-curses --disable-sdl --disable-vde \ - --disable-kqemu --disable-kvm" - fi - - if test ! -z "${user_targets}" ; then - einfo "Building following user targets: ${user_targets}" - conf_opts="$conf_opts --enable-linux-user" - else - einfo "Disabling usermode emulation (no usermode targets specified)" - conf_opts="$conf_opts --disable-linux-user" - fi - -# use fdt || conf_opts="$conf_opts --disable-fdt" - - conf_opts="$conf_opts --prefix=/usr" - - target_list="${softmmu_targets} ${user_targets}" - - filter-flags -fPIE - - ./configure ${conf_opts} \ - --audio-drv-list="$audio_opts" \ - --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \ - --target-list="${target_list}" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/qemu - doexe \ - "${FILESDIR}/qemu-ifup" \ - "${FILESDIR}/qemu-ifdown" \ - || die "qemu interface scripts failed" - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html || die -} - -pkg_postinst() { - 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/qemu." - echo -} diff --git a/app-emulation/qemu/qemu-0.9.0.ebuild b/app-emulation/qemu/qemu-0.9.0.ebuild deleted file mode 100644 index f057c0c59c0f..000000000000 --- a/app-emulation/qemu/qemu-0.9.0.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.9.0.ebuild,v 1.5 2007/07/12 06:39:56 mr_bones_ Exp $ - -DESCRIPTION="qemu emulator and abi wrapper meta ebuild" -HOMEPAGE="http://fabrice.bellard.free.fr/qemu/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND="~app-emulation/qemu-softmmu-${PV} - ~app-emulation/qemu-user-${PV} - !<=app-emulation/qemu-0.7.0" diff --git a/app-emulation/qemu/qemu-0.9.1.ebuild b/app-emulation/qemu/qemu-0.9.1.ebuild index 63c0d730f64f..fde0dfd144b6 100644 --- a/app-emulation/qemu/qemu-0.9.1.ebuild +++ b/app-emulation/qemu/qemu-0.9.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.9.1.ebuild,v 1.4 2008/09/03 17:54:12 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.9.1.ebuild,v 1.5 2010/10/15 14:21:09 flameeyes Exp $ DESCRIPTION="qemu emulator and abi wrapper meta ebuild" HOMEPAGE="http://fabrice.bellard.free.fr/qemu/" @@ -8,7 +8,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="" DEPEND="~app-emulation/qemu-softmmu-${PV} |