gentoo auto-resync : 23:12:2022 - 07:58:50

author: V3n3RiX <venerix@koprulu.sector> 2022-12-23 07:58:50 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-23 07:58:50 +0000
commit: 7819ef4baadbb9171070ce385f7051989fe64e49 (patch)
tree: 3ceb56418e8596ecbbd740e492938eaa4775bb3a
parent: 4921f12d049de1487e17383a32da50a03ea90d65 (diff)
66 files changed, 432 insertions, 443 deletions
diff --git a/Manifest b/Manifest
index 3b836f9a5ab8..5d937a81c951 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29786 BLAKE2B 16e507bed9a19fc0dc0cc1b7384ba2c2fb58119e8c229a092a41750f38acda4b74d09bc74e84bc8f8bceaeb5c47ce9d9f96867923c2504cfa8e9c585378c231b SHA512 d596ca07b91e86b5bba1301633518391755a8e3d00a190184f65275c7f66c8269c0f3ebeb09b14613d2bcddc4f96f6522a3b6b45fd6dde003914b2ff373fece6
-TIMESTAMP 2022-12-23T01:10:13Z
+MANIFEST Manifest.files.gz 29800 BLAKE2B fb3a7f02aa8151b569e34a53d9f1bda4d18a565f02de817350d4e36afcf0001eb62ea3e51e8a9f91d490a7fd719eba6d211954762d445555309b2b6998bed3e4 SHA512 d5fc51aa5866e23489e56ce7ffb997b52678edd0f841e130cdf5bd09063f58a46cedef3429c717ee1e36b89e801735008d8d069e49c693ff3b67223a88391552
+TIMESTAMP 2022-12-23T07:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOk//VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOlVElfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDMuxAAoLL3qLJ+RSuJDvhy31qxanfy8Q89IldL5de+zjx8Eo0Vbps4ubYRPU0P
-/Wk3hCcSkkJ2I+YkE9R3v8aB7CovDk1BtorhmpWEGqn+j/RvJKE8p5I08jHS+2S4
-g+ISZ7/0irQU5/Rp6GULEdm/a3E8x7wIkm1hWuNZBKvBoVEY+FFIMoLNkn0Qogz5
-nF22HNwWJiuueTPnMbMsQEUnCMODKbotd3AkaZwZT5bg9lXunWkaMDhz+BlEvhtn
-hF/9Xtslo5bv5XqIugk0jmz5CCOjaM0NTdGtLQ7ePGkTBKqN/Q6+pB2Ce0m+Z8yR
-3AEgHf+ELlpmCzVhz8LInxetDXaWOsXSRKwRX4a/CLfZdcRS9tZkt8xN83rFoQxK
-jcbv7rvNHcIyGA+bQ9ZqvsIePRe6UxMZ8GsV9rjcG6Z5AAKNuqGCU0/doGCSIrvF
-PIk4ac2dSJeVGHcVu98X8M16w+R2u7hdwXMdeGM0wFQggMNvjsXtEhK6b4/fUsXe
-qbsf8oBWQGF1jr/hqBgMSmCRow+ywZ36sbdaV1llRLjrcwmHbsxC9sdEppfYNdgx
-qKzRJDIQyUgy6TFj2W+LasL8+1K4xYl4T4rNJVbk1P5wfTnIRYrwdOsN1OETBmUQ
-xwl4cU+mA1zFi/8LOB8mCkA4rEWtM4q+KCW9CVd7I6+UVBqQuAE=
-=+6tB
+klCQBA/+Pk5kWWz5MAaInQwTfaoZ1FCYO/TdJV2lvucv1670WmbrsPQ5gbJN7NMd
+gFVKnAQNHhnMm9vxi03/lfCyA4AkuzdSsjNY0PZyPQLnjPg+qTaU3EBaFe7BuonW
+eWoGOYeY6o5t/DFhdso9PytjRiH5b/SE+zl5CmUV7VJQAcyz3QVJlRbc0RIqdecX
+AJHYw2iWg73R2b13fNYvXM9aNaCZJ4jqNeoxasAoo+Lwvuf5W6gXWPT3mfcHz008
+LbsBqoDMcvAi8Us1VpXBnO2Zqo43MczpCjEyqkfWdgx7YmFFBzl81Zq1/RZN0p6P
+YcM2eH73Ev9lUc6+V8Gg7dY8BL43LhvQGdUYfWgGzVD0jGXGftN6pvOETMy3Y03I
+b/IWuH9PWESHkJsFkzTcCD+eHo/3NIQaNfnecvx0+uXbm1AbeheQ66pPXtRXn+Bu
+1/SB565N6n/qotFyX4CetO0nckbhhQlIKy1WGa85TW6JcG5WMNv7+5KXm16wlUeW
+DrVM597hk2SXuU1rhpihMjb4PUQQw6dvvciFOzoEEE0PKSpi698+jxYdJ4anNF7G
+tuQlzzSNf3slDGu8/DTD7tx6mUYfSdOJWdmoLoGM6Yg3z9aQ8xRhSjR4MYagZCMD
+sbczXGrJBXV4I+yibJD3hFiQ9D/LitgPCptfaAY3O3KTOCfiAWw=
+=RnfH
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3bad9df5c4d9..5c990fbc09d6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a620b89a6938..01acd095346b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
index 47eae24b5876..233525838ae9 100644
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@@ -1,3 +1,5 @@
+AUX pxz-5.0_pre20220509-fix-xz-path.patch 484 BLAKE2B d81b33465655a24ce1de0c503f5186ab8ee279f930f43eee9e6493f84a95902594335b757a6c707dc0b05b95622067bbceab61464175529b0c6a1688e4f6131d SHA512 e730ac3ccf4a3d0e7c57c65eafe3242596ce0bce06f3d21e5d9603a66fe4c611f8311bb9aba4206a68d3fffce3d26bf9ffc86fcb8d8cbf74d1446b84582569af
 DIST pxz-5.0_pre20220509.tar.gz 12375 BLAKE2B 5d954d4cd1b139dc94a9ecc5aa99c19a1484812eb62fce089b8f33bfc0ce3ed3ad8053cdc58843c429a365439cd13b3a4b14ebc34de7f2a99deae7cd995cd4e6 SHA512 b1de877d2b8ee9ea5190af4c1a0dc97f7777c35a084137db6d86e23de99b332ea361a82ed995ac2ea12b7bf0670ae92a822235be3b19a1145b6cf5604074f960
+EBUILD pxz-5.0_pre20220509-r1.ebuild 1077 BLAKE2B 861904475eaec7edf1bc3b943c16d9a2073e32c9e88a2ac4d07469b5ba25bce725b7449e0075d66247fdeddff042752bdb870e18456399ee50b1776984d16d25 SHA512 76bace18e8e4795cb75298d8f43f4bb1e5af06f7e3e044b87abaa74c3f44b399ceabfba3f03a8f16448f7a3ff32cb9b6b702c7a08bca5b95a7c3b1cb89bdf24e
 EBUILD pxz-5.0_pre20220509.ebuild 981 BLAKE2B c26364f09afd4d6dfe9a9e2394353a127804cb75a2230819c5eda46690ac1790ff26bd042e1e0ce8ccb530cc8bbfac945fb364dc708d275d2b5b2b6e464c3015 SHA512 8e64fab91e2d8769347de0c7c3e8d6d7476086898be7e910d332f7a42c7ff57f791185da8839ce3659b5d6f3cb493ebe347a574e19b04d69c2e49a14b0cf62e4
 MISC metadata.xml 677 BLAKE2B 970357f7a9fbc5bbfefe6d2a8d8c72a27d3d62f37987a578811f056df9452efb7417c8a3cdd446f54ea0ffd1f12c4217a6ea8c8df9e699e88975c2e2b1afa183 SHA512 35091887bb484b965b915e280a4233f20fca36b19e893a1cc8eeae983f92a7afaf6ad67df87cf337083611e7805db6f80dcf184cab79ce4f0c2d877f28b01d6d
