gentoo auto-resync : 19:10:2023 - 21:52:41

13 files changed, 9 insertions, 361 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e57b1bbeb251..21de6773d93f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 7ff445e9dd6d..70a7f7050ceb 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -9,5 +9,5 @@ DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa9
 EBUILD bitcoin-tx-0.21.0-r2.ebuild 2477 BLAKE2B 29c4ac0ef985767c0c3d22013777ceb5edb29a53f4436ea0141da679c5dd6eea82dd019d7ad73891e0ebde862f60bfe291d337a2da2111724b28edc07b13b295 SHA512 6a501c4705757736422ebffb264c8cdf09b6e17c2327e113c85ba330067ffdebd990725dda191cbce7dcb80840567ef4e7c095f55a5a5e4033e3c65f51e63cca
 EBUILD bitcoin-tx-22.0-r2.ebuild 2741 BLAKE2B 56742837a3b542f1760d0f6122ace4762aeb85ff44dc8d321afce019d7e705aefd73d1c9c3a44a3410339192a2f99653d925673ce1a62fff1b1dae3fa302466f SHA512 bcb0f588aa503aca0ffe1ff6072703a859180cde9748bf15e4a8975ffd55a3fe4484995e07213f2d322790aea51785e3b9321511d21133aec7c26b1b4fc2489f
 EBUILD bitcoin-tx-24.0.1-r1.ebuild 1637 BLAKE2B b72b107f9814d4d5be527e94068c490c143df5f343aed66f981b8847b2beacce24908ae8c2201e1f336a21efe242539ab36f82cfa78074843869c8cce2b32543 SHA512 e7ec21e145117c6c0b2836f9df134474627f8589b54af70279c93ef2227dbce06c1d3e4a7c04305ea3396edbca3b754f04a10cb2c55c210fa2677dd6159e601a
-EBUILD bitcoin-tx-25.0.ebuild 349 BLAKE2B dc3f1ab18af1e61a7104ce680648835d0030ebfc32f38621085faeccf69aa776d3b4ae0ad9f0b4f07a350e11a7cc724c4b65c044b29093083c5dde38e90034df SHA512 75072bcb7ce659d52ccb4d67a5bead816921be63a14c36445844b56693f133328a4f3dc406053d13bee4162370c032a45a3c7cad1f4631e5d19cb2e83c0bcd6c
+EBUILD bitcoin-tx-25.1.ebuild 349 BLAKE2B dc3f1ab18af1e61a7104ce680648835d0030ebfc32f38621085faeccf69aa776d3b4ae0ad9f0b4f07a350e11a7cc724c4b65c044b29093083c5dde38e90034df SHA512 75072bcb7ce659d52ccb4d67a5bead816921be63a14c36445844b56693f133328a4f3dc406053d13bee4162370c032a45a3c7cad1f4631e5d19cb2e83c0bcd6c
 MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-25.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
index 7593d8a0097f..7593d8a0097f 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-25.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest
index 3b9eaa91186c..509738f123cd 100644
--- a/dev-util/hipcc/Manifest
+++ b/dev-util/hipcc/Manifest
@@ -1,3 +1,3 @@
 DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a
-EBUILD hipcc-5.7.1.ebuild 484 BLAKE2B d018d10a9945bce38212a845fbcbf72fd6992fa70f774e7da8de732f53fa93bd3040cb65f6742d61fb1d6eb47123e48a01d3d05bbb0a26d79cd934cf4e493898 SHA512 dae30d2e294da3698f9257203aae5ae0700673a736b926d87cc2f1c600c31d7cd8a086d3a04b2c152c1747f3a4ffe71f660bb96b10e638df3469ecd335e57947
+EBUILD hipcc-5.7.1.ebuild 514 BLAKE2B 85396696876960c47075dcf519c27d3dcb57c4154ba359a47222cb171c60a8a2532640d4f4e49e6f8d29a341faefa194ee28dd3075f867fee84d2880dbb63f0a SHA512 3fe23c89a253bb064417cee9f5766f7aebab482272245b06fe099fceacd59d79eb93102082cd22a1dab0b536ed24981e0542660628ea09479084b575907a1036
 MISC metadata.xml 845 BLAKE2B 108a9ee40f02d5e190f4d1ee11eea32aaec844c63811265d52046bdb266f6cddfb1774419feace41aaa2bacfd01581847f655aa5fc49536968c54e7f023d49ae SHA512 2b7bbe1205b4a07b81e6c0f4cc2c224a573a03004ce808b4d1ef51ea1b0bec770545b7c46530a1b18222cd67854f790ae44695dd39ef2201d7f3e3ea3ada904f
