gentoo auto-resync : 29:08:2023 - 10:04:54

21 files changed, 335 insertions, 594 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e985313630db..28eb0feeac75 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6e27bed401bd..530567bdb87c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,7 +1,6 @@
 AUX jenkins-bin-r1.confd 846 BLAKE2B 8ecbab9b974eca823a0039ccf83735648d57604ff8aaa8896b39bfe869eea6cc6837ce22ac2d8d110884c8934aaa558442d537dfe424662d5e5ba13dd17377f0 SHA512 a7c84e33d2b7e6ec2b195fc419715a8486f204dcd10806a9f32fc9133f295b9efbc63abefcac5f2e44d40d2dec04ced3b94a50674fe5066b8e32ee0cde042e20
 AUX jenkins-bin-r3.init 1485 BLAKE2B e15269e812ae1aed54f4aa88d161e182e7e20433832608481a2a29c79f8da9a3f4e9f29204ba6bf9944e54f3cb1662bfda8500a13ba55d97bdcfd5387ad1cf8f SHA512 fff205e58a09d4f2369aba61598e697542b8cf29908382f973ba465b6c32a57686e6389244f2188b0b432d49f3b633fbd616e002656f9e8dd10ad742b3786abc
 AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309ba7967873699a16a32da3e4e1eb2270d47e9dbd07833cd6afb9bbc65f2bce7c7345891bf1f4bcd2abb3bc40eb SHA512 f064f8516a7c158fee47a4d1c2a5d2520e88483226139b50e9cff828ccb46c41d01f4e8d4c76e82d1400b8c816edeaed18f0ee82f1a353f43f7bf0e6d987dc0d
-AUX jenkins-bin-r4.service 518 BLAKE2B bfd33c8afc8db031903c5d66dd3bba7c77b6b1ea179c91918daa8b03f7437092c948f00836f3382731096af3f3c76990412efb0b3c753d5de54709f0c64588b7 SHA512 330143f3527095cd7cf0cdfdbec0641c5bd6f10b6d62853c887193400162c9a1125de65f0baed9cec9f501d6d966a46c42b66030669c7b9f167808d2fe67f8e7
 AUX jenkins-bin-r5.service 509 BLAKE2B 570167d1949e072aadb03f570166a5c35de71260e3707da2c7258f9d39667be71bb9ede116fccd8d54f02f1769facb076e83ae0102fb65c1f376c37fc4b0d38a SHA512 5f9075977c8df0788cde4fbdfa9e84c4ca23c8927d5b88ab82109fab1326465ddea18b8f99831155a9c5b0fd902d204bd083c0bdf811b83c73eac8ab3ebd9ad9
 DIST jenkins-bin-2.401.3.war 98398119 BLAKE2B 249f7ace9dde2db5243aa041d5afc854cb3064c7044aa95a3f2bae6ec96c0fe2a9ed06917f3bdd9c8a3b9178ab795d5d5de1b3a45e28bac70b5fc096b888c1a0 SHA512 b634bea063dfbcfd24998af920324fd63c394da4d0e34c619ad5f2447ecf16c4142ab531e96d6b53572e9dd698804126c6ff8adfeff3bc7fa7b5192157346708
 DIST jenkins-bin-2.414.1.war 89532544 BLAKE2B 2da7c1d79b8e5421ded90f44697807d1c76e04c6652229d0cbdb73569116b7f78cb0887e8df8bda18248766f2b49b3d3e51ed553df488e1716b1370c0dd8df76 SHA512 4d9bcadc4296c43336ed90e5aa27feb271ff074793f2ea8e15513c77c9dd9e8f47409382ce1299ec21a05ca1d5a02b9dde40dab03952cc3c77109a17048739d7
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r4.service b/dev-util/jenkins-bin/files/jenkins-bin-r4.service
deleted file mode 100644
index dfe0d174f365..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r4.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Jenkins Daemon
-
-[Service]
-EnvironmentFile=/etc/conf.d/jenkins
-Type=simple
-ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index df860e82d49b..4358763887f3 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,26 +4,14 @@ 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.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-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-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-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
 EBUILD lldb-17.0.0.9999.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
