2023-05-10 11:39:46+00:00

50 files changed, 194 insertions, 390 deletions

diff --git a/Manifest b/Manifest
index 5ac9fdafa4014..38b570ef030dd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29453 BLAKE2B 567cef3bb14dbf52f493853183f4e84153bbdef8ff43dab8334b1bcebafd688efc2942860d1d17cd04b1c9b27823013d9c311109d15d12f2768530c9046a213c SHA512 7477c4df14be04567f2cc8046776272c740bd6ebbcdc42ccd2e08662297eab522a1993b96465841d42a2e482ec1ba4b6621ca6837dfd81b42d5e12cc69aa9981
-TIMESTAMP 2023-05-10T11:09:48Z
+MANIFEST Manifest.files.gz 29447 BLAKE2B 2a2367a560cb54220c033ff155c3b2338b66a4d27b36af41a05c9f82dbc86f45846fc3d3c03ef55a4d6c7fbcbfb688c09bcb1debcd4d54302a6adc55f44b54e7 SHA512 36b8b54a430863502d9588e929d882513ce418e2dea2b208e90866c0cae05079a4754e4c50f0f76a9c3ae4f9b44d25e939745a90974362d362953db231e52fc8
+TIMESTAMP 2023-05-10T11:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbe3xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbgoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA6Ag/5Ac2t4S6yfM3IinIow6coXq4iDUIYmLQ+Z8jlwUoJO1kD2Swwewrolsjy
-CVBTvc31Zt+0Ik398qbWgeoIWkH3kOVETuWrGD7/mL8mG/Rcno7zyZxUJqcqNbFw
-TEtGn0bzFjteY8qLY224ugIB8TZ3R+rOM5ySxWRkD02cIFI+cudIuvG4G2GETkKu
-5xknS414Qhi8eSdu3MzDI+c4CgZkl1Aq5+MymUAPp8jAGn6x4pEDCoRLFZHEzVkL
-HIDhpihiwLmBaiswO7qdxjWyowNzYT84XoiVpGolHss3RvCI08T+9B/6X4XdPUBC
-croLO+CxAOL03F9KWjTRO+DEvPX5t5HnwMLJHK8glmHuoL6+uIYdNpuiTLj5XMgl
-+SPueU830AlCyQgFhNbWwQredqGHemJ3C20ZpI8BCuhF3Olo5wGswTsV6Tt+xtwA
-VTt/1zzF+MyJtnkZZaAjgPEWvHLuU09y1U4ZS6E7qICJGq75/2rsHOq51Vg4D6B2
-syr6gAgNUOVjCG+9N0iknsaZh/8HQXWC9SjktWNnfDaq1GuGgBgSlVN/Ke0tA+XV
-YlGPj2wfM5RVscuh2Gp5ULkqE49DQZzEuIClKJ5XZpbZ2AfG3QlasiaVK+haCxy6
-AzmCAb7WkyGfcoTK9U6zeToFz94PzUda2NjZojjQNraNhuFN9p8=
-=HhTk
+klCLoQ//ZQdd4YThh7QzMgZ6wx/5vyQ5oYS69rKPi2EFZwbDztmifHm7LqPPbWWM
+3V7Bsjzr2JT72Lil+ruUGOyehF7ivlm0xT0Oa+AKb8BvjPyzrtCsQj2FSkCrwmCt
+/PgQx4/Z8MeTgH3xCqyxVXywo15TjFNSgNe21dmaHWRr9i2yremoWcPHUDpCvnLi
+hzE5+JflSZsOVWLAp9wazXNpKcj6MDIW0Zke8ZqA/wC4VxT+ANVk2n0RIdREdy2E
+S12ynANDU9BLWsPJswvp7QpollkTta/fSvDAihchkYPJX+LKeUBVhRuqXfjRqgEL
+HIft9ETsCn4nEZRmBtn9V0ZpG6RJW4p14tUxJLQJ35XQ9atFEv+gpd9m+9cyqT1w
+zngN5c8fXT77B4Dh/ZZehCPhdhiVEDSl4805ls8yipcuaOuruDuFY0Ps/R77+ZYo
+888/bxjtRolgz3vZ//m9yWWgxBsKh72Ml2UAQ4hi4QHXfVbTPH3AoxXcMdCZEpsX
+WGNO/RD+jquqLPDGgnLw3ASnqni6IkGwq2niyVWkQ5kzdylBF6taEwkXteL8ERYD
+FG/oVN5KrgFCupfFxbSmx4fo66BInU3YJ/E6v+eVHfWGONGelkaLe4cj3cmDyytr
+wLD2NrqGfQa2NnitacghFx8RQ59CxNkftCDximC65dzXTOkrXNU=
+=Y3H3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a94bd6f6cf9ef..0085e2638d650 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 524794fb36e41..ecb85b9e8e38b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 65cccf9c55417..c8e54e6d92775 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,5 @@
 AUX gentoo.nanorc-r1 5379 BLAKE2B b78e80125832dc4c69a6518344d772cebd4bf8839f64f77e2b0ae9b6b2a151239122144cf13a61f13ab360a777c8f0fa33a703c0ccd04ea59bcfbcc325a75ea4 SHA512 892c207d6924db1076ef7d74e5d36bddf6ca9ab77f4e3988abe269b7b2722e80f77607447b9254485ac58c1635159192fcde118d3e0f116f843a26f7886eef25
-DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
-DIST nano-7.1.tar.xz 1605272 BLAKE2B cc606a04b34e723da01326d617b50f79711d0b35034b3e75f410fa7e277ba3eddbb1a408a80255533d2fa953f23fee745979363d5621b63a79bd89b29d8d528e SHA512 e3226df636d3ae1d94e2907ce8bbdb8de69eb45afd02fb1c83e275a1dcc288081809041adbfdade35a580bcb9f9632d21a45d764b43d22b3e4cfd87c7757c4e0
 DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
-EBUILD nano-6.4.ebuild 2716 BLAKE2B 86f00018ade32386b2ee4f97755abbc02c08b3e60de04dfb40752696ab5fa834d8c06e6b67a7f54097eadeffa95f71708382e86e8d89962098dfe4cc0d86bd7d SHA512 1b8bbaf81a90ac30ec7d13a264c8895d280c8259c7c9bb0f84e7fabdc583e57e5106f0bf45f22aedfb39e55cb091df43b0396e119ad706e28d553bdc756024ab
-EBUILD nano-7.1.ebuild 2659 BLAKE2B 03652b470d2dd1a4573c773298a888cb7ffee1b9de9c7c620cd581347f816c79f9bee2cca4b7128160db4fc3f4f7d1f348c381dcf99b630dcf303ea69a3c0c36 SHA512 a1b47e9de73c9801bcecf7138639351fe9a908fa09137445d8f1dc5891c8b9fd8cc618408bad93701b4083189094fa725b05f26d6b0be660bf59d3b560fe7c9d
 EBUILD nano-7.2.ebuild 2651 BLAKE2B 09dba83cb9100f96524315f29dbf6827fa9b1905dbc3e421071b07f9ba497ecbb2d996068fe653577bc1146cbfeedcc9dcbf7e76146831c522f59f9715ca1954 SHA512 763c7e7342bac7c0d0cbb58dde43029004e58404b265db2a54d2820151e06394d8b5e7a103939000b34518374bcceaba7a2126973e3be9e372f7b440d82d9aaa
 EBUILD nano-9999.ebuild 2659 BLAKE2B 03652b470d2dd1a4573c773298a888cb7ffee1b9de9c7c620cd581347f816c79f9bee2cca4b7128160db4fc3f4f7d1f348c381dcf99b630dcf303ea69a3c0c36 SHA512 a1b47e9de73c9801bcecf7138639351fe9a908fa09137445d8f1dc5891c8b9fd8cc618408bad93701b4083189094fa725b05f26d6b0be660bf59d3b560fe7c9d
-MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f
+MISC metadata.xml 1580 BLAKE2B 5977013d57a99580adaf6df69a926972f430ceaec8f19f5d6ea060c5b5d066b9ac3e2fd1ca59def8266f39143b35340c6571651c90e5ef7050ec93cb58d588e3 SHA512 1533be592588e8f33c67072d14432cee0267f23d5a67626b21aa6ea8027fdce754fcd7c731645d5af7033c128b5b09af7140e15d8d5dc4e357ffa73a0428a865
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index f0ba3c2c58b5d..0e05c7d4c62fa 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -35,8 +35,5 @@ perhaps providing other extra functionality.
 			Disable all fancy features, including ones that otherwise have a dedicated
 			USE flag (such as spelling).
 		</flag>
