12 files changed, 197 insertions, 305 deletions
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..823fcadc4db2
--- /dev/null
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
+HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+	https://gitlab.gnome.org/jwestman/blueprint-compiler/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/${PN}.git"
+else
+	SRC_URI="https://gitlab.gnome.org/jwestman/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}"/${PN}-v${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/furo[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		gui-libs/gtk:4[introspection]
+	)
+"
+
+DOCS=( CONTRIBUTING.md MAINTENANCE.md NEWS.md README.md )
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_use doc docs)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	use doc && build_sphinx docs
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
deleted file mode 100644
index 59e34d7bb3be..000000000000
--- a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit meson python-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git"
-else
-	SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${PV}/blueprint-compiler-v${PV}.tar.bz2"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
-HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/furo[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	test? (
-		gui-libs/gtk:4[introspection]
-	)
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-	)
-	python_foreach_impl meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-	use doc && build_sphinx docs
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	my_src_install() {
-		local exe="${ED}/usr/bin/${PN}"
-
-		# Meson installs a Python script at ${ED}/usr/bin/${PN}; on
-		# Gentoo, the script should go into ${ED}/usr/lib/python-exec,
-		# and ${ED}/usr/bin/${PN} should be a symbolic link to
-		# ${ED}/usr/lib/python-exec/python-exec2.
-		#
-		# When multiple PYTHON_TARGETS are enabled, then after the
-		# package has been installed for one Python implementation,
-		# Meson will follow the ${ED}/usr/bin/${PN} symbolic link and
-		# install the script at ${ED}/usr/lib/python-exec/python-exec2
-		# for the remaining implementations, leading to file collision.
-		if [[ -L "${exe}" ]]; then
-			rm -v "${exe}" || die "Failed to remove symbolic link ${exe}"
-		fi
-
-		meson_src_install
-		python_doscript "${exe}"
-		python_optimize
-	}
-
-	python_foreach_impl my_src_install
-}
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
deleted file mode 100644
index c3437e90de10..000000000000
--- a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit meson python-r1 virtualx
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git"
-else
-	SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${PV}/blueprint-compiler-v${PV}.tar.bz2"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
-HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/furo[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	test? (
-		gui-libs/gtk:4[introspection]
-	)
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-	)
-	python_foreach_impl meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-	use doc && build_sphinx docs
-}
-
-src_test() {
-	virtx python_foreach_impl meson_src_test
-}
-
-src_install() {
-	my_src_install() {
-		local exe="${ED}/usr/bin/${PN}"
-
-		# Meson installs a Python script at ${ED}/usr/bin/${PN}; on
-		# Gentoo, the script should go into ${ED}/usr/lib/python-exec,
-		# and ${ED}/usr/bin/${PN} should be a symbolic link to
-		# ${ED}/usr/lib/python-exec/python-exec2.
-		#
-		# When multiple PYTHON_TARGETS are enabled, then after the
-		# package has been installed for one Python implementation,
-		# Meson will follow the ${ED}/usr/bin/${PN} symbolic link and
-		# install the script at ${ED}/usr/lib/python-exec/python-exec2
-		# for the remaining implementations, leading to file collision.
-		if [[ -L "${exe}" ]]; then
-			rm -v "${exe}" || die "Failed to remove symbolic link ${exe}"
-		fi
-
-		meson_src_install
-		python_doscript "${exe}"
-		python_optimize
-	}
-
-	python_foreach_impl my_src_install
-}
diff --git a/dev-util/blueprint-compiler/metadata.xml b/dev-util/blueprint-compiler/metadata.xml
index 5923134ff476..ceb04c0eb573 100644
--- a/dev-util/blueprint-compiler/metadata.xml
+++ b/dev-util/blueprint-compiler/metadata.xml
@@ -2,11 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>liaoyuan@gmail.com</email>
-  <name>Yuan Liao</name>
+  <email>xgqt@gentoo.org</email>
+  <name>Maciej Barć</name>
  </maintainer>
+ <longdescription>
+    Blueprint helps you build user interfaces in GTK quickly and declaratively.
+    It has modern IDE features like code completion and hover documentation,
+    and the compiler points out mistakes early on so you can focus on making
+    your app look amazing.
+  </longdescription>
  <upstream>
