diff --git a/dev-util/capstone/Manifest b/dev-util/capstone/Manifest
index 6a5381b9a..e413ddca6 100644
--- a/dev-util/capstone/Manifest
+++ b/dev-util/capstone/Manifest
@@ -1,7 +1,4 @@
-DIST capstone-2.1.2.tar.gz 1366145 SHA256 5312ba5fc09fe193f7fc2fd6cbbc34b6ea7a7b002c0fd7acb2b38ee6c492fb9c SHA512 220d937b49a0716b633bc4ffe25c5db11812ec6343f76caa10fcd00f03507f636089d3ce90d5a0423a8b4d003a9f2f0cac16cb80908925393daa09f3d8449672 WHIRLPOOL fc2994b8bffc5a9f03ae4cecead1327e13b374e3e75b8c4f7dc2751be3a26d57420ed841d791543d664c26820d4a6ad433e440d63b404674e552ea0ba517cead
 DIST capstone-3.0.1.tar.gz 2782421 SHA256 f6de496ced7b4fd667e7ce97223f17a15e3d29d68abedd466f73690655cc4e2f SHA512 440cdca263a018b22acbd24298aee7be0f094bda507d4d930ac6994c3b9e3fd9fcac18011c3ae74b4aba75f921f0c497de5ac9749f41325ba78dd54e38dee65f WHIRLPOOL 99ecbe7fdb008a6076f4270569b167380400ac483e7b4661c791120da024cceb142bf61a9dc8e962d33e738fbadcaf966ac6b25c3e809738eb0a1a7042bebf8b
-DIST capstone-3.0.tar.gz 2779599 SHA256 e79f644eec7dd8757a8d06a2e59dd51c15c60461d84ea365ec0c8750f31ef38d SHA512 cf6efe3159e7abb54ea747dee91eb4b9be42f4acc245cefb034aa37cac63afe7aa15cfdf49c5a1a79448bdad5beed030d58bf9593bf1010436f416a7ff35cceb WHIRLPOOL ed2107307f82970dd361f2cc6df3c6142fc703655146f4eb301c12363b30ab04c78a9b2e8856c8aff2198a064ccb9e7d851347810bda3edfdd4415f7daae8b3e
-EBUILD capstone-2.1.2-r1.ebuild 1018 SHA256 4b4f41a9012f5f3382285b7b525f64380a0926475c98b8ab7f6173c2ce82e43b SHA512 350ac8486b30c578c804df7718cebb060337d958e756188690897262c5eefe99097f4f0a7625b9af5671a22f56f823741388ce564b53c11a193417557457374d WHIRLPOOL 4b11b9d6866d5168d253545ac96a53d9681c8a15cda01df39ee351d2a0f373f63a17be52af5d0063c87cd9c9fe2484070264aac2b002ce7810d0c25745306a52
-EBUILD capstone-2.1.2_p20140711.ebuild 1098 SHA256 a49857451aeb770e7eb2ea67b4b0b7814341207538f7bf35f004bae4205e7e3b SHA512 de8dd2390c7084a3e616d5be29f2f2e2008fa6ace19c4e9d68f4936bec0a4c57eef69c78569d04e7ae285d1ba396d065171acb03e3f5fa8578fdd728b1e9313c WHIRLPOOL 918c69e91374f29742873de0b48b90d10021640b1a56570164341314f2eba25442c5edd3fd8c34b34670cdc8a90eba12fc2e4cdc9888fd6e0c4f481b9c398b38
+DIST capstone-3.0.2.tar.gz 2789288 SHA256 4505a33a04f5172e3ad667ab6bf045e2aa16d7fdb990483b08ce0a9599bae18b SHA512 931259ef9d2972f175a8594c0bca2788e6f0b792b415b3dffce6357dd0c7720c67df933994c26236a52d47845e39af1d99c5e2384a5da0d224c94bda523e92bd WHIRLPOOL 51ad8e312109d801ac6d66f832bd63cac4c9b2d97d4417451ba6eab9efb15963576cf488f90da25ce61ed15c4e2bc4c2ac2beeb877f14135c1af4063b7afefce
 EBUILD capstone-3.0.1.ebuild 816 SHA256 dd2fbb9cb40eeabfa0fb069e19d50bb196e958ba70813c661eec7ab7cd44c2c9 SHA512 d764143845a410dc48564e523b8a37584923931522e7a2e3949e9586e2249a6981d9a678b50c2791c32c6fafdf3172df2d026a4c8ee30908ab767fea9330545b WHIRLPOOL 6b2d5f152597a69a7d990f16488a275fe44b6d9971bd3c42186832f27d8c279d158d15b319e0a6da0f1565ccce3ecd4c44bd3708e68f5c221e413393c4c404f4
