Update patchset to include binfmt wrapper

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 158 insertions, 5 deletions

diff --git a/app-emulation/qemu-user/ChangeLog b/app-emulation/qemu-user/ChangeLog
index cae627b062df..c60fa510510e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.44 2012/06/20 10:58:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.45 2012/06/22 13:52:59 lu_zero Exp $
+
+*qemu-user-1.1.0-r1 (22 Jun 2012)
+
+  22 Jun 2012; Luca Barbato <lu_zero@gentoo.org> +qemu-user-1.1.0-r1.ebuild,
+  qemu-user-9999.ebuild:
+  Update patchset to include binfmt wrapper
 
 *qemu-user-9999 (20 Jun 2012)
 *qemu-user-1.1.0 (20 Jun 2012)
diff --git a/app-emulation/qemu-user/Manifest b/app-emulation/qemu-user/Manifest
index f089ec51bc86..3f6da21e1a8e 100644
--- a/app-emulation/qemu-user/Manifest
+++ b/app-emulation/qemu-user/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX qemu-0.7.0-ppc-linker.patch 11509 RMD160 d92e368e6adc2e6acdb97d92221781337d5322f7 SHA1 897be37b49b7908ea64972cd20ada0bb4def70cc SHA256 26d3832f1ff70d9d29f06cf8c6e1c1ac4ad353854c9b3b510875d2330ab6d2f9
 AUX qemu-binfmt.initd 7476 RMD160 466aac0a0296c3601a87a4d0c5c7d14833de4019 SHA1 aa927f7907fd402d7818df10f100a272ed95c94a SHA256 c8cf1caba5f8a966334eac34a0e6a2b3cd767664460db43af21c59af5efd7edf
 DIST qemu-0.12.2.tar.gz 4691757 RMD160 00d5a89eb069ffb0267c677d946671a27948594d SHA1 9e826ea1458d358598fbf61ab577c8f849cd99c1 SHA256 accec2eec7dbd89e0b49474d1a0277ae3e7239a7700754b1cfb192f091766843
@@ -6,10 +9,19 @@ DIST qemu-1.0-patches.tar.xz 43540 RMD160 79a39d5a8050fe8eedd5e0becb828d2ae0b465
 DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737
 DIST qemu-1.1.0-1.tar.bz2 9630116 RMD160 85c8c260b670056df4a82a06b9255be87f177b68 SHA1 8600765831c137a833854f1aac0313f25089a200 SHA256 1e566f8cbc33e5fb7d5f364c0fd1cdde9e921e647223b5d7ae7e5f95544b258d
 DIST qemu-1.1.0-patches.tar.xz 26728 RMD160 14c44bdf8be481303d1e3998769a0538d31d9b0d SHA1 51e1b5911657b2c9ffe5e8596cd541c23e275a00 SHA256 ceae860693a027f57942bd27a0f1d8ec07ec074ea5ffa378837b0da9ebbdf728
+DIST qemu-1.1.0-r1-patches.tar.xz 27916 RMD160 035f5729a5a0ba450f3cf3d9c1b7729d098c0bfb SHA1 e6d259d296b9485970b85194a28f6feaf357bfaf SHA256 f1e97bff0e7dd2155f572a09f0db407c121004412554612ebfaa29a8d3374609
 EBUILD qemu-user-0.12.2.ebuild 1754 RMD160 5f5b5f517d07889f13f61af1741d096b79e45bdf SHA1 d11747cee7fc11a22620dea6ca720c7c843ebe62 SHA256 b8ca632052d78d8e267ca55a03234a262ad2639683a9ee14c8fdc4d58dd1a024
 EBUILD qemu-user-0.9.0.ebuild 2385 RMD160 878466bbe7fb8f15cf86613aee4937b5cc3f3229 SHA1 e0df500334c37bfee2c10ec0bc1fbab4f1f7f412 SHA256 76e45f6a629e5a4bca4ecdaad2a2eb8fc4a22df6e31356adabbec87ec272ba6d
 EBUILD qemu-user-1.0.ebuild 3731 RMD160 3ead4e86bf4cbe1951e650806bbd21934b77cc95 SHA1 16a997b8014ae5602bbf4126cdef815b4019c9d9 SHA256 b7ce223ef146c69fd3f719f028a0b199664ceaf9b9ecda9e544dcc67db93b78e