diff --git a/dev-util/hipcc/hipcc-5.7.1.ebuild b/dev-util/hipcc/hipcc-5.7.1.ebuild
index 062d629e1a4c..71fbdc1e5def 100644
--- a/dev-util/hipcc/hipcc-5.7.1.ebuild
+++ b/dev-util/hipcc/hipcc-5.7.1.ebuild
@@ -17,3 +17,5 @@ IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/HIPCC-rocm-${PV}
+
+RDEPEND="!<dev-util/hip-5.7"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index a9a6adb5266f..4b656738df2b 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,24 +4,16 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-17.0.1.src.tar.xz 127830376 BLAKE2B bb3b9f7358df9006307f5eeccfc5c5ee5497498c4f091347924911cb6534e8d930024c35387456af24bf647d9e24a3d927aa49199036fb475018a610b5d792c7 SHA512 6fc1d5ff4fec49ef5bb495ba9d8f9ee9052c10999ec9d3ac8f825c718e3cdd64abd95408c4e5bb7f67eb9a7bfac9e26d2a949c4da9f163b5646c02e8a670ead5
-DIST llvm-project-17.0.1.src.tar.xz.sig 438 BLAKE2B 3182e3c3a48635fdec39b945ee3b782d7c9c2a07911d9ede2e3421031bb1b4959bd495c5e39d094aeaf555579b9fe3eb834c1449077c154c629f5db605375e7c SHA512 301a6e6c46d6fee13c86dec1a021c35f6bf3a97e5d6b0aa7b7eac34e7ca52f6cefffc25a9e376250b1eb721a65a5852f2f1948abd432698363a81dd7ee19d81c
-DIST llvm-project-17.0.2.src.tar.xz 127833708 BLAKE2B fa9e2e48ce1117063f5cef0aeef85ce84b99bd8fae23022572a6f016eff2ffbf8aab6250b0bdb6e0bbea1c4daf10cecceb18e80496260b5aa81086075d503e12 SHA512 4586224c3f547e8065fa4f0ca3629a1dfed868dfc372ab192d8b9384f0f74dc8cb27dcb6269dc4230202e6a524aae852d98b40fa02ed0393086a162387ea7659
-DIST llvm-project-17.0.2.src.tar.xz.sig 438 BLAKE2B 3ba5d7a09e9de3f38a6f7b5b771b08b1c4e96ea7eda948cfa679598d240fa5211fd37220fbe09e37682212b17fb71b8b5539475edb8ff46d9767054983f670cb SHA512 234276813e3f4b5ee9b1dc640a613fd2e60f1d659f4e089733278d08dd0e208ad37d4d64c9e1edd420b6b87e112458ecec5f76ed9a243c3023b0adbab19ab909
 DIST llvm-project-17.0.3.src.tar.xz 127843636 BLAKE2B 5331d9b545faab282a4caec9ee688d0f1e0615a56a26aa24d8f6fbbae10258e132d94634dab2f7bd69ada06bb28dc899730b9cd774a1086d7c03d5706de6d997 SHA512 44f37dea494a66a83c252e28d7d0517c3b2eed5b196565432dc663c7914bd66d665c8d13479e2776a14cac1905faf6972f986176722c053b58528570a6e68316
 DIST llvm-project-17.0.3.src.tar.xz.sig 438 BLAKE2B 045e7ca82c8d9b3f182e4fa331ec841b24777ac1888f10de435a389ae3a88172e0559a3fca0c2d37cc874464411ae50d7bc0d0829455149a8de8b953ef6c98c7 SHA512 95f9e6729074cfd71b0ffb21e423cd0fd87763268c24e0513f7afd6a85d08061658c44c03ea3ea3b6e3cc7051676d44c41a791e6905c8abb456d48a3762fc152
