Adding metadata

25 files changed, 199 insertions, 258 deletions

diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index b94b28d66199..167ed1854c50 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,2 +1 @@
-DIST clhpp-2.0.15.tar.gz 99826 BLAKE2B de5f6cab05d21199ffea37bbbcc5d312a4b812b602ce091d8fa22cb615060ce08454de1341881792996dd5c06378657a297505ff25ac159d85b59995e924bca5 SHA512 d24c035425c8204099e5264e61939c568e85b64e94d5ed3c58fe9430f4516495a974080a684b742f5aea1351455a0755efccd14317c20cd34885880cf1d8133b
 DIST clhpp-2.0.19.tar.gz 106871 BLAKE2B e8c94f3e242d272a7eedbb13f7ead89cacaffdeca8b837fab29eb023e60efc7eb730b3966702474168071e7c884801fa24f0eedad95f6ea866f27dddb3af4a4e SHA512 f2d37eaee7a46b505844ddf45ae94f5f94241dea0b8f03f6bf4ba7524d7556c9ed19cc2f702cdd9becc469816ffa3d8371ae3561aebff5486cae9b623a10f58b
diff --git a/dev-libs/clhpp/clhpp-2.0.15.ebuild b/dev-libs/clhpp/clhpp-2.0.15.ebuild
deleted file mode 100644
index 43da0bfe3323..000000000000
--- a/dev-libs/clhpp/clhpp-2.0.15.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Khronos OpenCL C++ bindings"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Khronos-CLHPP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/opencl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/OpenCL-CLHPP-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/clhpp/clhpp-2.0.19.ebuild b/dev-libs/clhpp/clhpp-2.0.19.ebuild
index 1130ed3788f4..419b89e9488e 100644
--- a/dev-libs/clhpp/clhpp-2.0.19.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${MY_PV}.ta
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # Tests require CMock (NOT cmocka), which is currently unpackaged
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 47e69b3b18f9..9cc211885656 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -1,3 +1 @@
-DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
-DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc15ce18070cdcdb12fd9b67f7ec732a53d8af7dc4b77add859bf64c4fa8bc52a593830de931a7bd12c60498cc SHA512 c276160ec960a38cd535c998336472694819bc6eb37beb711bd43a31441d1808c8a14d3a1f0eccc780785b19f739a4a51f923867a20b0707c465e0cc03f457e9
 DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
diff --git a/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild b/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
deleted file mode 100644
index 53b6e710e340..000000000000
--- a/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
-HOMEPAGE="https://github.com/google/crc32c"
-SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-big-endian.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	sed -e '/-Werror/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCRC32C_BUILD_TESTS=OFF
-		-DCRC32C_BUILD_BENCHMARKS=OFF
-		-DCRC32C_USE_GLOG=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/crc32c/crc32c-1.1.1.ebuild b/dev-libs/crc32c/crc32c-1.1.1.ebuild
deleted file mode 100644
index 0086632b41ee..000000000000
--- a/dev-libs/crc32c/crc32c-1.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
-HOMEPAGE="https://github.com/google/crc32c"
-SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.6-fix-big-endian.patch"
-	"${FILESDIR}/${PN}-1.1.1-system-testdeps.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	sed -e '/-Werror/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCRC32C_BUILD_TESTS=$(usex test)
-		-DCRC32C_BUILD_BENCHMARKS=OFF
-		-DCRC32C_USE_GLOG=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch b/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
deleted file mode 100644
index 3bd09930946a..000000000000
--- a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Pieter Wuille <github-sipa@wuille.net>
-Date: Thu, 18 Jun 2020 21:05:38 -0700
-Subject: [PATCH] Fix (unused) ReadUint64LE for BE machines (#41)
-
---- a/src/crc32c_read_le.h
-+++ b/src/crc32c_read_le.h
-@@ -30,14 +30,14 @@ inline uint32_t ReadUint32LE(const uint8_t* buffer) {
- // Reads a little-endian 64-bit integer from a 64-bit-aligned buffer.
- inline uint64_t ReadUint64LE(const uint8_t* buffer) {
- #if BYTE_ORDER_BIG_ENDIAN
--  return ((static_cast<uint32_t>(static_cast<uint8_t>(buffer[0]))) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[1])) << 8) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[2])) << 16) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[3])) << 24) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[4])) << 32) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[5])) << 40) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[6])) << 48) |
--          (static_cast<uint32_t>(static_cast<uint8_t>(buffer[7])) << 56));
-+  return ((static_cast<uint64_t>(static_cast<uint8_t>(buffer[0]))) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[1])) << 8) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[2])) << 16) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[3])) << 24) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[4])) << 32) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[5])) << 40) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[6])) << 48) |
-+          (static_cast<uint64_t>(static_cast<uint8_t>(buffer[7])) << 56));
- #else   // !BYTE_ORDER_BIG_ENDIAN
-   uint64_t result;
-   // This should be optimized to a single instruction.
diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild
index 6c7b9275a84a..be3203afdc82 100644
--- a/dev-libs/gmp/gmp-6.2.1-r5.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}"/${MY_P%a}
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="+asm doc +cpudetection +cxx pic static-libs"
 REQUIRED_USE="cpudetection? ( asm )"
 RESTRICT="!cpudetection? ( bindist )"