+EBUILD qemu-user-1.1.0-r1.ebuild 3904 RMD160 8e99f25bc75fbccf1ad8c782efba0eefdbe938a9 SHA1 4408c7dd473a193a93e0babef3a80b5397a4287f SHA256 9ec365c81627b6cde6f166ef35ab4d2d1b965e5cb8ee5dac298054951a74020e
 EBUILD qemu-user-1.1.0.ebuild 3900 RMD160 8009019d10e74136781e42e4dc108bfb9a6b3845 SHA1 83290713d09ff663ce81f1e43b0193520b78ed9f SHA256 a9bb7e25f9d033ddb9684e775ae80b2f29d19d918119d46872ad2b4a99aae3a4
-EBUILD qemu-user-9999.ebuild 3899 RMD160 7cb87b6d2176a45a08d438f1e9a5de65a3be5fdc SHA1 e66b0b590c08c6d8f7b406297b6db3f57af54a39 SHA256 775e188bcc4514355f7512d8597e60eef7544256a46f31c6ad79babc689b5577
-MISC ChangeLog 6377 RMD160 5243bd9fc9c0b0b1f4c22578578ca1a28dd8e7b2 SHA1 7f2ad1c8fc1319b276e74bd6bd8bc466808444cb SHA256 7bdb7291d7b6b0c7967ffa72137a07cf93d6617afd1ae00c8f007d527950cded
+EBUILD qemu-user-9999.ebuild 3900 RMD160 83d78f28244b3352e5d8c8523b500e5ae85cba36 SHA1 bb2a2da8f42d00c89befb42c78c6c5b477755f96 SHA256 fcdc131488a00e91bb920e949afda491f34a0f76a59c57c01d10be29daa7bfe1
+MISC ChangeLog 6559 RMD160 aa2ab0c676816d69ac413b047eeaea14bec34543 SHA1 49c5eef00b68e441cc970de98df03e21ad49b136 SHA256 049ded01abdd60df2fb892f5c2de60c9101a542940526c5a6dc5035c376d79d6
 MISC metadata.xml 202 RMD160 1a73e85a81ce1045569a8b488999c0823756a0d9 SHA1 de56e79375b449ed9bdf49abd86aa9d28acd54ef SHA256 eda78eb836e5f76704299683d68168157f552076da6446e1a246b345aaa5811f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk/keM8ACgkQcXOrnRGRc468xQEAtIKqiPUw8d3yY1Rpq8pfKbaC