-DIST llvm-project-39fec5457c0925bd39f67f63fe17391584e08258.tar.gz 198361956 BLAKE2B 001b9d9b7997762dcce4f0b1deb94d41c3d840c178ba1e92208782e7e21fdc0041cde359051b2b1b1fc75526ff6504d3b9375ff873831350de359530c944a961 SHA512 b560e71c9855aff9fb5385f9fb30f63fbef074fd695e7cb31847192837a161bfe4808ceb09c514a676ae817616f15fb5a57d325aa9744eaac46b8f4b20b77a13
 DIST llvm-project-5d35273a32d239b7407338e13ed71b59174d6536.tar.gz 198787569 BLAKE2B 7f4f1eb490028e18826a6ebade649a682e433252ceab1f3dcd9e50c34f24e7ef108c3325ec209a4d4fa1ded8e09ebda4980cb9d8ddce8a0d517923d6c38b8f4a SHA512 4d263561fb12cc07a5e8f7ed2f8f22a3645aa959cf963a6a735a9bb93cfc2a51bf7e4d36b54e8425725029cfcfd868dfcc53af95d26d84be72be124d8c564271
-DIST llvm-project-f5cb9cb59d7c9c6ac3d5c41c677f68c9b75d34a3.tar.gz 198113948 BLAKE2B 1688920eb790421f4143e92bd7bd26794a2497e7b445dde6d55b59c9df4b1aebb848833c7cb1b7c273c5e002763f2531a341313500ce207242f992dfe343b988 SHA512 9817e8b7adf7c69d673124e8334c3e511dfd1cc386832c52b2fb0f2517475d29cd98513ad87188a962f9697dfac39ea03f5b2db6c549c307cf3d27b1370ffdf3
+DIST llvm-project-e6e90840708099425b7b69dd053634ff25d4907f.tar.gz 199022115 BLAKE2B 442aff8f561f7c5834a36b7eb217fd2b984e58af9cbcf3e6495305f386a7651e73345bbe65133af4bffaf8cb209cfb9a94fb28756ffaaaae8f7d28ec253ccb78 SHA512 fa9c180f36f4c782208ae7baff1683ee466c70f7d021b21b9cb8a8fd0f2005c0b47889d8bb37f5fb984f6b2ec26c74df60490c7b51ac3d080830e6844e33e300
 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
-EBUILD lldb-17.0.1.ebuild 2669 BLAKE2B 451b6279f309058f54fedd42da8ffcc67974af957b7bf04a7b82227572c50aa86eb4faff81a6200579a827b0342861706cdf480502c103f452cf19e7dafe6147 SHA512 9cadc47fac62aa257ca563e7620b2e4b91f04a3c4aac2ec3140a9a51d8f6aaafd5048b5bcee5d3cb2a71c4e7a68b5f77b8c9326ff366790dedb750757d607e10
-EBUILD lldb-17.0.2.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7d62f441c8ec43dd97ac24784229f1c013861148989bd69fed80e22897e51812e2cc17c897568b3dd5fa8aca SHA512 bb1876624b17d9cbe095e677c7ed247597d7a502c6b494022f33e3306f49a163a3105cda8d2565aaf52e76cce7ea15dfe9b19e379841bc1155e7465a227340da
-EBUILD lldb-17.0.3.9999.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
+EBUILD lldb-17.0.3.9999.ebuild 2606 BLAKE2B a5467c2d552c1966169490a48e2aa37bc4211735b79b0e94fb91e185c325e598df9cd93b9eb722dfd550fa56b82e762da803d0e6839b0a4b2f66d768844460de SHA512 1b2af73228333953fe6de0e855fecc751bcf3e4e22974ef77a5a69ab6b9aba218a7723215429ce1dbb3ecf46b2066523e7174495a25a1b79ab5ba7eb1828af40
 EBUILD lldb-17.0.3.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7d62f441c8ec43dd97ac24784229f1c013861148989bd69fed80e22897e51812e2cc17c897568b3dd5fa8aca SHA512 bb1876624b17d9cbe095e677c7ed247597d7a502c6b494022f33e3306f49a163a3105cda8d2565aaf52e76cce7ea15dfe9b19e379841bc1155e7465a227340da