+  <changelog>https://gitlab.gnome.org/jwestman/blueprint-compiler/-/raw/main/NEWS.md</changelog>
+  <bugs-to>https://github.com/jwestman/blueprint-compiler/issues</bugs-to>
   <doc>https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/</doc>
  </upstream>
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 21cba2c15fc6..0c03f62c5b4b 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -10,5 +10,7 @@ DIST cmake-3.25.3-SHA-256.txt 1646 BLAKE2B 2b4febaa4c486f42c773621efe5ab3ff90357
 DIST cmake-3.25.3-SHA-256.txt.asc 833 BLAKE2B 7db637e3383915cb659b176ffc72508460ef73a245dc5ff99d9ba2649d8db0666e04ff2d428fefaa86cd14a07047bc7b7df0e0bed91ac80d9a8bb993f1d70102 SHA512 26f6c584d8f8bb44fc10b227f81ef3655d35140a1825270877e2be5460e4f0bfa92ca7d7186f55ef08085814c7f79e50cfc9cd7ba9880620aba25661ed1f75ac
 DIST cmake-3.25.3-docs.tar.xz 500216 BLAKE2B 5c6474328e2bfa17f5aa39693dabb19f33ac1f6875119e41d60f97c94bf1441b9d9528e96e4dd36d5d68e711c4bf4d32fe84a454df796755eccb1483fa55e3c8 SHA512 6e9ce5fc545324c327d8216dbbc316bbd5966640ae2b3e17ada00926004d55df75c5d25e6590ed53a8033d9638c5b6282bedd115ddf28b27980a80e40a3cba0c
 DIST cmake-3.25.3.tar.gz 10562254 BLAKE2B b7ae9f129731da30f89967eac20bdfcebd9c4f6ca3b28decc2016ab18292e4b51eb5a43b5797f874e23e64e1d01eeb98b18a927035aab8edc63a069f1bfce32b SHA512 ebcb5616ca418fe164863b157f67cff6e8c49b0f8f723c0bd219466211f3cfe8b93c4b3ad0fe6d2d3772881fd867b0905340945156f6d70a9ea08bfb7eb98550