diff --git a/dev-libs/libbase58/metadata.xml b/dev-libs/libbase58/metadata.xml
index 690c2287eb35..6ebf88c89a18 100644
--- a/dev-libs/libbase58/metadata.xml
+++ b/dev-libs/libbase58/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
- <maintainer type="person">
-  <email>luke-jr+gentoobugs@utopios.org</email>
-  <name>Luke Dashjr</name>
- </maintainer>
  
  <use>
   <flag name="tools">Build command line base58 tool</flag>
diff --git a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
new file mode 100644
index 000000000000..0fcfb6bd563b
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/guillemjover.asc
+inherit multilib multilib-minimal verify-sig
+
+DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc )"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.17
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# ld scripts on standalone prefix (RAP) systems should have the prefix
+	# stripped from any paths, as the sysroot is automatically prepended.
+	local ldscript=${ED}/usr/$(get_libdir)/${PN}$(get_libname)
+	if use prefix && ! use prefix-guest && grep -qIF "ld script" "${ldscript}" 2>/dev/null; then
+		sed -i "s|${EPREFIX}/|/|g" "${ldscript}" || die
+	fi
+}
diff --git a/dev-libs/libcgroup/metadata.xml b/dev-libs/libcgroup/metadata.xml
index b9b4cd65883d..847e1b7a2559 100644
--- a/dev-libs/libcgroup/metadata.xml
+++ b/dev-libs/libcgroup/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
  <longdescription>
 		This package provides configuration and command-line tools, as well as a
 		rules processing daemon for working with kernel control groups.
diff --git a/dev-libs/libelf/metadata.xml b/dev-libs/libelf/metadata.xml
index 5da7ff511b14..83d00b14c8d4 100644
--- a/dev-libs/libelf/metadata.xml
+++ b/dev-libs/libelf/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/libgpiod/metadata.xml b/dev-libs/libgpiod/metadata.xml
index ce11b35dd4d2..0a4cd77c5e1b 100644
--- a/dev-libs/libgpiod/metadata.xml
+++ b/dev-libs/libgpiod/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
  
  <use>
   <flag name="tools">Build some useful gpio tools that use libgpiod.</flag>