diff --git a/app-arch/pxz/files/pxz-5.0_pre20220509-fix-xz-path.patch b/app-arch/pxz/files/pxz-5.0_pre20220509-fix-xz-path.patch
new file mode 100644
index 000000000000..76e1f1506157
--- /dev/null
+++ b/app-arch/pxz/files/pxz-5.0_pre20220509-fix-xz-path.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/887255
+https://github.com/jnovy/pxz/issues/34
+https://github.com/jnovy/pxz/pull/40
+
+From 20014a968d2330ac90f48fc2091e15a44cb1e759 Mon Sep 17 00:00:00 2001
+From: Tobias Faller <fallert@tf.uni-freiburg.de>
+Date: Tue, 20 Dec 2022 22:41:59 +0100
+Subject: [PATCH] Updated default path for xz binary
+
+--- a/pxz.c
++++ b/pxz.c
+@@ -43,7 +43,7 @@
+ #endif
+ 
+ #ifndef XZ_BINARY
+-#define XZ_BINARY "xz"
++#define XZ_BINARY "/usr/bin/xz"
+ #endif
+ 
+ #define BUFFSIZE 0x10000
+
diff --git a/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild b/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
new file mode 100644
index 000000000000..051b8312f0de
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs prefix vcs-snapshot
+
+PXZ_COMMIT="136e5c25daf545753329d7cee1b06ae482fb9c44"
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
+SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+# Needs the library from xz-utils
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0_pre20220509-fix-xz-path.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	eprefixify pxz.c
+
+	if use elibc_musl ; then
+		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	export BINDIR="${EPREFIX}"/usr/bin
+	export MANDIR="${EPREFIX}"/usr/share/man
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e23672106082..e0a58f213486 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index a2a98cefd303..65134d472678 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,4 +1,3 @@
 DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b
 EBUILD beep-1.4.9-r1.ebuild 1036 BLAKE2B 8af1179f91ed10e068d03fe9d0e9eb7d8dc9529511522a28b62e54ec536d6da28d270df35e3ac6da5fc28afe3f4722663b64bd32e9cb4f3932dae3f69f48ef06 SHA512 cd8973c1d2a37052abb4990a8e194c5ea70dac5afd07814b7a54a689660c4d9510ea5ecaa2678d8a42ffface6823b1a9d6e6adc1800f1bb9576af65edebb872b
-EBUILD beep-1.4.9.ebuild 1044 BLAKE2B 2de3a51eb677557cc0012aad4573594c5bf0f86d489e95e1f32cfc73f2a33d18606e35158aa3af342833a768547d86a71f7c33a62ea3d98624b03ee57b7c2d57 SHA512 1a66a24c42965a2b2c80e4ba9698aa710d2beefc7bc40c3cae0933198a2a2f51a5b319c6f5fde1249dc47edc044332c2ae65409071640b1bdd84641c8c56f675
-MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
+MISC metadata.xml 345 BLAKE2B 3ce8134e5c5971fdeb01d04278c1d7382aa2fc372be720ea86fd13c42831c45cddc6ed59e316a79d43fb3c0175bf6b1eccaa561332ea97810ab59b4171b62cbd SHA512 f67241c51be678cf1f672eee63de0149325b3ec96c5f2c92e7fb9b10c3b187d76a7864cf64ed40ed80cd8331ccc4f55ec81904e16baaeac7edfb719b2c8d8d95
diff --git a/app-misc/beep/beep-1.4.9.ebuild b/app-misc/beep/beep-1.4.9.ebuild
deleted file mode 100644
index e8c215dbe0b6..000000000000
--- a/app-misc/beep/beep-1.4.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Advanced PC speaker beeper"
-HOMEPAGE="https://github.com/spkr-beep"
-SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="suid"
-
-# Tests require a speaker
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i -e "s#-D_FORTIFY_SOURCE=2##g;" GNUmakefile || die
-}
-
-src_compile() {
-	emake \
-		COMPILERS=gcc \
-		COMPILER_gcc="$(tc-getCC)" \
-		LINKER_gcc="$(tc-getCC)" \
-		CFLAGS_gcc="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS_gcc="" \
-		all
-}
-
-src_test() {
-	emake \
-		COMPILERS=gcc \
-		COMPILER_gcc="$(tc-getCC)" \
-		LINKER_gcc="$(tc-getCC)" \
-		CFLAGS_gcc="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		check
-}
-
-src_install() {
-	dobin beep
-	doman "${PN}.1"
-
-	if use suid; then
-		fowners :audio /usr/bin/beep
-		fperms 4710 /usr/bin/beep
-	else
-		fperms 0711 /usr/bin/beep
-	fi
-
-	einstalldocs
-}
diff --git a/app-misc/beep/metadata.xml b/app-misc/beep/metadata.xml
index df1ea8d84522..59fb8cd72e42 100644
--- a/app-misc/beep/metadata.xml
+++ b/app-misc/beep/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">spkr-beep/beep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7dc798400ff1..d0b6c36d69b2 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
new file mode 100644
index 000000000000..8919bdfbb7bd
--- /dev/null
+++ b/app-text/crengine-ng/Manifest
@@ -0,0 +1,3 @@
+DIST crengine-ng-0.9.2.tar.bz2 3123671 BLAKE2B 7ecafc398e81fa9771f5728d0fa60fbc6c3fb883a56d09fc4857d92c3d2f997cbbc0d4ac9818bff82d38ffb110463b88663f3298380a15e83df7292dff461cc2 SHA512 09b6f8f9bb747d71258802741d0d8962808279122ed6f2791b2c3813b684bb515206bc8656128e129fc7bcc76bcbb2c485360adb3b60f51377b87f26a1874e05
+EBUILD crengine-ng-0.9.2.ebuild 1634 BLAKE2B 66e9342e3fa43ffc227a022fb82539a755b23fd078989c0851211f0ef798094fd9cc818f67011c9f8010d4efe6457a59eb6e1a4db64c3099e4afef09459ac05f SHA512 c283ac39b48919622238c443af5192440c10ad456d06f049b1f641984e1f1f2597a45c66d52fb8c11a63cf28797e082c6e7a33f9a28462f4b977142883097f5f
+MISC metadata.xml 1225 BLAKE2B f4d77011c511148302e8ca82ca9505a282245a35aafece3a160361734ddd1d8a4c9e2ee62f6200ba32e01138d58a13f1e60ec4ce82625b7b31978b7fb38fc807 SHA512 1d27b4ecd665cb667996c15c1912a9120c3a1a70e44f8394d0f366fa4b5a81682a5f75a43e75570731e4a26f1f8a5570948d09709d1c16604a2ba2d105af9f3c
diff --git a/app-text/crengine-ng/crengine-ng-0.9.2.ebuild b/app-text/crengine-ng/crengine-ng-0.9.2.ebuild
new file mode 100644
index 000000000000..35edaf121645
--- /dev/null
+++ b/app-text/crengine-ng/crengine-ng-0.9.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Cross-platform library designed to implement e-book readers. Supports many e-book formats"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
+
+CDEPEND="sys-libs/zlib
+	png? ( media-libs/libpng:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
+	>=media-libs/freetype-2.10.0
+	harfbuzz? ( media-libs/harfbuzz:= )
+	libunibreak? ( dev-libs/libunibreak:= )
+	fribidi? ( dev-libs/fribidi )
+	zstd? ( app-arch/zstd:= )
+	libutf8proc? ( dev-libs/libutf8proc:= )
+	fontconfig? ( media-libs/fontconfig )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	${CDEPEND}"
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DCRE_BUILD_SHARED=ON
+		-DCRE_BUILD_STATIC=$(usex static-libs)
+		-DUSE_COLOR_BACKBUFFER=ON
+		-DWITH_LIBPNG=$(usex png)
+		-DWITH_LIBJPEG=$(usex jpeg)
+		-DWITH_FREETYPE=ON
+		-DWITH_HARFBUZZ=$(usex harfbuzz)
+		-DWITH_LIBUNIBREAK=$(usex libunibreak)
+		-DWITH_FRIBIDI=$(usex fribidi)
+		-DWITH_ZSTD=$(usex zstd)
+		-DWITH_UTF8PROC=$(usex libutf8proc)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_NANOSVG=$(usex svg)
+		-DUSE_CHM=$(usex chm)
+		-DUSE_ANTIWORD=ON
+		-DUSE_FONTCONFIG=$(usex fontconfig)
+		-DUSE_SHASUM=OFF
+		-DBUILD_TOOLS=OFF
+		-DENABLE_UNITTESTING=OFF
+		-DENABLE_LTO=$(usex lto)
+	)
+	cmake_src_configure
+}
diff --git a/app-text/crengine-ng/metadata.xml b/app-text/crengine-ng/metadata.xml
new file mode 100644
index 000000000000..19324ff37cd7
--- /dev/null
+++ b/app-text/crengine-ng/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>valexlin@gmail.com</email>
+    <name>Aleksey Chernov</name>
+    <description>upstream</description>
+  </maintainer>
+  <longdescription lang="en">
+    A fork of coolreader. Supported formats are: fb2 (including fb2.zip), fb3, epub (without DRM),
+    rtf, doc, docx, odt, html, chm, pdb, mobi (without DRM), txt, trc, prc.
+  </longdescription>
+  <use>
+    <flag name="chm">Support chm format</flag>
+    <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag>
+    <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for hyphenation</flag>
+    <flag name="fribidi">Support bidirectional text by <pkg>dev-libs/fribidi</pkg></flag>
+    <flag name="libutf8proc">Use <pkg>dev-libs/libutf8proc</pkg> for manipulating unicode strings</flag>
+    <flag name="lto">Use link time optimization</flag>
+  </use>
+  <upstream>
+    <remote-id type="gitlab">coolreader-ng/crengine-ng</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
new file mode 100644
index 000000000000..6652d76ff948
--- /dev/null
+++ b/app-text/crqt-ng/Manifest
@@ -0,0 +1,3 @@
+DIST crqt-ng-1.0.2.tar.bz2 419058 BLAKE2B 5d8b6704e6ec226852a0c82cc6c00b386c5b348675f00c4acc9dddbee999f381616083101f183523671ef81bb5036eddb7643b3f31857535d6773a549405ab1c SHA512 f8ebf9d5dec13b69fe7440209cd4da807d25413075b4ad2de885fa73134729be5c23df7d0a73bff061171449e394474ac3779b940120f144d93a7a98eca6cf55
+EBUILD crqt-ng-1.0.2.ebuild 1087 BLAKE2B edaf6f8101555e0227c516b3ae616849c6b19bdb8418641dfbee2b0a2438d9e379f7b85ce67303a388e205bee9c4c78985593e3f3d1386bf34e53c0eee59ebc0 SHA512 e0c99bf02db0e39d2a6d6adbdc8de192766b54fc8a0a126f1bbcd36836f355363cac3e2c43f634eed45e4c042d966a7152a025321472276678418f9a2159a981
+MISC metadata.xml 1166 BLAKE2B b611a0ba6988c389c0a5b18b6e0a35b823529be3b1a5f6dd9f4f10baa82db79c79e9a9be6c709706480b6aa7d5acaecb2283fdd7accea44290bb79d503e52f5b SHA512 e86c87eb1cea3667041359e74f18771da797ed3363935efee7576db38b706c873c6057bccc335d48dc0d6727f5b57c57518c04c6cfb81882124b07a56e541d98
diff --git a/app-text/crqt-ng/crqt-ng-1.0.2.ebuild b/app-text/crqt-ng/crqt-ng-1.0.2.ebuild
new file mode 100644
index 000000000000..ecb531fad955
--- /dev/null
+++ b/app-text/crqt-ng/crqt-ng-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="bg cs hu ru uk"
+inherit cmake plocale xdg
+
+DESCRIPTION="Cross-platform e-book reader"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
+
+CDEPEND="app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_environment_reset
+
+	# locales
+	plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts'
+	sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \
+		-i "${S}"/src/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(-DUSE_QT=QT5)
+	cmake_src_configure
+}
diff --git a/app-text/crqt-ng/metadata.xml b/app-text/crqt-ng/metadata.xml
new file mode 100644
index 000000000000..6aee26085f6e
--- /dev/null
+++ b/app-text/crqt-ng/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>valexlin@gmail.com</email>
+    <name>Aleksey Chernov</name>
+    <description>upstream</description>
+  </maintainer>
+  <longdescription lang="en">
+    A fork of coolreader. Supported formats are: fb2 (including fb2.zip), fb3, epub (without DRM),
+    rtf, doc, docx, odt, html, chm, pdb, mobi (without DRM), txt, trc, prc.
+  </longdescription>
+  <use>
+    <flag name="chm">Support chm format</flag>
+    <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag>
+    <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for hyphenation</flag>
+    <flag name="fribidi">Support bidirectional text by <pkg>dev-libs/fribidi</pkg></flag>
+    <flag name="libutf8proc">Use <pkg>dev-libs/libutf8proc</pkg> for manipulating unicode strings</flag>
+  </use>
+  <upstream>
+    <remote-id type="gitlab">coolreader-ng/crqt-ng</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index e2c7d7e1a25f..c6096fdddd31 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -5,5 +5,5 @@ AUX multitail-7.0.0-gentoo.patch 1029 BLAKE2B 7aa35008a0dc58f82bdde4c2972b7028e6
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
 DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae
 EBUILD multitail-6.4.2-r1.ebuild 1325 BLAKE2B 266d8fe2b7be9ef97487256010b84d25d046bd16a5790eb920e730d84228b2b7f678a73dd85f3a67a9a38d184f38ef030d92f9153398566f6a4982a99d19284f SHA512 717979028622d84bb660d477aca52ee7f2b1b6ea430a4982e35680830f0a14e7829e7551b96e48784af0f51f9c1f987b1aaa8baf8fd61c211d8f187035b1816f
