New version

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 278 insertions, 1 deletions

diff --git a/app-emulation/qemu-user/ChangeLog b/app-emulation/qemu-user/ChangeLog
index d1e2beb1e272..cae627b062df 100644
--- a/app-emulation/qemu-user/ChangeLog
+++ b/app-emulation/qemu-user/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2012/05/03 18:49:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.44 2012/06/20 10:58:19 lu_zero Exp $
+
+*qemu-user-9999 (20 Jun 2012)
+*qemu-user-1.1.0 (20 Jun 2012)
+
+  20 Jun 2012; Luca Barbato <lu_zero@gentoo.org> +qemu-user-1.1.0.ebuild,
+  +qemu-user-9999.ebuild:
+  New version
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> qemu-user-1.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-emulation/qemu-user/qemu-user-1.1.0.ebuild b/app-emulation/qemu-user/qemu-user-1.1.0.ebuild
new file mode 100644
index 000000000000..331155799928
--- /dev/null
+++ b/app-emulation/qemu-user/qemu-user-1.1.0.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.ebuild,v 1.1 2012/06/20 10:58:19 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-1.1.0-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
new file mode 100644
index 000000000000..4fdd490af6a0
--- /dev/null
+++ b/app-emulation/qemu-user/qemu-user-9999.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-9999.ebuild,v 1.1 2012/06/20 10:58:19 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-1.1.0-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
+}