7 files changed, 90 insertions, 5 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fc5ec6d1f24d..a30f6b022676 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index f204dac3db58..8d5b34f0368d 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,9 +6,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.7.2.tar.xz 546016 BLAKE2B ce68e759bbeb99e5d5fb7341c85e58dbcf05aa21caa7aea67cba244041a44cfb22bceb7dcea47597ea44f39e88d7d006fd0a5fc7ceefb264309a74affedf8d8e SHA512 854834d38ae64c1a253746be7f30b6f6f50215277a3eb01f25dcab23d3fe1131bc5fde76da10506b72c8eca5b00bc63555f5c2363b8613833f491d05635173ed
-DIST ccache-4.7.2.tar.xz.asc 833 BLAKE2B 63dc3d283148622b2ed3a8688c865602e6f803f6cf00c1281e0004ac16b4c7606df2d977329328b784bf36134ac529f3d7dbabfd3c295b9eb688a7962e2d81fb SHA512 5ffd9f51b7ff580603c9926cba6df0f13ccd1cf217a49d0cc97963a15d690cc51da9a42e37f6f2fd53bbf8b3458badb138c19f1383ef3899a54514d135362070
+DIST ccache-4.7.3.tar.xz 546528 BLAKE2B 2b219506b94a7ae7d62545b02d976f8afd12acc226bd4cabc575199629e4abc86657150b55c2aaf283e477fc5bcfa38843d0d52c8737bd98f11c126d4afe2582 SHA512 c7d15db426967ff69ec31bc167d49069f1908dfc03d70ac0ac61a281bca1202c17e3a469006bb42a11549cb6a064d89af94f0779c550617bb68b213ed9cef784
+DIST ccache-4.7.3.tar.xz.asc 833 BLAKE2B 743a066d5b3a69341e51e4b48ef9ae81b74acfe14a566ffa38f839c8aa09d178c48e4a14ea388648de847651ab6c0c2279fd646d623745e68fd7b2555e32aba3 SHA512 4049d9dc342b604d5228809c0e5d20656d4408bf2bc2242f0d1fc30e7df1cec0f3f48ed77b1be2f3b1e3bbace79397ce3fae411de99f6bf5a7626fd4225777a1
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
 EBUILD ccache-4.6.3.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
-EBUILD ccache-4.7.2.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
+EBUILD ccache-4.7.3.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.7.2.ebuild b/dev-util/ccache/ccache-4.7.3.ebuild
index 57b53e31e44a..57b53e31e44a 100644
--- a/dev-util/ccache/ccache-4.7.2.ebuild
+++ b/dev-util/ccache/ccache-4.7.3.ebuild
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 9237e39437ed..109c152adcaf 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,6 +2,6 @@ AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031
 DIST pkgcheck-0.10.16.tar.gz 495095 BLAKE2B 361d0619454cd25a9b50d837e39501ad7065a0f4f04a7abfa0a24788800247d417d0dfdf0f94d45be1a224564c09b849c4fd111ce38646dfc7e7a6c41fee9470 SHA512 976acd7c8cc4dae9fb486d8ab9d3903286fa0050db43a402dc70e6287daa8613fdf107cd4aa51bb74820aab1e4d9585e9d574ce1c335a118340d7148c793667c
 DIST pkgcheck-0.10.17.tar.gz 497163 BLAKE2B 600b51c5c034356fcfbbbb741681e7e304ccf14b9390207305d35c48dff7675e808101fa76f6a4ce250691b2fd99deae7d59cc91560d609c1a2c3d7421859849 SHA512 3539d877b63e739877f79340ff59c3592f43ac9e00b507ab63d7afc2bb3eaa32f863e7cc8029c5a05bcf7068de70fd3149447054f0d9d304d4e3548a0a25d676
 EBUILD pkgcheck-0.10.16.ebuild 2197 BLAKE2B 1cef589de0990ab73811621f418bae99ae69f8b2e1837525ff580742f96ee93c3c06d1c76afefa967830421a4b355452ebd050c6588e3c6bd386d46bc727efae SHA512 3ca911a33b0808cf35a77fd28905f39816dac6237f35bf9438a8860250bba80747beaa048bb70cfdb90a6d20ae5c11f87eb6ac47861d458e343d69b65d292996