-EBUILD multitail-7.0.0.ebuild 1542 BLAKE2B 5947c1575da67b12c8bc1bc3a3ea653a3c5823a20d36ba6c57511e2daac2803760c334fd12272b1d815baf3fad1b141bfb264da1d0f3ee3a902e8303dc57c2df SHA512 965e09079358d49af79eacc3b30350bd62599da65b907092a6eb9e5367e73f01c8653d4c1af657d6dd5b2d9d2c15ecefa46bbe0a0e767dad6cb1b70c7400cfb2
+EBUILD multitail-7.0.0.ebuild 1507 BLAKE2B 8da2b0e5ccde03ce9363254435059522f39237988d7ac79d4e82c231784335f13cd7d1b4bf8b6651349d8e361800d5fa226b347e27dc5eb7197c8ed58fc7996c SHA512 92dc2dfa7371058f5b96a3d9955391c25432c1ebea510294f358488ee94b99543d4610a60aa3b3710721c3e09b5ef55b7ecdcc12e8f889ee139e177664948f86
 MISC metadata.xml 358 BLAKE2B febc299cf49a8c7bb3a55c83a95fbce0ceb46a9297f91a8d34e6275fb66f7847b08d0facfdcaacc2d88b97af8cf64244712f424a1bfcd11fa866fab7f4d28702 SHA512 834755fd8e98223a18d1487ad8e182bbdd02094b3b52603f7945099dfb0f525a5f08f1d2162b2a5785ce01fd252e4a6b2f4ad9b7ae775e7922ac560a332ea42c
diff --git a/app-text/multitail/multitail-7.0.0.ebuild b/app-text/multitail/multitail-7.0.0.ebuild
index 63fce453c73e..022866ca0977 100644
--- a/app-text/multitail/multitail-7.0.0.ebuild
+++ b/app-text/multitail/multitail-7.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic optfeature toolchain-funcs
+inherit cmake optfeature
 
 DESCRIPTION="Tail with multiple windows"
 HOMEPAGE="http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
@@ -19,9 +19,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-  "${FILESDIR}"/${PN}-7.0.0-gentoo.patch
-  "${FILESDIR}"/${PN}-7.0.0-fix-clang16-build.patch
-  "${FILESDIR}"/${PN}-7.0.0-fix-lto-type-mismatch.patch
+	"${FILESDIR}"/${PN}-7.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-7.0.0-fix-clang16-build.patch
+	"${FILESDIR}"/${PN}-7.0.0-fix-lto-type-mismatch.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d22bdb8357ab..2b12ea946f56 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 2383a8c8a0d3..8208ebe5d2cb 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -8,5 +8,5 @@ DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B ecd19eaf84dbc80448b51651abe52a89cc005
 DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca SHA512 aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
-EBUILD openssl-compat-1.1.1s.ebuild 7672 BLAKE2B e57cd370b40e51c7760210991ac26ee5a83f8c237dda83d2ffd674eafbd78a256ad162151832dfa219a56edabaf21708c6cf1c66f74facb18a104f680667974d SHA512 8e9ea75d023cc9321d6499bfad17ab2537c26d969656f8df2530aa36e2a6de2b13b949531366a8a5e6579a3008f786e713e15f0886b7b7179459cd8f46a55b75
+EBUILD openssl-compat-1.1.1s.ebuild 7760 BLAKE2B 6764b4c114772b49fdb24a1102d9ac53f6c6e93ef265d7f251f78a67ab8a8dfebaef9555e9ede3c882ad6f26eef2cc0caba5dd2ad2fd51018f168fff94919091 SHA512 e0cdf8b85b6932ca54c8aeafd7e5f30309fb378a656773badcbc381f9ac43d0df2fe9bc4885566224394a46fdc054b289eefd9f30e4852a8e3bf3831341943fb
 MISC metadata.xml 1223 BLAKE2B db6fe704a4a09590821cd011556759cfd60543fd531fef3bd233378f396ac5e67c7d834eee4e544995c3af02dc9f222ac787e0b8a1c48a6cadd06541c81372fb SHA512 3cd0b3d8ba2c2c31d3240a080c0edf61a3b090adb4bb14c3b79c9cd1f0c0ac332a9c9457b218a09fb9192cc82004dba57cd4cac404fdd5ddfe4f0c7780b596cd
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
index 7f129274d627..e95f60fc6006 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
 
 MY_P=openssl-${PV/_/-}
 DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