-EBUILD capstone-3.0.ebuild 816 SHA256 dd2fbb9cb40eeabfa0fb069e19d50bb196e958ba70813c661eec7ab7cd44c2c9 SHA512 d764143845a410dc48564e523b8a37584923931522e7a2e3949e9586e2249a6981d9a678b50c2791c32c6fafdf3172df2d026a4c8ee30908ab767fea9330545b WHIRLPOOL 6b2d5f152597a69a7d990f16488a275fe44b6d9971bd3c42186832f27d8c279d158d15b319e0a6da0f1565ccce3ecd4c44bd3708e68f5c221e413393c4c404f4
+EBUILD capstone-3.0.2.ebuild 816 SHA256 dd2fbb9cb40eeabfa0fb069e19d50bb196e958ba70813c661eec7ab7cd44c2c9 SHA512 d764143845a410dc48564e523b8a37584923931522e7a2e3949e9586e2249a6981d9a678b50c2791c32c6fafdf3172df2d026a4c8ee30908ab767fea9330545b WHIRLPOOL 6b2d5f152597a69a7d990f16488a275fe44b6d9971bd3c42186832f27d8c279d158d15b319e0a6da0f1565ccce3ecd4c44bd3708e68f5c221e413393c4c404f4
diff --git a/dev-util/capstone/capstone-2.1.2-r1.ebuild b/dev-util/capstone/capstone-2.1.2-r1.ebuild
deleted file mode 100644
index ad498bc17..000000000
--- a/dev-util/capstone/capstone-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv$
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="A lightweight multi-platform, multi-architecture disassembly framework"
-HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/capstone/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="python"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="python? ( ~dev-python/capstone-python-${PV} )"
-DEPEND=""
-
-#TODO: add java and ocaml bindings
-
-src_prepare() {
-	#upstream bug: https://github.com/aquynh/capstone/issues/92
-	sed -i '/$(MAKE) -C tests/d' Makefile || die "sed failed"
-	sed -i '/$(INSTALL_DATA) lib$(LIBNAME).$(EXT) tests/d' Makefile || die "sed failed"
-}
-
-#Do not compile tests/* files. Let users do it
-#src_compile() {
-#	emake
-#	cd tests
-#	emake
-#}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /usr/share/"${PN}"/
-	cp -R "${S}"/tests "${D}/usr/share/${PN}/" || die "Install failed!"
-	dodoc README
-}
diff --git a/dev-util/capstone/capstone-2.1.2_p20140711.ebuild b/dev-util/capstone/capstone-2.1.2_p20140711.ebuild
deleted file mode 100644
index 5d51ccab6..000000000
--- a/dev-util/capstone/capstone-2.1.2_p20140711.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv$
-
-EAPI=5
-
-inherit eutils multilib git-2
-
-DESCRIPTION="A lightweight multi-platform, multi-architecture disassembly framework"
-HOMEPAGE="http://www.capstone-engine.org/"
-#SRC_URI="https://github.com/aquynh/capstone/archive/${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aquynh/capstone.git"
-EGIT_BRANCH="next"
-EGIT_COMMIT="aa791a2f48383d024bcfbae1542f5f2d05b27642"
-
-#IUSE="python"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-#RDEPEND="python? ( >=dev-python/capstone-python-${PV} )"
-RDEPEND=""
-DEPEND=""
-
-#TODO: add java and ocaml bindings
-
-src_prepare() {
-	#upstream bug: https://github.com/aquynh/capstone/issues/92
-	sed -i '/$(MAKE) -C tests/d' Makefile || die "sed failed"
-	sed -i '/$(INSTALL_DATA) lib$(LIBNAME).$(EXT) tests/d' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIRARCH=$(get_libdir) install
-	dodir /usr/share/"${PN}"/
-	cp -R "${S}"/tests "${D}/usr/share/${PN}/" || die "Install failed!"
-	dodoc README
-}
diff --git a/dev-util/capstone/capstone-3.0.ebuild b/dev-util/capstone/capstone-3.0.2.ebuild
similarity index 100%
rename from dev-util/capstone/capstone-3.0.ebuild
rename to dev-util/capstone/capstone-3.0.2.ebuild