gentoo resync : 17.02.2020

5 files changed, 4 insertions, 137 deletions

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 5a0899b7f640..b304cb160331 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -5,9 +5,6 @@ AUX capstone-4.0-double-DESTDIR.patch 307 BLAKE2B 91fad2475b7289311c8eeceaec962a
 AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df449ea6a8fe9e6e58c43438f37c63edce46d4f64db953322ac74c54fc1077f35b0d86d732685533cfe7d495a235afebc40ef SHA512 2abc022678214a09869c728e1cb83a4a69213d977d1ad752cda415e5861b83d4af2ca2fa80377dee1322d8bfad6fb5d1d12e23cdc30285ebe83c3eca91110279
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362 SHA512 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
-DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
-EBUILD capstone-3.0.5_rc2-r1.ebuild 1437 BLAKE2B ae4c1737e5371dfa688a5fa8926f27d696e660d825c2e3b5acb8e4231da4804859f4a72cb08eaf8d997b15ad9e09fe818641f9d15e50633db1e5f6f94c7e5786 SHA512 a1c46de9984c0726737cbbab900bd80afe548b56a33c18c34ff7b6a8fad8730eb9f3d81b56b7fa38b0f32389458407dc459006362f958bf1b1946a8e9647f472
-EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
-EBUILD capstone-4.0.1.ebuild 1643 BLAKE2B 592c6ffb2f204e8c49fcfc094346e6c5716f96d146f9a7bad5e19ed088127fd8845c2de9bf625288bc1678ab6c0e3a1f4aa5c35c8f9fd3ae9f1d5e87c672caf1 SHA512 f6babd7599bfa1469f28f896512fb1c7fdfe04408a5bb22ed2e0bd1f68f7309e4faf07cece7f7dfe65210f541dd2789796577b2876886a82ea143c8f97b6b6bd
-EBUILD capstone-4.0.ebuild 1504 BLAKE2B f9429a6dceaff0dc031421d81f30ff77f918a18516bfe9e997eac3524c55b4b99a326219652c3f5976e7c0f6f8d1d2dff5aa1c0c2735e0cdbb8a6bc412621941 SHA512 e81f9992cc537ef98c16849e4b19ad20d6eee4d368a6382a330cb0cb0078fac69a436e18d4678c3cc2878f5081a3db42e1f5bdc6a20131369272a013514a86dc
+EBUILD capstone-3.0.5_rc2-r1.ebuild 1433 BLAKE2B 51bc4a73591d107c2d00a92aca7e09bd8ede53015619488ae813f1d7cc91945751ff40040298300368fc234087afbf86bae61f22ee0d924459584ca6a2eb1045 SHA512 26c1dabbc29f8ac8e5a0f0730d5ed3f690126f3efc06fe0a4da5703afe2162abc0b243cf6f1eef65abd2310f1ffa9315a4d015e3d67641b0acea0501738696eb
+EBUILD capstone-4.0.1.ebuild 1639 BLAKE2B faa0dd154c884f9e4074a8a6111e656df160c165b1ead2abb96d9005eb7353442861d4c0232a1a6b2be3d378128c5ca7eb94c41a5a8b4ec1a78ca6c7c91042b8 SHA512 d611934bcc6f3d0faee23835917c1b66cd7d65c1f737ff496810a8d9c47cba0323313fe0047c09b09bfed0f6ea557573f94b84aca468d2d25371faef208e8429
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index 6407273eaf65..b3ee45ea8df2 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-3.0.5_rc2.ebuild b/dev-libs/capstone/capstone-3.0.5_rc2.ebuild
deleted file mode 100644
index 80fb03207d64..000000000000
--- a/dev-libs/capstone/capstone-3.0.5_rc2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3" # libcapstone.so.3
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2017-6952.patch
-	"${FILESDIR}"/${P}-FLAGS.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-src_configure() {
-	{
-		cat <<-EOF
-		# Gentoo overrides:
-		#   verbose build
-		V = 1
-		#   toolchain
-		AR = $(tc-getAR)
-		CC = $(tc-getCC)
-		RANLIB = $(tc-getRANLIB)
-		#  toolchain flags
-		CFLAGS = ${CFLAGS}
-		LDFLAGS = ${LDFLAGS}
-		#  libs
-		LIBDIRARCH = $(get_libdir)
-		EOF
-	} >> config.mk || die
-
-}
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.1.ebuild
index a7b6f1e60192..3f7e112a1071 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.ebuild b/dev-libs/capstone/capstone-4.0.ebuild
deleted file mode 100644
index 80f4a2016cfc..000000000000
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="python"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-FLAGS.patch
-	"${FILESDIR}"/${P}-no-fuzz-tests.patch
-	"${FILESDIR}"/${P}-double-DESTDIR.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-	if use python; then
-		pushd bindings/python >/dev/null || die
-		distutils-r1_${1} "$@"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-	{
-		cat <<-EOF
-		# Gentoo overrides:
-		#   verbose build
-		V = 1
-		#   toolchain
-		AR = $(tc-getAR)
-		CC = $(tc-getCC)
-		RANLIB = $(tc-getRANLIB)
-		#  toolchain flags
-		CFLAGS = ${CFLAGS}
-		LDFLAGS = ${LDFLAGS}
-		#  libs
-		LIBDIRARCH = $(get_libdir)
-		PREFIX = ${EPREFIX}/usr
-		EOF
-	} >> config.mk || die
-
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	default
-
-	wrap_python ${FUNCNAME}
-}