@@ -54,6 +54,9 @@ pkg_setup() {
 			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
 		fi
 	fi
+
+	use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER"
+	linux-info_pkg_setup
 }
 
 src_unpack() {
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index cc016e4404c0..bcdef0c27735 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -16,7 +16,7 @@ DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45
 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee
-EBUILD openssl-1.1.1s.ebuild 10156 BLAKE2B 1748ebcd3c309783f794c7edebc8e1ba4d815f7381689c6d38c7dd3c740c3e6cb8298695df5873c075e987d3cfd7f2b5af42103304121392ec3bbdfd6e44976d SHA512 1dcbaac82562127fbaacd5afad73970474fdf90d4bc9d248ef41a703764a402d55f6919b67e860b179eda35642c4553e575f4af89f1dab3781e401205e39f071
+EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba1542ede77d5038f6cc9a5f42abd27c0fccb5d713afb408d6092caf8c0b774a96dadda918f07900be0c7f4f76fbd47a SHA512 72fe25bc58d23ba2a31cbf137a179ae8477a084fbf1ada28cd878fd1958dce891ee3b8fba7d31ab10e623f202b49d96779d6e03f9761c73c77c6d5d8a25dafd3
 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47
-EBUILD openssl-3.0.7-r2.ebuild 10063 BLAKE2B f013be422b4aa7c08c7ad0b64977b7bdb08ff8c3624fd31debfb85739e99d857c23823bb3f4bcdacf861567ead68c7d5c64cdf2fd2fae77b98fcb4463457f292 SHA512 66e377c6a59deb1524859ee3b220b898c0ac2daed3c15a79d992e324e0b10dff3c7bf145fb7e325a6b1aed6caf29b9fb220e46939ee0357fa208832a68b9785c
+EBUILD openssl-3.0.7-r2.ebuild 10121 BLAKE2B 2f3129b1f077c15a2108c9316a702786cdd0d73eff57e53963d506d846bb509b0a76f419164bec65038c5db2dd9dc22890a24890e43926c391cac4053245d029 SHA512 b76e62dd36d16566c80ad02ed65ab5022ab7f2be7b618a163aff6fb9060064af503b8dc5c863148070c08f9ac6e62ee3f884169ae68de1d5b8640e13e17d2a0e
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild
index 3bfa37a91882..a47367ffab4c 100644
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1s.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
 
 MY_P=${P/_/-}
 DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
@@ -61,6 +61,9 @@ pkg_setup() {
 			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
 		fi
 	fi
+
+	use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER"
+	linux-info_pkg_setup
 }
 
 src_unpack() {
diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
index 17ccd678b293..3ce576abc93d 100644
--- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
@@ -63,6 +63,7 @@ pkg_setup() {
 			CONFIG_CHECK="~TLS ~TLS_DEVICE"
 			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
 			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
 
 			linux-info_pkg_setup
 		fi
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 78f86a742687..6343a048ec0d 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass
deleted file mode 100644
index 72d87829a938..000000000000
--- a/eclass/mozcoreconf-v5.eclass
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# @DEAD
-# @ECLASS: mozcoreconf-v5.eclass
-# @MAINTAINER:
-# Mozilla team <mozilla@gentoo.org>
-# @BLURB: core options and configuration functions for mozilla
-# @DESCRIPTION:
-#
-# inherit mozconfig-v6.* or above for mozilla configuration support
-
-# @ECLASS_VARIABLE: MOZILLA_FIVE_HOME
-# @DESCRIPTION:
-# This is an eclass-generated variable that defines the rpath that the mozilla
-# product will be installed in.  Read-only
-
-if [[ ! ${_MOZCORECONF} ]]; then
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator
-
-IUSE="${IUSE} custom-cflags custom-optimization"
-
-DEPEND="virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-# @FUNCTION: mozconfig_annotate
-# @DESCRIPTION:
-# add an annotated line to .mozconfig
-#
-# Example:
-# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
-# => ac_add_options --enable-js-ultrasparc # building on ultrasparc
-mozconfig_annotate() {
-	declare reason=$1 x ; shift
-	[[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!"
-	for x in ${*}; do
-		echo "ac_add_options ${x} # ${reason}" >>.mozconfig
-	done
-}
-
-# @FUNCTION: mozconfig_use_enable
-# @DESCRIPTION:
-# add a line to .mozconfig based on a USE-flag
-#
-# Example:
-# mozconfig_use_enable truetype freetype2
-# => ac_add_options --enable-freetype2 # +truetype
-mozconfig_use_enable() {
-	declare flag=$(use_enable "$@")
-	mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
-}
-
-# @FUNCTION: mozconfig_use_with
-# @DESCRIPTION:
-# add a line to .mozconfig based on a USE-flag
-#
-# Example:
-# mozconfig_use_with kerberos gss-api /usr/$(get_libdir)
-# => ac_add_options --with-gss-api=/usr/lib # +kerberos
-mozconfig_use_with() {
-	declare flag=$(use_with "$@")
-	mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
-}
-
-# @FUNCTION: mozconfig_use_extension
-# @DESCRIPTION:
-# enable or disable an extension based on a USE-flag
-#
-# Example:
-# mozconfig_use_extension gnome gnomevfs
-# => ac_add_options --enable-extensions=gnomevfs
-mozconfig_use_extension() {
-	declare minus=$(use $1 || echo -)
-	mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2}
-}
-
-moz_pkgsetup() {
-	# Ensure we use C locale when building
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD PKG_CONFIG
-
-	# Ensure that we have a sane build enviroment
-	export MOZILLA_CLIENT=1
-	export BUILD_OPT=1
-	export NO_STATIC_LIB=1
-	export USE_PTHREADS=1
-	export ALDFLAGS=${LDFLAGS}
-	# ensure MOZCONFIG is not defined
-	unset MOZCONFIG
-
-	# set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# nested configure scripts in mozilla products generate unrecognized options
-	# false positives when toplevel configure passes downwards.
-	export QA_CONFIGURE_OPTIONS=".*"
-
-	python-any-r1_pkg_setup
-}
-
-# @FUNCTION: mozconfig_init
-# @DESCRIPTION:
-# Initialize mozilla configuration and populate with core settings.
-# This should be called in src_configure before any other mozconfig_* functions.
-mozconfig_init() {
-	declare enable_optimize pango_version myext x
-	declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
-	declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
-	declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
-	declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false)
-	declare WF=$([[ ${PN} == waterfox* ]] && echo true || echo false)
-
-	####################################
-	#
-	# Setup the initial .mozconfig
-	# See http://www.mozilla.org/build/configure-build.html
-	#
-	####################################
-
-	case ${PN} in
-		*xulrunner)
-			cp xulrunner/config/mozconfig .mozconfig \
-				|| die "cp xulrunner/config/mozconfig failed" ;;
-		*firefox|waterfox*)
-			cp browser/config/mozconfig .mozconfig \
-				|| die "cp browser/config/mozconfig failed" ;;
-		seamonkey)
-			# Must create the initial mozconfig to enable application
-			: >.mozconfig || die "initial mozconfig creation failed"
-			mozconfig_annotate "" --enable-application=suite ;;
-		*thunderbird)
-			# Must create the initial mozconfig to enable application
-			: >.mozconfig || die "initial mozconfig creation failed"
-			mozconfig_annotate "" --enable-application=mail ;;
-	esac
-
-	####################################
-	#
-	# CFLAGS setup and ARCH support
-	#
-	####################################
-
-	# Set optimization level
-	mozconfig_annotate "Workaround known breakage" --enable-optimize=-O2
-
-	if [[ ${ARCH} == hppa ]]; then
-		mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0
-	elif [[ ${ARCH} == x86 ]]; then
-		mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2
-	elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
-		# Set optimization level based on CFLAGS
-		if is-flag -O0; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
-		elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then
-			mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1
-		elif is-flag -O4; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O4
-		elif is-flag -O3; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O3
-		elif is-flag -O1; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O1
-		elif is-flag -Os; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2
-		fi
-	else
-		# Enable Mozilla's default
-		mozconfig_annotate "mozilla default" --enable-optimize
-	fi
-
-	# Strip optimization so it does not end up in compile string
-	filter-flags '-O*'
-
-	# Strip over-aggressive CFLAGS
-	use custom-cflags || strip-flags
-
-	# Additional ARCH support
-	case "${ARCH}" in
-	arm)
-		# Reduce the memory requirements for linking
-		append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-		;;
-	alpha)
-		# Historically we have needed to add -fPIC manually for 64-bit.
-		# Additionally, alpha should *always* build with -mieee for correct math
-		# operation
-		append-flags -fPIC -mieee
-		;;
-	ia64)
-		# Historically we have needed to add this manually for 64-bit
-		append-flags -fPIC
-		;;
-	ppc64)
-		append-flags -fPIC -mminimal-toc
-		# Reduce the memory requirements for linking
-		append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-		;;
-	esac
-
-	# We need to append flags for >= gcc-6 support
-	append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
-
-	# Use the MOZILLA_FIVE_HOME for the rpath
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-	# Set MOZILLA_FIVE_HOME in mozconfig
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	####################################
-	#
-	# mozconfig setup
-	#
-	####################################
-
-	mozconfig_annotate disable_update_strip \
-		--disable-updater \
-		--disable-strip \
-		--disable-install-strip
-
-	# jemalloc won't build with older glibc
-	! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc
-}
-
-# @FUNCTION: mozconfig_final
-# @DESCRIPTION:
-# Apply EXTRA_ECONF values to .mozconfig
-# Display a table describing all configuration options paired
-# with reasons, then clean up extensions list.
-# This should be called in src_configure at the end of all other mozconfig_* functions.
-mozconfig_final() {
-	declare ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to .mozconfig
-	if [[ -n ${EXTRA_ECONF} ]]; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_annotate "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options .mozconfig | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	# Resolve multiple --enable-extensions down to one
-	declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ ]*\).*/\1/p' \
-		.mozconfig | xargs)
-	sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
-	echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
-}
-
-_MOZCORECONF=1
-fi
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index faac3b089d43..f8a2158feacd 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 7a29662dfc27..c6ff4738889c 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -2,7 +2,7 @@ AUX freeimage-3.18.0-CVE-2019-12211-CVE-2019-12213.patch 6242 BLAKE2B 3deb724b2c
 AUX freeimage-3.18.0-disable-plugin-G3.patch 1553 BLAKE2B d122df83a8889cd599d12c65cee5678b3654266c2e128d1d8d963eed7743b62ba6da7c582acc389f874fd218e2f7857d718a562bd81c52cf23f31284fdc00dc4 SHA512 9a0adeaaa3bf839387dbbccc54e0e32e0af87af4c398edd4cc44f1c6d380228dc7c174a7715ac397c15d48b7b5337543aac05020e25b6680187e179e8738dccd
 AUX freeimage-3.18.0-libjpeg9.patch 520 BLAKE2B 4788a3c4c209568df7176ed7b2699f9c33efb8c2ff2dc51d1e6bc76329ade073bdd296d7e9aa2441a655e46407df31cc5dd84c0d1805ca75418bae9d4ca4ecfa SHA512 75fc7c4d257d4bd67202c5c91af23f3e990342490c4661ab2219b89c40626703d9ceb5f05dc8d2a912153fbe5b9e07f24566570597f84cec15fbe03cb7d4b69e
 AUX freeimage-3.18.0-libraw-0.20.0.patch 1912 BLAKE2B 56892466e8c8c4a1178c66ba24fa0da0b4218ac883a21eee47ac87044a5cb300182d33c04e91e9ed30a0e3b03c34cd447c0400bb2b6045f96866bb583aeaee06 SHA512 6fde3ee5e0219bdb6cf897e1898dfd0e06dbfceb67f06a935776b96c4688b27e11075958c339c417c3d3490d5778e802b1eafb4c92360c342acf0a2b7ff6345e
