gentoo auto-resync : 10:02:2024 - 17:34:25

7 files changed, 12 insertions, 242 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index d518c365e542..d125cde785e4 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/lldb/Manifest b/dev-debug/lldb/Manifest
index 4d986bdae353..696f42ad4a63 100644
--- a/dev-debug/lldb/Manifest
+++ b/dev-debug/lldb/Manifest
@@ -4,19 +4,14 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0rc1.src.tar.xz 131969632 BLAKE2B 0cc2f3049a89ee07182189a1ff7aec1751bfe6bbaed4887e139854737fe4eb0ec924b37d8d5b01e298d6a4b271735a615283465262345d0a288180edd6276139 SHA512 85afc331c8a023f4d8177cc42143b968b94d6987a7ed38b8be1170c6b4e1ef1a79d2d4e44d5fae98b713959b5d69bd4e44c6ba84355f59e8fe99588cbca03d7a
-DIST llvm-project-18.1.0rc1.src.tar.xz.sig 566 BLAKE2B c9fd7e92e0c6bb8291314ed388d518d15b75c5d4e7ba5da461c2176c5519d721c5ae95d8ecf99ce17bdc398cf23f13b540aacab306c2923e4c0ac8a5f059746f SHA512 0bb072ef2d3156241bcb74102c977db73720f38918e1a0b2cbe6191b6884ce5750ed9f5af69575599bad840c0151a04f81ebc5194c4ce258cbd6516d6c26d9cb
 DIST llvm-project-18.1.0rc2.src.tar.xz 131993176 BLAKE2B 8df1e34a54214975efe1b9a649753a2dc20c04e3c763bd8648000f48dd18f27ccfdc597ff6e68e0f408310493dfa92f48c7eee53376501e8ebc3b7c614809c15 SHA512 b595bb5d029723fee4e8f8edeaddd6fdcd48d668f66f4239e3208fd19d3a3622e8e4f90ae3fa4b1216fca1621d6c6b6ebf4d99dec7febff2457d0ceb79e8617a
 DIST llvm-project-18.1.0rc2.src.tar.xz.sig 566 BLAKE2B c765549386a92883bd348d9be25a3c92b1e66a1bac71385ef99978ec2af413a7616a2d9699c57554d927f95b80a3584572557d26e3df16b2ff6678359d5fd6b0 SHA512 83bb4c133f34faec8a0109689ed7aa18222c9a803ba8c95c571a18e854726024f106a1c8e3a820020255c426b7fa8bda26789ff1546972e233fbe3e3ab3a8e91