-EBUILD lldb-17.0.0_rc1.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
-EBUILD lldb-17.0.0_rc2.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 EBUILD lldb-17.0.0_rc3.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 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
 EBUILD lldb-18.0.0_pre20230825.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_rc1.ebuild b/dev-util/lldb/lldb-17.0.0_rc1.ebuild
deleted file mode 100644
index 0b408d9e3c91..000000000000
--- a/dev-util/lldb/lldb-17.0.0_rc1.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
-
-		-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.0_rc2.ebuild b/dev-util/lldb/lldb-17.0.0_rc2.ebuild
deleted file mode 100644
index 0b408d9e3c91..000000000000
--- a/dev-util/lldb/lldb-17.0.0_rc2.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
-
-		-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-18.0.0_pre20230803.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230803.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230803.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_pre20230810.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230810.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230810.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_pre20230820.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230820.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230820.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/sdl-jstest/Manifest b/dev-util/sdl-jstest/Manifest
new file mode 100644
index 000000000000..a7469ed99e8b
--- /dev/null
+++ b/dev-util/sdl-jstest/Manifest
@@ -0,0 +1,7 @@
+AUX sdl-jstest-0.2.2-appstream-util-nonet.patch 1370 BLAKE2B a7fae0e41537bb780603330d7018b1f790a4e3a3dbc00e669b989fd310b1a2ed92913fe553e9079c9a5e850d7499381e3c3fa5378aa6bf328f8d91d76e4112ba SHA512 5283a949b800bbf4d34c0138ee7230a8059a64db2a40a701fda6b3f234991696667496540cacaeb1a6402c5a5dcdccd6f046db32e8ce595e4b7cad5241a11c26
+AUX sdl-jstest-0.2.2-sdl1.patch 1199 BLAKE2B 3faa164fa14ba0f39891bb719f029cf8384bb21842574aaf982789f84cd54ab67f65fd8e71a129581b1852181abd60c51b74c2c1a7c026ca94dbe389fafa52ae SHA512 da0e63ecfde9fb8008c752ef868536e45cf5547be5e7b451c493ce1f7227b9e6ceb2d80ca374fad49c4c74486c7668605d323d42fdbeb977322f60f1b4447632
+DIST sdl-jstest-0.2.2.tar.gz 24018 BLAKE2B 21d5b50fceb6543084c68d04c732e8e45722fd36b7fecdc96e1c360da0d139dacf0a127c54f20bf008181390a201a1c9cf448945719f94721eb7931c1a4f23f9 SHA512 56d8688b22e86f307d94ec3b45f2c1a6068c92745e02e477a956218126e97c45d8f8a8606638e98f25ffa5893d7e52622df799815a64d05c0f09d466a8a33346
+DIST sdl-jstest-sdl_gamecontrollerdb-69c2ca071a.tar.gz 61994 BLAKE2B 41ae614dbdcbc4b820cd5586798cef4d56eefe58386829dc502552f0696ffd53fb1320a970e1a25fde29ba2e3243b0feae3e58014dfbd7e43cb85abf90cbc03e SHA512 d295f484ee108a18e48003321fb92e3ccb3f7b6885ddc3a0a4a20df7b6c25dba2e1d067f50ba5596ed246d08ed7d243cd0d2791f6c01c9fc6f1f440aa52fb2f6
+EBUILD sdl-jstest-0.2.2.ebuild 1578 BLAKE2B 09e1b34969972a3d74aa0fccf4cc3d317176c0a70166191961e2c82bd5666a90c9f160f52fdc2f8e6efb0fb306041107b6d3cf94c761c73ef5564f3889be8cda SHA512 51f0ddd5f964a0cfc72d7bdad2a7e060a387fea6ead43cb687749839b416c9c856ae48986ae36504c0ed622c1c09ee7b095cca814e6183ddf6e04dc3052c998f
+EBUILD sdl-jstest-9999.ebuild 1487 BLAKE2B 61fabb76913947f1b608a0ca31ba011ac43e7b56cfb571cbe0db91251748979422c1283ed2ff7279c550a539723e0281ccde4aa6ff8bd8eaf123e9ab4203fcd8 SHA512 62e83878e5fa34f1d1eb40174ff18d6ef8264a0fe78c37bbff955eb8b45444a741d394879b16a134d632768822481beca604441fad710dc6e95654641879ce66
+MISC metadata.xml 1105 BLAKE2B 1f39f01d735d356abc6fb2fa351ecb83f1726df58d3c6d6cff02975b86cd5593b1f23f98d36313b0d5719b1104ff8f4d094c427528d33f9562e5a5692d473d36 SHA512 ddd16b5dd98f264c48eb5464eeb58ab8e355c9e99add572c7e6bf55594b1ea61462b4554862d1813c313fe124e17b58dff0213879fcf1e2493efbb12b5d4932b
diff --git a/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-appstream-util-nonet.patch b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-appstream-util-nonet.patch
new file mode 100644
index 000000000000..bcbb99518597
--- /dev/null
+++ b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-appstream-util-nonet.patch
@@ -0,0 +1,35 @@
+https://github.com/Grumbel/sdl-jstest/issues/17
+https://github.com/Grumbel/sdl-jstest/commit/d442ee9e2c4dda1fd43cb3201ea8edf8222ee66c.patch
+
+From d442ee9e2c4dda1fd43cb3201ea8edf8222ee66c Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Fri, 14 Jul 2023 10:25:11 +0200
+Subject: [PATCH] Disable tests requiring network access
+
+Fixes #17
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1e4284..09d3e2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ if(BUILD_SDL_JSTEST)
+   if (BUILD_TESTS)
+     add_test(NAME sdl-jstest.appdata.xml
+       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-      COMMAND appstream-util validate-relax ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.appdata.xml)
++      COMMAND appstream-util validate-relax --nonet ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.appdata.xml)
+   endif(BUILD_TESTS)
+ 
+   file(COPY sdl-jstest.1
+@@ -101,7 +101,7 @@ if(BUILD_SDL2_JSTEST)
+   if (BUILD_TESTS)
+     add_test(NAME sdl2-jstest.appdata.xml
+       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-      COMMAND appstream-util validate-relax ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.appdata.xml)
++      COMMAND appstream-util validate-relax --nonet ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.appdata.xml)
+   endif(BUILD_TESTS)
+ 
+   file(COPY sdl2-jstest.1
diff --git a/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-sdl1.patch b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-sdl1.patch
new file mode 100644
index 000000000000..d90024019e14
--- /dev/null
+++ b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-sdl1.patch
@@ -0,0 +1,42 @@
+https://github.com/Grumbel/sdl-jstest/issues/15
+https://github.com/Grumbel/sdl-jstest/commit/62124aa8b9d4c3a8eec5206bf0fc09fade52b326
+
+From 62124aa8b9d4c3a8eec5206bf0fc09fade52b326 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Wed, 12 Jul 2023 17:34:38 +0200
+Subject: [PATCH] Fix initial blank screen in sdl-jstest
+
+Screen was left blank due to only getting drawn once a new event
+arrived.
+
+Fixes #15
+---
+ src/sdl-jstest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/sdl-jstest.c b/src/sdl-jstest.c
+index 388e84d..bc95024 100644
+--- a/src/sdl-jstest.c
++++ b/src/sdl-jstest.c
+@@ -192,11 +192,11 @@ int main(int argc, char** argv)
+ 
+         int quit = 0;
+         SDL_Event event;
++        bool something_new = TRUE;
+         while(!quit)
+         {
+           SDL_Delay(10);
+ 
+-          bool something_new = FALSE;
+           while (SDL_PollEvent(&event)) {
+             something_new = TRUE;
+             switch(event.type)
+@@ -302,6 +302,8 @@ int main(int argc, char** argv)
+             printw("Press Ctrl-c to exit\n");
+ 
+             refresh();
++
++            something_new = FALSE;
+           }
+ 
+           if ( getch() == 3 ) // Ctrl-c
diff --git a/dev-util/sdl-jstest/metadata.xml b/dev-util/sdl-jstest/metadata.xml
new file mode 100644
index 000000000000..4e991521b8b8
--- /dev/null
+++ b/dev-util/sdl-jstest/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="sdl1">Enable <pkg>media-libs/libsdl</pkg> based input test</flag>
+		<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based input test</flag>
+	</use>
+	<longdescription>
+		sdl-jstest and sdl2-jstest are simple programs that lets you find
+		out how many joysticks SDL or SDL2 detected on your system, how many
+		axes, buttons, hats and balls they have each. They also lets you test
+		the joysticks by displaying the events they send or by displaying
+		their current button, axis, hat or ball state. sdl-jstest is
+		especially useful if you want to test your SDL_LINUX_JOYSTICK
+		configuration.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Grumbel/sdl-jstest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/sdl-jstest/sdl-jstest-0.2.2.ebuild b/dev-util/sdl-jstest/sdl-jstest-0.2.2.ebuild
new file mode 100644
index 000000000000..5494d36cbeee
--- /dev/null
+++ b/dev-util/sdl-jstest/sdl-jstest-0.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	HASH_GAMECONTROLLERDB="69c2ca071ac380569b7037e05d9153a08e2e7651"
+	SRC_URI="
+		https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz
+		https://github.com/gabomdq/SDL_GameControllerDB/archive/${HASH_GAMECONTROLLERDB}.tar.gz
+			-> ${PN}-sdl_gamecontrollerdb-${HASH_GAMECONTROLLERDB::10}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple SDL joystick test application for the console"
+HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
+
+LICENSE="GPL-3+ ZLIB"
+SLOT="0"
+IUSE="+sdl sdl1 test"
+REQUIRED_USE="|| ( sdl sdl1 )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sdl1? ( media-libs/libsdl[joystick] )
+	sdl? ( media-libs/libsdl2[haptic,joystick] )
+	sys-libs/ncurses:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-libs/appstream-glib )
+	dev-util/tinycmmc
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-appstream-util-nonet.patch
+	"${FILESDIR}"/${P}-sdl1.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=( external/sdl_gamecontrollerdb )
+
+		git-r3_src_unpack
+	else
+		default
+
+		rmdir "${S}"/external/sdl_gamecontrollerdb || die
+		mv SDL_GameControllerDB-${HASH_GAMECONTROLLERDB} \
+			"${S}"/external/sdl_gamecontrollerdb || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SDL2_JSTEST=$(usex sdl)
+		-DBUILD_SDL_JSTEST=$(usex sdl1)
+		-DBUILD_TESTS=$(usex test)
+		-DWARNINGS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/sdl-jstest/sdl-jstest-9999.ebuild b/dev-util/sdl-jstest/sdl-jstest-9999.ebuild
new file mode 100644
index 000000000000..c2514acce683
--- /dev/null
+++ b/dev-util/sdl-jstest/sdl-jstest-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	HASH_GAMECONTROLLERDB="69c2ca071ac380569b7037e05d9153a08e2e7651"
+	SRC_URI="
+		https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz
+		https://github.com/gabomdq/SDL_GameControllerDB/archive/${HASH_GAMECONTROLLERDB}.tar.gz
+			-> ${PN}-sdl_gamecontrollerdb-${HASH_GAMECONTROLLERDB::10}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple SDL joystick test application for the console"
+HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
+
+LICENSE="GPL-3+ ZLIB"
+SLOT="0"
+IUSE="+sdl sdl1 test"
+REQUIRED_USE="|| ( sdl sdl1 )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sdl1? ( media-libs/libsdl[joystick] )
+	sdl? ( media-libs/libsdl2[haptic,joystick] )
+	sys-libs/ncurses:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-libs/appstream-glib )
+	dev-util/tinycmmc
+	virtual/pkgconfig
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=( external/sdl_gamecontrollerdb )
+
+		git-r3_src_unpack
+	else
+		default
+
+		rmdir "${S}"/external/sdl_gamecontrollerdb || die
+		mv SDL_GameControllerDB-${HASH_GAMECONTROLLERDB} \
+			"${S}"/external/sdl_gamecontrollerdb || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SDL2_JSTEST=$(usex sdl)
+		-DBUILD_SDL_JSTEST=$(usex sdl1)
+		-DBUILD_TESTS=$(usex test)
+		-DWARNINGS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 697f71329715..053e58cc5b21 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -2,8 +2,10 @@ DIST stripe-mock-0.168.0.tar.gz 1290778 BLAKE2B a8d9ad32ecccb6ced1c45c34174a6a9c
 DIST stripe-mock-0.169.0.tar.gz 1290637 BLAKE2B e9e5e8861a23760830b6161fb69a55082457d370bd67811cb12d8ab3689eea915ceaa47f7954fd341cf8487d403b31b6e90c034d7fcd535014b7ba249c5eb7f0 SHA512 0ff65570c8327a929b132684dbed7858f62fe63d1ba6d6a41f355e5260d87433b1b5c0efe38e103f7ae814ae5d008f3f41683f46ae4bef295e28589cf2e3cc16
 DIST stripe-mock-0.170.0.tar.gz 1288862 BLAKE2B 141a0001ef9117e296a711e6a5cf786bd20b6eb7711a07e78e2ebdaf5e2b71ee8e9a9caba4d3f2e23482c6f56ae4fb7504c1c20c299eaeed694d4c119c65f873 SHA512 7bf6128aa3406426a845c199d1fc0c51e2d299ef5ae1add01d3fc43db2b0311ca9e813148fac453a5d48865ebc3155fb2498cf09c8661300e2dc97f148e8809e
 DIST stripe-mock-0.171.0.tar.gz 1297648 BLAKE2B a152573e43363133b8a32f998d1a5ea4a40232a4dc6a7fb9342c6e9b538ae026f1cee3b4d2139239a497d9e3d426467991e1ce721bd0179071a87568093ebb24 SHA512 9877c3ce68255496c99a08f57af89f4070e5d3ecca699c6d437ae62fda8781abe7ef63f56aee72662f5350b05083b47ca8b4552e513187465c73276d3bed4831