-AUX freeimage-3.18.0-libraw-0.21.patch 435 BLAKE2B f6fb2f1b9dac6ee6708059f76e778b1a8a72fb2d3236cf14c9aff4ef53c92814910ba655c16836c5c5a8bfba7f12b8ce9ecc2d2ea5aab05f7a0bf888323ca6b5 SHA512 5061791f95e299b7be83bd55db99c2f6080df4f1fd4cb1bfba85255fe85726a9195aa462e035073160418a37df0ea65ac3903cf73eae3ed41939a0e322f5ec56
+AUX freeimage-3.18.0-libraw-0.21.0.patch 429 BLAKE2B 6a47d08643a9cb23132dc740eb00f3c734088e229f69b500d6564c256f013ea5f6fc77fdbca587776ef1be2da7116bf11bc391194e860ae4d2afa4866c731e23 SHA512 1733a23048dae052c93d2b38a6b3360dd436fd1762d2f04cfac0b108db39d1d9f2aaafc230eb7f73e6c87f7763c668d02465fb9ff3f335fa58463ec639f7e4cb
 AUX freeimage-3.18.0-null-to-false.patch 679 BLAKE2B e2f23dc328b6fdc9e5f11e0cf097627b9a7c524cb96b58731f38f69921b5f34f7a414b93ab75e0e7fc7620f21688bbc5b6a2ee303c1b05cb02e4cb550f534409 SHA512 0c7ba4969dd718678b87d4a6ad3358b797d2a793831a7e1a29d006e81ea5f7cb4316f456eba05edced65fcb846509a36d5f2e8c487528e1303be346e0564157b
 AUX freeimage-3.18.0-openexr-3-imath.patch 5333 BLAKE2B 9465fb9c9f50f5bfe08d1d337acff27441d2054dbcada9df173f5bbaae5b25dd2d155de141c464e3188cc871a2dc2e25fb8b992151ae1cd9e6134a889e3ab705 SHA512 88ebb72e6b531e4444904789025962d1e4b2b7947c1b353b46db138c55c5f486ed7ee81ee455f084ed4780b6aef0a0afe2f0a8518b5b723c51bfc6dad4ca9fe1
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
@@ -12,5 +12,5 @@ AUX freeimage-3.18.0-tiff-4.4.0.patch 492 BLAKE2B 284ed6a083b982fbc758237ba96812
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
-EBUILD freeimage-3.18.0-r10.ebuild 3431 BLAKE2B 652a1b8152d8fa573bfec0743d5c1e1ba3b985ac0b5924bb779697e18fffe92767a1d18d5bd975a85213d380b3170f02338efbec4c447f31d38b1cf9c517a548 SHA512 da665a6a26f0191cabc9be308299a65fb08fe0217979e76827e0150c9992beece1d137105d1ac9a8830c71fc845ffa8f2dd4863124b2cac5522608a40a43a85b
+EBUILD freeimage-3.18.0-r10.ebuild 3433 BLAKE2B 733f4af807476237cf4d79361b18da579b61bd62a0cc7e75ecee6da81f05249bf0bc5e0458890c7b9bd2cd30fac0835a9059ee4bdeb8ddff1546d1995008aeb7 SHA512 e0ce9af89f287d7fe03e325effc8240b6d4274552561c065b551dc0d77bb36f38a40874ad7a34115b3fcc3ce7d216566a1c324fa07081ceead11747b21e3fa6c
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch b/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.0.patch
index 3005bf44d623..906590bbd329 100644
--- a/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.patch
+++ b/media-libs/freeimage/files/freeimage-3.18.0-libraw-0.21.0.patch
@@ -3,9 +3,9 @@ https://bugs.gentoo.org/887467
 +++ b/Source/FreeImage/PluginRAW.cpp
 @@ -693,3 +693,7 @@
  		// (-s [0..N-1]) Select one raw image from input file
-+		#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
 +		RawProcessor->imgdata.rawparams.shot_select = 0;
-+		#else
++#else
  		RawProcessor->imgdata.params.shot_select = 0;
-+		#endif
++#endif
  		// (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb)
diff --git a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
index 24e12d89db37..502ee0298dbe 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
@@ -57,7 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
 	"${FILESDIR}"/${PN}-3.18.0-tiff-4.4.0.patch
 	"${FILESDIR}"/${PN}-3.18.0-null-to-false.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.21.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.21.0.patch
 )
 
 src_prepare() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 17e619b980ae..021f6aaaf3b5 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fef88fc3698c..c534afcebcbf 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Dec 2022 01:10:10 +0000