diff --git a/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..f5c82fdbc28a
--- /dev/null
+++ b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Please bump with sys-devel/libtool.
+
+inherit multilib-minimal flag-o-matic
+
+MY_P="libtool-${PV}"
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}/libltdl
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="static-libs"
+# libltdl doesn't have a testsuite.
+
+BDEPEND="app-arch/xz-utils"
+
+multilib_src_configure() {
+	append-lfs-flags
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-ltdl-install \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. # bug #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+}
diff --git a/dev-libs/libpcre2/libpcre2-10.42.ebuild b/dev-libs/libpcre2/libpcre2-10.42.ebuild
index a4fe2829c736..36611df4065d 100644
--- a/dev-libs/libpcre2/libpcre2-10.42.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.42.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libretls/metadata.xml b/dev-libs/libretls/metadata.xml
index 08e333ff8f76..4207c6f887e3 100644
--- a/dev-libs/libretls/metadata.xml
+++ b/dev-libs/libretls/metadata.xml
@@ -5,10 +5,6 @@
   <email>mgorny@gentoo.org</email>
   <name>Michał Górny</name>
  </maintainer>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/libzia/libzia-4.39.ebuild b/dev-libs/libzia/libzia-4.39.ebuild
index 616bad6dd7ce..d2bf5df52022 100644
--- a/dev-libs/libzia/libzia-4.39.ebuild
+++ b/dev-libs/libzia/libzia-4.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/mpc/mpc-1.3.1.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
index ec060322ab5e..700a8b0f1467 100644
--- a/dev-libs/mpc/mpc-1.3.1.ebuild
+++ b/dev-libs/mpc/mpc-1.3.1.ebuild
@@ -23,7 +23,7 @@ SLOT="0/3" # libmpc.so.3
 IUSE="static-libs"
 # 1.3.1_rc1 is identical to 1.3.0-r1 so just keyword it and later RCs
 # contain further build fixes for consumers.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
 
 DEPEND="
 	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index bb8d45218a47..b274b47fa96d 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1 @@
-DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
-DIST opencl-icd-loader-2022.05.18.tar.gz 86968 BLAKE2B 24931d9f59e885ea5673c774c30632735392a9994545d87737ac392566af991385f25a5b71a8f79b4dd271c6675667088123d25c015fbc843378641f19791ffa SHA512 a02cfef224f552294f029ad5ffda8901cc486cedaab8e7b47723eec59d215488bce4d255bd6350980e8fbcf7f71c73939b10ebb2b7cfd51c5b8051079e2b3af7
 DIST opencl-icd-loader-2022.09.30.tar.gz 87782 BLAKE2B 78d4c19d71c212dbe43a22d9e9504f9d22c3c5b5d078b9aa5625462c5591b87fdd472532d80e594b2a4e7dca1f10a5093bd4dbe661a23c3dbe254868b07e7b40 SHA512 0e7161f61c58f4d05f2a5f611560da1e57dfcc95184d25676cdc19f6e2136eca11cad4a87c769f2bff416928efa168220300749dc7607151a0e34a6c1b751295
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
deleted file mode 100644
index 4ae2ca46c9e0..000000000000
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-MY_PN="OpenCL-ICD-Loader"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Official Khronos OpenCL ICD Loader"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-util/opencl-headers-2022.01.04
-	!dev-libs/ocl-icd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
-	cmake_src_test
-}
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild
deleted file mode 100644
index 082f069a5031..000000000000
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-MY_PN="OpenCL-ICD-Loader"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Official Khronos OpenCL ICD Loader"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-libs/ocl-icd"
-# Need an opencl-headers ebuild which installs cmake package configs
-# TODO: revert to the usual >=${PV} come next upstream version
-DEPEND="${RDEPEND}
-	>=dev-util/opencl-headers-2022.05.18-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so"
-	local -x OCL_ICD_VENDORS="/dev/null"
-	cmake_src_test
-}
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild
index 78a30e45e5aa..9475bd7ad873 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
new file mode 100644
index 000000000000..1c5dbad81059
--- /dev/null
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+COMMIT="6092368aabdd0dbb0fbceb2766a37b98e0ff6911"
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1
+
+DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
+HOMEPAGE="
+	https://laurikari.net/tre/
+	https://github.com/laurikari/tre
+"
+SRC_URI="https://github.com/laurikari/tre/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+agrep +alloca +approx debug nls profile python"
+
+RDEPEND="
+	agrep? (
+		!app-text/agrep
+		!dev-ruby/amatch
+		!app-misc/glimpse
+	)
+	python?	( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="
+	python? ( ${DISTUTILS_DEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	agrep? ( approx )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/0.8.0-pkgcfg.patch"
+	"${FILESDIR}/0.8.0-CVE-2016-8559.patch"
+	"${FILESDIR}/${PN}-chicken.patch"
+	"${FILESDIR}/${PN}-issue37.patch"
+	"${FILESDIR}/${PN}-issue50.patch"
+	"${FILESDIR}/${PN}-issue55-part1.patch"
+	"${FILESDIR}/${PN}-issue55-part2.patch"
+	"${FILESDIR}/${PN}-python3.patch"
+	"${FILESDIR}/${PN}-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-system-abi
+		--enable-multibyte
+		--enable-wchar
+		$(use_enable agrep)
+		$(use_enable approx)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable profile)
+		$(use_with alloca)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	if locale -a | grep -iq en_US.iso88591; then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.ISO-8859-1 is installed."
+		die "en_US.ISO-8859-1 locale is missing"
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	local HTML_DOCS=( doc/*.{css,html} )
+
+	default
+
+	use python && distutils-r1_src_install
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/xapian-bindings/metadata.xml b/dev-libs/xapian-bindings/metadata.xml
index 5da7ff511b14..83d00b14c8d4 100644
--- a/dev-libs/xapian-bindings/metadata.xml
+++ b/dev-libs/xapian-bindings/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index d9f8f928c168..bb359c898e1f 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>blueness@gentoo.org</email>
-  <name>Anthony G. Basile</name>
- </maintainer>
  <longdescription lang="en">
 		Xapian is an Open Source Probabilistic Information Retrieval library,
 		released under the GPL. It's written in C++, with bindings to allow use