gentoo auto-resync : 20:08:2023 - 15:41:38

5 files changed, 132 insertions, 2 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 674d545d5e66..71ab07d63d3e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 696e496fdc17..44eeb9afb4b4 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -10,6 +10,7 @@ DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d57
 DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
 DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
+DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.6.ebuild 2665 BLAKE2B 75e985037a61bfd49b00214e9d31377f6862fd4e5bd1038d316c4b42ed99df48db2464da7a16358a05bd144abf6c2313cadd860cb0d4a815a179ee37f2ff0899 SHA512 6d4ca2fe6f8c76170c6d70304a711113658176ea29616e0cd9e050458f3883ab90eca7ec09908cd56437c13c71e8440b013cd724a74319bf7c0adb7b3af0536f
@@ -19,4 +20,5 @@ EBUILD lldb-17.0.0_rc2.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f2
 EBUILD lldb-18.0.0.9999.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
 EBUILD lldb-18.0.0_pre20230803.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
 EBUILD lldb-18.0.0_pre20230810.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
+EBUILD lldb-18.0.0_pre20230820.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-18.0.0_pre20230820.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230820.ebuild
new file mode 100644
index 000000000000..ef2125c2af64
--- /dev/null
+++ b/dev-util/lldb/lldb-18.0.0_pre20230820.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 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}"
+KEYWORDS=""
+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_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	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-util/scons/Manifest b/dev-util/scons/Manifest
index 0f0345167947..4aae30251d0c 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -16,5 +16,5 @@ DIST scons-4.5.2.gh.tar.gz 5844800 BLAKE2B c0f42994a178bb0fb329cfa05328bdae89b37
 EBUILD scons-4.4.0-r1.ebuild 3708 BLAKE2B f517ee268e793b20fa6e9f3d4f3399db258bb72a13d6498bda215da4de7e4099252e0832e7c011a9d4d9a0543e3062653d27a6cfc0990121d4b692b2f236c43d SHA512 b81dca9f1fa22f5642dfcd46db010b827f7354a9bd7519b9a0587a8e1b9eed11694b305b33b9ad490b8de2b98dcf79d4774969228192dcfb7e12da333c3b2967
 EBUILD scons-4.4.0.ebuild 3619 BLAKE2B cbaf4e1ffe2482d7e22a7dace5b3afd8cd34bebcffec151a4544d8a1c45ea738ba58190f53124614ceff53a00ddd5ca3b840f0235cdd2d07cbc5d2af329766d7 SHA512 167f5716a65b491a5f4781c2709e3c56135f4d52432059b9e30bb3a258c421cd1ea3712f68ff692aacaaaddae1df12cee6d9f5555b12a431810f16bd4595d977
 EBUILD scons-4.5.1-r2.ebuild 4059 BLAKE2B a40a08be3b49ed1c5a24f989527cbaf8707cf17698adee8716036a782b251dd7419d84acd093e074e6d1623fdc807738fabac051ca487f758d56e9e6de178a65 SHA512 221ca76a7800855809b7f5f029a98815dcdb796f6d4fb5bdeeb3d030e5583349500d760afa0d7d85a3ba21b3234f32a33705c23d739ae59eed3de5a77cd711e0
-EBUILD scons-4.5.2.ebuild 3961 BLAKE2B b60bfe85398ea428bf465f8c526bacd47a5319b7d2c332d8652c15c27a90799506c53db6ded7cc92a681f92575b246e83959b24f4915163b09d39a436f3568d3 SHA512 be5476896ad3b31933041f56b65d7a2d3b139f8392c376163279aa6ae33f46f5c71e57171b582859da4380b1ff69d8a110398424e0eece4ac6b6b3a52cf45e3d
+EBUILD scons-4.5.2.ebuild 4416 BLAKE2B 6ebeeacbaa8f3c72c4e0ae6d2cee7a058a9c67f22490a0f1413fd3f9fac0c181704459b002341732978655976d0e265b59d688f9316f188cc7904344fe6a49fc SHA512 b4dfda5d85b66e95fa21b078662a0421cf6bc70695d86306e971f568def361794e84f2865f7af4210442313f0e3c027fd22d26dccb17ce2c33643497284f91b0
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-util/scons/scons-4.5.2.ebuild b/dev-util/scons/scons-4.5.2.ebuild
index b08903645edf..811391d01289 100644
--- a/dev-util/scons/scons-4.5.2.ebuild
+++ b/dev-util/scons/scons-4.5.2.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -74,6 +74,7 @@ src_prepare() {
 			test/Java/multi-step.py
 			test/TEX/newglossary.py
 			test/TEX/variant_dir_newglossary.py
+			test/Configure/option--config.py
 			# broken by commas in date, sic!
 			test/option/option-v.py
 			test/Interactive/version.py
@@ -91,6 +92,16 @@ src_prepare() {
 			test/Repository/multi-dir.py
 			test/Repository/variants.py
 			test/virtualenv/activated/option/ignore-virtualenv.py
+			# broken by CC being set? *facepalm*
+			test/LINK/applelink.py
+			test/ToolSurrogate.py
+			# no clue but why would we care about rpm?
+			test/packaging/option--package-type.py
+			test/packaging/rpm/cleanup.py
+			test/packaging/rpm/internationalization.py
+			test/packaging/rpm/multipackage.py
+			test/packaging/rpm/package.py
+			test/packaging/rpm/tagging.py
 		)
 
 		if ! use amd64 && ! use x86 ; then
@@ -128,6 +139,9 @@ python_test() {
 	# and returns "2" if there are any tests with "no result"
 	# (i.e. in case if some tools are not installed or it's Windows specific tests)
 	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+
+	# sigh
+	rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die
 }
 
 python_install_all() {