+Fri, 23 Dec 2022 07:09:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fb42104184cc..e1ef35b22356 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-23T01:10:12Z
+TIMESTAMP 2022-12-23T07:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOk//RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOlVEhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAqGg/+IZav0KnzTmG8iW3NBTZ/iB8CrVBqn9lYuyBgAWF3GVb3jlRPqv+HfdBS
-alEHy9Yb5cfTAcf3QXpUc3iEMp5zAXxaHQxQtt8GBcRb7hGH5u76WnYdrBZr1nnn
-abeF6ElsXC/Sz5JrkQfWaX3NiSqgTHzFwwZ19OD06ziCJFpkWsHQK3iHbsnWlloU
-acwkoDNh6AIf9GFpp3vPUlfVME9gW2pcTBRQAUopcJu8X47BiU9/QFKaMZ+L3y/N
-uja6vMNwNrnAnjzxaXKJcgVuDinQqG0ykDnG1Gp4KIsl04MIFGBpF8d8hg0AeT9N
-OiBMrdaxrhC5mw32Epr4gnPRCB4UdsH0dHJkaTtXCx9qRaFXXtsP+6L/USChj4Fy
-e40/S0/pYzDny7fGj4UKIS0qn+ytCsVpwUm6ZhLykJ45dv+l/I8SQwyKlAIt00J9
-gKARtdM5zu3TlW57DbjJxADHhV1+TOQq5/xAGTwV1P43nrEZfpuAQy2gZ5gtmaaI
-mh4suBqL8mNSu6mqY1XFVflFg1NP1SqO7h/0ApPKrl4uGac1JkFefG1r6jsWXLWA
-6OF9oY1/h1BFIDhE0tp3TAAZcrC2s3lOOWwqADK94aEJC6Qj8uzHT9sgcxdycFTT
-gWHwysNCHO0wBHIKhL/fD/VA3F5FVp6dD30OfqfaglOO2L6Twak=
-=s/m6
+klCVzQ/9FoL/lkc9eUDW/LsJcmt4IWdvRovww4i64qZJtpASZBfkJg/m/QuhyeUL
+XFdG2RSVbghqxdXDmtCQdvU/nvMx5XU8TT/fQPxncskQP+Vy/4uB8OzNZy3sF+RW
+SB6arA0+prZE/PdaDBFTBEGgW9GNwgF5FtNRm0L7Blio/P6zx3NFYMd4k+XzStfb
+5nR78mIi7CaxldICZKv8IuCZoBL7tcElxpMOwQDntA/jOTy9lphvo1uegvulvRen
+ZxQl0wyec4YmbM3ECoNX9+iL/BJ6V/cKKOMrzzHo/Rze6KzEkqNe7Ndc11fcEs8o
+gP8kd1RJsFT/mmDXOHvZL12V6Rs67lP2zj6aI5d60xfn+E1auUFE9balS0KDD1oX
+g/fohLvauqOwv33lJAY/MDolfpW7CiQUxT2DH/oeVtv/NzhSulgL2xAZGin8JIXB
+n7lrTHqIVxFcd6uKe17EYRihp5xu4WELqqJT75p2WL33rtqQkCBcxhv+oJe4+RKX
+fiyr2oV8thjVhyayL8Cy8FYCZW6311Fuw5YALcvHdB95u2wgQoamkz/lEfPy9+V8
+q18KKNwdYOhGzZywUjvvjYgwBCcoeKK6E+8V+VhE743SYJnULst4xWRs/ypARAgd
+5nLy85WZjy12CSzdWvHhxnT8iyvWz6KLv7wTU1WbE3br2jFA8dM=
+=MfXN
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fef88fc3698c..c534afcebcbf 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Dec 2022 01:10:10 +0000
+Fri, 23 Dec 2022 07:09:57 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ab0a03969450..843bd39f4eaa 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index baa81613a179..42b5c0ae410d 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20220509-r1 b/metadata/md5-cache/app-arch/pxz-5.0_pre20220509-r1
new file mode 100644
index 000000000000..d33a54316a0a
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20220509-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare pretend setup unpack
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Parallel implementation of the XZ compression utility
+EAPI=8
+HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
+INHERIT=toolchain-funcs prefix vcs-snapshot
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=app-arch/xz-utils
+SLOT=0
+SRC_URI=https://github.com/jnovy/pxz/archive/136e5c25daf545753329d7cee1b06ae482fb9c44.tar.gz -> pxz-5.0_pre20220509.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_md5_=17221880f18f4f0dea6fd217daba3419
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 97dde9ff18e6..5e8584ce00ca 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/beep-1.4.9 b/metadata/md5-cache/app-misc/beep-1.4.9
deleted file mode 100644
index fffcf8f5ab14..000000000000
--- a/metadata/md5-cache/app-misc/beep-1.4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=Advanced PC speaker beeper
-EAPI=7
-HOMEPAGE=https://github.com/spkr-beep
-INHERIT=toolchain-funcs
-IUSE=suid
-KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/spkr-beep/beep/archive/v1.4.9.tar.gz -> beep-1.4.9.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a49873b8acdf89b4c8e60d32f8c1d380
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 98261e0681da..e85084489919 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/crengine-ng-0.9.2 b/metadata/md5-cache/app-text/crengine-ng-0.9.2
new file mode 100644
index 000000000000..a9aab15ac134
--- /dev/null
+++ b/metadata/md5-cache/app-text/crengine-ng-0.9.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
+DESCRIPTION=Cross-platform library designed to implement e-book readers. Supports many e-book formats
+EAPI=8
+HOMEPAGE=https://gitlab.com/coolreader-ng/crengine-ng
+INHERIT=cmake
+IUSE=+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
+SLOT=0
+SRC_URI=https://gitlab.com/coolreader-ng/crengine-ng/-/archive/0.9.2/crengine-ng-0.9.2.tar.bz2
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=65278d7c3557a1288716ba0870218dcc
diff --git a/metadata/md5-cache/app-text/crqt-ng-1.0.2 b/metadata/md5-cache/app-text/crqt-ng-1.0.2
new file mode 100644
index 000000000000..b0f6e31c62e4
--- /dev/null
+++ b/metadata/md5-cache/app-text/crqt-ng-1.0.2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=Cross-platform e-book reader
+EAPI=8
+HOMEPAGE=https://gitlab.com/coolreader-ng/crqt-ng
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake plocale xdg
+IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gitlab.com/coolreader-ng/crqt-ng/-/archive/1.0.2/crqt-ng-1.0.2.tar.bz2
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=597b809d9905999690003a381be73f93
diff --git a/metadata/md5-cache/app-text/multitail-7.0.0 b/metadata/md5-cache/app-text/multitail-7.0.0
index 2723e3ec863f..88a490bc92b7 100644
--- a/metadata/md5-cache/app-text/multitail-7.0.0
+++ b/metadata/md5-cache/app-text/multitail-7.0.0
@@ -4,12 +4,12 @@ DEPEND=sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=Tail with multiple windows
 EAPI=8
 HOMEPAGE=http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/
-INHERIT=cmake flag-o-matic optfeature toolchain-funcs
+INHERIT=cmake optfeature
 IUSE=debug examples unicode
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0
 SRC_URI=https://github.com/folkertvanheusden/multitail/archive/7.0.0.tar.gz -> multitail-7.0.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=03b30498aecf45129806e243fe355f26