-DIST llvm-project-1f13203029333ac99cc9844b8b6915aae3fc0902.tar.gz 205629630 BLAKE2B cd6c127bc7b63fffc4707863ab8a34e23371ce28878818723ba74d78a1be1b43c2f401fba7de2084f628f9418b7f0e7b9fe9c224b92dc44233cde2f5e3470333 SHA512 0b35754d6e8836267393d0d63effe04e1af5851b217252953ca3a75e7d71e32b1188991d34ff649f8c1cf2a1b49b844ca7e0704597655ffd37d151f4b9a0cf36
 DIST llvm-project-78b4e7c5e349d8c101b50affbd260eb109748f8f.tar.gz 207433034 BLAKE2B ab7189fe82b5a9309348b499130295b3057dbb263ad9c60b1748e4ea92be3a85f0160baa1408dde5516650994951d9f948223d2d6260492a07b07dde51a51ff9 SHA512 366ecb02720d2b550ebeca989abf74ca1c93b2585a95fa378f44edc6c3329ee4e1548f5fa2cf7a19e59bc817abe6cc8850841415227380114c59b58867959a5a
 EBUILD lldb-15.0.7.ebuild 2694 BLAKE2B 5580b30227d9aae638c3be427a243fd876928c4383b0cc6e19cf53833bf0c9863208f98bf4384486a32eb383e84c94ee376b295f7b37b6e98bf32a18246519a4 SHA512 2dcdd55c4fe52a66472802e1021f539e8fd841f219fa3fcee1fef5576c83b22476a131cf2ae1d83afc69c4fd6a54091d4703cf8f5f32eadcff00ffd77cd9ed96
 EBUILD lldb-16.0.6-r1.ebuild 2512 BLAKE2B 44f7f9e02f606ed242e08a222d6b5f8febb2f8595cfa1b4905f4efd5ec99ee50410dbfbed9c48b46355532cf97874891c6002d02f707024bd0688c81dc3108e5 SHA512 ea50ecc91efff01a6ef86a7d195a2edd4ccd8cff7bfe52f6f8625e6a66b1422e7a4993dcfa33e090fed03436d617ba8c392564dd3709e1bb4c5bcd742cef5dc8
 EBUILD lldb-16.0.6.ebuild 2642 BLAKE2B 89460fbcd7677bf6eb70ba4c8acd1c75013abb4d895a928c595f50ba7081ad4b55c5a4cbceac54f450eddf07202de13f15e4f4b2bb1b5b7b420e81fc2f5540d3 SHA512 a0360df5f0336e7d5ac025e7d393eb17cceb723f6864a2538d977b1e5c193f34353410d01c9b481709c9a44636ad5ffd37524a89f917c6a371d6938268047e7b
 EBUILD lldb-17.0.6.ebuild 2621 BLAKE2B e0623f3effe73330f820e81ea344fee4dfac72fff74ef9fa1398de5577574a956b2490ad841d2d9beeae0e93a9197be072214536c02866e775c67093aef0ee10 SHA512 0475eba1a9c1d2bab6955f7a56ef451ad3e9389f364647ef8cfea62469d95e99f2140a55c74c7a089042e946fc73a652e7dcd631414135fe7fadee332659aa7e
-EBUILD lldb-18.1.0_rc1.ebuild 2533 BLAKE2B b09c6580fee125285ae6cce9ea4927b4e5f10917ad38ca0a4381db9e74c3fb877ca92ba5f461d5dd2b8d4996e65ad64ce5fc6afaa8ed906f0072ad085e4d0814 SHA512 d85c836b27494ffa10f182eae682bfaeb8591ded293b5c3f20f5d0a10cc5430ea02677235aa504805dd434880a435e6158bffc2460b8a8cd7b0c3b3ea1094ffe
-EBUILD lldb-18.1.0_rc2.ebuild 2533 BLAKE2B b09c6580fee125285ae6cce9ea4927b4e5f10917ad38ca0a4381db9e74c3fb877ca92ba5f461d5dd2b8d4996e65ad64ce5fc6afaa8ed906f0072ad085e4d0814 SHA512 d85c836b27494ffa10f182eae682bfaeb8591ded293b5c3f20f5d0a10cc5430ea02677235aa504805dd434880a435e6158bffc2460b8a8cd7b0c3b3ea1094ffe
-EBUILD lldb-19.0.0.9999.ebuild 2533 BLAKE2B b09c6580fee125285ae6cce9ea4927b4e5f10917ad38ca0a4381db9e74c3fb877ca92ba5f461d5dd2b8d4996e65ad64ce5fc6afaa8ed906f0072ad085e4d0814 SHA512 d85c836b27494ffa10f182eae682bfaeb8591ded293b5c3f20f5d0a10cc5430ea02677235aa504805dd434880a435e6158bffc2460b8a8cd7b0c3b3ea1094ffe
-EBUILD lldb-19.0.0_pre20240127.ebuild 2449 BLAKE2B 33181192b806d4f86c330ebebb31c5509a0e2a66372dabe5f41bde66da210153c68e50358f46fd3f28ffb5fa734fdb2cf1da2fd3faae4c7d55bb71110362c916 SHA512 6175e13def56fafe7898118a8098d4e603c3a3b15fdc9baa39d8ce483ebd47b2d99350ab6a8b5484f8aee5d7580897a733d6b1927e6702545c2d125dfb22ba73
-EBUILD lldb-19.0.0_pre20240203.ebuild 2533 BLAKE2B b09c6580fee125285ae6cce9ea4927b4e5f10917ad38ca0a4381db9e74c3fb877ca92ba5f461d5dd2b8d4996e65ad64ce5fc6afaa8ed906f0072ad085e4d0814 SHA512 d85c836b27494ffa10f182eae682bfaeb8591ded293b5c3f20f5d0a10cc5430ea02677235aa504805dd434880a435e6158bffc2460b8a8cd7b0c3b3ea1094ffe
+EBUILD lldb-18.1.0_rc2.ebuild 2486 BLAKE2B ac97b3182cacd61e44d96bd18d14697ea440ff2814317b4e7eb39c73314f7edcda52b4feddb2b01eb7f737f6017c145650e2974bde3f2a351283a555fa4a7278 SHA512 91f6ddb4fda3581f7a6977a612a9467124cf7f8d70c9f184ee6a67f81cd5491f30c2e95b04f41529ee760408b319a2af300567ba82e05651d0582c5cf00597c0
+EBUILD lldb-19.0.0.9999.ebuild 2486 BLAKE2B ac97b3182cacd61e44d96bd18d14697ea440ff2814317b4e7eb39c73314f7edcda52b4feddb2b01eb7f737f6017c145650e2974bde3f2a351283a555fa4a7278 SHA512 91f6ddb4fda3581f7a6977a612a9467124cf7f8d70c9f184ee6a67f81cd5491f30c2e95b04f41529ee760408b319a2af300567ba82e05651d0582c5cf00597c0
+EBUILD lldb-19.0.0_pre20240203.ebuild 2486 BLAKE2B ac97b3182cacd61e44d96bd18d14697ea440ff2814317b4e7eb39c73314f7edcda52b4feddb2b01eb7f737f6017c145650e2974bde3f2a351283a555fa4a7278 SHA512 91f6ddb4fda3581f7a6977a612a9467124cf7f8d70c9f184ee6a67f81cd5491f30c2e95b04f41529ee760408b319a2af300567ba82e05651d0582c5cf00597c0
 MISC metadata.xml 495 BLAKE2B dec5cbc692a57ddb85bccb855d6e16893e6e851c6e3b3f321693fd7cb8bf930167976573d61bfca3c29dc667bb57c2c11669299bcc80d1da04fb53ea90ca1826 SHA512 6168aeac121fa7b3f19fe2590c4ad52eae959bfd3bebceebc64a54d254a29226d5424ab031f9730af9f574e3956119856d1ea2008b5d24721b346cf8f5ad7f9f
