5 files changed, 240 insertions, 0 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f618d1e30a3f..426058d65d8c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 1b5f4d7ed401..bf4cb5451683 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -2,6 +2,8 @@ AUX bear-3.0.21-clang16-tests.patch 911 BLAKE2B e9a11358b80604ef7a2e59e22bc5bde5
 AUX bear-3.0.21-libfmt-10.0.0.patch 936 BLAKE2B 1ac889c2bfa057cc6b25fa473a88b05a66f02524134b3f10ee37c5c5fa662800523ae86ec3ec4197eb503944f782449bd65f107e23ff6f9529d4ceb886c508d6 SHA512 cef41aa6ef8ce580f4b12df5e883b477f67d6bed3b71a31aa7d9c2265d0e324bb669d05387b5401629e2bbe72fe4094a53a96a11bdf656fd833585567a748890
 DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
 DIST bear-3.0.21.tar.gz 125827 BLAKE2B f7dcd383f27c370edb2fa0225e8337b2abe086df25a0272f61051600c017527b4079750328cb811b6967ad6fab51647909333eb1d084e24060fe56ca1036e40d SHA512 9fe43a52fb30b7b413244576c6ea0d493bb720e54d0b6263280224efef4b0432dee46697df160ba7e76bc1a5c8735fe814e0eb686ed797658b563bcb8c5bb7e5
+DIST bear-3.1.2.tar.gz 127197 BLAKE2B b9ef373aab194f0e7330c5f457b88e3c11bb3b202940eff65ecbae79b123254df9629c06f4781570b19675834be80fba041b070820663a6b9a747fc6d269be25 SHA512 02701e8a53b9d776ca838248f5b5d149d7ded6e024ce65bd1ca3b440ab1bf95691dc3d36bb28f043ce24bc1da6e666fb022ff92fa9df7c3142451742de16ca3e
 EBUILD bear-3.0.20-r1.ebuild 2130 BLAKE2B 032ab0d9e944f03b29a31756b7b482a7b29c27e85767e25a6d32c94b0e5c98252d7d847df991989346625d90e92179a8307eba883758776c4653d1c99081302a SHA512 6b97b0d7e42951d9e78f0ba6940500b2d397f8326e1453041e088bada11e57c62828d5a02f5ea16f023ae0fe4d8651d1a0c62439392ea5cb39cb54691b454de7
 EBUILD bear-3.0.21.ebuild 2269 BLAKE2B c90eeb683137b82948a2fa44a0131188dcf3c94d46b25eac9b5e7a0dc63d1d834bd7b816b15d0dbe24a23161c86ce9de93dc8235b1c2a35bb2ffb6e36a4fbb4b SHA512 a9d88ebf9da3caf67f5800ab7c4ebfc775e47a6237c5b12ea07615ae9dcddf1593525b830bc1a346b93abf79347a212d88605010ed0d60e113a5349bfaf540eb
+EBUILD bear-3.1.2.ebuild 2222 BLAKE2B 39710df2b9aae604e1511a475ec6f8ae3b30ddb8a1cca8e4cf3a96d7ba1aaf9efa36976cf80daf774f14a13e911e99ef04e45b0321d6b3f04d9b5e23a95d727f SHA512 29c95731a45213ba4810dfafbdab0d304d4bcb07de8ed8273930ec05c84d4c0765e6623b58ec8d56d49e24123d6a084cb6818f9ebf9ee42595856763c488d3ae
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.1.2.ebuild b/dev-util/bear/bear-3.1.2.ebuild
new file mode 100644
index 000000000000..a02a930c0f9c
--- /dev/null
+++ b/dev-util/bear/bear-3.1.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.11.2:=
+	>=dev-db/sqlite-3.14:=
+	>=dev-libs/libfmt-9.1.0:=
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.11.0:=
+	>=net-libs/grpc-1.49.2:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.13
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-devel/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.21-libfmt-10.0.0.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test)"
+		-DENABLE_FUNC_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 7514f3759a9e..a355ae0254df 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -2,5 +2,7 @@ AUX plan9port-builderr.patch 882 BLAKE2B 1526bad2833a416cfb214f047f2f14bda89ca82
 AUX plan9port-cflags.patch 312 BLAKE2B d09a4bb70451beb0cb6de05be37c6d68334d51f4db882debde4e3f3accf3aec25054ad5411a3c7289df6b556f59c1a729005f1c21247545158879c429462843d SHA512 29c4419bbc36330b322541b625bbe9131ed14d01008ba2ab2865a175918506de1e96a2b078246d1d6b6bc48537f90f74b1a72b223d74dc73d13cb7cf63d33c58
 AUX plan9port-noexecstack.patch 384 BLAKE2B 7f887894113677df743f64d7b1015aa65837818aff3c8d93bb553177da377a5975e7f8841addfff6b533771085490d306124adaf62a834615f0f5ca46f455bf4 SHA512 833a331d963e1f02ce497ffb293750cd6c535b6b2d6d26a2218264d3a7aa098b30f95cb3968fbaa3a734505286ff560e65f0390154af6a324078e3d7f80385be
 DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373 BLAKE2B 6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64 SHA512 f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