+XnObsVtSTrBWF1L9/zQA/jK3VhgFQ9v6TkUtlsEcA9eAPuvFyZHNe8QWmquwBzd1
+=px9j
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild b/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..5e46c9d06e43
--- /dev/null
+++ b/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild,v 1.1 2012/06/22 13:52:59 lu_zero Exp $
+
+EAPI=4
+
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git
+		http://git.qemu.org/git/qemu.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils base flag-o-matic pax-utils toolchain-funcs ${GIT_ECLASS}
+
+MY_P=${P/-user/}
+
+if [[ ${PV} != *9999 ]]; then
+SRC_URI="http://wiki.qemu.org/download/${MY_P}-1.tar.bz2
+		 http://dev.gentoo.org/~lu_zero/distfiles/qemu-${PVR}-patches.tar.xz"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
+S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Open source dynamic CPU translator"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+DEPEND="app-text/texi2html
+	virtual/pkgconfig
+	sys-libs/zlib[static-libs]
+	dev-libs/glib[static-libs]"
+RDEPEND=""
+
+QA_WX_LOAD="
+	usr/bin/qemu-static-ppc64abi32-binfmt
+	usr/bin/qemu-static-ppc64
+	usr/bin/qemu-static-x86_64-binfmt
+	usr/bin/qemu-static-x86_64
+	usr/bin/qemu-static-unicore32-binfmt
+	usr/bin/qemu-static-m68k-binfmt
+	usr/bin/qemu-static-ppc-binfmt
+	usr/bin/qemu-static-alpha-binfmt
+	usr/bin/qemu-static-microblazeel-binfmt
+	usr/bin/qemu-static-sparc-binfmt
+	usr/bin/qemu-static-sparc32plus-binfmt
+	usr/bin/qemu-static-ppc
+	usr/bin/qemu-static-mipsn32el-binfmt
+	usr/bin/qemu-static-sh4eb-binfmt
+	usr/bin/qemu-static-ppc64abi32
+	usr/bin/qemu-static-ppc64-binfmt
+	usr/bin/qemu-static-armeb-binfmt
+	usr/bin/qemu-static-microblaze-binfmt
+	usr/bin/qemu-static-mips-binfmt
+	usr/bin/qemu-static-mipsel-binfmt
+	usr/bin/qemu-static-sh4-binfmt
+	usr/bin/qemu-static-s390x-binfmt
+	usr/bin/qemu-static-i386-binfmt
+	usr/bin/qemu-static-cris-binfmt
+	usr/bin/qemu-static-arm-binfmt
+	usr/bin/qemu-static-sparc64-binfmt
+	usr/bin/qemu-static-mipsn32-binfmt
+"
+
+
+src_prepare() {
+	cd "${S}"
+	# 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
+
+	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" epatch
+}
+
+src_configure() {
+	filter-flags -fpie -fstack-protector
+
+	local conf_opts user_targets
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	conf_opts="--enable-linux-user --disable-strip"
+	conf_opts+=" --disable-bsd-user"
+	conf_opts+=" --disable-system"
+	conf_opts+=" --disable-vnc-tls"
+	conf_opts+=" --disable-curses"
+	conf_opts+=" --disable-sdl"
+	conf_opts+=" --disable-vde"
+	conf_opts+=" --prefix=/usr --disable-bluez --disable-kvm"
+	conf_opts+=" --cc=$(tc-getCC) --host-cc=$(tc-getBUILD_CC)"
+	conf_opts+=" --disable-smartcard --disable-smartcard-nss"
+	conf_opts+=" --extra-ldflags=-Wl,-z,execheap"
+	conf_opts+=" --disable-strip --disable-werror"
+	conf_opts+=" --static"
+
+	./configure ${conf_opts} --target-list="${user_targets}" || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake qemu failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die "make install failed"
+
+	# fixup to avoid collisions with qemu
+	base_dir="${ED}/usr/bin"
+	for qemu_bin in "${base_dir}"/qemu-*; do
+		qemu_bin_name=$(basename "${qemu_bin}")
+		mv "${qemu_bin}" "${base_dir}"/"${qemu_bin_name/qemu-/qemu-static-}" || die
+	done
+
+	pax-mark r "${ED}"/usr/bin/qemu-static-*
+	rm -fr "${ED}/usr/share"
+	dohtml qemu-doc.html
+	dohtml qemu-tech.html
+	newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
+}
diff --git a/app-emulation/qemu-user/qemu-user-9999.ebuild b/app-emulation/qemu-user/qemu-user-9999.ebuild
index d9a63b130812..776103abfbbc 100644
--- a/app-emulation/qemu-user/qemu-user-9999.ebuild
+++ b/app-emulation/qemu-user/qemu-user-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v 1.2 2012/06/20 19:48:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v 1.3 2012/06/22 13:52:59 lu_zero Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ MY_P=${P/-user/}
 
 if [[ ${PV} != *9999 ]]; then
 SRC_URI="http://wiki.qemu.org/download/${MY_P}-1.tar.bz2
-		 http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.1.0-patches.tar.xz"
+		 http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.1.0-r1-patches.tar.xz"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
 S="${WORKDIR}/${MY_P}"
 fi