gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 16 insertions, 103 deletions

diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index e3d6789647b2..086ea33029a3 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,6 +1,6 @@
+AUX keystone-0.9.2-gcc15-cstdint.patch 295 BLAKE2B 9ae77b7ed9d8387db86a26834313d53ce7788efd7dd2692e86943dfe1edb2a83e57ca73a4e8a97fadc04c301f09466e460e26d8e2986abe8445bfb3033448bee SHA512 9e6184ab0d1cd8d15a127a277044605948df14cffd6dd80bb3119aa1b65816677ba747ccac181df775e013711e7723719987bb3fec18d2884c61ab15349e22e9
 AUX keystone-0.9.2-strict-prototypes.patch 5380 BLAKE2B fa7f3c5ab895fbde2b92d5b09ba74d900c502ee09d201a8d63bc9f68f173d93393f57c3358292f769006a3b1b694f519b5ce0efce0082ac651ed1620343ed593 SHA512 617c7ddefed76a51b19bbb2b3c89a34898fcf0aece01daa50b4d6f1779e3994be67b4c58cc54630de92f29baca2d36daeee7dc793b99de73111b26847d6bcb7f
 DIST keystone-0.9.2.tar.gz 4433222 BLAKE2B 5654ae6a66ccf6832fbdbb8c1083a2318e413bb833a0fadc4e1374f0de601e3dad9f354b1dec92d9a944621923458e432510299c1b55579ac9bb6b6e90a818de SHA512 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
-EBUILD keystone-0.9.2-r2.ebuild 1910 BLAKE2B d3314f0f8c04733dab8bd54ae12dedd6eecf914005404563551f784844ade93f5ca8da5637ef66c9f33067e3204333a3443bc5ae8fa935a5097f4708b4ea4951 SHA512 35e8dbacc61b0a936d58f417c4d7c26ce9a51a443801a914bb6e101eeb6ca36d8fa3185110852b26f97b67c0014ba0298406fe3bec600d87ec2b20eb3171a183
-EBUILD keystone-0.9.2-r3.ebuild 2031 BLAKE2B f5353187600811bd028c28fb4bfdb743323d8f0e416a9c2ead19544bb4f84bc75c8d03d84632ebdd8eda0334feddfb304fd40ea995b6c1d4a186fe9b0e20b3b7 SHA512 e90ca0c0114b9e866c6a126a8ba5c69173cb5ed04a4418151cbddc172ba21317360c2b0c4cc2dea0d00ef9110b3d15646b724c3e5a2ce4926a7734180746eb46
-EBUILD keystone-9999.ebuild 1976 BLAKE2B 054695140aa4fb1435c7eee5de34e3e7a46a34b2fc491ba52cd7d920c7720cb08e1e495df93101701329ef8520bd012a2bd17118048ff7e4cbdddd2058f46d9c SHA512 ec1fbdaeb73a5ca021bc02123a13329f2df62da13e618302d9830a1826d2d4c6e46acd39e7f88270bbe03054c564d5f801a6e792ad97be6c4e244b12aaaac060
+EBUILD keystone-0.9.2-r3.ebuild 2078 BLAKE2B 564b9a76987ee665356aba888411a19b383bd414f97f74bdc796380cc5bf98d037b499acead10a69411e92fd5e6b9514fda24e796ee86a6c360feef1d4482804 SHA512 1a5355c6eae40fb0c66148e04f7e45c772237b5695cbd26031e472c400a446c5acabc6a1c44d8e988d33724111c33a3fb474facafac20d5f9fd1a87a83bd290e
+EBUILD keystone-9999.ebuild 1976 BLAKE2B 1263fc24349cda80f9016d732bffeb3b3e78c1615bb3ac0f0519dff3dcd0f9fd772d65dd30dd4c4018086a4952ceb41849ae524ee3fcf0b8b69cca76b041bcf9 SHA512 c31dcfe6f0c78dabbab19fdf152cbf165dbf256e71b9aa5b13cc62570e22366653b0053d185d558c4f7356ae94dbc9b18396e58e0efe3eea4194f90e0608d736
 MISC metadata.xml 500 BLAKE2B 4b4e43ac4694c90c31773bede3c829801ab8ac33709a750bf574b3b4808fdb2ab10c655f16a6b19afbd9981eda154cf2fe40f62c0ade3457bad30fe013b37e38 SHA512 8380f6fbc99e23fbdcc5e820207b63082c903d5b41ff91a899acb1d6a6262eba63a17e4f930b8b56a6be1cb301b0605cc1a4413d62764208416017d520206785
diff --git a/dev-libs/keystone/files/keystone-0.9.2-gcc15-cstdint.patch b/dev-libs/keystone/files/keystone-0.9.2-gcc15-cstdint.patch
new file mode 100644
index 000000000000..ba053db30040
--- /dev/null
+++ b/dev-libs/keystone/files/keystone-0.9.2-gcc15-cstdint.patch
@@ -0,0 +1,10 @@
+--- a/llvm/include/llvm/ADT/STLExtras.h
++++ b/llvm/include/llvm/ADT/STLExtras.h
+@@ -21,6 +21,7 @@
+ #include <algorithm> // for std::all_of
+ #include <cassert>
+ #include <cstddef> // for std::size_t
++#include <cstdint>
+ #include <cstdlib> // for qsort
+ #include <functional>
+ #include <iterator>
diff --git a/dev-libs/keystone/keystone-0.9.2-r2.ebuild b/dev-libs/keystone/keystone-0.9.2-r2.ebuild
deleted file mode 100644
index 1ca6a8f4b3fe..000000000000
--- a/dev-libs/keystone/keystone-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 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_{10..12} )
-
-inherit cmake distutils-r1
-
-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="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-0.9.2-r3.ebuild b/dev-libs/keystone/keystone-0.9.2-r3.ebuild
index 0edae53eacbe..b6d645b0d8ee 100644
--- a/dev-libs/keystone/keystone-0.9.2-r3.ebuild
+++ b/dev-libs/keystone/keystone-0.9.2-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake distutils-r1 flag-o-matic
 
@@ -50,6 +50,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${P}-strict-prototypes.patch"
+	"${FILESDIR}/${PN}-0.9.2-gcc15-cstdint.patch"
 )
 
 # Upstream doesn't flag patch releases (bug 858395)
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index c1e7b73fa5d4..a44f6c75a455 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake distutils-r1 flag-o-matic