-EBUILD lldb-18.0.0.9999.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
-EBUILD lldb-18.0.0_pre20230925.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
-EBUILD lldb-18.0.0_pre20231002.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
-EBUILD lldb-18.0.0_pre20231013.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
+EBUILD lldb-18.0.0.9999.ebuild 2606 BLAKE2B a5467c2d552c1966169490a48e2aa37bc4211735b79b0e94fb91e185c325e598df9cd93b9eb722dfd550fa56b82e762da803d0e6839b0a4b2f66d768844460de SHA512 1b2af73228333953fe6de0e855fecc751bcf3e4e22974ef77a5a69ab6b9aba218a7723215429ce1dbb3ecf46b2066523e7174495a25a1b79ab5ba7eb1828af40
+EBUILD lldb-18.0.0_pre20231013.ebuild 2606 BLAKE2B a5467c2d552c1966169490a48e2aa37bc4211735b79b0e94fb91e185c325e598df9cd93b9eb722dfd550fa56b82e762da803d0e6839b0a4b2f66d768844460de SHA512 1b2af73228333953fe6de0e855fecc751bcf3e4e22974ef77a5a69ab6b9aba218a7723215429ce1dbb3ecf46b2066523e7174495a25a1b79ab5ba7eb1828af40
+EBUILD lldb-18.0.0_pre20231019.ebuild 2606 BLAKE2B a5467c2d552c1966169490a48e2aa37bc4211735b79b0e94fb91e185c325e598df9cd93b9eb722dfd550fa56b82e762da803d0e6839b0a4b2f66d768844460de SHA512 1b2af73228333953fe6de0e855fecc751bcf3e4e22974ef77a5a69ab6b9aba218a7723215429ce1dbb3ecf46b2066523e7174495a25a1b79ab5ba7eb1828af40
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.1.ebuild b/dev-util/lldb/lldb-17.0.1.ebuild
deleted file mode 100644
index 4558dc67b1f5..000000000000
--- a/dev-util/lldb/lldb-17.0.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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="~amd64 ~arm ~arm64 ~loong ~x86"
-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
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/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/lldb/lldb-17.0.2.ebuild b/dev-util/lldb/lldb-17.0.2.ebuild
deleted file mode 100644
index 2fb5872a822f..000000000000
--- a/dev-util/lldb/lldb-17.0.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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="~amd64 ~arm ~arm64 ~loong ~x86"
-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/lldb/lldb-17.0.3.9999.ebuild b/dev-util/lldb/lldb-17.0.3.9999.ebuild
index ef2125c2af64..85f3da6a1874 100644
--- a/dev-util/lldb/lldb-17.0.3.9999.ebuild
+++ b/dev-util/lldb/lldb-17.0.3.9999.ebuild
@@ -11,7 +11,6 @@ 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}
diff --git a/dev-util/lldb/lldb-18.0.0.9999.ebuild b/dev-util/lldb/lldb-18.0.0.9999.ebuild
index ef2125c2af64..85f3da6a1874 100644
--- a/dev-util/lldb/lldb-18.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-18.0.0.9999.ebuild
@@ -11,7 +11,6 @@ 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}
diff --git a/dev-util/lldb/lldb-18.0.0_pre20230925.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230925.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230925.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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/lldb/lldb-18.0.0_pre20231013.ebuild b/dev-util/lldb/lldb-18.0.0_pre20231013.ebuild
index ef2125c2af64..85f3da6a1874 100644
--- a/dev-util/lldb/lldb-18.0.0_pre20231013.ebuild
+++ b/dev-util/lldb/lldb-18.0.0_pre20231013.ebuild
@@ -11,7 +11,6 @@ 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}
diff --git a/dev-util/lldb/lldb-18.0.0_pre20231002.ebuild b/dev-util/lldb/lldb-18.0.0_pre20231019.ebuild
index ef2125c2af64..85f3da6a1874 100644
--- a/dev-util/lldb/lldb-18.0.0_pre20231002.ebuild
+++ b/dev-util/lldb/lldb-18.0.0_pre20231019.ebuild
@@ -11,7 +11,6 @@ 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}