+DIST plan9port-cc4571fec67407652b03d6603ada6580de2194dc.tar.gz 23411459 BLAKE2B 439ea7dcddfc466a7fe8bea8b75a7e73558e5cdbd7f0adf9b3367d6eab9eaab8afa8e9fb60bcf83a4a614abbd52a85ddfa65b5dd757fdd2b725f554bf66f3c90 SHA512 e347ffd04c92508b3bc324d93837c831af40b5eb11583f6c61e15c0e861067c76945a1a65929c1e725f18760035a1a14a6cd16a7b8b6a14fd2422750cef1e4d4
 EBUILD plan9port-0_pre20210321.ebuild 3770 BLAKE2B 1301ab238c1bfdee211cba8a8affa038a4a80b1620ec694a0ae3091464f01c6045b4eeb97aecb2d5ea08d434e702bba9b3f48482118cac48965342044fb6afaa SHA512 9841e41f44145ecf36fd06b4004d7911576963d8ca05d8d352b46228eed4c99f419f05acc4aebbfb4a374750a50bc818e90eb8d707c6eda93a14af18309a2f97
+EBUILD plan9port-0_pre20230331-r1.ebuild 3685 BLAKE2B 336a49954d2bc5dcf835e95226771239760945062b6da1dc956d052cd27bda5726aef8e4f7e642cf1a59cdd046db8bdf7bc8bdd8566c4d509249a869ec459b57 SHA512 7060b572a4649bd968ae640fc5c6fda263ba9331775e39d458e4c2228f2d170217ef1779cd7a6c91e06616fee716fa245e6887bfe947d699a87f7fd0d658d4fd
 MISC metadata.xml 482 BLAKE2B 70ae535a97db4267a15ddc5f50c667075b5e124dcd526931fec7ca526128e28eab60ffc586f9b72a142b1b33a5b561cf5cc9a2278ec591a4c9e94df2de50a538 SHA512 3f3d15c13435cacbc31ed57263350b58681e4c868b1724ea35668c3e5f1ae5e6d12760ef8615a128349559889477db37c1dd22b653356504b623a89f4f4935e1
diff --git a/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
new file mode 100644
index 000000000000..4373389cdfc5
--- /dev/null
+++ b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs readme.gentoo-r1
+
+MY_HASH="cc4571fec67407652b03d6603ada6580de2194dc"
+MY_P="${PN}-${MY_HASH}"
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port"
+SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="
+	MIT RSA Apache-2.0 public-domain BitstreamVera BZIP2
+	!freefonts? ( BigelowHolmes )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X aqua freefonts"
+REQUIRED_USE="?? ( X aqua )"
+
+DEPEND="
+	X? (
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-apps/xauth
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-noexecstack.patch"
+	"${FILESDIR}/${PN}-cflags.patch"
+	"${FILESDIR}/${PN}-builderr.patch"
+)
+
+PLAN9="/opt/plan9"
+EPLAN9="${EPREFIX}${PLAN9}"
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+DOC_CONTENTS="Plan 9 from User Space has been successfully installed into
+${PLAN9}. Your PLAN9 and PATH environment variables have
+also been appropriately set, please use env-update and
+source /etc/profile to bring that into immediate effect.
+
+Please note that ${PLAN9}/bin has been appended to the
+*end* or your PATH to prevent conflicts. To use the Plan9
+versions of common UNIX tools, use the absolute path:
+${PLAN9}/bin or the 9 command (eg: 9 troff)
+
+Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+DISABLE_AUTOFORMATTING="yes"
+
+src_prepare() {
+	default
+
+	if use freefonts; then
+		pushd font || die
+		rm -r big5 fixed jis luc{,m,sans} misc naga10 pelm shinonome || die
+		popd || die
+		rm -r postscript/font/luxi || die
+	fi
+
+	case "${CHOST}" in
+	*apple*)
+		sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
+			die "Failed to sed AFLAGS" ;;
+	*)
+		rm -rf mac || die
+	esac
+
+	# don't hardcode /bin and /usr/bin in PATH
+	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
+
+	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
+	sed -Ei -e 's,-I/usr(|/local)/include ,,g' \
+		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \
+		src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) ||
+		die "sed failed"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) ||
+		die "sed failed"
+}
+
+src_configure() {
+	local -a myconf=(
+		CC9="$(tc-getCC)"
+		CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
+	)
+
+	if use X; then
+		myconf+=(
+			WSYSTYPE=x11
+			FONTSRV=fontsrv
+		)
+	elif use aqua; then
+		local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \
+			<<< "${MACOSX_DEPLOYMENT_TARGET}")"
+		myconf+=( WSYSTYPE="${wsystype}" )
+	else
+		myconf+=( WSYSTYPE=nowsys )
+	fi
+
+	printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
+		die "cannot create configuration"
+}
+
+src_compile() {
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	NPROC="$(makeopts_jobs)" ./INSTALL -b ||
+		die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	rm -rf src || die
+
+	# do* plays with the executable bit, and we should not modify them
+	dodir "${PLAN9}"
+	cp -a * "${ED}${PLAN9}" || die "cp failed"
+
+	# build the environment variables and install them in env.d
+	newenvd - 60plan9 <<-EOF
+		PLAN9="${EPLAN9}"
+		PATH="${EPLAN9}/bin"
+		ROOTPATH="${EPLAN9}/bin"
+		MANPATH="${EPLAN9}/man"
+	EOF
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}