-DIST cmake-3.26.0-rc4.tar.gz 10668045 BLAKE2B 2f768c69dcc4476a90bad3e6ffeed91c07ae349999057cbca450acc2aaccd12039a1131b0a268370b21c12ef41e7eafcb8a0dc3fc7b650337a97bf9a314bf674 SHA512 647c44833eaffb65400a1909fe29d502c633c76e0be6245bea57e337d2a81d04b0c5fd00ad556c668469bc5391e896679369c979fe3abe8e09fc2090986595a7
-DIST cmake-3.26.0_rc4-docs.tar.xz 507420 BLAKE2B 554d4d49053230c5c5f435ba31e7e82bcb5024e126511f91c767294e5e6739a36ff94f425c5deadd7b31b9bbd9df3f91c83b4b3578cad2f84959502950c4d0f4 SHA512 cef63824bb8c59e70b527f8f20a49cffa59ef69ca32b4f74d7c75a620bd3472e06200fb01f1ee393c3fc3e8607fe9df4ae2416e1c68a755c8cb2f89eca60a623
+DIST cmake-3.26.0-SHA-256.txt 1646 BLAKE2B 4d206db310af5b0305329755473d936d54adb30cc3effb91b12f37e290ada84cb5f0ead5f0e813e653b5a3918f471256ba75a5253151bc0f70dfcc5e65b8665c SHA512 1fe9615b0695f4c94c1d8e963247db9354e5749fcb3abcd1605ec20bd8ff1e53ce0c18d8c1eee5d10c6b04e5a82dbdf61266ab0801267ab22573c7080ffbbd05
+DIST cmake-3.26.0-SHA-256.txt.asc 833 BLAKE2B cbbc54efd9e4b0242f28bbb7c6ce435fc31bd28180331537c44538600ec6470b69fe37635c5de8b55eb1eb015b51c0fb2f591b698195b27686644341ef1813b2 SHA512 eb81bf190fd74b2ad2cb9d35fd8248024054ec6e33b5a12ce49da23cc0fac1ec5bae48df748ad9b30680e77e9b51af5dd8e3de02e47b587670d25b372f977fcb
+DIST cmake-3.26.0-docs.tar.xz 507564 BLAKE2B 13f0f30cd87ce10e8331573a8bb93c796b7ad2862eba6e7ca676784068931f19ac3e3758b5767f4897933cf432099899668acf0dbf132e367eaa3b54bf674cd9 SHA512 5e140b1a81ab24dc05851717ddd1a7d57bc3c54103328db8826ff190e6d27f5d0d35f4e07f094dec4217aaa8c497abd7c858132775955cb89560c8e080de9279
+DIST cmake-3.26.0.tar.gz 10667656 BLAKE2B a1c6970935e103467f0557d244fa630d6f01add9a61f4f6200c711b757b7852eceb9c96f4247c2c09f8582c19a6def0c8b632e8e56574019c630a65c6a77bdd2 SHA512 c9d166989abbae71002fe2fbe589c18794a0d6d2ff61fd197c473ff593066a1a17d12889cd875d63fa8824327c8ad165cb03d1f17e517dcef6b2de3b0f0ee789
diff --git a/dev-util/cmake/cmake-3.26.0_rc4.ebuild b/dev-util/cmake/cmake-3.26.0.ebuild
index a2b661bbcdbe..a2b661bbcdbe 100644
--- a/dev-util/cmake/cmake-3.26.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.26.0.ebuild
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r2.init b/dev-util/jenkins-bin/files/jenkins-bin-r2.init
deleted file mode 100644
index 93d4d5f7e687..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r2.init
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-    need net
-    use dns logger mysql postgresql
-}
-
-checkconfig() {
-    if [ ! -n "$JENKINS_HOME" ] ; then
-        eerror "JENKINS_HOME not configured"
-        return 1
-    fi
-    if [ ! -d "$JENKINS_HOME" ] ; then
-        checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return 1
-
-    JAVA_HOME=`java-config --jre-home`
-    COMMAND=$JAVA_HOME/bin/java
-
-    JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
-
-    # Don't use --daemon here, because in this case stop will not work
-    PARAMS="--logfile=/var/log/jenkins/jenkins.log"
-    [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
-    [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
-    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
-    [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
-    [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
-    [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
-
-    if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
-        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
-    fi
-
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet --background \
-        --make-pidfile --pidfile $JENKINS_PIDFILE \
-        --user ${JENKINS_USER} \
-        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
-    eend $?
-}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.service b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
deleted file mode 100644
index 520a052f43f1..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r3.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} --handlerCountMax=100 --handlerCountMaxIdle=20 --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/jenkins-bin/files/jenkins-bin.confd b/dev-util/jenkins-bin/files/jenkins-bin.confd
deleted file mode 100644
index f84e3463e359..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.confd
+++ /dev/null
@@ -1,62 +0,0 @@
-# Config file for /etc/init.d/jenkins
-
-#
-# Directory where Jenkins store its configuration and working
-# files (checkouts, build reports, artifacts, ...).
-#
-JENKINS_HOME="/var/lib/jenkins/home"
-
-#
-# Options to pass to java when running Jenkins.
-#
-JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
-
-#
-# Port Jenkins is listening on.
-#
-JENKINS_PORT="8080"
-
-#
-# Debug level for logs -- the higher the value, the more verbose.
-# 5 is INFO.
-#
-JENKINS_DEBUG_LEVEL="5"
-
-#
-# Whether to enable access logging or not.
-#
-JENKINS_ENABLE_ACCESS_LOG="no"
-
-#
-# Maximum number of HTTP worker threads.
-#
-JENKINS_HANDLER_MAX="100"
-
-#
-# Maximum number of idle HTTP worker threads.
-#
-JENKINS_HANDLER_IDLE="20"
-
-#
-# Pass arbitrary arguments to Jenkins.
-# Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
-# Full option list: java -jar jenkins.war --help
-#
-JENKINS_ARGS=""
-
-#
-# User
-#
-JENKINS_USER=jenkins
-
-
-
-#
-# Pid File 
-#
-JENKINS_PIDFILE="/var/run/jenkins.pid"
-
-#
-# War File
-#
-JENKINS_WAR="/opt/jenkins/jenkins.war"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 15bdf7aeec4f..ac2c7f3d69fc 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,3 +7,4 @@ DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f7141
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
 DIST llvm-project-16.0.0rc4.src.tar.xz.sig 566 BLAKE2B bfcf39070f32e16cfeae699d95d06f184b1331c3af403340c31cc5a973a3bb1faec0b6342445176cebed5819ddf68e4abfdaa8542ec425b1c822fc8c03c03349 SHA512 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
+DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAKE2B 6750855453b575eb8fcc861d5b24b144497bba62df9b9292ac586cf340e04b2b58290fe9df6d89142f29b56aa37ddeb3bd11cc3337e4dc985a4487954d1e2ffa SHA512 d8a87064ba0f92967df019e9345222b87cda81852a9599902cedc4a49ec7d9e2175c972b7fa6d19920489c1d309822f9c31c23bdce0376a8d40c71d57bcd5068
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230314.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230314.ebuild
new file mode 100644
index 000000000000..6366c380f05a
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230314.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_{7,8,9,10,11} )
+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/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
index a17c0cf70206..609e76035dec 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0