From 918cae786715d531d338afc9fa4bf350c6e74233 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Tue, 27 Oct 2020 13:15:16 -0400
Subject: [PATCH] unicorn: address some fairly simply missing variables

---
 ...n-1.0.2.ebuild => unicorn-1.0.2-r1.ebuild} |  9 +-
 dev-util/unicorn/unicorn-1.0.2_rc3.ebuild     | 88 -------------------
 2 files changed, 7 insertions(+), 90 deletions(-)
 rename dev-util/unicorn/{unicorn-1.0.2.ebuild => unicorn-1.0.2-r1.ebuild} (91%)
 delete mode 100644 dev-util/unicorn/unicorn-1.0.2_rc3.ebuild

diff --git a/dev-util/unicorn/unicorn-1.0.2.ebuild b/dev-util/unicorn/unicorn-1.0.2-r1.ebuild
similarity index 91%
rename from dev-util/unicorn/unicorn-1.0.2.ebuild
rename to dev-util/unicorn/unicorn-1.0.2-r1.ebuild
index 7c3bd036f..8c3e1ce88 100644
--- a/dev-util/unicorn/unicorn-1.0.2.ebuild
+++ b/dev-util/unicorn/unicorn-1.0.2-r1.ebuild
@@ -71,7 +71,7 @@ src_compile() {
 	export CC INSTALL_BIN PREFIX PKGCFGDIR LIBDIRARCH LIBARCHS CFLAGS LDFLAGS
 	UNICORN_ARCHS="${unicorn_targets}" \
 		UNICORN_STATIC="$(use static-libs && echo yes || echo no)" \
-		emake
+		emake V=s
 	wrap_python ${FUNCNAME}
 }
 
@@ -82,6 +82,11 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" UNICORN_STATIC="$(use static-libs && echo yes || echo no)" install
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		UNICORN_STATIC="$(use static-libs && echo yes || echo no)" \
+		UNICORN_ARCHS="${unicorn_targets}"
+		install
 	wrap_python ${FUNCNAME}
 }
diff --git a/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild b/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild
deleted file mode 100644
index 4256d7362..000000000
--- a/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/_/-}
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit multilib distutils-r1
-
-DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
-HOMEPAGE="http://www.unicorn-engine.org"
-SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~sparc ~x86"
-
-IUSE_UNICORN_TARGETS="x86 m68k arm aarch64 mips sparc"
-use_unicorn_targets=$(printf ' unicorn_targets_%s' ${IUSE_UNICORN_TARGETS})
-IUSE="python ${use_unicorn_targets} static-libs"
-
-REQUIRED_USE="|| ( ${use_unicorn_targets} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="dev-libs/glib:2
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-wrap_python() {
-	if use python; then
-		#src_prepare
-		#do not compile C extensions
-		export LIBUNICORN_PATH=1
-
-		pushd bindings/python >/dev/null || die
-		distutils-r1_${1} "$@"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	#build from sources
-	rm -r bindings/python/prebuilt || die "failed to remove prebuild"
-
-	default
-	wrap_python ${FUNCNAME}
-}
-
-src_configure(){
-	local target
-	unicorn_softmmu_targets=""
-
-	for target in ${IUSE_UNICORN_TARGETS} ; do
-		if use "unicorn_targets_${target}"; then
-			unicorn_targets+="${target} "
-		fi
-	done
-
-	#the following variable is getting recreated using UNICORN_ARCHS below
-	UNICORN_TARGETS=""
-	default
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	export CC INSTALL_BIN PREFIX PKGCFGDIR LIBDIRARCH LIBARCHS CFLAGS LDFLAGS
-	UNICORN_QEMU_FLAGS="--python=/usr/bin/python3" \
-		UNICORN_ARCHS="${unicorn_targets}" \
-		UNICORN_STATIC="$(use static-libs && echo yes || echo no)" \
-		emake
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" UNICORN_STATIC="$(use static-libs && echo yes || echo no)" install
-	wrap_python ${FUNCNAME}
-}