-		<flag name="split-usr">
-			Enable this if /bin and /usr/bin are separate directories
-		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-editors/nano/nano-6.4.ebuild b/app-editors/nano/nano-6.4.ebuild
deleted file mode 100644
index e6c3f4ce901af..0000000000000
--- a/app-editors/nano/nano-6.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit autotools git-r3
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
-
-	local e
-	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
-	if [[ ${e##*/} == nano ]]; then
-		ewarn "The EDITOR variable is still set to ${e}."
-		ewarn "You can update it with \"eselect editor\"."
-	fi
-}
diff --git a/app-editors/nano/nano-7.1.ebuild b/app-editors/nano/nano-7.1.ebuild
deleted file mode 100644
index 1cc0796fdf71e..0000000000000
--- a/app-editors/nano/nano-7.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit autotools git-r3
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
-	fi
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
-
-	local e
-	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
-	if [[ ${e##*/} == nano ]]; then
-		ewarn "The EDITOR variable is still set to ${e}."
-		ewarn "You can update it with \"eselect editor\"."
-	fi
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 826e5e70dae5b..2ff3320e86659 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index c156adfe3e819..e6978d0e0023d 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -1,5 +1,5 @@
 AUX opendbx-doxy.patch 1557 BLAKE2B 260c5578e22a751f59308d9dc3f94017951f24775c5dc52d3e4e512380244e5d7266704aae43119267c1726a08c086658c7c0e89bbcb66f671507712d9e2c9ba SHA512 f98f1b1014a44713c1cc5adf46fba8af5333c97faf765e8d1e6c0eb4772650c7524f4c8a90cffe6bbdb4c688beb6bac3eb2755105164002f3e85797adb135004
 AUX opendbx-man-optional.patch 1000 BLAKE2B a8e5dc4e0721b94acd0b379a6d27ea8e349e85ea31d362d4f6c0ac274220f69e09bcb4c0436b6cfd3037983e66d484cb48057cb740456d772ab49e7c4dade566 SHA512 1acf644bc84474e62d28cfa07a0030fd2ec919e27cb514cf710d4322f0f6c869e79bb11895e5eee549e4edb5e1924e708dc7ec87b02be722ce5306c418b6ecf8
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
-EBUILD opendbx-1.4.6-r5.ebuild 2425 BLAKE2B 781a56db8841b8de991c90fed771562b4b13fbb3baf09cac4947a1bb67f450a4b63e9509beeb3ff3eddb4e1caaea8910aea0fd1c1801322f57da7f4d00f1f61b SHA512 540cf68cae95be043da81401ca63ba9e09289c154c20919878076de7eb94e5eb7ab1593b705f63c68155edb0b94f6ceae60e8c6e083893cef90e96c122535b25
+EBUILD opendbx-1.4.6-r6.ebuild 2575 BLAKE2B 691d03cf32321b5a8b280b5e3acd10c0116c662d1a8d483e9d0c803679f6613baa64b4bf38f6e687c255c376769311c7a9e6b8d40cf0e8ea451ba312fd532469 SHA512 b84063de45c99775d9766751b69b1c942b2b9630815641f9236bf9537433581bcc707c7a3fd0dc15dc4e75d1188287543cd7618d6a9d016b76450d61cdc9d942
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild
index a84c00e4f96db..5a24ad4af48df 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -12,26 +12,35 @@ SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="firebird +man +mysql oracle postgres sqlite"
-RESTRICT="firebird? ( bindist )"
+IUSE="firebird +man +mysql oracle postgres sqlite test"
+# The test programs need manual/interactive use.
+RESTRICT="
+	firebird? ( bindist )
+	!test? ( test )
+	test
+"
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
 	oracle? ( dev-db/oracle-instantclient[sdk] )
 	firebird? ( dev-db/firebird )"
-DEPEND="${RDEPEND}
-	man? ( app-doc/doxygen
-		app-text/docbook2X )"
-
-REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
-
-PATCHES=( "${FILESDIR}/${PN}-doxy.patch"
-	"${FILESDIR}/${PN}-man-optional.patch" )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	man? (
+		app-doc/doxygen
+		app-text/docbook2X
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-doxy.patch"
+	"${FILESDIR}/${PN}-man-optional.patch"
+)
 
 pkg_setup() {
-	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
-	then
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]; then
 		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
 	fi
 }
@@ -50,8 +59,8 @@ src_configure() {
 	use postgres && backends="${backends} pgsql"
 	use sqlite && backends="${backends} sqlite3"
 
-	use mysql && append-cppflags -I/usr/include/mysql
-	use firebird && append-cppflags -I/opt/firebird/include
+	use mysql && append-cppflags -I"${ESYSROOT}"/usr/include/mysql
+	use firebird && append-cppflags -I"${ESYSROOT}"/opt/firebird/include
 
 	if use oracle ; then
 		# Traditionally, OCI header files are provided in:
@@ -71,7 +80,10 @@ src_configure() {
 	# bug #788304
 	append-cxxflags -std=c++14
 
-	econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)"
+	econf \
+		--with-backends="${backends}" \
+		--enable-manpages="$(usex man yes no)" \
+		$(use_enable test)
 }
 
 src_compile() {
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 6b29116ee1a1a..fae00e4509cf0 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index fec73b888cd70..038c8fc70350e 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,4 +1,4 @@
 DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
-EBUILD wf-config-0.7.1-r1.ebuild 647 BLAKE2B a1ae5d6c093d738b7bbae79329441879d09f448dcb3fc688254ed4154149ce53b842739ae4eb152583d2a5faa939740455623a50ace1efbac4f6df0d8abb63df SHA512 fe2e9957e6b9a894f053d6a8512170d01e553d83831c1192d3f7fc613be5ecd9ba04579eeb694f378d960fa9a931778416e78e9303282a6abaedddcdcf9465a1
-EBUILD wf-config-9999.ebuild 648 BLAKE2B 7ed4b2e30559c64d915ad51f91d21b2092776c7b75d37206d5c22aeb22764b468de0f0502cccd668ab61c9129fedcb8ae471dc7929214c47ea0b0e3ffc5b6f88 SHA512 b5c963ed5891c17a4477896ba68a549c4bbe2ba1d6f7d44267942d83ee5e188e8c701abd0abd897b9fa684841166f7a77dbdfe270dc5eb2f258477683ba03393
+EBUILD wf-config-0.7.1-r1.ebuild 809 BLAKE2B 9f67605ea19118594c5a1d4a7e908787b9731234efa01ed4dcf5957d4a8c7e2f2dab90983e3b45a9a760ac2a0bbc7873ef09cc04c1247e326f0cf5a19e51de46 SHA512 0c48c0fc68edb3aab37eec47058db82434b3ce970b473927067aa94d274360faa5a871857466d4df54aaec138a7e13d371c54ef59af2e598498e8a15dccb317f
+EBUILD wf-config-9999.ebuild 810 BLAKE2B 68f71681519ec39e272cf5a35fc48855314fd77b0c98784f662ff266f9ca26bbcd415e8a7bc17793214ca72f7af6e1e581cba164ca8643f52f371186d3cd7c45 SHA512 e998fa99485845ee9f57a3fa57576f6f1908ea51f1232d88ce29f1e972656aacd6862ae5b7e2431fabfb5f430b3af064fda870db77e3caae1538ce25c8a703ec
 MISC metadata.xml 507 BLAKE2B 503103e40f0527b6593821f4170bf58d7077d6d32096cb71d125ed88ac768c341b089a6d7c173797aa4604e6450f9c9716fb4122d8d499b67f1067f75d3c60a0 SHA512 122c9699e3a22be6d91680ac303d09b9614313345f11a9a3a344c4064fecede8107f3b891c9e04bb19479aeed846beb18355803dc41b2052a81fb6c016c25f5f
diff --git a/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild b/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
index c663a20684e4a..a223d4b9907c3 100644
--- a/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
+++ b/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libevdev
@@ -28,4 +30,13 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
+	test? ( dev-cpp/doctest )
 "
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index 7ceb2c95adb3c..ae9b12db688bb 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libevdev
@@ -28,4 +30,13 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
+	test? ( dev-cpp/doctest )
 "
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5afd03ebddce4..65496f04f8f78 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index de6db5cec9d06..c50dc3a1d8983 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,9 +5,9 @@ AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e
 DIST postfix-3.7.4.tar.gz 4833834 BLAKE2B edb716ef4576d339189f11b535a62f3c6f8f28613723d916f13cdd2d37228aa8768dacdb9d8616c83f0ded3a3c801c45747375ea6cfa505b668a7163c4637128 SHA512 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236
 DIST postfix-3.7.5.tar.gz 4834332 BLAKE2B 60be442c165e722dca3f1b5ece30adb85493560c583f6bb485e548f35bffe9e5ec27193eb68222f95a3076007af046622c98ee954167b53d2e306969ccf07647 SHA512 097c8f74386d746e849176c1344fe51c957b972cc1b15ebbb27cee4c825deae7201081cb1212e3fb12f16a6795c86381492d71123a8bf287fc8b58c6979fbf8f
 DIST postfix-3.8.0.tar.gz 4851893 BLAKE2B 3ef0c0c83eed3263c890143ae962674dfbfa01f589f1b503a01d57497e4732171aa58468357276f29a9454c577573e8442095c2db25005324754dbd305875297 SHA512 a66956b0cc5eb6ad5ee926348b584ba5640586784aec794a84c40472faecb6313d46537c9f5696edfd8fda070591925a0cfaedc014e15bb3496195e5fb9ee4bd
-DIST postfix-3.9-20230507.tar.gz 4860598 BLAKE2B 44bcaae2f870e2d41f34ab58869dce2a94bb2f5a750092ef399e657bc53ba144caa52f18882691bfbc1e1a4378950a2720cba137ba3555127a4dc28bb9f076d8 SHA512 0eb4dccad6b7a4e9c6014439e9f1107254e402d2c96bc7c0cefae6951b95949266662fa5eedf5d8ca59929290c1441e0b9a12473715d01acc6eb1237ceac01e2
+DIST postfix-3.9-20230508.tar.gz 4861450 BLAKE2B a7f6787f73bf8bcc6604b88cd75f4a93cd334cd622c89aa8c8cbb45f8c25b3fb58c9cd9893fd99580531bb65f9a05bcf7dbcee702c6f0b3d687b1ce65b9704b6 SHA512 e3945471d5ee625ffad08ede66444efa721f00fe428c4c82a47afcb3a84f70bcc05159d1dc1371464803f0879862f16339aa1fe6890e0dbeda9e03fb97d6c04d
 EBUILD postfix-3.7.4.ebuild 8023 BLAKE2B f1ed37c430536e96591beceb346144d28bf5eee3a1f93d7d41d4db3f3ed36b9fea7847cbf0c3b278a8ee99ec93ad91797a8fccfad5104717deec5bf4ef18396e SHA512 0676646a5d0bc5187779b707593b8c6ac438c2f13524c4105bc4955feb57ed40aa86df78b740bec4cfa651ce22e44075d8fe6bbecbe44ad591842634856403cf
 EBUILD postfix-3.7.5.ebuild 8029 BLAKE2B acc668752b4e0f4df4cb5fc03a2fb1ed723018a2a6ebd016d7f3172203151f83d9abc23f9c50924788cfc57ccce9ef39b7968d6b7c4ee888f2120afa25182779 SHA512 0cefa25cffd806d11983d9324b10668ca53ff18a5a9192bcefb4b92ae00fc9acb8cbabd75b6fb38089b62399d50d2076dd1f2b2c53ce5577ad04e9054d97219e
 EBUILD postfix-3.8.0.ebuild 8196 BLAKE2B cd5dd1fead1f37a73ca3b2ffd232db629b617470d6543cd3d6b0fd34ce6b82a2bcfd7cac91a81719fcbb5097cd478548227cc01aa16aa71249ea7c923ee61c64 SHA512 38285f7690cc46d9adb91dfa0d49e58987b45f673b85d09e5acc65658c5cb865129e8c279a95d5eeb4276bcea7ea72e6c293c071cc05639710686681591a2b15
-EBUILD postfix-3.9_pre20230507.ebuild 8199 BLAKE2B 4415e28f87a7a5a1df454e45f4d296845f7cc1947a7df900cf25d4fa1c4c73158e831d78e5d0d427ab5d09f96536803a56d2dcb2a71f142d288a631a4219e5ed SHA512 50a2464559afd3582603876caeb44db9a733344d7ff9524b8b68015b0ee5412526703db6b4b62a955f60e4e7bd4545a811ce0552d69e9346c0196e05fc1be86a
+EBUILD postfix-3.9_pre20230508.ebuild 8199 BLAKE2B 4415e28f87a7a5a1df454e45f4d296845f7cc1947a7df900cf25d4fa1c4c73158e831d78e5d0d427ab5d09f96536803a56d2dcb2a71f142d288a631a4219e5ed SHA512 50a2464559afd3582603876caeb44db9a733344d7ff9524b8b68015b0ee5412526703db6b4b62a955f60e4e7bd4545a811ce0552d69e9346c0196e05fc1be86a
 MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/postfix-3.9_pre20230507.ebuild b/mail-mta/postfix/postfix-3.9_pre20230508.ebuild
index 809c17c943f16..809c17c943f16 100644
--- a/mail-mta/postfix/postfix-3.9_pre20230507.ebuild
+++ b/mail-mta/postfix/postfix-3.9_pre20230508.ebuild
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index 92246118ba07c..c0169ea6f67c0 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1683717021 Wed May 10 11:10:21 AM UTC 2023
+1683718823 Wed May 10 11:40:23 AM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 450b2e89706b6..4a07755dc8cf5 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 938e0991b83c2..6200ee2462f79 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 11:09:44 +0000
+Wed, 10 May 2023 11:39:46 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index feac76e596ddc..35a6c0507c8a3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-10T11:09:48Z
+TIMESTAMP 2023-05-10T11:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbe3xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbgoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkIw//WsfeFo3nhQtUZAaG7Zx+OROqVNJqBFNrPO3nmBs1tMPKgJtqNf1A865k
-meeWFUve0uylWSmQLKCtaFIcPqRixCxzTEQAc5+pBxp6Md/TZUPZkD23IcQ1N7zq
-734rTqFmbjKqEe8/YRe9Gz3RLOkkdH/LlZndYbQCCLwTKw6hniwE3ZowOgJIvnhN
-XhpA3ONYE5dZmsYQUzJ0q+LxgPj4iFWwJ7qMVwmCYBckkFW2C3sM+V+Fp6Ko+jVq
-QQEhJEIev9AtR0YwMNYiWQj1M46idY7rAJ8QCA/qKeELt6Yc9gG/f9W9QcglSoco
-q4GdN4HkDECnHn5nklfpQa4KYqGDv4j4EAIKmGw3cHNqLcqyir9gdAvK8IKSAGLQ
-m1snXxZJcBRLUlULO5RjD2bHPYMlFSjZ+0JTZ32EL0BU34S5OVA/vHU0LSxR4e9k
-F9osZOzXWHXjZavPKVfHCD44S0XcqCN9rLTRws/8s7VsrDoYgwG9xxQevs42BBsX
-NwZV2D832o/ipGGuLE45zGTtNdAKDt76afveWwmhe5wHzQBqQS7v8IQ7OOcYkwR0
-Uq5uDsSV9jmBFI9vhMXK84UOwiNeKefo1au9nPxgc/m1M77b2+iTt1w5BjeSx67k
-ruUH9KbfINsjtZL/UeLmz8AdgQLjAW+t1wP9cS2Tb31sFQ6jM4I=
-=mnTw
+klC2SxAAtuuJLqbFkfeg6ffrq7/H+nj8yr85aNSf+D2u4nnqlf+6w6U9jPvzg/HI
+nsp/hi0Xe++3cnFBmepKSVU9uMoTJ1sOox6MKXpsBmUQ+ZmvR5OUWbhMaJEfNJ1I
+3hH69KTgAeRC/ePZT5ruLw76B0guHLPGyspBO9Gn4F5NpJ35PQDrQv192RcTSZRj
+iUijTTPtG8nciMLs6Zohtf3Y2bMW2PLSgfCuQ6JOfplkr0cKGiK25R9j1fWg8Isf
+wNLhCalzCeuM45HHHKNkT+RO05L+G51MRl5zp5GAttJnEFOq6Im7yJ+dq9DBj3k8
+eAG5p4Pgz6kHqA7Mr5s3Qy9ClJhnXws5maezIyer60A2KJJhCiNjKjq4WDA7efeA
+PpWV/tY4K//xW076bLtk8tNPuilXt7Q8DmpT7e6AgyfhydJoGv0GQNTP7JZxOD/Z
+EAkXBdTWkyuafpdEitqBi7VcdufTeOiSpluDc0hC5nb2iQ4vj4wA3E6HI4PgZmdR
+7s2xLrfMDBQpxlG8n8BIMt53XU0fRu/pkZd1zfQw3SHol3F56cckfWmA6n9iTtmM
+DoDsajMoTfgZem0d6F3e6ff5gqQbJsNHn9Kq0OxgxyVjtcWWyWmTzD+n47ahSqJy
+AEj0l3JZvVPCAql519NgKE+P5hcWsqFkQohIlzGjq+Qs+rWtMlA=
+=WSqy
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 938e0991b83c2..6200ee2462f79 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 11:09:44 +0000
+Wed, 10 May 2023 11:39:46 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a5ea90daf5da4..64ccdc3f88681 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index e70d996c58736..b2bcf942f9dde 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/nano-6.4 b/metadata/md5-cache/app-editors/nano-6.4
deleted file mode 100644
index 8c8388c9b2be6..0000000000000
--- a/metadata/md5-cache/app-editors/nano-6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postrm prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v6/nano-6.4.tar.xz
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c886be7d62ae7e6532c93e80aec2b551
diff --git a/metadata/md5-cache/app-editors/nano-7.1 b/metadata/md5-cache/app-editors/nano-7.1
deleted file mode 100644
index ed30fcf9b8591..0000000000000
--- a/metadata/md5-cache/app-editors/nano-7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postrm prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v7/nano-7.1.tar.xz
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=580b5e8a7276460557174293d1182d4a
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7d690b10916f7..ef7a22ba3dbcd 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.6-r5 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
deleted file mode 100644
index 8d769b19524c0..0000000000000
--- a/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird ) man? ( app-doc/doxygen app-text/docbook2X ) 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
-DESCRIPTION=OpenDBX - A database abstraction layer
-EAPI=6
-HOMEPAGE=https://www.linuxnetworks.de/doc/index.php/OpenDBX
-INHERIT=autotools flag-o-matic
-IUSE=firebird +man +mysql oracle postgres sqlite
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
-REQUIRED_USE=|| ( firebird mysql oracle postgres sqlite )
-RESTRICT=firebird? ( bindist )
-SLOT=0
-SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	d1408425c7c4a7669b9b17735404b693	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bb78f07c0e8f14d280aa317dd415c2f3
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.6-r6 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r6
new file mode 100644
index 0000000000000..96d1fa01a2ec3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.6-r6
@@ -0,0 +1,17 @@
+BDEPEND=man? ( app-doc/doxygen app-text/docbook2X ) 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
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
+DESCRIPTION=OpenDBX - A database abstraction layer
+EAPI=8
+HOMEPAGE=https://www.linuxnetworks.de/doc/index.php/OpenDBX
+INHERIT=autotools flag-o-matic
+IUSE=firebird +man +mysql oracle postgres sqlite test
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=LGPL-2.1
+RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
+REQUIRED_USE=|| ( firebird mysql oracle postgres sqlite )
+RESTRICT=firebird? ( bindist ) !test? ( test ) test
+SLOT=0
+SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4c3df5c3ef15119a916fedd41c820b8e
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 6b3e9afa02bc5..ba5c145aad875 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1 b/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1
index ea700365ba11a..e69315014676f 100644
--- a/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1
+++ b/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1
@@ -1,14 +1,16 @@
-BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig test? ( dev-cpp/doctest ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
 INHERIT=meson
+IUSE=test
 KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/v0.7.1/wf-config-0.7.1.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9da8ec74fe09bfc87c6b373f6d5ebb08
+_md5_=3ed78adc930888f37afd2d0a68a4657f
diff --git a/metadata/md5-cache/gui-libs/wf-config-9999 b/metadata/md5-cache/gui-libs/wf-config-9999
index 5e0d6953717c3..df0cb85eba850 100644
--- a/metadata/md5-cache/gui-libs/wf-config-9999
+++ b/metadata/md5-cache/gui-libs/wf-config-9999
@@ -1,13 +1,15 @@
-BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig test? ( dev-cpp/doctest ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
 INHERIT=meson git-r3
+IUSE=test
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=20869d6eeb6aa0a4486e43992177272d
+_md5_=ac195e62c9b7cf2a4248bad42a39c0ac
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 0c5de38b84354..53624fcb6f967 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/postfix-3.9_pre20230507 b/metadata/md5-cache/mail-mta/postfix-3.9_pre20230508
index c8f59773bfd58..8ede7bc5b90df 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.9_pre20230507
+++ b/metadata/md5-cache/mail-mta/postfix-3.9_pre20230508
@@ -11,6 +11,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=|| ( berkdb cdb lmdb ) ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.9-20230507.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.9-20230508.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=309c87e1dbbfaca113e1b39855a03954
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 480b202f2b45c..ebd23e1eb0cd8 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libiscsi-1.19.0-r1 b/metadata/md5-cache/net-libs/libiscsi-1.19.0-r2
index 6903a03740ee7..945dc3cac7f30 100644
--- a/metadata/md5-cache/net-libs/libiscsi-1.19.0-r1
+++ b/metadata/md5-cache/net-libs/libiscsi-1.19.0-r2
@@ -1,15 +1,16 @@
 BDEPEND=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
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt:0= rdma? ( sys-cluster/rdma-core )
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core ) test? ( dev-util/cunit )
 DESCRIPTION=iscsi client library and utilities
 EAPI=8
 HOMEPAGE=https://github.com/sahlberg/libiscsi
 INHERIT=autotools
-IUSE=rdma
+IUSE=rdma test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/libgcrypt:0= rdma? ( sys-cluster/rdma-core )
+RDEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core )
+RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libiscsi/archive/1.19.0.tar.gz -> libiscsi-1.19.0.tar.gz https://dev.gentoo.org/~sam/distfiles/net-libs/libiscsi/libiscsi-1.19.0-remove-ld-iscsi.patch.bz2
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2de173d6ab0f6963511e033c7179eaef
+_md5_=b8d93525681b1d2ae635d6a0ee81fdec
diff --git a/metadata/md5-cache/net-libs/libiscsi-9999 b/metadata/md5-cache/net-libs/libiscsi-9999
index 3a286e901fdf7..979e2a0169b86 100644
--- a/metadata/md5-cache/net-libs/libiscsi-9999
+++ b/metadata/md5-cache/net-libs/libiscsi-9999
@@ -1,13 +1,15 @@
 BDEPEND=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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/libgcrypt:0=
+DEFINED_PHASES=configure install prepare test unpack
+DEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core ) test? ( dev-util/cunit )
 DESCRIPTION=iscsi client library and utilities
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/sahlberg/libiscsi
 INHERIT=autotools git-r3
+IUSE=rdma test
 LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libgcrypt:0=
+RDEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core )
+RESTRICT=!test? ( test ) test
 SLOT=0
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5a4b1c856ebb176c1eaf21e3a95e167e
+_md5_=a98d0a51e6037e429b59be7e16ea55f2
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e8d5b76825088..fef8c8d14a79f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-10T11:09:48Z
+TIMESTAMP 2023-05-10T11:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbe3xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbgoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC2xw//c+kDuIrF3ph0ASsImOeu96FJCMXWseVvgabHO6Kaz0vl9fTtEePyso4U
-H7r8H4E+hupnPCBUUpgCjJ4YYbV3EfqpNFPloW8xj3vIrxsGjnfcVWeC/5aj8M1G
-rvYXq/drcT1bA1FBZAWbw34WCk7McAmQlrD07s9Nwv1yF9DMLGhcS6dLJ88nRS4c
-1A6BkjaY27yZYEuQqU2XtTbyd+hCvn0FBKdFFvDo3YAH9p8gAljlHlragSdZ5M58
-rfKMR4REsLTUZtgg2CTZVaG8vvP6yiDc3cfcY00jxwiMV4gdE5zms7ozWV9gHoNV
-Go6zHF+eN4uoE7HbuQs7SBzrQ1tWr8+X1xu2C18xoe+MJbPS/buh0vukbzqNS4ii
-C5neYvksrTK7KJnunHbLW4WzFWGMFhFnmJCsPRn50WCaP3X8BUaDt7v8jJ7tz360
-WaZKdhTcadjI+KYdYZPUFt9734jJQetfo6u2gJ2urTBTx1erRxiy1+SK4AMClKw9
-6u7gEV3s66YGZ2W5DvACBSxuFMVVLu9IFM2enX+K6B+32Aozhi7OfK2cFzhQO2WO
-DqHtmb1vuPoztLB5+LN8kBsm3EmtSF1lN80B45PdoMx8vp7jCJijdRnRf00LfAnT
-NqAuhUfhaOwHOGYY4o0Z+0JNd6EtMNWjVwH/AVd4gBUGa6X6/AM=
-=y44q
+klCN7xAAjzRbqMS0nfBO8SIAtLyomK6En8I/ZRsBA4fzwHQUDN3tp6651L6B4HIo
+4FisK1QuPnC8M3vu5rR3YuggeO1eSVM3QenVplRqga12K7GeGT0yM4kU7C91F04g
+5kFsMlWDQuwYtka624j1HGyOqq6KSdiDsnMsKBZRotflR9Uqh6lRIXoXZIkzwUYo
+jg//HoQe2OcaF02MTeUROakwYUmVpTeznq9bTD5Uc04EgseZ7URcmeXmH3phnCn6
+864+f6vlDRcSGv6IxPAwSOOy78VOnSUt4MKaEHZhFc5Hra3yUjpilWbx5r4QR7Wz
+MvvcRjhfOe5Bkj1qxCp/U/uNgMEHNF3cUC+M+PXPWJL9+yN+NAyodBi41ukRNWcv
+nyVKM+sw7svXy4hT/WtAuGdjsRiG/uBMF6srX78qzCfsUuxFiSMp9FGJeQrkbRgc
+Y6FfFyGKd9iShaGm+rfH7hl0UQMGlIRjRdPO+x+VsCZjJXHwCDivU1+ifb1B9hew
+aXCpPL742wt+h+npuDfHZFgLnD+7rSYXUk2ncdhFIuydAFnBQym285WWKUsdI8Rf
+DyrFq0fTp8MvedlIOoYDjnp186AfphHJXrVW5dt0ZQ6nlzYc5pj54dV5Xj84P3tt
+YcZAU3Tsm4E11S50jdJZp79MhBSg4rjDlxfXvvp2NPddaxoWH3E=
+=OMoe
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 938e0991b83c2..6200ee2462f79 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 11:09:44 +0000
+Wed, 10 May 2023 11:39:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 50da0dc9b5690..8b505759a7bc7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 10 11:09:44 AM UTC 2023
+Wed May 10 11:39:46 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 722ab14186e9c..8461e16c69bc9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 11:15:01 +0000
+Wed, 10 May 2023 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e12bc57e3d1d3..bcfe99a311877 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1067e9951208957ddbb68139603a51573deb7b4c 1683711640 2023-05-10T09:40:40+00:00
+40545a61b4a0489f6da963f4fe1fa0c3ea96c6f9 1683718182 2023-05-10T11:29:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 56c06a28be73a..ddb22f81bfe6e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683717001 Wed 10 May 2023 11:10:01 AM UTC
+1683718801 Wed 10 May 2023 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 938e0991b83c2..6200ee2462f79 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 11:09:44 +0000
+Wed, 10 May 2023 11:39:46 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ce40c8f0a48b7..44997c042f103 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 5220b6cbe41cb..596cdebd1f026 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -6,6 +6,6 @@ DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda6927
 DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
-EBUILD libiscsi-1.19.0-r1.ebuild 1189 BLAKE2B 194ad7ea6756fa09f937ca14305efecc354ad9fde09f4f7a75dc57ad371e754c6db54f1f86a3935d7d94b357d66922f05c1526c47a132970c14183db324da06b SHA512 dd1d745621a4cba756caf9d24edb19bcf060761c0db05277227b11c4b4dae3b5c6ac5b5d618770c1917b824db5a898a09c6cccee30d810cf607e1e4cde4cd4f7
-EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
+EBUILD libiscsi-1.19.0-r2.ebuild 1382 BLAKE2B a49a22f4475a06fca6be78cadf73271eb5c1edc3cb59ddb881cbf13b0daf96181a9f2771e954f9d6bbe6365139789a36ea6fabc14a2111eb9ce118d5d3bb70ca SHA512 cbdcbf900be41a74a5dd070b1910231213fafc5d1adedd92b258dfeae766e9424961b863d26067eddf676b0d71e2d42b02cc4f87447268d4e5c98ded22eb3f2f
+EBUILD libiscsi-9999.ebuild 1036 BLAKE2B 4dd8fdbc53cfc2197e5e7cbcf02538950968c59189cc6680bafac09881015a88d4ba1bccc10b713abf7562ee7bad9b8ee2be12964ca2a2777c68454badb22d6a SHA512 e4445fe497ecf49ca32bb2a34a44b22c1a60a49098163592758473b00dd7762c1ab81804feaa0c02edd7dad002fb6bae0cdd2672297669af06bdb88dee0bbf6f
 MISC metadata.xml 353 BLAKE2B 3c729c58e8fe95f38a6f5ea14eba047ebb50b2b80819d53acfaae83d81f51510b652b618c3a7c59d16fe0d1a4e397246c5ea6b0b6807197d580a61f3784cb79f SHA512 070979945abed956dd34ae0d1cc93ea45d30a9eb555262de9f767107d2f3323260df6377c151b8705de5fffd001febd21b9bb3d8fc278b56e52ddb47a081add9
diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild
index 851b26691c45a..f0879dde5e86e 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,11 +19,18 @@ HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="rdma"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	rdma? ( sys-cluster/rdma-core )"
-DEPEND="${RDEPEND}"
+IUSE="rdma test"
+# test_9000_compareandwrite.sh failure needs investigation
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
@@ -42,7 +49,12 @@ src_configure() {
 	econf \
 		--enable-manpages \
 		$(use_with rdma) \
-		--disable-werror
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
 }
 
 src_install() {
diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild
index 9d1977923e123..6d289d4b8eb37 100644
--- a/net-libs/libiscsi/libiscsi-9999.ebuild
+++ b/net-libs/libiscsi/libiscsi-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -10,17 +10,26 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="iscsi client library and utilities"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
+SLOT="0"
+IUSE="rdma test"
+# test_9000_compareandwrite.sh failure needs investigation
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
 
 src_prepare() {
 	default
@@ -30,8 +39,13 @@ src_prepare() {
 src_configure() {
 	econf \
 		--enable-manpages \
-		--disable-static \
-		--disable-werror
+		$(use_with rdma) \
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
 }
 
 src_install() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 39720a7e322cf..df4bca6e308fc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 73b89c809391c..917d329c9fb85 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -464,7 +464,6 @@ app-editors/nano:debug - Enable debug messages and assert warnings. Note that th
 app-editors/nano:justify - Enable justify/unjustify functions for text formatting.
 app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
 app-editors/nano:minimal - Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling).
-app-editors/nano:split-usr - Enable this if /bin and /usr/bin are separate directories
 app-editors/neovim:lto - Build with Link Time Optimization (LTO)
 app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/neovim:tui - Build the neovim unix tui