+_md5_=04fc0afebc4e2649413e08156171bf8e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 719b64b0645a..bd9fd079ff86 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1s b/metadata/md5-cache/dev-libs/openssl-1.1.1s
index 18477297567a..ae9799e19ab2 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1s
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1s
@@ -4,7 +4,7 @@ DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[st
 DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
 EAPI=8
 HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 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 ~x86-winnt
 LICENSE=openssl
@@ -13,5 +13,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=186d7d2972c1ca23eb7fd7e30ed059cc
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=003af2588fa5fd41dc7d68a38f237aa0
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.7-r2 b/metadata/md5-cache/dev-libs/openssl-3.0.7-r2
index 34b2ebe0af03..f720f4cd187a 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.7-r2
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.7-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.7.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.7.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9491ab36d286fc82d88c9c7506a4d6ba
+_md5_=72895fd8586a37a73a379fd812f12956
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
index 1dd3f846a642..67f826e731b9 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
@@ -4,7 +4,7 @@ DEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
 EAPI=8
 HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=openssl
@@ -12,5 +12,5 @@ RDEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[
 RESTRICT=!test? ( test )
 SLOT=1.1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9afb958cd2f7b3639b29efa73b1c199a
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=3eab7915a458b091fa411367747584fd
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 090ba37c9349..6f71f907a8bc 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r10 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r10
index 21f4da90543b..0107fefef953 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r10
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r10
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/zlib jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/
 SLOT=0
 SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ac0d7ab906731e2ae00bb996e62b7d76
+_md5_=3fabe00ac8532f0eb53476bb2dc081e9
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4705546c8769..3ba7f48fc10c 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/curl-7.87.0 b/metadata/md5-cache/net-misc/curl-7.87.0
index cad9850356c4..5701082e5ac1 100644
--- a/metadata/md5-cache/net-misc/curl-7.87.0
+++ b/metadata/md5-cache/net-misc/curl-7.87.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=A Client that groks URLs
 EAPI=8
 HOMEPAGE=https://curl.haxx.se/
@@ -8,10 +8,10 @@ INHERIT=autotools prefix multilib-minimal verify-sig
 IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls nghttp3 quiche abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 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
 LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_rustls ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.87.0.tar.xz verify-sig? ( https://curl.haxx.se/download/curl-7.87.0.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3153266299b9dd998b47205d45e9d8de
+_md5_=ea6a35fb6421e9a4d4042733c3ea6f65
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 5c62d40a3f50..06c16d264b83 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14603 BLAKE2B e2577f15dd9e0d475df5b593952aec19dbd6bd1d98fe3cf3f0798f0d5c069ce285e42d594e3b05990923eecd40549b08f04abe17b02a4fc3856c0cce38640336 SHA512 af95e49316b05b0546f6bd6ea11a1d52c27280a7719f4e850d4b026ff56a8948fca0d992cbe3c778a8a17737da71c2aab3027a71ea2d1805575ee1cc97e3095b
-TIMESTAMP 2022-12-23T01:10:12Z
+TIMESTAMP 2022-12-23T07:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOk//RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOlVElfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCiLw/8CI81gA7QATWtOqNIK9kNvzsQIoYPqHeBtAgCmEaTEU75h6pioRy5KK8e
-QrWHLEruwXEGEmVdP2k5iy0x5XcEDDPgl+S0L485IUe6n1Q7aNbs03ranQGhRSE/
-IWT6ODGVfgVxHcQIFK7v1nXWdSReePUOcue3yHL9l676ldxDO3KTOMSekSy2PnWo
-wjeKbFxwHd3GslX5JInaSFy+F0WDXfGnPLR+K9HD7PT4Fne+VvqA7UBqUkzxTndU
-SgCsyKMIXka3aXjXhZWuFMrMegZ3AalooO00TrjlRFN2vKAGvDp7xKMfQiA8kGWM
-vO5C8K4k6HDb0gXfDgEtslSSNqz58wijCsyJ9hhSOpdde8gHHCO/0H3+lmTFkxs3
-7EIc/oo74sXYzMJU/0yEADbzi6Hyla+Z0QsydSnM+Sq10K6aBlWqWlt+FZiKdjse
-062MveMVIIm6OkGI/GRJFkJGhs2LTVJoACYXACNc95uzVntfWzIc1NF9x17D73y3
-AjSOakNXU+ME6KGcQIa678FlTmC3Rq0QLVshjKMW5FdjjD0MBTi0mRbelvR7o2cz
-z3HMtCr1LQdoyCUubhH/WkD5gQ/b77BJAimqBCAeKmjl7oIdHbD8VRiAlO8lu/KJ
-4t9AJ5IHHGAm2/F1iphjlG2hDGQxU2TUV08NMLc9KMnkw0Y6mdQ=
-=CeCF
+klBM1g/+Kmgy70R2mEgxxWhNXqiqgYC3yWjre2UDefAlyZpyqHmSdpqH0DjCmrOL
+w1iQwjdh07Wyh3ThIq7tL33Fd4mwe+/zNAPkH41NPF7c5XxxYWDussPzAYdlSHqT
+G/+j6nbcoSFwg4by9JO5pxhki86LapzlhELW6n9GXgEMtW2ZL8iUdXe9uBL5bgl+
+CzeDB2NRew2JZPzxesuzSLzMzyKdChOXSXFujJCDOumhFMvGlKFakCKaXOhM1OzC
+uVJjQf4WgXjr16yj9E+Zr8a92iFPoBkvN/7c03yDinu4yH6G7bc5EF5V5rdHc61p
+/hSKepOKNcAiAJScbVy1FLDDMaRg/S/3DJ+19p+2W9vt0ExUw9eZWmfVfinopLAD
+XhG1SeqI4iMCRdqb4DuHQc9MrOuZ6ZFthigsXNHMUFx1Eq9UNW5i8gqWCQor6Ea2
+f/D7eksBWZpy6cg5MI/fQHqJfAZtavIGzAPeuV9HrVFyHKd5WOhYuAIrrzpeCIlN
+O0+vZtcn4vxO3imf7xB1oZ6xJNYy4dkEcJIHPjatB1UvlhtGcs4YB489EFsB6rhF
+obYGsFgfPg7Kno2ZfcsGyYPFGQGE5fsitgJ7CtCbZGbWL8u1c06C9h0xgJCsEAmZ
+XaOMSx1QfN8UhAWlzaZ6gFTA09HcF2leCAGf/QltTppmwXhRlw8=
+=XSC0
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fef88fc3698c..c534afcebcbf 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Dec 2022 01:10:10 +0000
+Fri, 23 Dec 2022 07:09:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b7a546851f63..2b0e3f54e5ca 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 23 01:10:10 AM UTC 2022
+Fri Dec 23 07:09:57 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f4cff8b2d736..b2ac90206fe0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Dec 2022 01:15:01 +0000
+Fri, 23 Dec 2022 07:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 12d847dd1603..b0635f2c5c4e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-51168520f6f8da312d68ea778d8a0e0b9cca54b6 1671754743 2022-12-23T00:19:03+00:00
+8fb4d24dc3128187bb6a00586c22cb62c6a72980 1671776131 2022-12-23T06:15:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1121d77973d9..2c0d3e1d77b6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1671757801 Fri 23 Dec 2022 01:10:01 AM UTC
+1671779401 Fri 23 Dec 2022 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fef88fc3698c..c534afcebcbf 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Dec 2022 01:10:10 +0000
+Fri, 23 Dec 2022 07:09:57 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 852f36551d31..a88111e87edb 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 9e62e54cb30b..af0744a2a836 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,11 +4,12 @@ AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea9
 AUX curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch 3609 BLAKE2B 6f7e80c915d8592b93349d8aade7670f37bf37803ee02130245905636de30a70be51272b2d06392397ffcf76bfda78cfc2fbb671971ab3d18b20677239944544 SHA512 20999f12d5316be5854c9ab09a0f9e887edb7878f157069759c8404d31bfd23db352894c0dca6ce871618d0088f0320ebaa1b6166b54facce0e5faf74600232b
 AUX curl-7.86.0-proxy-noproxy-match-comma.patch 3143 BLAKE2B 1aa8d62e6082601eae9e3ae7690a1e7ddce7f12be4cf9f20010f32aa51cd5b1c4206be0b731935a9ddd45bb5654ceed3cba3eabb6a1b9dc60112052d7e79ffa7 SHA512 1a0c67bdabeb1ea8cba7a0f93c12ea626bdc329bbe8c3978f03cb25a78c74fa3257a36f2ed53c177b3a256bca2c0dd8081bab1536b0670e1ec9c0541ac23fc11
 AUX curl-7.86.0-proxy-noproxy-tailmatching.patch 2302 BLAKE2B c4199bc1eb04c8c69f8c72397ce526df6c2186151f77d5e13551e589712e9032e1a52720bd1b946a1b5b984f49a01b297410f4cf74814a58bf4bf43701435c76 SHA512 aa211a5428cc746d07cfd37571169d59ccc97560a69e7c6d21cc8b4a133182366264470de540e1813eee51b376d9056ec8dd01f8e95957e58a83f33d37db0442
+AUX curl-7.87.0-gnutls-openssl-build.patch 1010 BLAKE2B 716760a38a7a61420e3e508f976c14776d5f3313c4305e8c2fcff9af1744bcaab61bae643546d625448cc613933f8a7137a783e6313a53799485f432d8b9791f SHA512 2a94cf409f33683ca53a347a99faec3c51ba05c4f531be4e784401e4ed977d1142b5d5bc153dd2444311cdeafd3c406ae4a27e515b875f978f5402487d177e9a
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.86.0.tar.xz 2518356 BLAKE2B a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce SHA512 18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656
 DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a9d5caf51c0d5a4a2e6881fb478f1768a6b71efbd9283563e2c7e2badbc5a6d6df265013e14eee2ec7e9be148 SHA512 9e97d5f44b3c856f401fe30ba713e1ca1f74edfc693dc42f1ce8e43f9f6dd4bf6998c579bc9c5d0f749f475a7d67d232e92ab6f89b95141acdb53e149f2312f0
 DIST curl-7.87.0.tar.xz 2547932 BLAKE2B b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13 SHA512 aa125991592667280dce3788aabe81487cf8c55b0afc59d675cc30b76055bb7114f5380b4a0e3b6461a8f81bf9812fa26d493a85f7e01d84263d484a0d699ee7
 DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 031d8236b357bd3c519548b181254dc0aea1efc1375738bce04f4f331d35bafe99d1ca394ecf5943ede7cae040854b6d2b478fd305147eb7330f8d50e5d95c96 SHA512 0bcc12bafc4ae50d80128af2cf4bf1a1ec6018ebb8d5b9c49f52b51c0c25acc77e820858965656549ef43c1f923f4e5fe75b0a3523623154b4cfb9dc8a1d76e4
 EBUILD curl-7.86.0-r3.ebuild 8775 BLAKE2B 22e521fddcf34f1ec259e3bea7daa4a3ac929355511b9798865bbf89e0c98b740d03a9dd7a4f6efacd7cc03f75a14bfc7456eb89f8507934b47bf9f72da579f6 SHA512 94041a785f6b361e8e23f9972c5dc329e5159fc7fca2f2d4c43c1fcc063f06c35ea138d3b556f73ac0a7e6da2bbd1470aba0bbb94ab7be44c4ff627ee69e2127
-EBUILD curl-7.87.0.ebuild 8607 BLAKE2B 4fd6158ba90ab8bd68c3bb36141636f518e2bfa4fad56988d9eb7c7046dad7b2c60babfd152b0d1ec0486e4a7e92464cfd7a54b6c7af4ed914ea8f64c7e44eab SHA512 b78df721b6832f5087b90bbc3b334e23cf6628ee1d5108ea4a3f05f88d9edf53577575c97ee15786a7acec6684c798595b182e1e81d4509ab91f858cd8db8b87
+EBUILD curl-7.87.0.ebuild 8635 BLAKE2B 28db1e893a3b2aa686c94181bf3bb0d6399e40e095525a031bb7456476c5ede31ea7dfb8fbb7e3c909e918f8cb35a83724fe308552ace30c25adae079073c324 SHA512 a30e4f15991869a2f9e4690dfd20bf39a84ccd95fe6584cfdf112475032967f3f2a4d0cdf4e9ebf634848996d2af77864a2a428fda6b10facd7249879d730e9f
 MISC metadata.xml 2158 BLAKE2B 2b99163e490c531d73aa8c62d428ff4e994537b140e159548d74d52a7c46a2b5e04c992a541298253464f7eaab447d7a680140aadc6b33ecd7d69c35b6aaf6c5 SHA512 a3313197aeedaa7f347e3b6b791d8e5e3bda4292225afcc457ec21cd883347c4cdccaeaa79a7c212e061fdb339be3706815d425d09d8511a4d984f9318164797
diff --git a/net-misc/curl/curl-7.87.0.ebuild b/net-misc/curl/curl-7.87.0.ebuild
index f804460a11c1..128b0427d016 100644
--- a/net-misc/curl/curl-7.87.0.ebuild
+++ b/net-misc/curl/curl-7.87.0.ebuild
@@ -37,16 +37,16 @@ RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
 	ssl? (
 		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
 			app-misc/ca-certificates
 		)
 		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
 			app-misc/ca-certificates
 		)
 		openssl? (
-			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
 		)
 		nss? (
 			dev-libs/nss:0[${MULTILIB_USEDEP}]
@@ -63,8 +63,8 @@ RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
 	)
 	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
 	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
@@ -99,6 +99,8 @@ MULTILIB_CHOST_TOOLS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+
+	"${FILESDIR}"/${P}-gnutls-openssl-build.patch
 )
 
 src_prepare() {
@@ -121,7 +123,7 @@ multilib_src_configure() {
 
 		if use gnutls || use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
+			myconf+=( --with-gnutls )
 		fi
 		if use mbedtls || use curl_ssl_mbedtls; then
 			einfo "SSL provided by mbedtls"
diff --git a/net-misc/curl/files/curl-7.87.0-gnutls-openssl-build.patch b/net-misc/curl/files/curl-7.87.0-gnutls-openssl-build.patch
new file mode 100644
index 000000000000..88463dc003f7
--- /dev/null
+++ b/net-misc/curl/files/curl-7.87.0-gnutls-openssl-build.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/887833
+https://github.com/curl/curl/issues/10110
+https://github.com/curl/curl/commit/aef4dc892d012d990c85c7bad0d9d06c2ebfa775
+
+From aef4dc892d012d990c85c7bad0d9d06c2ebfa775 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 22 Dec 2022 17:40:26 +0100
+Subject: [PATCH] md4: fix build with GnuTLS + OpenSSL v1
+
+Reported-by: Esdras de Morais da Silva
+
+Fixes #10110
+Closes #10142
+--- a/lib/md4.c
++++ b/lib/md4.c
+@@ -86,11 +86,7 @@
+ #include "memdebug.h"
+ 
+ 
+-#if defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4)
+-
+-#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4)
+-
+-#elif defined(USE_GNUTLS)
++#if defined(USE_GNUTLS)
+ 
+ typedef struct md4_ctx MD4_CTX;
+ 
+@@ -109,6 +105,10 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
+   md4_digest(ctx, MD4_DIGEST_SIZE, result);
+ }
+ 
++#elif defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4)
++
++#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4)
++
+ #elif defined(AN_APPLE_OS)
+ typedef CC_MD4_CTX MD4_CTX;
+ 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5317fce1405f..0538f12afda8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index b2e2efc0ce58..b30dcba26113 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -310,10 +310,6 @@ dev-libs/dbus-c++ ecore
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
 
-# Matt Turner <mattst88@gentoo.org> (2019-12-01)
-# Fails to build, bug #676060
-dev-libs/openssl asm
-
 # Eugene Bright <eugene@bright.gdn> (2019-09-09)
 # Missing keyword on dev-embedded/libjaylink
 sys-apps/flashrom jlink-spi
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fbb186226ce4..2dcc60d84832 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1086,9 +1086,20 @@ app-text/blogc:git - Build blogc-git-receiver tool
 app-text/blogc:httpd - Build blogc-runserver tool
 app-text/blogc:make - Build blogc-make tool
 app-text/coolreader:wxwidgets - Use x11-libs/wxGTK instead of Qt5
+app-text/crengine-ng:chm - Support chm format
+app-text/crengine-ng:fribidi - Support bidirectional text by dev-libs/fribidi
+app-text/crengine-ng:harfbuzz - Use media-libs/harfbuzz for kerning and ligatures
+app-text/crengine-ng:libunibreak - Use dev-libs/libunibreak for hyphenation
+app-text/crengine-ng:libutf8proc - Use dev-libs/libutf8proc for manipulating unicode strings
+app-text/crengine-ng:lto - Use link time optimization
 app-text/crm114:mew - Add support for using the mewdecode mime decoder (app-emacs/mew)
 app-text/crm114:mimencode - Add support for using the mimencode mime (net-mail/metamail)
 app-text/crm114:normalizemime - Add support for using the normalizemime (mail-filter/normalizemime)
+app-text/crqt-ng:chm - Support chm format
+app-text/crqt-ng:fribidi - Support bidirectional text by dev-libs/fribidi
+app-text/crqt-ng:harfbuzz - Use media-libs/harfbuzz for kerning and ligatures
+app-text/crqt-ng:libunibreak - Use dev-libs/libunibreak for hyphenation
+app-text/crqt-ng:libutf8proc - Use dev-libs/libutf8proc for manipulating unicode strings
 app-text/dblatex:inkscape - Use inkscape to convert SVG. Disable to use gnome-base/librsvg instead.
 app-text/dictd:judy - Build Judy-based (dev-libs/judy) plugin implementing fast "exact" and especially "lev" strategies
 app-text/dictd:minimal - Don't build server but dict client, dictzip and dictfmt only.
author	V3n3RiX <venerix@koprulu.sector>	2022-12-23 07:58:50 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-23 07:58:50 +0000
commit	7819ef4baadbb9171070ce385f7051989fe64e49 (patch)
tree	3ceb56418e8596ecbbd740e492938eaa4775bb3a
parent	4921f12d049de1487e17383a32da50a03ea90d65 (diff)