diff --git a/dev-debug/lldb/lldb-18.1.0_rc1.ebuild b/dev-debug/lldb/lldb-18.1.0_rc1.ebuild
deleted file mode 100644
index eb67407b87fc..000000000000
--- a/dev-debug/lldb/lldb-18.1.0_rc1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-debug/lldb/lldb-18.1.0_rc2.ebuild b/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
index eb67407b87fc..6d10771e220b 100644
--- a/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
+++ b/dev-debug/lldb/lldb-18.1.0_rc2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
+inherit cmake llvm.org llvm-utils python-single-r1
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -51,12 +51,9 @@ LLVM_COMPONENTS=( lldb cmake llvm/utils )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
 src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
diff --git a/dev-debug/lldb/lldb-19.0.0.9999.ebuild b/dev-debug/lldb/lldb-19.0.0.9999.ebuild
index eb67407b87fc..6d10771e220b 100644
--- a/dev-debug/lldb/lldb-19.0.0.9999.ebuild
+++ b/dev-debug/lldb/lldb-19.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
+inherit cmake llvm.org llvm-utils python-single-r1
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -51,12 +51,9 @@ LLVM_COMPONENTS=( lldb cmake llvm/utils )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
 src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
diff --git a/dev-debug/lldb/lldb-19.0.0_pre20240127.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240127.ebuild
deleted file mode 100644
index caf23a9a38ee..000000000000
--- a/dev-debug/lldb/lldb-19.0.0_pre20240127.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
index eb67407b87fc..6d10771e220b 100644
--- a/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
+++ b/dev-debug/lldb/lldb-19.0.0_pre20240203.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
+inherit cmake llvm.org llvm-utils python-single-r1
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -51,12 +51,9 @@ LLVM_COMPONENTS=( lldb cmake llvm/utils )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
 src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"