5 files changed, 112 insertions, 3 deletions
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index c3d476e4b7b8..1cdc6c594038 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1 +1,2 @@
 DIST cvise-2.8.0.tar.gz 269582 BLAKE2B fe0f0d4e63ec7c69b209b8be1f3fd160a2573b9bfc555a3bb5caec5c818c8251569103e71509d194e0effc86c09420cf523393686dd412660acde1e85ebffb67 SHA512 7e2dee2001aacb96cf5ffdb62047d229e23273fd26f34648e23ab4374bf6cae149f13db529494ce8d2d16555a0d2143487923c57f4b303b0ab1f678ffcff6f6e
+DIST cvise-2.9.0.tar.gz 269921 BLAKE2B d3b491316ea4ec5b623eeba0131f31edb421635508786a04868394c9bdc62c4510c34bd30095c5b034fa66ec5f8f6f78bb762e17f1c534ba137eb469544ddafe SHA512 dd3b2e5c4603e8a73594863ce5b83d0ca864fc688a7b094c84b745b7086d384173809b9a915edb51938a7df8310eabbde1ea6a997c480d19618065c0d8270c52
diff --git a/dev-util/cvise/cvise-2.9.0.ebuild b/dev-util/cvise/cvise-2.9.0.ebuild
new file mode 100644
index 000000000000..b712c10abb97
--- /dev/null
+++ b/dev-util/cvise/cvise-2.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=17
+DEPEND="
+	|| (
+		sys-devel/clang:17
+		sys-devel/clang:16
+		sys-devel/clang:15
+		sys-devel/clang:14
+	)
+	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' -e '/CMAKE_CXX_FLAGS_REL/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
+
+src_install() {
+	cmake_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/cvise
+}
diff --git a/dev-util/cvise/metadata.xml b/dev-util/cvise/metadata.xml
index 4207c6f887e3..ae7a70b1efcc 100644
--- a/dev-util/cvise/metadata.xml
+++ b/dev-util/cvise/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>mgorny@gentoo.org</email>
-  <name>Michał Górny</name>
+ <maintainer type="project">
+  <email>toolchain@gentoo.org</email>
+  <name>Gentoo Toolchain Project</name>
  </maintainer>
  
  <origin>gentoo-staging</origin>
diff --git a/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch b/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch
new file mode 100644
index 000000000000..c546a4dc2e9b
--- /dev/null
+++ b/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/909738
+https://github.com/NixOS/patchelf/pull/529
+Note this has removed the unit test changes because it involves adding a binary
+file which is not supported in portage for now, see
+https://bugs.gentoo.org/835964
+
+commit dbc9aeaadfd982b2d8a04eb74cbcecb83208844d
+Author: matoro <matoro@users.noreply.github.com>
+Date:   Sat Nov 4 20:01:22 2023 -0400
+
+    Fix page size on Alpha
+    
+    All tests pass.
+    
+    Also explicitly specifies -no-pie for executables which should have it
+    disabled, to be compatible with gccs built with --enable-default-pie.
+
+diff --git a/src/patchelf.cc b/src/patchelf.cc
+index b42111d..b4d4a7d 100644
+--- a/src/patchelf.cc
++++ b/src/patchelf.cc
+@@ -367,6 +367,7 @@ unsigned int ElfFile<ElfFileParamNames>::getPageSize() const noexcept
+     // requirements. There is no authoritative list of these values. The
+     // current list is extracted from GNU gold's source code (abi_pagesize).
+     switch (rdi(hdr()->e_machine)) {
++      case EM_ALPHA:
+       case EM_IA_64:
+       case EM_MIPS:
+       case EM_PPC:
diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index 19d9351a66a2..d5a6cabb6087 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-glibc-dt-mips-xhash.patch
+	"${FILESDIR}"/${PN}-0.18.0-alpha.patch
 )
 
 src_prepare() {