New version

(Portage version: 2.1.1_pre5-r1)

4 files changed, 394 insertions, 1 deletions

diff --git a/app-emulation/qemu-user/ChangeLog b/app-emulation/qemu-user/ChangeLog
index 5456a340a485..77ac0af3077b 100644
--- a/app-emulation/qemu-user/ChangeLog
+++ b/app-emulation/qemu-user/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-user
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.16 2006/06/09 06:19:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.17 2006/08/16 14:55:00 lu_zero Exp $
+
+*qemu-user-0.8.2 (16 Aug 2006)
+
+  16 Aug 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/qemu-0.7.0-ppc-linker.patch, +qemu-user-0.8.2.ebuild:
+  New version, I gave up about the sparc module (broken upstream)
 
   09 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -qemu-user-0.7.0-r1.ebuild, -qemu-user-0.7.1.ebuild,
diff --git a/app-emulation/qemu-user/files/digest-qemu-user-0.8.2 b/app-emulation/qemu-user/files/digest-qemu-user-0.8.2
new file mode 100644
index 000000000000..767c6c8715e5
--- /dev/null
+++ b/app-emulation/qemu-user/files/digest-qemu-user-0.8.2
@@ -0,0 +1,3 @@
+MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909
+RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909
+SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909
diff --git a/app-emulation/qemu-user/files/qemu-0.7.0-ppc-linker.patch b/app-emulation/qemu-user/files/qemu-0.7.0-ppc-linker.patch
new file mode 100644
index 000000000000..09ae1d814317
--- /dev/null
+++ b/app-emulation/qemu-user/files/qemu-0.7.0-ppc-linker.patch
@@ -0,0 +1,297 @@
+#DPATCHLEVEL=1
+diff -Naur qemu.orig/ppc.ld qemu/ppc.ld
+--- qemu.orig/ppc.ld	2005-09-04 20:11:31.000000000 +0300
++++ qemu/ppc.ld	2005-11-21 01:57:35.000000000 +0200
+@@ -1,116 +1,195 @@
+-/* ld script to make i386 Linux kernel
+- * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
+- */
+-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
+-OUTPUT_ARCH(powerpc)
+-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/alpha-unknown-linux-gnu/lib);
++/* Default linker script, for normal executables */
++OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
++	      "elf32-powerpc")
++OUTPUT_ARCH(powerpc:common)
+ ENTRY(_start)
++SEARCH_DIR("/usr/powerpc-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
++/* Do we need any of these for elf?
++   __DYNAMIC = 0;    */
+ SECTIONS
+ {
+   /* Read-only sections, merged into text segment: */
+-  . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp     : { *(.interp) 	}
+-  .hash          : { *(.hash)		}
+-  .dynsym        : { *(.dynsym)		}
+-  .dynstr        : { *(.dynstr)		}
+-  .gnu.version   : { *(.gnu.version)	}
+-  .gnu.version_d   : { *(.gnu.version_d)	}
+-  .gnu.version_r   : { *(.gnu.version_r)	}
+-  .rel.text      :
+-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
+-  .rela.text     :
+-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+-  .rel.data      :
+-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
+-  .rela.data     :
+-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+-  .rel.rodata    :
+-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
+-  .rela.rodata   :
+-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+-  .rel.got       : { *(.rel.got)		}
+-  .rela.got      : { *(.rela.got)		}
+-  .rel.ctors     : { *(.rel.ctors)	}
+-  .rela.ctors    : { *(.rela.ctors)	}
+-  .rel.dtors     : { *(.rel.dtors)	}
+-  .rela.dtors    : { *(.rela.dtors)	}
+-  .rel.init      : { *(.rel.init)	}
+-  .rela.init     : { *(.rela.init)	}
+-  .rel.fini      : { *(.rel.fini)	}
+-  .rela.fini     : { *(.rela.fini)	}
+-  .rel.bss       : { *(.rel.bss)		}
+-  .rela.bss      : { *(.rela.bss)		}
+-  .rel.plt       : { *(.rel.plt)		}
+-  .rela.plt      : { *(.rela.plt)		}
+-  .init          : { *(.init)	} =0x47ff041f
+-  .text      :
++  PROVIDE (__executable_start = 0x60000000); . = 0x60000000 + SIZEOF_HEADERS;
++  .interp         : { *(.interp) }
++  .hash           : { *(.hash) }
++  .dynsym         : { *(.dynsym) }
++  .dynstr         : { *(.dynstr) }
++  .gnu.version    : { *(.gnu.version) }
++  .gnu.version_d  : { *(.gnu.version_d) }
++  .gnu.version_r  : { *(.gnu.version_r) }
++  .rel.init       : { *(.rel.init) }
++  .rela.init      : { *(.rela.init) }
++  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
++  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
++  .rel.fini       : { *(.rel.fini) }
++  .rela.fini      : { *(.rela.fini) }
++  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
++  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
++  .rel.data.rel.ro   : { *(.rel.data.rel.ro*) }
++  .rela.data.rel.ro   : { *(.rel.data.rel.ro*) }
++  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
++  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
++  .rel.tdata	  : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
++  .rela.tdata	  : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
++  .rel.tbss	  : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
++  .rela.tbss	  : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
++  .rel.ctors      : { *(.rel.ctors) }
++  .rela.ctors     : { *(.rela.ctors) }
++  .rel.dtors      : { *(.rel.dtors) }
++  .rela.dtors     : { *(.rela.dtors) }
++  .rel.got        : { *(.rel.got) }
++  .rela.got       : { *(.rela.got) }
++  .rela.got1           : { *(.rela.got1) }
++  .rela.got2           : { *(.rela.got2) }
++  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
++  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
++  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
++  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
++  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
++  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
++  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
++  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
++  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
++  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
++  .rel.plt        : { *(.rel.plt) }
++  .rela.plt       : { *(.rela.plt) }
++  .init           :
+   {
+-    *(.text)
++    KEEP (*(.init))
++  } =0
++  .text           :
++  {
++    *(.text .stub .text.* .gnu.linkonce.t.*)
++    KEEP (*(.text.*personality*))
+     /* .gnu.warning sections are handled specially by elf32.em.  */
+     *(.gnu.warning)
+-    *(.gnu.linkonce.t*)
+-  } =0x47ff041f
+-  _etext = .;
++  } =0
++  .fini           :
++  {
++    KEEP (*(.fini))
++  } =0
++  PROVIDE (__etext = .);
++  PROVIDE (_etext = .);
+   PROVIDE (etext = .);
+-  .fini      : { *(.fini)    } =0x47ff041f
++  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
++  .rodata1        : { *(.rodata1) }
++  .sdata2         :
++  {
++    PROVIDE (_SDA2_BASE_ = 32768);
++    *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
++  }
++  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
++  .eh_frame_hdr : { *(.eh_frame_hdr) }
++  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
++  .gcc_except_table   : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }
++  /* Adjust the address for the data segment.  We want to adjust up to
++     the same address within the page on the next page up.  */
++  . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN (0x10000, 0x1000);
++  /* Exception handling  */
++  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
++  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }
++  /* Thread Local Storage sections  */
++  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
++  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
++  /* Ensure the __preinit_array_start label is properly aligned.  We
++     could instead move the label definition inside the section, but
++     the linker would then create the section even if it turns out to
++     be empty, which isn't pretty.  */
+   . = ALIGN(32 / 8);
+   PROVIDE (__preinit_array_start = .);
+-  .preinit_array     : { *(.preinit_array) }
++  .preinit_array     : { KEEP (*(.preinit_array)) }
+   PROVIDE (__preinit_array_end = .);
+   PROVIDE (__init_array_start = .);
+-  .init_array     : { *(.init_array) }
++  .init_array     : { KEEP (*(.init_array)) }
+   PROVIDE (__init_array_end = .);
+   PROVIDE (__fini_array_start = .);
+-  .fini_array     : { *(.fini_array) }
++  .fini_array     : { KEEP (*(.fini_array)) }
+   PROVIDE (__fini_array_end = .);
+-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
+-  .rodata1   : { *(.rodata1) }
+-  .reginfo : { *(.reginfo) }
+-  /* Adjust the address for the data segment.  We want to adjust up to
+-     the same address within the page on the next page up.  */
+-  . = ALIGN(0x100000) + (. & (0x100000 - 1));
+-  .data    :
++  .ctors          :
+   {
+-    *(.data)
+-    *(.gnu.linkonce.d*)
+-    CONSTRUCTORS
++    /* gcc uses crtbegin.o to find the start of
++       the constructors, so we make sure it is
++       first.  Because this is a wildcard, it
++       doesn't matter if the user does not
++       actually link against crtbegin.o; the
++       linker won't look for a file to match a
++       wildcard.  The wildcard also means that it
++       doesn't matter which directory crtbegin.o
++       is in.  */
++    KEEP (*crtbegin*.o(.ctors))
++    /* We don't want to include the .ctor section from
++       from the crtend.o file until after the sorted ctors.
++       The .ctor section from the crtend file contains the
++       end of ctors marker and it must be last */
++    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
++    KEEP (*(SORT(.ctors.*)))
++    KEEP (*(.ctors))
+   }
+-  .data1   : { *(.data1) }
+-  .ctors         :
++  .dtors          :
+   {
+-    *(.ctors)
++    KEEP (*crtbegin*.o(.dtors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
++    KEEP (*(SORT(.dtors.*)))
++    KEEP (*(.dtors))
+   }
+-  .dtors         :
++  .jcr            : { KEEP (*(.jcr)) }
++  .data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }
++  .got1           : { *(.got1) }
++  .got2           : { *(.got2) }
++  .dynamic        : { *(.dynamic) }
++  . = DATA_SEGMENT_RELRO_END (0, .);
++  .data           :
+   {
+-    *(.dtors)
++    *(.data .data.* .gnu.linkonce.d.*)
++    KEEP (*(.gnu.linkonce.d.*personality*))
++    SORT(CONSTRUCTORS)
+   }
+-  .plt      : { *(.plt)	}
+-  .got           : { *(.got.plt) *(.got) }
+-  .dynamic       : { *(.dynamic) }
++  .data1          : { *(.data1) }
++  .got            : { *(.got.plt) *(.got) }
+   /* We want the small data sections together, so single-instruction offsets
+      can access them all, and initialized data all before uninitialized, so
+      we can shorten the on-disk segment size.  */
+-  .sdata     : { *(.sdata) }
+-  _edata  =  .;
++  .sdata          :
++  {
++    PROVIDE (_SDA_BASE_ = 32768);
++    *(.sdata .sdata.* .gnu.linkonce.s.*)
++  }
++  _edata = .;
+   PROVIDE (edata = .);
+   __bss_start = .;
+-  .sbss      : { *(.sbss) *(.scommon) }
+-  .bss       :
++  .sbss           :
++  {
++    PROVIDE (__sbss_start = .);
++    PROVIDE (___sbss_start = .);
++    *(.dynsbss)
++    *(.sbss .sbss.* .gnu.linkonce.sb.*)
++    *(.scommon)
++    PROVIDE (__sbss_end = .);
++    PROVIDE (___sbss_end = .);
++  }
++  .plt            : { *(.plt) }
++  .bss            :
+   {
+    *(.dynbss)
+-   *(.bss)
++   *(.bss .bss.* .gnu.linkonce.b.*)
+    *(COMMON)
++   /* Align here to ensure that the .bss section occupies space up to
++      _end.  Align after .bss to ensure correct alignment even if the
++      .bss section disappears because there are no input sections.  */
++   . = ALIGN(32 / 8);
+   }
+-  _end = . ;
++  . = ALIGN(32 / 8);
++  _end = .;
+   PROVIDE (end = .);
++  . = DATA_SEGMENT_END (.);
+   /* Stabs debugging sections.  */
+-  .stab 0 : { *(.stab) }
+-  .stabstr 0 : { *(.stabstr) }
+-  .stab.excl 0 : { *(.stab.excl) }
+-  .stab.exclstr 0 : { *(.stab.exclstr) }
+-  .stab.index 0 : { *(.stab.index) }
++  .stab          0 : { *(.stab) }
++  .stabstr       0 : { *(.stabstr) }
++  .stab.excl     0 : { *(.stab.excl) }
++  .stab.exclstr  0 : { *(.stab.exclstr) }
++  .stab.index    0 : { *(.stab.index) }
+   .stab.indexstr 0 : { *(.stab.indexstr) }
+-  .comment 0 : { *(.comment) }
++  .comment       0 : { *(.comment) }
+   /* DWARF debug sections.
+      Symbols in the DWARF debugging sections are relative to the beginning
+      of the section so we begin them at 0.  */
+@@ -124,7 +203,7 @@
+   .debug_aranges  0 : { *(.debug_aranges) }
+   .debug_pubnames 0 : { *(.debug_pubnames) }
+   /* DWARF 2 */
+-  .debug_info     0 : { *(.debug_info) }
++  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+   .debug_abbrev   0 : { *(.debug_abbrev) }
+   .debug_line     0 : { *(.debug_line) }
+   .debug_frame    0 : { *(.debug_frame) }
+@@ -136,5 +215,6 @@
+   .debug_funcnames 0 : { *(.debug_funcnames) }
+   .debug_typenames 0 : { *(.debug_typenames) }
+   .debug_varnames  0 : { *(.debug_varnames) }
+-  /* These must appear regardless of  .  */
++  /DISCARD/	: { *(.fixup) }
++  /DISCARD/ : { *(.note.GNU-stack) }
+ }
diff --git a/app-emulation/qemu-user/qemu-user-0.8.2.ebuild b/app-emulation/qemu-user/qemu-user-0.8.2.ebuild
new file mode 100644
index 000000000000..94c1123befb0
--- /dev/null
+++ b/app-emulation/qemu-user/qemu-user-0.8.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-0.8.2.ebuild,v 1.1 2006/08/16 14:55:00 lu_zero Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
+HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
+SRC_URI="http://fabrice.bellard.free.fr/qemu/${P/-user/}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~ppc -sparc ~x86"
+IUSE=""  #qvm86 debug nptl qemu-fast nptlonly"
+RESTRICT="nostrip test"
+
+DEPEND="virtual/libc
+	app-text/texi2html
+	!<=app-emulation/qemu-0.7.0"
+RDEPEND=""
+
+S="${WORKDIR}/${P/-user/}"
+
+set_target_list() {
+	TARGET_LIST="arm-user armeb-user i386-user ppc-user mips-user"
+	export TARGET_LIST
+}
+
+pkg_setup() {
+	if [ "$(gcc-major-version)" == "4" ]; then
+		die "Qemu must build with GCC 3"
+	fi
+}
+
+#RUNTIME_PATH="/emul/gnemul/"
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/qemu-0.7.0-ppc-linker.patch
+	epatch ${FILESDIR}/qemu-0.8.0-gcc4-hacks.patch
+	epatch ${FILESDIR}/qemu-0.8.0-stwbrx.patch
+	epatch ${FILESDIR}/qemu-user-0.7.0-errno.patch
+
+	# 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
+	# Ensure mprotect restrictions are relaxed for emulator binaries
+	[[ -x /sbin/paxctl ]] && \
+		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
+			Makefile.target
+	# Prevent install of kernel module by qemu's makefile
+	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
+}
+
+src_compile() {
+	#Let the application set its cflags
+	unset CFLAGS
+
+	# Switch off hardened tech
+	filter-flags -fpie -fstack-protector
+
+	myconf="--disable-gcc-check"
+	set_target_list
+#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
+	./configure \
+		--prefix=/usr \
+		--target-list="${TARGET_LIST}" \
+		--enable-slirp \
+		--kernel-path=${KV_DIR} \
+		${myconf} \
+		|| die "could not configure"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make install \
+		prefix=${D}/usr \
+		bindir=${D}/usr/bin \
+		datadir=${D}/usr/share/qemu \
+		docdir=${D}/usr/share/doc/${P} \
+		mandir=${D}/usr/share/man || die
+
+	rm -fR ${D}/usr/share/{man,qemu}
+	rm -fR ${D}/usr/bin/qemu-img
+}