gentoo resync : 21.06.2020

3 files changed, 120 insertions, 16 deletions

diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 0e7052b15ddf..6e4446dbecd3 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,5 @@
 DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
+EBUILD keystone-0.9.1-r1.ebuild 1989 BLAKE2B 8ce13f3d075df104c223f8c54d1e96a2dbf8723c5c830a2e644369dc77d95b05daeb2dade431df45d6c7334b749919ad7cc2df5ddce5d8c243a66cf2d553b2b7 SHA512 08d5158aa067724c075dc495f977e6f140d9ecb48fdf745db8d00e3cdeebf320cabda30b8c5623837f8998415bc3fc8fd3530c537de29290c1982e22078bad69
 EBUILD keystone-0.9.1.ebuild 1739 BLAKE2B ceaa4d25089477e82afa431e3f1563ea70b19cb5bc99e1cbe360052323b4ac95468a2fba4dfb5218cd8cbcf24112cd1a79afc8ca38f29289e2995c7a7abbba34 SHA512 84a30e655c0ed51a72ff01c70779c72d5e088d6803c242933c8bc05e6b1e19003f7668b3ec7d58672b85dbd06ac1b360cbd7530cd28aed561cdd511ffc323fdc
-EBUILD keystone-9999.ebuild 1710 BLAKE2B 23d9ac9184c1902d2fcb65333e14ced5fb1e546ea94b05c0d2744f69a672fb20c3da96896d8978cc61d375e50863242dbe1ee5c09ea88b1b4acf9e36c4aa4227 SHA512 8e9a1798073e3f8d3c96736128bab752002d484e6efff19e17af179ec53d2496f63cd0c34c43e98af19aea9494109f0411ade1b339355c78f1a863644a16bde6
+EBUILD keystone-9999.ebuild 1989 BLAKE2B 8ce13f3d075df104c223f8c54d1e96a2dbf8723c5c830a2e644369dc77d95b05daeb2dade431df45d6c7334b749919ad7cc2df5ddce5d8c243a66cf2d553b2b7 SHA512 08d5158aa067724c075dc495f977e6f140d9ecb48fdf745db8d00e3cdeebf320cabda30b8c5623837f8998415bc3fc8fd3530c537de29290c1982e22078bad69
 MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
diff --git a/dev-libs/keystone/keystone-0.9.1-r1.ebuild b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..a4863b0bced5
--- /dev/null
+++ b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake distutils-r1 llvm
+
+DESCRIPTION="assembly/assembler framework + bindings"
+HOMEPAGE="http://www.keystone-engine.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+IUSE="python ${ALL_LLVM_TARGETS[*]}"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	<sys-devel/llvm-11:=
+	|| (
+		sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}]
+		sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
+		sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	|| ( ${ALL_LLVM_TARGETS[*]} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i '/NOT uppercase_CMAKE_BUILD_TYPE MATCHES/ s/DEBUG/GENTOO|DEBUG/' \
+		llvm/CMakeLists.txt || die
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+	)
+
+	cmake_src_configure
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index dba275576bed..a4863b0bced5 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_OPTIONAL=1
-CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils distutils-r1
+inherit cmake distutils-r1 llvm
 
 DESCRIPTION="assembly/assembler framework + bindings"
 HOMEPAGE="http://www.keystone-engine.org/"
@@ -18,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -30,19 +29,28 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 IUSE="python ${ALL_LLVM_TARGETS[*]}"
-RDEPEND="sys-devel/llvm:=[${LLVM_TARGET_USEDEPS// /,}]
-	${PYTHON_DEPS}
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	<sys-devel/llvm-11:=
+	|| (
+		sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}]
+		sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
+		sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
+	)
+	python? ( ${PYTHON_DEPS} )
 "
+
 DEPEND="${RDEPEND}"
+
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
 	|| ( ${ALL_LLVM_TARGETS[*]} )
+	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 S=${WORKDIR}/${P/_rc/-rc}
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 wrap_python() {
 	if use python; then
 		pushd bindings/python >/dev/null || die
@@ -53,29 +61,32 @@ wrap_python() {
 
 src_prepare() {
 	default
-	cmake-utils_src_prepare
+	sed -i '/NOT uppercase_CMAKE_BUILD_TYPE MATCHES/ s/DEBUG/GENTOO|DEBUG/' \
+		llvm/CMakeLists.txt || die
+	cmake_src_prepare
 	wrap_python ${FUNCNAME}
 }
 
 src_configure() {
+	local libdir="$(get_libdir)"
 	local mycmakeargs=(
+		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
 		-DLLVM_HOST_TRIPLE="${CHOST}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 	wrap_python ${FUNCNAME}
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	wrap_python ${FUNCNAME}
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	wrap_python ${FUNCNAME}
 }