gentoo resync : 30.05.2020

3 files changed, 12 insertions, 128 deletions

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 25b71d275bd1..cf279342ef95 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -3,8 +3,6 @@ AUX capstone-3.0.5_rc2-FLAGS.patch 398 BLAKE2B 40cdebbdd64e057982af6d7b4cce44821
 AUX capstone-4.0-FLAGS.patch 418 BLAKE2B 425d12eeeca7d4ca2d350d0ec821c6861c0fd7df7021be44c3c371837ab27e22af83d0af1627ae6c920628619d780608863d6f4d41ec6f79a18ea37251b82915 SHA512 c423d0f827afd4b11979ac6fbf4f8972df10670dec113f4a08f1860229cd3e1c5b61f3f6fc7195f457f29eeb46580e18213e9195acae821ca57b63372af07564
 AUX capstone-4.0-double-DESTDIR.patch 307 BLAKE2B 91fad2475b7289311c8eeceaec962a9b1cf735cb13835de19eeed208a20c2b4f8b3cf59683ff72bc726b83ca41d696f3889b7019e2751d79c8d4fba48f736018 SHA512 92d839aad1a576ae550c618ffda3cd070419b72b105583f3861d47df0a57f29fbf8b4e1727c7768199fa650e1c734726f7cc8bd0ef913da336ed16d6d77feda4
 AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df449ea6a8fe9e6e58c43438f37c63edce46d4f64db953322ac74c54fc1077f35b0d86d732685533cfe7d495a235afebc40ef SHA512 2abc022678214a09869c728e1cb83a4a69213d977d1ad752cda415e5861b83d4af2ca2fa80377dee1322d8bfad6fb5d1d12e23cdc30285ebe83c3eca91110279
-DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-EBUILD capstone-4.0.1.ebuild 1639 BLAKE2B faa0dd154c884f9e4074a8a6111e656df160c165b1ead2abb96d9005eb7353442861d4c0232a1a6b2be3d378128c5ca7eb94c41a5a8b4ec1a78ca6c7c91042b8 SHA512 d611934bcc6f3d0faee23835917c1b66cd7d65c1f737ff496810a8d9c47cba0323313fe0047c09b09bfed0f6ea557573f94b84aca468d2d25371faef208e8429
-EBUILD capstone-4.0.2.ebuild 1639 BLAKE2B faa0dd154c884f9e4074a8a6111e656df160c165b1ead2abb96d9005eb7353442861d4c0232a1a6b2be3d378128c5ca7eb94c41a5a8b4ec1a78ca6c7c91042b8 SHA512 d611934bcc6f3d0faee23835917c1b66cd7d65c1f737ff496810a8d9c47cba0323313fe0047c09b09bfed0f6ea557573f94b84aca468d2d25371faef208e8429
+EBUILD capstone-4.0.2-r1.ebuild 1325 BLAKE2B 09988c2ae5ef6401220570c2ecee7ae39106a30c35489ee9330b078233e3551a05dde3ad82b3eae93007c4f279ad1910eedc1495ed68c58e37ed90079ab00c34 SHA512 02f30417e3de309847bd26ca97f5a3e1df99366f78d533a78e2d551a41e3d24b4ea1b5acf9e6c7cd6bb8025474c3016717432dc67265ab6bca880902d61de25c
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
index 3f7e112a1071..6de5971d2cdc 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit distutils-r1 toolchain-funcs
+inherit cmake-utils distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
@@ -18,18 +18,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RESTRICT="!test? ( test )"
 
-IUSE="python test"
+IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-FLAGS.patch
-	"${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
-)
-
 S=${WORKDIR}/${P/_rc/-rc}
 
 wrap_python() {
@@ -41,52 +36,35 @@ wrap_python() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	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
-
-	if ! use test; then
-		# Don't build tests if not requested: bug #663006
-		sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
-	fi
+	local mycmakeargs=(
+		-DCAPSTONE_BUILD_TESTS="$(usex test)"
+		-DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
+	)
+	cmake-utils_src_configure
 
 	wrap_python ${FUNCNAME}
 }
 
 src_compile() {
-	default
+	cmake-utils_src_compile
 
 	wrap_python ${FUNCNAME}
 }
 
 src_test() {
-	default
+	cmake-utils_src_test
 
 	wrap_python ${FUNCNAME}
 }
 
 src_install() {
-	default
+	cmake-utils_src_install
 
 	wrap_python ${FUNCNAME}
 }
diff --git a/dev-libs/capstone/capstone-4.0.2.ebuild b/dev-libs/capstone/capstone-4.0.2.ebuild
deleted file mode 100644
index 3f7e112a1071..000000000000
--- a/dev-libs/capstone/capstone-4.0.2.ebuild
+++ /dev/null
@@ -1,92 +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{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"
-
-RESTRICT="!test? ( test )"
-
-IUSE="python test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-FLAGS.patch
-	"${FILESDIR}"/${PN}-4.0-no-fuzz-tests.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
-
-	if ! use test; then
-		# Don't build tests if not requested: bug #663006
-		sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
-	fi
-
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	default
-
-	wrap_python ${FUNCNAME}
-}