-EBUILD pkgcheck-0.10.17.ebuild 2260 BLAKE2B 5004efe4de17aeb4812b62a512c6ba8ee2e12c6d63904b8ebf8b38411ad3c88bc20f94d7638e66c0bb57e15df68a927670456bc634aefb12aa64e3d3c18bd517 SHA512 4c9744cf7b5fefb95e36b5ff9937ee8d3f0b027db272862463d8e06e1714b96fcdb7af0ea2f0133f23e68c3a82ef5641f8220fe3408ee5d2ccbf31b757c6c810
+EBUILD pkgcheck-0.10.17.ebuild 2256 BLAKE2B 478e5ac7b887f585449c7045ba05aa3d1a5fdca32d95f5df2797c36add6abc40e09042a70f99f5105e4a566d2604dd73c9392bb04da417e92738598691a97c51 SHA512 9d3a5d2f45cd48210a7eb146d60ebbe975202a0d82b2abbafd63a06c781f0ed66c9084102de590994e97cf602609074d55cf9159d82ed876dd80901ae42ed7cf
 EBUILD pkgcheck-9999.ebuild 2264 BLAKE2B 2afd642fb511e06a914ff94ce59120ed77accca4ea09c76d9fd6dc7939205b0cff46d706a35101817e3d99aa8a977a8b5db78b0fbd19e8740273d7e314afb035 SHA512 78e559b2ecc15c56d1abec0708de1a5042b9643811fee0fa765773060e8b593eb0a8f72af1d97101289a14c5c93bfd03044187df49db69ff02fda5ca685278f9
 MISC metadata.xml 431 BLAKE2B d7d5cd3611d661ef181be38b7087169cd7a73351e54a5e5630915666a81e62761f6b797e255fb7e3172d0135e1a076045ec3727ed6bc9f6d741b5dc63090307c SHA512 8635c9e2b28a5477209d5c3d3a4daf8bbe7a876d1d43bcd0cad30d28155e2cb98c9ca3880418f58bd9ff536e210ae379c3477f2ccdfa3cae409b2b978eb14c64
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
index fe4e443927ba..6caa77b54c59 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
index 4d6f61c3aa35..320ba9fcbb1b 100644
--- a/dev-util/unicorn/Manifest
+++ b/dev-util/unicorn/Manifest
@@ -1,5 +1,7 @@
 AUX unicorn-2.0.0-lto.patch 2165 BLAKE2B 5858b3d7daf1f3654271d974f04836baa1c89a8204317c37b043e44f1c9005c2e4d1207308db253e2463f0c0b5ec2d59ef1717d941ad35feeab8c94b9518d3f5 SHA512 bd3f7e281f6c064b08dde128453da5db41ddd673fca53975a9e80a2ffe5f5fa05f5826f5027a7662ef11182e3f77680aa357341e0cbe085943047ed280af8d75
 DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789
+DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f
 EBUILD unicorn-2.0.0.ebuild 1749 BLAKE2B 964761d8c139fe79c8549715fefa2ed7a8f33928cec4eef2246143b3d690e4a2dcaec8a74cdf5c69b6da33aa1ded0958b56bf157ce355c943d090c3051860879 SHA512 5ac8715ced8967784293087a71203c12ec5dd7292ae4f2d764b90af3cf7591ba22b91935d39c873dafba670b8093cbc9b0d4485dd3dd716817f04f20c2cc56cb
+EBUILD unicorn-2.0.1.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 EBUILD unicorn-9999.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 MISC metadata.xml 510 BLAKE2B 857f3ee3645ffdb28846b7305ec3066ddf49934225fe2c173a5a6b5b8354b208b6bb1337c2e11713b7c983a6fe3a1e67dae62bf64b0c9228f14ccfea8d57d5c5 SHA512 e1da17744042b95f11fb8b5f562020738c7495b0256469420cfa19fda995a24f02e806f67db8521e2f4a19a32825bf54a0865ec723d853cd5aa440c42b007946
diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild
new file mode 100644
index 000000000000..34777b117a28
--- /dev/null
+++ b/dev-util/unicorn/unicorn-2.0.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_/-}
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake distutils-r1
+
+DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
+HOMEPAGE="https://www.unicorn-engine.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
+else
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1"
+SLOT="0/2"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+BDEPEND="virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )"
+
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
+
+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 || die
+	fi
+}
+
+src_prepare() {
+	# Build from sources
+	rm -r bindings/python/prebuilt || die "failed to remove prebuilt files"
+
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DUNICORN_ARCH="${UNICORN_TARGETS// /;}"
+	)
+
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+
+	wrap_python ${FUNCNAME}
+}