gentoo auto-resync : 26:04:2023 - 00:13:39

3 files changed, 115 insertions, 13 deletions

diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 48bb90370b51..33ab8f3fcae5 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,5 @@
 DIST keystone-0.9.2.tar.gz 4433222 BLAKE2B 5654ae6a66ccf6832fbdbb8c1083a2318e413bb833a0fadc4e1374f0de601e3dad9f354b1dec92d9a944621923458e432510299c1b55579ac9bb6b6e90a818de SHA512 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
 EBUILD keystone-0.9.2-r1.ebuild 2105 BLAKE2B ff6380e12d9d2c272f9a0b7a859b238e650770700bd07ccb04402ccbbb5be2c8fb0449fd99dc333c539103ed2f1051bc8bedf149011bba7fb4c63b7000db7e91 SHA512 f0d02b371070aa431da940164743fadf9b8af83e5bd53937192568675ae01c173f2fbbdc0361c61633aa500415cd8f051fa4227697b617270b69e48aa17bbfff
-EBUILD keystone-9999.ebuild 2095 BLAKE2B b48f0c965e33bcf51249d748f6df27328193ec65cb7b0c3c2ba2f0dbc00b90a2ae39cd17a78943aa6006c57db7ecc724ab682c66113dd30f9b66ed0bee6d133c SHA512 f979113e30dfcabda4d5e2eba06f454a4a04508a544f3aa13585b852c276e9150a868bedb2442005573f1726d14ee4909a4643f2d114c0658375260836b0fac8
+EBUILD keystone-0.9.2-r2.ebuild 1920 BLAKE2B dd9200bd7dfe335c983645f0372590d2868652462d5d1c5b90cc1a4f1a27f35c44d3b1bf7ae8aa81b32ccbb6b87a2ef89e6b98901048fd24823f784e47691f7f SHA512 2a7cc6c45d5556fc15d9eb0409516601c0c2e7b5361ff81880620dda1b82eb7be487c46e404e205b1272dfeee8d781d8a9c754af4098f956d51a09b7244eee65
+EBUILD keystone-9999.ebuild 1922 BLAKE2B 1a8a82602ed33c231f1708e89e0c907ed86218359baa15585e33008b1f261de7bed1315033dc547329429e56ab6923ba53df09c4c0f305c1e8d877e832bf4c70 SHA512 a9e71f58e0fe54e7920808af37ea73db211a7f5e72a62ce1ff00b721e4fd5da7bd4a2fd11d6d4035be312b8256d19fb6e8d18ad058fc2cd5fe7ed63904bb09e3
 MISC metadata.xml 500 BLAKE2B 4b4e43ac4694c90c31773bede3c829801ab8ac33709a750bf574b3b4808fdb2ab10c655f16a6b19afbd9981eda154cf2fe40f62c0ade3457bad30fe013b37e38 SHA512 8380f6fbc99e23fbdcc5e820207b63082c903d5b41ff91a899acb1d6a6262eba63a17e4f930b8b56a6be1cb301b0605cc1a4413d62764208416017d520206785
diff --git a/dev-libs/keystone/keystone-0.9.2-r2.ebuild b/dev-libs/keystone/keystone-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..7298fa032259
--- /dev/null
+++ b/dev-libs/keystone/keystone-0.9.2-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake distutils-r1 llvm
+
+DESCRIPTION="assembly/assembler framework + bindings"
+HOMEPAGE="https://www.keystone-engine.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+fi
+S="${WORKDIR}"/${P/_rc/-rc}
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Keep in sync with llvm/CMakeLists.txt
+KEYSTONE_TARGETS="AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86"
+
+IUSE="debug python"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python?
+	(
+		${DISTUTILS_DEPS}
+		${PYTHON_DEPS}
+	)
+"
+
+RESTRICT=test # only regression tests
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Upstream doesn't flag patch releases (bug 858395)
+QA_PKGCONFIG_VERSION="$(ver_cut 1-2)"
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+pkg_setup() {
+	python_setup
+}
+
+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="${KEYSTONE_TARGETS// /;}"
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+
+	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 a6f8dcdd8897..aec73814fd16 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_MAX_SLOT=14
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake distutils-r1 llvm
@@ -17,31 +18,33 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 S="${WORKDIR}"/${P/_rc/-rc}
 
 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[@]/%/?}
+# Keep in sync with llvm/CMakeLists.txt
+KEYSTONE_TARGETS="AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86"
 
-IUSE="python ${ALL_LLVM_TARGETS[*]}"
+IUSE="debug python"
 
 RDEPEND="
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[${LLVM_TARGET_USEDEPS// /,}]
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	python?
+	(
+		${DISTUTILS_DEPS}
+		${PYTHON_DEPS}
+	)
+"
 
 RESTRICT=test # only regression tests
 
 REQUIRED_USE="
-	|| ( ${ALL_LLVM_TARGETS[*]} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
@@ -75,7 +78,7 @@ src_configure() {
 		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
 		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_TARGETS_TO_BUILD="${KEYSTONE_TARGETS// /;}"
 		-DLLVM_HOST_TRIPLE="${CHOST}"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)