+DIST stripe-mock-0.172.0.tar.gz 1297748 BLAKE2B a712f532e9b8af019212bcd744a97bdd195388debb29c153041539ebe640ad877d37d0de1ad6d878f75e0e3c72e53ae62ca97a4662e77b3b111e1d926e240bb9 SHA512 5ae159389aaa5ac5e2b9caec923824771bc8a75434146f915ecb23e81f25d43ec73bdfa73b1851101b4cad7db431cece61c111ddedc89f229e5dd7de963b72a9
 EBUILD stripe-mock-0.168.0.ebuild 498 BLAKE2B a8e1dd0ac1f07195ecdadc4d5e68499e6d48ef5ac47fd770a7a421cc6b8fdc035bb1ae7c4f0ee7028c7ded5dbca4f260499f4fabb58d80794e807d6206232b1e SHA512 9fc51687f9fad3ac4c9c505c4a5f6b7bc668acd17f186bdec61a13cb4eb0b8d024b3eca7717434c6720f7ae4bd89431a7916575492700ad9dd9f86508b85d007
 EBUILD stripe-mock-0.169.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.170.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.171.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
+EBUILD stripe-mock-0.172.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.172.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.172.0.ebuild
new file mode 100644
index 000000000000..ca0f4e60efa7
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.172.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock/"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin stripe-mock
+	einstalldocs
+}
diff --git a/dev-util/tinycmmc/Manifest b/dev-util/tinycmmc/Manifest
new file mode 100644
index 000000000000..cbcc2b98a493
--- /dev/null
+++ b/dev-util/tinycmmc/Manifest
@@ -0,0 +1,4 @@
+DIST tinycmmc-0.1.0.tar.gz 10559 BLAKE2B 9708c6c95c5746d000bb02b46bc40b788b8b18d55d3bd2e97e88789f4b084e145db39e038b4d619c75273b8fd23713f6906a8618fa248664a468c60e1073000c SHA512 cf1e8108be2f5c8a23e08756b6f50a2493a688ffa8bd7a06a59330cdd74046035705f18d5f53a00d6779dafb76a2c529b4ca9be7e53ff2660d718e8f68544769
+EBUILD tinycmmc-0.1.0.ebuild 440 BLAKE2B 22bfe8ee885011786b41eaffed3edc427921086cac66bb3ecf3d494e2d6c9dec6a64eec2afce0b9ffe772e58a03a0dc9e3a9c8b7a2cae0e76648471ef9f1d33a SHA512 88a2d143fc2c3f5db8e964db71b0b1ee81f652f56213150d72e4e291e51e88d971a175cdeed8fe24832512d558a8bd894642d5f37f0f83f0bae2b9dc44058d0d
+EBUILD tinycmmc-9999.ebuild 438 BLAKE2B f2efba8224cde6c3099d5551dcfedf3dd714e381c2e55b7dc93e194d206752d6a680d7fb48dc807eb855793b62cfef810b1035f538db91e460ad5bb1bf04712c SHA512 cab8f8d6aaba6b6729a9f17cfe34222b5c6f2be3009b5a747a954ff2bb6b3f1eb791fbc3af8e639f90806465b0b83cfc8007c48cfe6e599e1bdaca28f8aa822c
+MISC metadata.xml 466 BLAKE2B 2fe1efd4c596f9c0023f6f6758da754cda0467f615798ff4f9eda4c9a4500db4364415ce14277dfbe40fdf1babde0a8ebd1ba636b58cb2776fc63ed977498304 SHA512 c0bf3b4a08ef90c34d7dfa222b59fb38cc6590465b9b2a93d5cbc501794f6ed36fc76ce971da04f495262964f4f7e8e659770881f7cb8308617ed60655b515c6
diff --git a/dev-util/tinycmmc/metadata.xml b/dev-util/tinycmmc/metadata.xml
new file mode 100644
index 000000000000..a85353b5969e
--- /dev/null
+++ b/dev-util/tinycmmc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Grumbel/tinycmmc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/tinycmmc/tinycmmc-0.1.0.ebuild b/dev-util/tinycmmc/tinycmmc-0.1.0.ebuild
new file mode 100644
index 000000000000..d36c835eb825
--- /dev/null
+++ b/dev-util/tinycmmc/tinycmmc-0.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	SRC_URI="https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Tiny CMake Module Collections"
+HOMEPAGE="https://github.com/Grumbel/tinycmmc"
+
+LICENSE="GPL-3+"
+SLOT="0"
diff --git a/dev-util/tinycmmc/tinycmmc-9999.ebuild b/dev-util/tinycmmc/tinycmmc-9999.ebuild
new file mode 100644
index 000000000000..ecaf99a1a6db
--- /dev/null
+++ b/dev-util/tinycmmc/tinycmmc-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	SRC_URI="https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Tiny CMake Module Collections"
+HOMEPAGE="https://github.com/Grumbel/tinycmmc"
+
+LICENSE="ZLIB"
+SLOT="0"