diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml
new file mode 100644
index 000000000..6056db96c
--- /dev/null
+++ b/dev-util/unicorn/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="unicorn_targets_x86">Use the x86 architecture</flag>
+		<flag name="unicorn_targets_m68k">Use the m68k architecture</flag>
+		<flag name="unicorn_targets_arm">Use the arm architecture</flag>
+		<flag name="unicorn_targets_aarch64">Use the aarch64 architecture</flag>
+		<flag name="unicorn_targets_mips">Use the mips architecture</flag>
+		<flag name="unicorn_targets_sparc">Use the sparc architecture</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/unicorn/unicorn-1.0.2_rc2.ebuild b/dev-util/unicorn/unicorn-1.0.2_rc2.ebuild
index b2c432ef3..af5bf6591 100644
--- a/dev-util/unicorn/unicorn-1.0.2_rc2.ebuild
+++ b/dev-util/unicorn/unicorn-1.0.2_rc2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_PV=${PV/_/-}
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit multilib distutils-r1
 
 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~m68k ~arm ~arm64 ~mips ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~sparc ~x86"
 IUSE="python static-libs"
 
 IUSE_UNICORN_TARGETS="x86 m68k arm aarch64 mips sparc"
@@ -22,9 +22,9 @@ use_unicorn_targets=$(printf ' unicorn_targets_%s' ${IUSE_UNICORN_TARGETS})
 IUSE+=" ${use_unicorn_targets}"
 
 DEPEND="dev-libs/glib:2
+	virtual/pkgconfig
 	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	virtual/pkgconfig"
+RDEPEND=""
 PDEPEND="dev-libs/unicorn-bindings[python?]"
 
 REQUIRED_USE="|| ( ${use_unicorn_targets} )"
diff --git a/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild b/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild
index 3b521f480..4256d7362 100644
--- a/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild
+++ b/dev-util/unicorn/unicorn-1.0.2_rc3.ebuild
@@ -25,10 +25,9 @@ REQUIRED_USE="|| ( ${use_unicorn_targets} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="dev-libs/glib:2
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
 	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} )"
+	${PYTHON_DEPS}"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"