gentoo resync : 17.06.2021

37 files changed, 515 insertions, 445 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 924102eeae54..aeda32ddaf58 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index e309466a9b72..717d93aee3f1 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -9,5 +9,5 @@ AUX boost-1.76-sparc-define.patch 1026 BLAKE2B ad88b1c5231c0cbbd6bfb1f01d050ff20
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-1.75.0.ebuild 11103 BLAKE2B c8b74a302e399613bc23bc8d3e78977113721dd64554db1371f58a3f36d47933c09903ca94fddaa7fe81af0f45105059b51da9c2b6fd3edc6e4a4e9684d8f3b1 SHA512 b1eb508b1f1060bf5f5e91b1c43492fb1374880290d0874afd9e3a4c7cbd9dd4f909ba1b7b7cb40fe447b15eba19cebbd5da9d8263c26209c89661d513a629b5
-EBUILD boost-1.76.0-r1.ebuild 10967 BLAKE2B 3ef87a872fad7945d82e1392013ea4bb2ab7526d816034df3e5b9e2f44412cdc4ebc5a6e7376631876b3f876ecc9593651d5407cabf703720e953b7ae05e883b SHA512 0fe6a80c702416eb1be54199e2c479478d57813f2114e1b5f90f6377081b872e25aff166872c7a009be328072dc97e89118d605d8318843e056fc19505c56a0c
+EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B e71f1c19e051bc7d79093f23647d9358143f8c1fd06e73afa48e2cc5e8eb22104111a4605ca1844eb160b17623653985a49b0305266b0d8f8dc4aee542d5f8bc SHA512 e813b5407aee56f3a5734b185eb1a6cf6129210027794c735e25d2266040b56d2709d21d57a2d14ddbd843d59744b0497885f7e615d925311ce027164c3d0c5d
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.76.0-r1.ebuild b/dev-libs/boost/boost-1.76.0-r1.ebuild
index 83a1e70616af..54d5ffc74c1b 100644
--- a/dev-libs/boost/boost-1.76.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.76.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index 660351ff5f42..e1e393936861 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,3 +1,4 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
+EBUILD boxfort-0.0.1_pre20200902-r1.ebuild 957 BLAKE2B 4ca8a524daaa3d23813577c5d4e48c339bb4abc2adc261e9f4a125df3aecb439b2f60402a7d419655bcd630cb8dc77c516dc263f19a5e9f4520b2e6429e85459 SHA512 b67ca37a55d1bbcc1057937d5b84ed96af12644f4afe8a3ddf9a7a995a13670c88c328361dd9d817ae2ec28e4b9fd55f28eac38d084013aec2803748b0f6cd96
 EBUILD boxfort-0.0.1_pre20200902.ebuild 955 BLAKE2B e2bb6d346fdd0287d95b370035067b320720105e6c082d98fa28552df6339fd3b00323ebe531bdcc30d551bf8ced1d87c5e80d029ec67f9d49469ee0fe31c4bf SHA512 fc62cf164a55fce91e97b8cab102951ff33d51ea2f19bcfcbf28d400a29a7d3059dc17d27770b00704c5271b2c6c48e41dae8e86597c5dc1f45c11e707d3a5f8
 MISC metadata.xml 492 BLAKE2B 01ab25ee5881fb36b9218d2f88695e4c690cb1573c2d23efa8a4c0783f96142ae24c81e1c98af8ddb55ee5f1e03cb31ab9f3e8bd8b19ebea2b7465c3cf1798c4 SHA512 4b3eee55c730d06c5e041143900ac4dc2753c4327f92441896563359cc1e5d46aadbcc6c54a5f12d67cc4a2b5ee688cb30722ef67b71a26625878398cf3539c1
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
new file mode 100644
index 000000000000..18bce1975ded
--- /dev/null
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson python-any-r1
+
+BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
+
+DESCRIPTION="Convenient & cross-platform sandboxing C library"
+HOMEPAGE="https://github.com/Snaipe/BoxFort"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
+
+python_check_deps() {
+	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 362bf73b06ac..275f511fc280 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,3 +1,4 @@
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
+EBUILD cereal-1.3.0-r1.ebuild 815 BLAKE2B 8ca410517b7d8f92e4d0fc8c534fbc1bf6d20790c3842b1323d11df7afa657c3c89e891efd51bf20a2af3b7278fc97493285f87490e9b8598e745cee4e351d77 SHA512 e44bb348fbded83fe7a5277570a0bc4ccc7558d11fdca65df216140fb51b548e0a814e77dfecd8b5e00dcb1df237bc06449d2b08059207fcecad5efebfd6ff04
 EBUILD cereal-1.3.0.ebuild 553 BLAKE2B ae9b5d7897c871ef8f67495e0162f1fd5c88abb03eb146c17321d49b53454d5369725a80bf421a75a60b977aaa5eb98007f4fce258a83f1b45e7f3c0099abf52 SHA512 9d6f822c803d6da65184219b0644b1f6941824ecc67de12c6325be3e6391bdce32826f993de434ac7ab690579956bb6c2f6688c54b5db4511856c1686f96e618
-MISC metadata.xml 246 BLAKE2B 5b5665b0dd02a1ffcb5fa8c1c1ad30d32b6996e772f2d5418b3c705fe6514e26c27ff8c09c7d64ac7bf3223600c0d97a652c54cfbc98fa12c952ed01da6f85cc SHA512 11bd994e7a2b931824521a66ee32e85fa73e75d7aa3207d9b24ffca4e698c0e5e3100291710afa0d4e8b6e4d4529dd4ecdafa3827cd05761dd6b60c4c3b9820c
+MISC metadata.xml 394 BLAKE2B 436d9bbaeb57804831437da0632e3902af16aa36f0bacfc162a3b5f45c74a96f35997fc18ad0a204b0150dad1f9897953fe9a5f39eb22c2d67a00835cf4fbb5b SHA512 9fb5069ca3081f9fe590e8af3c925cd4ced1a945d7357ecb6debeff5635404d3dc98c6cc4583724206b78a0438eca3dbddb2df917441dd1e2d7f61350de560bf
diff --git a/dev-libs/cereal/cereal-1.3.0-r1.ebuild b/dev-libs/cereal/cereal-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..c14fc8b906f6
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only C++11 serialization library"
+HOMEPAGE="https://uscilab.github.io/cereal/"
+SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+
+src_prepare() {
+	sed -i -e '/set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")/d' CMakeLists.txt || die
+
+	if ! use doc ; then
+		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJUST_INSTALL_CEREAL=$(usex !test)
+		-DWITH_WERROR=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/cereal/metadata.xml b/dev-libs/cereal/metadata.xml
index 907c95a13f45..b739f14cee13 100644
--- a/dev-libs/cereal/metadata.xml
+++ b/dev-libs/cereal/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+		<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:usc:cereal</remote-id>
 		<remote-id type="github">USCiLab/cereal</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 43eac4827f0a..459568ba6375 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,7 +1,10 @@
 AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
 DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
+DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
+DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
 EBUILD criterion-2.4_pre20200110.ebuild 1936 BLAKE2B 188447cc2878f4933ef220f7b5282a35c3e47c1d38fe32fe8fe509d5a6e8a76626f3d7d1e8caaa4114ca962981a300e0cc3b66f33c3099698bb06014d5254533 SHA512 313dd311531830f92952874e5c0a712a5d55b18816f6681c919d71db6a2eadcee9c927f6ef646afc8c35ede0fa6c20d79716f408347992e233dd149e6fba3e48
+EBUILD criterion-2.4_pre20210114.ebuild 1929 BLAKE2B 15da10459a48a1d720d4c7ffbdbbe3489ab851d8a537e42a63342391d1d21a7994c64b3b728b9ec52d7fe8b7b96a8d4ff01a7c4ae8265ba57fe9c8459eb93bd2 SHA512 d2b23b09dba767caed1c9ce2e06b0c2894a2a28c3ef94473d37e4cfebbb92b578f322f0e02dae6c61c78f654e86d63e741568f03aaa08b50c15cbe61134dd1a4
 MISC metadata.xml 494 BLAKE2B 87f251d2ac7543391bbc2648981a34953fcd20426433ca89632d888316677ff0c542fdce8aa37c3df1a06d3bf714cb4dfc11f954451a51fc8f08ccef042563ac SHA512 c40f763d2a1e8610c7ab547b49520ab0afaa1b5c69584db9cb0c913367777147a159322ad19f733729719af7974a9e07d4431bfe1d722ad1e655ad76c7d98f7f
diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
new file mode 100644
index 000000000000..2a210335a427
--- /dev/null
+++ b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson python-any-r1
+
+CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712"
+DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
+KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
+NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc"
+
+DESCRIPTION="Cross platform unit testing framework for C and C++"
+HOMEPAGE="https://github.com/Snaipe/Criterion"
+SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
+	https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
+	https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
+	https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
+
+LICENSE="BSD-2 MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/nanomsg:=
+	dev-libs/libgit2:=
+	dev-libs/libffi:="
+DEPEND="${RDEPEND}
+	dev-libs/boxfort
+	test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
+)
+
+python_check_deps() {
+	has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	rm -r dependencies/{debugbreak,klib} || die
+	mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
+	mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
+	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index a7bf68b5abaa..2e23b5378fbf 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,11 +3,13 @@ AUX libgcrypt-1.9.1-fix-no-asm-on-amd64-x86.patch 4737 BLAKE2B d19d42d92392b0e1b
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
+DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8
 DIST libgcrypt-1.9.1.tar.bz2 3202683 BLAKE2B 102a61c855fb4a9e5c9433f52988ea87db7672de6586ed47f888526369d0ef8ad640752ca1ef144c2db73ce90464d6624cc3b12dbdeaf568d706222af3955672 SHA512 e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6
 DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
 DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6
 EBUILD libgcrypt-1.8.6.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
 EBUILD libgcrypt-1.8.7.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
+EBUILD libgcrypt-1.8.8.ebuild 2326 BLAKE2B 748b8c2a2e05f06d4e9106f1ddadf47f26ba9cb5091f4f762d894a3971d94e4530651507296c8f2eb05f0fc025ddd663109152b3d338bc392bf30270f88c09c0 SHA512 7e82d6cb85b5801ba2783811f72673f5b5e801fa96368682feec3b4b509d54a0577d4ca2d1c588dbd79d10f21f8eac9e5408fd30218b8377f7516fa924ac5fa5
 EBUILD libgcrypt-1.9.1-r1.ebuild 2896 BLAKE2B 450a6eabffe65b2d7cac0f8e0495c9ff63ea041c3f7227bbcf729326d45ce57529f1cddcd4514a5533163fc10e2b1dc4edd612a7ce4f2d067ad404f53334cb0d SHA512 0d3c07a5893db2941d7c33c1f5465e5e04c62a7e0d457bc8143b4beb9a4afc8d53ff32166072837e56d2d941c1b7eb52a71a91ebc0d8831776530473a15cf736
 EBUILD libgcrypt-1.9.2.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
 EBUILD libgcrypt-1.9.3.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
new file mode 100644
index 000000000000..76cbe5b9aad5
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		--enable-noexecstack
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index bf9174ff473f..a29612fb4df2 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,4 +1,6 @@
 AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
+DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a
 EBUILD libpcre-8.44.ebuild 2536 BLAKE2B 4816504c3c0aa9c6c4e2acf598483ad24027be06de64ed33f6451457391e4b76b4b1a3c7df2900b4823f0b57befa5f440421a9db67a63ca11ea0909d0a5a8d83 SHA512 76d67bde25ad0c478001d82a6760b63e9834fe478dd326b94ef2e54d7a7a9c45ccb16b663b155b9719fb3a5ea4ba847f7ec3be78d62bc608d5c234af78e893f8
+EBUILD libpcre-8.45.ebuild 2593 BLAKE2B f7c093918ae3060c5cc9d95c4ff2d0357f06bd5186e504dea888309fd9620207a67935018147f5de19985e162199435cad34905341f7cc8857a52465e836234d SHA512 676d0c2e907ddc4fdd46399dfbef2e9b4bc29596a86bb5d76f7ba0b46965942dea53d66399301a2857d5ffeba2c2bf2ca3467b2584bb22d366f7a4f2a87ee31e
 MISC metadata.xml 1219 BLAKE2B 633af3b60f5cd2d75585f1747b6d0233f5b5c46a182450777c55038a3e0da55b6bd70e471e4287267ba28b18af8bd9c9cd4f44a76415ad1baa2b5738655d5c86 SHA512 f012e32d3a8198b9ecb5b03aa99007c3a9a64652843071c6d106569ba9fdea4d1922c58f2e049a21217b92e0d3b32d264c5a4c41f4a84b0c2320f4f06deffcb1
diff --git a/dev-libs/libpcre/libpcre-8.45.ebuild b/dev-libs/libpcre/libpcre-8.45.ebuild
new file mode 100644
index 000000000000..78e4947fa844
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.45.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal preserve-libs usr-ldscript
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2)
+		$(use_enable cxx cpp)
+		$(use_enable jit)
+		$(use_enable jit pcregrep-jit)
+		$(use_enable pcre16)
+		$(use_enable pcre32)
+		$(multilib_native_use_enable libedit pcretest-libedit)
+		$(multilib_native_use_enable readline pcretest-libreadline)
+		$(use_enable static-libs static)
+		$(use_enable unicode utf)
+		$(use_enable unicode unicode-properties)
+		$(multilib_native_use_enable zlib pcregrep-libz)
+
+		--enable-pcre8
+		--enable-shared
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+
+	gen_usr_ldscript -a pcre
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 245ce819bb30..3ac96b1fe53f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -17,6 +17,6 @@ DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862f
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 EBUILD libxml2-2.9.12-r2.ebuild 6944 BLAKE2B 52a117d89831d0fb07eccc94bfba0e28444c5704cdbd476fe3cc8a0ac886f02ef63b0a7c8ff53ef371db422827c3527811b8f7709e60b40cb8aa548eedde9e41 SHA512 62b49df2388d217dcfa8a2e2c013869ffd4ea86569ebe6a6b7855f6c6c9d067606a03b8bb9f1147063ec9881560c8f5851cb925372d0140f9d4bd6b8e6da4021
-EBUILD libxml2-2.9.12-r3.ebuild 7099 BLAKE2B 94c2334599571ecaf9f0e348f62871fab7eb1156d3f746403ecce488c4611697437cdf83bfb4fd709b483f95eda61c774cb8886e14e2bc6b7d3e69aebcc4269c SHA512 83945cf8b255f3c952540fb1a9ea05c7a2c0a1f68ac51b9de0321e018c3e21f185939735a6bbc40fe0cf4673809bb59afb756998990dcbacdb27117d9309ca56
+EBUILD libxml2-2.9.12-r3.ebuild 7098 BLAKE2B 610470493d1cbfb4094e1c8c2466fde0aeb9026b29c31d6f2790ca99c90361017a4e857b82e9340c6402554ca024383c08c165ebc8ab3aa54a368420a9bfeba0 SHA512 707f7efa06e4440be182a8ed3e16ace92c5869c272ebde85d14f9209fcf935375324ae0989b7a192b0dec57ca582696de4355c89aa7f8a3a75fefbadaa9b0805
 EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
index 39a7586055ae..824b111956af 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index cacfa3a0a886..350f57f19fd4 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -4,4 +4,4 @@ DIST libxmlb-0.3.2.tar.gz 113428 BLAKE2B 30f29ebd7522ee2338b4e78e15a544bdf20514e
 EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B b7c684f7643c068f1394e5faa8c13e58fbe7920dcea85ce0dd523bea99fa97370079b9162eb7818aaefb820fe0b7d6a650c8cc50d2469b84ff0415a6dff73c61 SHA512 2fa73b4aeeb0aa9e1845741bb0ed6d523adaaba4f8269a398cf59ecb756c65e77acb9b7418a876b453c42e68fcad9b814d2d007ed66f1d7067ec8044161a5cb6
 EBUILD libxmlb-0.3.1.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
 EBUILD libxmlb-0.3.2.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
-MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
+MISC metadata.xml 541 BLAKE2B 06a78ea07fff14353777549351cc8655b621d71c51d47b11359fb231653506385291363b9c7139de5da067ad9f7e463bec6332957a6f4f42b16703a93ed9aec2 SHA512 0a65dcd6beb1e8a39214a77ff8ed0fd91adb0a3f536c18c02ba3e387b2be743b866d45dfd13652120f6ca3778e2e872f8ca0fa36d2842f26540284d97f152b5e
diff --git a/dev-libs/libxmlb/metadata.xml b/dev-libs/libxmlb/metadata.xml
index 1fda232c2458..f15e726c33bb 100644
--- a/dev-libs/libxmlb/metadata.xml
+++ b/dev-libs/libxmlb/metadata.xml
@@ -5,6 +5,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer type="person">
+    <email>whissi@gentoo.org</email>
+    <name>Thomas Deutschmann</name>
+  </maintainer>
   <use>
     <flag name="stemmer">Enable language stemming support</flag>
   </use>
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index e071c4be666a..0d3730737496 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,4 +1,6 @@
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
+DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
 EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
+EBUILD spdlog-1.8.5.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 474 BLAKE2B c66a689b156ede0e146807626045108496b9557afe1c24992f3314d1eba04beeb47e3048286df4c0a029410bd19892eb963910f3a505e3b609010a76a48bf223 SHA512 41ad4b9ee9d6803838d1f090616c4d6d2ecd754c62d6f271815aa77bf157366b659c2c78233a912d0b92dc372ff123b96ea77a6db37660b09783f6c5c2f02f61
diff --git a/dev-libs/spdlog/spdlog-1.8.5.ebuild b/dev-libs/spdlog/spdlog-1.8.5.ebuild
new file mode 100644
index 000000000000..deb8aada3af3
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.8.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/libfmt-6.1.2:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 32bb9501d5b5..b0d37cf7278a 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
-EBUILD tree-sitter-0.19.5.ebuild 757 BLAKE2B 6e35d71a61461094f1b1f5b9973d9439b33dd9b46e31bc9fc454b0f9b1fbb9daac0052cf627e38f4fc6758419ffe7348b1d65969a21d0aebfdb7ebacbc17ffef SHA512 ecbf7f58b06040a0a6a27eeb1e31fa8a1ada430d31effd07b8c67079ef71f23b43133ac255e9149869e4352b9d569e6fd825eac7f5c052cd71ed899c8faa60dc
+EBUILD tree-sitter-0.19.5.ebuild 763 BLAKE2B 500cce0afffaef886e181be47fd55efe177d665440e897cd4b26be097e25f4b5a7f62f6d4c98c4c1c842aaa3ae0b36b73802fe542a8fd3e18e4109c8da98950e SHA512 35f228535e4d29cdefc9d8933b2009107d6e0472872b517ab354c3c87ca7fc060fa7cfbf7943cd843e279f3840973388ebf12ee6aada52b167aa89417605a3c6
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
index ac77081630dd..60833984005b 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 2cd4f0a4064a..7c19a0518649 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,13 +1,3 @@
-AUX tvision-2.1.0_pre2-asneeded.patch 1908 BLAKE2B 7a3013155d762b9e49ab91ceec8ac1eb4dc6b9217b80feda8e2f93d9927882b36796ea7b73b4bb65a57f07308cfb2c9a23652b0567c271788f96be12b1aa7b7b SHA512 673532f787496598498a179b6a59518e6e24bc63d45223b42660592e27afb37f0bb8102c7f791b645d1e809f9ffcdf065db580a683b8119fa574e3ada978b2f1
-AUX tvision-2.1.0_pre2-build-system.patch 1102 BLAKE2B 61f600f1922a4e969392c2b8770c7e291af0f4c8aef08f07d5e3206384babebc7d6bc0d7aad2a42cab4c882f64e4eb109c3f4c27c70005c1ea10238636cb80d0 SHA512 5459a69aeb70fff0832a9b24c80020ef63c535e942a8767888509f7a3e6ae8dd845a4d81a36d0be9335ec9dd7cbeb688fbb315737c9d748e1d0be66a46f20ede
-AUX tvision-2.1.0_pre2-flags.patch 335 BLAKE2B 972dd44183334619e24d25ccb9f9301088a9e539883a2d7ae42bc90d04f1f7d50d364cdeca7ff08979e1e9d369e09643e4567fe23fbd0a31c2866f35dd9201fd SHA512 3537bf54649dee2eb1b245c446ffdd07e1123f08724567ccbab008a5df9fd8c93e47e654ef7da35199fa05e032a731dc4b777bd35685b8aa756ed5541a773588
-AUX tvision-2.1.0_pre2-gcc41.patch 265 BLAKE2B 9e5ef9db210048f15f103e664762d7df3aec7a2c2e05a91ff2d95187407b3551eab2a7ec48f44878b40c8dd09023115a469c2443555ddfa951534c391f4a2fc8 SHA512 89b6130c6e62c55b8c6f0b380672cc5e305e2f6eedc3b4cd3bd511e0959727aa7445c5999dbc3fbc9d651ed67620600d56f40e3701c8d649f7d12bf1e0a0f4d9
-AUX tvision-2.1.0_pre2-gcc44.patch 438 BLAKE2B ad2f7400b9f6683862b67c2558010984c4e627caad6eaf775160d8f6015aea23681fefd1b6611d6a25fca75ef347bfc3b03a9c4efe86eaa15ffc9e848df38f30 SHA512 203181e2e110e93fa082cf351333e6b662bd2236fa3aeafe546cc83edd5e8ae639769fa3e60350d1d7f5466b82db840e313c3637c7f5e5c414f8638127ac14d4
-AUX tvision-2.1.0_pre2-gcc6.patch 4891 BLAKE2B 674ddaebc2d4fa35debd319627d862c152b491106c6fcec0cc8d4d09896e13362fda099a5541e2b68b4c27cfd46f607717bfa8d3500b5dec891aba3ea730010e SHA512 cba8d6f16e10e8821be6c255ae156760030c725dda279537180ac66ae2dfdee28aa286c2a93653b77f666ddc28ad3e4440b9f58449f81d5d8f2dbfb0060964f1
-AUX tvision-2.1.0_pre2-ldconfig.patch 522 BLAKE2B 459dd4941159ca23027339e812a0c21ffc81a10ff1afdb136f6d8ab9ca819f25120ec0172386140b1e8f15258507831903ec5232c108e784c87b2416f14686b8 SHA512 d54daf2946007f43a4777571e89cc4670fd0124f28d82471de7d4010a84878fd08923e952e9cca9b08938b45e1e367e268c967f1afd12c25f50cac75e591fcf4
-AUX tvision-2.1.0_pre2-outb.patch 954 BLAKE2B c0cf973c3d83008106b96ad2b1658a2b50891c88a9ce81091a65db9b98818fc6fbef105604b78101e2fd84e217eca17a18b21797876a119ab293ef986467f03f SHA512 bb9cf5ac414f02d008aac345299d1a0701103bc044e637cdf4be5181fabcc7c4851ee6d569f91d86a8c9ff1134e32db36f3efaf5242e528b091c029a489d1fd7
-AUX tvision-2.1.0_pre2-perl-INC.patch 680 BLAKE2B e525daf089b00cd22338dd483394591c12be634b3d825a22706b31aff25a46c119bf662c808f74267f2b9f465551b230b7753d816e23934e57ee087f5dbafe9c SHA512 007d2a8738a918e455685b50ed148b5a0b43c64c53c1674826771f4b3510706161e81477f82f1cf123d52fee123c649446644be9a78dbf6966650e3bf51db1f3
-AUX tvision-2.1.0_pre2-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
 AUX tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch 1267 BLAKE2B 3e0e09562052ff2830fefc9ded095f7693de0e92290aebb8317327261968cbc055dd908e60b46aecc6705e64974aa4921ad4e00bfa744e8f11fd838044053fb5 SHA512 83f50ecb6ee9f1eeb2599c46764257c8931fc6f6d8daac3b9f0ab28de25931718c90fdae4d52ef042dd42cacd3f5946c55697760ed35939e4ca5d6f0d0a9d516
 AUX tvision-2.2.1.4-build-system.patch 1119 BLAKE2B 98d594371ba91cb70acb8865b1817c4cfa4563bd7965d4079357ccdab2c679f584677f209275e9a4851b31cca0de7ca2ca1688d523970704a3cc126620b4df59 SHA512 60b239c4f2c6a5c3ca00e5f6c29293f92ebb5f00e6dcfc709bee986a1960a01cb77c542921c2e02c576ef9ffc2a7a600534997d8c2a6e5d691ae2825b38b161d
 AUX tvision-2.2.1.4-fix-dot-INC.patch 675 BLAKE2B 8fd53d6e384b5cd71a2850fa0d80fdcd4544f1462d21cbfeb0cd5056ed23f5892d5f97d4f5fca7d8a86757ae171aae19fb689df98927f8ae0acac2d351e92e5f SHA512 49ab191bb74388d1cb6fd31c825b924dccfee5e9a85a55e86c2df50c5a186f78e6112b3fc0dde361f481ea7daea5b9b656aaa93ebbaccb80bcf146d460efda7d
@@ -15,8 +5,9 @@ AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214
 AUX tvision-2.2.1.4-flags.patch 392 BLAKE2B 8124537533a9a9e6568dec6aebdae766f05b1c59f7bbfbb34f8096ce0c4b61e9e5f0a70f525505592fe57c41ee61c8e31db1cd5e6fad5c977c73649c6b4f9b8e SHA512 8b3ccdf1dd49d436d9ebb05ee69081ca0abfb6b1dc6b41042788ef7b0c1328cbcf67788837577897d2e2485b41aaf620d789b39b33a0f82d442a263508f52017
 AUX tvision-2.2.1.4-gcc6.patch 1108 BLAKE2B 7a99bd2aa759d7995fa1bd0afd93c4b1a329d764f9dfff47796a997079718d90eeabe71e09046a6801644fcbf04caa05c955225a3fc77a0f031cad6d6ccc45e8 SHA512 05f55ad5f99107419bac22226b82dd2f94ec673e2c10e9872b59d47a42c7ab12e0f36c30bb1d019b15c8c07d8f5ebe2cf7637d42ca271d34c2042bb259fab3af
 AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5bb25d68e5c9ad8d09c2fd16ca6e7a5c52c1febc2e8547b4f3444339f806415a396cccd140db1df10de6a3dbdb6ebff0f SHA512 92c867111f4f528da29ff612c72c90d77709eb46c587b5759f2bc69392d538a6c25ed2d54b8fe7eca0cd3b167a7db0c50de94e88f2107f7527884d15485c1a3f
-DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
+AUX tvision-2.2.3-0001-use-proper-AR.patch 622 BLAKE2B e95e94946361f3f32058318603dd863ca14620d4dcebcf9e0a2335afcaed221bf7dceaff2f210d4d928a9c9afa514ba2e3e9f43730d5a28aa098a9cd67845511 SHA512 aca74659cf17f614178cbcdc6f6161ed46d7f6dbbcd0166f9f4697bce63a8547bdf3d9a615483071616911665e8c2a154e7116388d8b0c2c64c8ca08b3b62bcb
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
-EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
+DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3 SHA512 96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030
 EBUILD tvision-2.2.1.4.ebuild 1591 BLAKE2B 25dfa8ba53fc2bf40e717daa4e502820ea2609fb2ea96d170c79acff33ff640c1242d3b98593ca9abc22026ec9bbd7162f12e4f65cb8a73f500f35bb4954945e SHA512 d090aa5a123d4b81ffacbaa14ec6dea5f728196afc185abc076c3ff288b5a3db9e1f788999f89ec124ce6d5130b12a2e4b5c03970c507d8e353b03110a864d67
-MISC metadata.xml 584 BLAKE2B 9e0a46f70886d90423d03dbacca6f561f72aca282cbbead51e61a78632d93b444caf1d4485f0cdc1a3c8ef6069e0da7f04fc9eb152a0f630f8ed745e2347e11e SHA512 5c47abf240f67aa4eac6aafb2d1ca26bd494ffb8eb3ecaa6c989939cf201707ca50be9244abda468cb17391d4d8acc287a6676f4fbd565587cea446d51da4bb1
+EBUILD tvision-2.2.3.ebuild 1696 BLAKE2B 1f59386adba13f4083bc84b19dd68f469ebeeb6069862ccb363fb633219bd48337c040f3076b8709b9974b749b68e102c586a690ed2de81d5acafa3c2401af76 SHA512 9894629043baf8046153d6ce042418e8b2ce28beb5e70b24cb1bba28f5c2eb0ca95cad03795e8e45ad33ccb6fbcad1e05103b35195a2259ef0a83df76d6a83dc
+MISC metadata.xml 480 BLAKE2B dae64ea0d83b95289c108bd2b7d6bebd3d715e528ac3805306855962df76fa3e30192776d344443c25b874d739753a963fa9074d302b26b19c697ee743ba6562 SHA512 b55cef1bf47c4254ecc1461f246e5f3548bce7ebd449bf62f08574a5c27394bc9cfa8affa948ff63d14f815bd7ac41e6d78780a1b94b77d52d28541e2ddfc88a
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
deleted file mode 100644
index 314ab225f051..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -206,6 +206,7 @@
-   }
- # Flags to link as a dynamic lib
- $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
-+$MakeDefsRHIDE[7]='RHIDE_LIBS=';
- if ($OS eq 'UNIX')
-   {
-    if ($OSf ne 'Darwin')
-@@ -229,15 +230,15 @@
-      }
-    $libs=$conf{'X11Lib'};
-    $libs=~s/(\S+)/-l$1/g;
--   $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
-+   $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
--   $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
-+   $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
--   $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
-+   $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
--   $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
-+   $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
--   $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
-+   $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
--   $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-+   $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-   }
--$MakeDefsRHIDE[7]="LIB_VER=$Version";
-+$MakeDefsRHIDE[8]="LIB_VER=$Version";
--$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
-+$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
- 
- ModifyMakefiles('intl/dummy/Makefile');
- CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
---- tvision/makes/common.imk
-+++ tvision/makes/common.imk
-@@ -54,7 +54,7 @@
- C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
- 	$(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE)  \
--	$(OBJFILES)
-+	$(OBJFILES) $(addprefix -l,$(RHIDE_OS_LIBS))
- else
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
- 	$(ALL_PREREQ)
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
deleted file mode 100644
index 8ba26208948a..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-index 8b78ba3..92aa570 100644
---- a/config.pl
-+++ b/config.pl
-@@ -1111,7 +1111,7 @@ sub GenerateMakefile
-     $rep.="\t\$(MAKE) prefix=\$(prefix) -C intl\n";
-    }
-  $text=~s/\@target_rules\@/$rep/g;
-- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
-+ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
-  $rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
-  $rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
-  $text=~s/\@intl_dummy_rule\@/$rep/g;
-@@ -1196,7 +1196,7 @@ sub GenerateMakefile
-    }
-  if ($internac)
-    {
--    $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
-+    $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
-    }
-  $text=~s/\@install_rules\@/$rep/g;
- 
-@@ -1216,7 +1216,7 @@ sub GenerateMakefile
-  $rep.="\trm -f intl/dummy/*.lo\n";
-  $rep.="\trm -f intl/dummy/*.a\n";
-  $rep.="\t-\$(MAKE) -C examples clean\n";
-- $rep.="\t-\$(MAKE) -C intl clean\n";
-+ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
-  $rep.="\trm -f configure.cache\n";
-  $rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
-  $text=~s/\@clean\@/$rep/g;
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
deleted file mode 100644
index e74b09ee57d0..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/Makefile.in
-+++ tvision/Makefile.in
-@@ -31,7 +31,7 @@ examples:
- 	$(MAKE) -C examples
- 
- rhtv-config$(EXE_EXT): rhtv-config.c include/tv/configtv.h
--	@GCC@ -o rhtv-config$(EXE_EXT) -Iinclude rhtv-config.c
-+	@GCC@ -o rhtv-config$(EXE_EXT) $(CFLAGS) $(LDFLAGS) -Iinclude rhtv-config.c
- 
- install-headers:
- 	@install_headers@
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
deleted file mode 100644
index 36246b214f99..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/include/tv/inputln.h
-+++ tvision/include/tv/inputln.h
-@@ -201,7 +201,7 @@
-      { return name; }
- 
- protected:
-- TInputLine::TInputLine(StreamableInit) :
-+ TInputLine(StreamableInit) :
-    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
- 
- public:
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
deleted file mode 100644
index 40911f3a3e29..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tvision/classes/ipstream.cc
-+++ tvision/classes/ipstream.cc
-@@ -19,6 +19,7 @@
-  *
-  */
- #include <assert.h>
-+#include <stdio.h>
- #define Uses_string
- #define Uses_TStreamable
- #define Uses_TStreamableClass
---- tvision/include/tv/textdev.h
-+++ tvision/include/tv/textdev.h
-@@ -16,6 +16,8 @@
- #if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
- #define __TTextDevice
- 
-+#include <stdio.h>
-+
- class TRect;
- class TScrollBar;
- 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
deleted file mode 100644
index 8570bb04222e..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Fix gcc-6 compilation errors; bug 594176
-
---- a/classes/tdesktop.cc
-+++ b/classes/tdesktop.cc
-@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
- #define Uses_TVCodePage
- #include <tv.h>
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
-     createBackground( cBackground )
- {
---- a/classes/tdisplay.cc
-+++ b/classes/tdisplay.cc
-@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes.
- #define Uses_TVCodePage
- #include <tv.h>
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- // Remove me please!
- int TDisplay::dual_display=0;
- 
---- a/classes/tvtext1.cc
-+++ b/classes/tvtext1.cc
-@@ -110,8 +110,8 @@
- char TCheckBoxes::button[] = " [ ] ";
- char TCheckBoxes::obutton[] = " [ ] ";
- 
--TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178};
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178};
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178};
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178};
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178};
- 
---- a/classes/x11/x11src.cc
-+++ b/classes/x11/x11src.cc
-@@ -94,6 +94,10 @@
-  #define TIMER_ALARM SIGALRM
- #endif
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32;
- const int cursorDelay=300000;
- 
-@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor,
-        TScreenX11::leftPtr;
- char   TScreenX11::busyCursorMap[]=
- {
-- 0xff, 0xff, 0xff, 0x1f,
-- 0xfd, 0xff, 0xff, 0x1f,
-- 0xf9, 0xff, 0xff, 0x1f,
-- 0xf1, 0xff, 0xff, 0x1f,
-- 0xe1, 0x7f, 0xc0, 0x1f,
-- 0xc1, 0x7f, 0xc0, 0x1f,
-- 0x81, 0x3f, 0x80, 0x1f,
-- 0x01, 0x9f, 0x3b, 0x1f,
-- 0x01, 0xce, 0x7b, 0x1e,
-- 0xc1, 0xef, 0xfb, 0x1e,
-- 0xc9, 0xef, 0xf1, 0x18,
-- 0x9d, 0xef, 0xf1, 0x18,
-- 0x9f, 0xef, 0xfe, 0x18,
-- 0x3f, 0x6f, 0xff, 0x1e,
-- 0x3f, 0xcf, 0x7f, 0x1e,
-- 0xff, 0x9f, 0x3f, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0xff, 0xff, 0x1f
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f,
-+ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e,
-+ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e,
-+ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18,
-+ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e,
-+ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e,
-+ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f
- };
- char TScreenX11::busyCursorMask[]=
- {
-- 0xfc, 0xff, 0xff, 0x1f,
-- 0xf8, 0xff, 0xff, 0x1f,
-- 0xf0, 0xff, 0xff, 0x1f,
-- 0xe0, 0x3f, 0x80, 0x1f,
-- 0xc0, 0x3f, 0x80, 0x1f,
-- 0x80, 0x3f, 0x80, 0x1f,
-- 0x00, 0x1f, 0x00, 0x1f,
-- 0x00, 0x0e, 0x00, 0x1e,
-- 0x00, 0x04, 0x00, 0x1c,
-- 0x00, 0x04, 0x00, 0x10,
-- 0x80, 0x07, 0x00, 0x10,
-- 0x08, 0x07, 0x00, 0x10,
-- 0x0c, 0x07, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x1c,
-- 0x3f, 0x0f, 0x00, 0x1e,
-- 0xff, 0x1f, 0x00, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f
-+ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x1c,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x10,
-+ (char)0x80, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x08, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x0c, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c,
-+ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e,
-+ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f
- };
- 
- /* This is the function which creates cursors. On success it return
-
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
deleted file mode 100644
index 6d7d94fe8a0d..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -1193,12 +1193,6 @@
-     $rep.="\t".GenInstallFiles('0644',"$makeDir/$ver",'$(libdir)');
-     $stripDebug=($OSf eq 'Darwin') ? '-S' : '--strip-debug';
-     $rep.="\tstrip $stripDebug \$(libdir)/$ver\n" unless $conf{'debugInfo'} eq 'yes';
--    # FreeBSD: merge data from libdir.
--    # Darwin: doesn't have ldconfig.
--    if ($OSf ne 'Darwin')
--      {
--       $rep.=($OSf eq 'FreeBSD') ? "\t-ldconfig -m \$(libdir)\n" : "\t-ldconfig\n";
--      }
-    }
-  if ($internac)
-    {
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
deleted file mode 100644
index 0735f8ffeb77..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Recent kernel headers no longer provide asm/io.h.
-
---- tvision/classes/linux/linuxdis.cc
-+++ tvision/classes/linux/linuxdis.cc
-@@ -300,7 +300,11 @@
- *****************************************************************************/
- 
- #ifdef h386LowLevel
-+#if HAVE_OUTB_IN_SYS
-+#include <sys/io.h>
-+#else
- #include <asm/io.h>
-+#endif
- 
- static inline
- unsigned char I(unsigned char i)
---- tvision/classes/linux/linuxscr.cc
-+++ tvision/classes/linux/linuxscr.cc
-@@ -123,7 +123,11 @@
- #include <tv/linux/log.h>
- 
- #ifdef h386LowLevel
-+ #if HAVE_OUTB_IN_SYS
-+ #include <sys/io.h>
-+ #else
-  #include <asm/io.h>
-+ #endif
- #endif
- 
- // What a hell is that?!
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -77,7 +77,7 @@
-    # glibc I use but the fact is that the needed tricks make it very Linux
-    # dependent.
-    LookForPThread() if $OSf eq 'Linux';
--   #LookForOutB();
-+   LookForOutB();
-   }
- if ($Compf eq 'Cygwin')
-   {# Cygwin incorporates a XFree86 port
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
deleted file mode 100644
index 8a559bde5ccf..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/config.pl b/config.pl
-index 53a7b50..784676b 100644
---- a/config.pl
-+++ b/config.pl
-@@ -5,8 +5,8 @@
- # To specify the compilation flags define the CFLAGS environment variable.
- #
- 
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
- 
- # If the script is newer discard the cache.
- #GetCache() unless (-M 'config.pl' < -M 'configure.cache');
-diff --git a/confignt.pl b/confignt.pl
-index e185f49..9ff7ae6 100644
---- a/confignt.pl
-+++ b/confignt.pl
-@@ -3,8 +3,8 @@
- # see copyrigh file for details
- #
- 
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
- 
- SeeCommandLine();
- 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
deleted file mode 100644
index d693a359a6cf..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug #160591; fixes a buffer underflow.
-Reported by B Douglas Hilton <b.d.hilton@verizon.net>
-
---- tvision/classes/ttermina.cc
-+++ tvision/classes/ttermina.cc
-@@ -233,7 +233,7 @@
-          }
-       }
-    }
-- while (pos-->=queBack);
-+ while (pos-->queBack);
- 
-  return queBack;
- }
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
new file mode 100644
index 000000000000..ce45ec32ef5e
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
@@ -0,0 +1,23 @@
+From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 14 Jun 2021 17:48:45 +0200
+Subject: [PATCH 2/2] use proper AR
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ intl/dummy/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8..d47e185 100644
+--- a/intl/dummy/Makefile
++++ b/intl/dummy/Makefile
+@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
+ CC=$(RHIDE_GCC)
+ 
+ libtvfintl.a: intldummy.o
+-	ar -rv libtvfintl.a intldummy.o
++	$(AR) -rv libtvfintl.a intldummy.o
+-- 
+2.32.0
+
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 9bf7fccc56e8..74ce76bd57bf 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -9,11 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="gpm">
-			Support text mode mouse through <pkg>sys-libs/gpm</pkg>
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">set-soft/tvision</remote-id>
 	</upstream>
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
deleted file mode 100644
index 0990426185ec..000000000000
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Text User Interface that implements the well known CUA widgets"
-HOMEPAGE="http://tvision.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DOCS=( readme.txt THANKS TODO )
-
-HTML_DOCS=( www-site/. )
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc41.patch"
-	"${FILESDIR}/${P}-outb.patch"
-	"${FILESDIR}/${P}-underflow.patch"
-	"${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-ldconfig.patch"
-	"${FILESDIR}/${P}-flags.patch"
-	"${FILESDIR}/${P}-gcc6.patch" # bug #594176
-	"${FILESDIR}/${P}-build-system.patch" # for EAPI=6
-	"${FILESDIR}/${P}-perl-INC.patch" # dot-in-INC
-)
-
-src_prepare() {
-	# Strip hunk from invalid characters for gcc6.patch
-	sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \
-		-e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \
-		-i classes/tvtext1.cc || die
-	default
-}
-
-src_configure() {
-	./configure --fhs || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		prefix="\${DESTDIR}/usr" \
-		libdir="\$(prefix)/$(get_libdir)"
-
-	einstalldocs
-	dosym rhtvision /usr/include/tvision
-}
diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild
new file mode 100644
index 000000000000..28c667ecd8dd
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="rh${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="https://github.com/set-soft/${PN}/releases/download/v${PV}/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nls"
+
+DOCS=( readme.txt THANKS TODO )
+HTML_DOCS=( www-site/. )
+
+RDEPEND="
+	dev-libs/libbsd
+	media-libs/allegro:0[X]
+	sys-apps/util-linux
+	sys-libs/gpm
+	sys-libs/ncurses:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libxcb:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1.4-flags.patch
+	"${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
+	"${FILESDIR}"/${P}-0001-use-proper-AR.patch
+)
+
+src_configure() {
+	tc-export CC CXX AR
+
+	local myconf=()
+	myconf+=(
+		--fhs
+		--prefix="${EPREFIX}/usr"
+		--with-pthread
+		--without-static
+		--x-include="${EPREFIX}/usr/include/X11"
+	)
+
+	use nls || myconf+=( --no-intl )
+
+	# Note: Do not use econf here, this isn't an autoconf configure script,
+	# but a perl based script which simply calls config.pl
+	einfo "Running ./configure ${myconf[@]}"
+	./configure ${myconf[@]} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		prefix="\${DESTDIR}${EPREFIX}/usr" \
+		libdir="\$(prefix)/$(get_libdir)"
+
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r examples/*
+	fi
+}