gentoo auto-resync : 08:05:2023 - 11:38:53

5 files changed, 11 insertions, 867 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 764feecc5e84..68b072f9c74c 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 72de3d0dd4ae..7aa686900225 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -149,18 +149,19 @@ DIST ncurses-6.4-20230423.patch.gz 115574 BLAKE2B 72a98086f00f02cf0ea018392373f7
 DIST ncurses-6.4-20230423.patch.gz.asc 729 BLAKE2B 74a5e9cdc519788bb3c501a37061fe5f9ebbed531d274f252f21d293d4687b5767f7935f4bf1cf209980d9c2690959bac1ceb883bcb17d49ba012afe9bcda139 SHA512 3f840f5f8dcf2d901077d7b717431c3f6146e7ad895102b2af46d8b329e428baf15225d905f46027c7e9c4796be40d95b7322e764cc8d56afc357657e019f1cf
 DIST ncurses-6.4-20230424.patch.gz 4488 BLAKE2B faebd76ba1f868b8637b4a72b427123c08b33871fc366b989fccb107898702f089c2014c453fecbb12dc260816e5acf97212f3fa2b9a7ace9fa384c31b6ba1f2 SHA512 bdaa63e0494b981443f07e9ce134785b2420dff3d561eef7a8041e7df5d04e9c9242cdd1cd9e4592fa0724f073b829bff36e74e480235f4eacf37bb639d914ef
 DIST ncurses-6.4-20230424.patch.gz.asc 729 BLAKE2B 6eab548bea6fb01f6845ec03a41bb0ab3969b5982baed9458910d207542a480e911d53e3bfd968f485aaf754f94fb166b910bf8965646c3de035b255489dcb1f SHA512 91645fb4997f0e276468aca9a702d79b487d7018b56665e0fda8e37e8fadb6cda7f8b1e653eb3c1cd0ad563360b410d8143102d2ba3bb6d1c7b18ba1657a86dc
+DIST ncurses-6.4-20230429.patch.gz 9195 BLAKE2B 6ed8c3cac11d3c3e52b7dce20be5b7695967622aa517c364d0f1af7f4a813befe5cfe200eb3097fba610e63e22092100066968f55eba499c9fc21a95bced7524 SHA512 f37164116ed9f09c51a62d90e28dbef68b19a4444c4aa7e2ccdafa3cfa2c7530bcac65b421910a273d0e34b91382bf4f7957f0116af30e13856710199dd266e3
+DIST ncurses-6.4-20230429.patch.gz.asc 729 BLAKE2B 2e063a7818ac443182ec4f4d8da13884accd563ab66e04297ca0bd4b9610f974efd3ca29dfcf13939cd9ee369c5e5799eb13a55050249036ebbc375e6ef8d6d1 SHA512 55167510e21aa3ad6d4a57fa37ae82308424ae9141e6e4756b4b335d30136675add5c00ee102d74ed93eccfc2d752eff5045d88e708928df3cecde3c0be77c79
+DIST ncurses-6.4-20230506.patch.gz 52834 BLAKE2B 55d2351a507a60aa5baeb9e7e392fbbf714a6bffcf4729e9b195aabc2dc81372336d0dc3501f95abda04491013220060983d2186531471694f40b35d4ef3196d SHA512 04967b96d9723b2939fe64eff4388ceee0adf478f659b58cac8601770dd7763fa192d673e78b33c267e00f4ecbfc2863bc49b12fcdeaa8ce24df39126f20b4e1
+DIST ncurses-6.4-20230506.patch.gz.asc 729 BLAKE2B 5ccb09f5b48a4a9c98ad4224cde68df659a365aca12210ec14a6519216e32b10531b1dfc4184bd12e62e1f0fdd9f06974b59866bba6115407d52712f5adff6f8 SHA512 2f63a62e37a15aa6a276a5d9a2c4b86a4e50af037ee5b1c339bccb02200d3e477b5b93ce5833a4d3933a952970caec3b38639412281c1df7c30d7b241bc3a2ab
 DIST ncurses-6.4-patches.tar.xz 63720 BLAKE2B 6b767f65a9c7e8f9fdebaa2623e3770872e710fa103d11e48509e5315ebf5ad1a37519b1b40c5138e631693fb2e2e30ea5eef11002698a341a623a85c5b0b4fc SHA512 5094f6cb8fa54d9df0802173f1e0ff2ad40fc3d4bd298c0742479f72ba4f9afee0ccf9f0a4eb068b0a5552523abf7b212861b61abbde6f69ff22d62dd686daa9
 DIST ncurses-6.4.tar.gz 3612591 BLAKE2B 47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3 SHA512 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
 DIST ncurses-6.4.tar.gz.sig 438 BLAKE2B e6a78b8d0cbce1577205b49b0260394094632cefd95294813c7e4e51a2908e8599a9f24b3b648e42ba16c015fb9424b2a82236f58aac3bf96f5400a50482e44e SHA512 f2a7859725b4d5d62f68006338d56598ac6b38a1448983108906e192f0ec922be287cc89bcc79c1ae49ebc80c967af3dd077427f35ae579b00d445c882414fed
 DIST ncurses-6.4_p20230408-patches.tar.xz 80472 BLAKE2B 0ba8156ebd4f1691fec7bc1b800ef39ce6a4210573c027dd437919cdcd7c995830116da06c69f31c65923845a4d5c88e974673fac38acce5813f7d6cdc646e3e SHA512 32960e2cc4cd9dc60c38b49f46c5ce2c02179479abb66ca29f63cd06475ae8e26299a78b5f06762d114aefbbca3ba6fbebe7093a58106eeaa40cf500d21633a4
-DIST ncurses-6.4_p20230415-patches.tar.xz 63188 BLAKE2B 2f05eb332a2af69bb5418026ef9fdfcfc6b164c20ad7618c481127054b653ab5961a8a96cd7dbce653631ae8a1afc9377c4a82b4ff8aff27bb47f21fbead48a8 SHA512 a052004fb8dd2653b12f0ee6b9d423fdedc77a049c67e7f34794aad9f249bbcb8439cf9d15647911583895c7a579f1b4c887fa884a699e74e7ea24861566eb6f
-DIST ncurses-6.4_p20230418-patches.tar.xz 63200 BLAKE2B 07328d1e998bcde6cbad46550f3d563632963483d72c624a9b64e6e07d80b61f1ab28bee486aeb7cae7d966892762c4aec8ecc504df3f01d5dda49825c9e9693 SHA512 1bcbf9d14d5c693309f79f83c2f85c02cdd40e4de057e6efb5451feed49265d1b8d0bf672e2afae773e68b32a49911c5036ed3f74d9a0089b7b6b03f53fb0b47
 DIST ncurses-6.4_p20230424-patches.tar.xz 63080 BLAKE2B 3924b22d60d995766987a217b960b4c719a51f7334c9be80d19c0df4615e1f9c657507e77124cc8f5663249cbd480cac6570fdd49362a12e2fb69fcae8c800e8 SHA512 188b4da6d75cd15397977a07789ee6365262bd392fb7b2714e870834b2195d29fc5aadff6664a9a13d8d73e88aa43f502ae97c7b1f980231ce392a05ed4d3eb7
+DIST ncurses-6.4_p20230506-patches.tar.xz 63132 BLAKE2B 5067aa5f82ff9c9ffad0cc9effc1990095b808a1c76ce1ad640aef39f896ed3f1a81caf000cbdb355a2f213133d877bad949ca14debeb88b2d0d3c3a8331e605 SHA512 cef883f486cf5b2abecfd951e408aeeb76257b53abea465b33b0e9f4b9bd9b7dc001f4aa48dcbd429143ed14b784bd841bcd5bc722d528d21521d5630dcf8315
 EBUILD ncurses-6.3_p20221203-r2.ebuild 13955 BLAKE2B c25f6791b0660f45c310e32b9d1f35b50eaf87cec00d1cc46d6dfc383118260e81c0ae90ef27ea53dc0b1d131cb930ec64adce935d3b9074ac9e44701e0d49ea SHA512 421a2fcdda660f04bc81463577619e319a18bb0f1bedcf933ff8c50f027b567f8307434c4038d45cd6391933c3f9ef3b6e7711176dea1f964073ac8292b66980
 EBUILD ncurses-6.4.ebuild 13197 BLAKE2B 8d1330d7d40fa0a873063804e4bbbc45c5a6dc5a2b7774db5f8769fe6cefc57869f51a1431d00d8643518dc2000407f18bee83fa5f95864b42c1294bb166777f SHA512 48e0183d62b18e588a58edc07a1e7e8ce18ff54e59cd6bcc9930d9c570e27030d0314649d50d7ba996dd71a17ffbc86dac4cb9cbc058e2c1078b63a07f35092d
 EBUILD ncurses-6.4_p20230401.ebuild 13282 BLAKE2B cc731d33bbd33d7f0ee019148f9c222d5692d55d362f2f8ff60e98d9f1359bbc1b6acb2caf52ac662f89c782463429ed3d02a517b818f9f569999365cead0921 SHA512 352bd23fb7754522c04e5c5646c7924c085e2a2dee0c031b82c674c64d09a3796f7c4c80dbe0bfd71f2da496fee3fdb571d28d567597141af40ffb4bd68af7d5
-EBUILD ncurses-6.4_p20230408.ebuild 13293 BLAKE2B 53950fc41274abf52cb024fe433f21f03b5cf889b071e0d10dd4b3fd0e0d33cdc1bc682f4bbc90b0fb261528111b0b1692435ca26108a94e8e739b089ee93cb8 SHA512 48573c3742882d6e03d851531d0c74fabd9a37e9ffbcf2cc3c37b46f966e859d91ac62335cc5c8426c81fce120bee6a3770a2620a686d796ff4b90d67446479e
-EBUILD ncurses-6.4_p20230415.ebuild 13304 BLAKE2B 257c7162230c8ec3513fe37500f05ccb5c126671a6bb64c22e86297eee11539dbdd2b22a8394d1ff3db4f6ddfcb41cb01745ecce2011ef61516c45516a057b1e SHA512 0a458c40ea78fa1c94068f3dd66e9d765d7a99e8c10c2b64bfa1ff674b5749994b48e762999926c39e7c4d7347287127feddb395d2e0c3fe930325380fc5f70c
-EBUILD ncurses-6.4_p20230418.ebuild 13315 BLAKE2B 2c7ab31d596ae6eff2e5d89fef04dd55a5244554041b42ac8d1ab4fc5e637d8ae5db01f2cb031f78d9ceb88b9d161525fdc7aac8b709691f211910fb5bc335e6 SHA512 8bbf091af3e0deca23258e14e96c5aa99db97e836d4c5ea39aaeb2712bbc21b2812a30980d4ee75ecb643b326cd18ecdaaa0e359dfa0e29d96652a224b149bf3
 EBUILD ncurses-6.4_p20230424.ebuild 13337 BLAKE2B 3c00fa6140ab20b7ebd37442351e716a42551deeb24ae39e3c7a99b71c8926534702185046a2279881a72543c5ca40d3e31c591d7aa7886ab6a67bd869af026b SHA512 5ad8675aabb7c40d8ba93bc973103e377370ed6bfb038498288f82c18611f3de62eef857a9f661e4d0aa68e1aae36f5578059d0ac89d76c510ecc1a81c84067e
+EBUILD ncurses-6.4_p20230506.ebuild 13359 BLAKE2B edbc1d0e422bcea731288472d32e1a23160c8a293618ab05c2621b1591c277c858908474d34f3e4f8e8e193edd536d1544693c0cc0c151bd587620082c20f035 SHA512 39514d937b49ecf65b744eea25ec2d173fdf860d3f667b8fbf144e9c36cfc552a2cd44456d53ed80dcbda2aeb60580f94c9f52c27028b46465ed3fb76caff0b8
 MISC metadata.xml 1094 BLAKE2B a65bbb9584f77fb07fff735e6471ef48a5d63e7fa79112bf75df67f2f94e816706165fdd42a482708a7fd2ab3b3e308f9766eac0b39c3a4e31dcff5b3db25d57 SHA512 adf0f939a1e14c964bfb44ab80b1b8c1ee897a036a994848ba3e40280ab3a73ddb3beef540c905efd623e71b890c4c91e0b7c24651561d0e2bb2a4c86f039dba
diff --git a/sys-libs/ncurses/ncurses-6.4_p20230408.ebuild b/sys-libs/ncurses/ncurses-6.4_p20230408.ebuild
deleted file mode 100644
index 1b802d47265e..000000000000
--- a/sys-libs/ncurses/ncurses-6.4_p20230408.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Console display library"
-HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
-# Keep invisible-mirror.net here as some users reported 403 forbidden with invisible-island.net
-SRC_URI="
-	mirror://gnu/ncurses/${MY_P}.tar.gz
-	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
-	https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
-	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
-"
-
-GENTOO_PATCH_DEV=sam
-GENTOO_PATCH_PV=6.4_p20230408
-GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
-
-# Populated below in a loop. Do not add patches manually here.
-UPSTREAM_PATCHES=()
-
-if [[ ${PV} == *_p* ]] ; then
-	# Sometimes, after releases, there's no megapatch available yet.
-	#
-	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
-	#
-	#	"At times (generally to mark a relatively stable point), I create a rollup
-	#	patch, which consists of all changes from the release through the current date."
-	#
-	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
-	# the patches are considered to be acceptable to use after some testing. They
-	# are both for development but also bug fixes.
-	#
-	# This array should contain a list of all the snapshots since the last
-	# release if there's no megapatch available yet.
-	PATCH_DATES=(
-		20230107
-		20230114
-		20230121
-		20230128
-		20230211
-		20230218
-		20230225
-		20230311
-		20230401
-
-		# Latest patch is just _pN = $(ver_cut 4)
-		$(ver_cut 4)
-	)
-
-	if [[ -z ${PATCH_DATES[@]} ]] ; then
-		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
-		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
-
-		# If we have a rollup patch, use that instead of the individual ones.
-		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
-	else
-		patch_url=
-		my_patch_index=
-
-		# We keep a bunch of mirrors here as we've had reports of invisible*.net
-		# being 403 forbidden for some users.
-		urls=(
-			"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
-			"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
-			"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s"
-		)
-
-		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
-			for url in "${urls[@]}" ; do
-				patch_url="$(printf ${urls} ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
-				SRC_URI+=" ${patch_url}"
-				SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-			done
-
-			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
-		done
-
-		unset patch_url
-		unset my_patch_index
-		unset urls
-	fi
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# Block the older ncurses that installed all files w/SLOT=5, bug #557472
-RDEPEND="
-	${DEPEND}
-	!<=sys-libs/ncurses-5.9-r4:5
-	!<sys-libs/slang-2.3.2_pre23
-	!<x11-terms/rxvt-unicode-9.06-r3
-	!<x11-terms/st-0.6-r1
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${UPSTREAM_PATCHES[@]}"
-
-	# When rebasing Gentoo's patchset, please use git from a clean
-	# src_prepare with upstream patches already applied. git am --reject
-	# the existing patchset and rebase as required. This makes it easier
-	# to manage future rebasing & adding new patches.
-	#
-	# For the same reasons, please include the original configure.in changes,
-	# NOT just the generated results!
-	"${WORKDIR}"/${GENTOO_PATCH_NAME}
-)
-
-src_unpack() {
-	# Avoid trying to verify our own patchset tarball, there's no point
-	if use verify-sig ; then
-		local file
-		for file in ${A} ; do
-			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
-				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
-			else
-				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
-
-				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	# bug #115036
-	unset TERMINFO
-
-	tc-export_build_env BUILD_{CC,CXX,CPP}
-
-	# bug #214642
-	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
-
-	# bug #852665
-	if [[ ${CHOST} == *-cygwin* ]]; then
-		BUILD_CPPFLAGS+=" -DBUILDING_NCURSES"
-	fi
-
-	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
-	# Order matters here -- we want unicode/thread versions to come last so that the
-	# binaries in /usr/bin support both wide and narrow.
-	# The naming is also important as we use these directly with filenames and when
-	# checking configure flags.
-	NCURSES_TARGETS=(
-		ncurses
-		ncursesw
-		ncursest
-		ncursestw
-	)
-
-	# When installing ncurses, we have to use a compatible version of tic.
-	# This comes up when cross-compiling, doing multilib builds, upgrading,
-	# or installing for the first time.  Build a local copy of tic whenever
-	# the host version isn't available. bug #249363, bug #557598
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		local lbuildflags="-static"
-
-		# some toolchains don't quite support static linking
-		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
-		case ${CHOST} in
-			*-darwin*)  dbuildflags=     ;;
-			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
-		esac
-		echo "int main() {}" | \
-			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
-			|| lbuildflags="${dbuildflags}"
-
-		# We can't re-use the multilib BUILD_DIR because we run outside of it.
-		BUILD_DIR="${WORKDIR}" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		CPP=${BUILD_CPP} \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-		do_configure cross --without-shared --with-normal --with-progs
-	fi
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if [[ ${ABI} == x86 ]] ; then
-		# For compatibility with older binaries at slight performance cost.
-		# bug #616402
-		use stack-realign && append-flags -mstackrealign
-	fi
-
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_configure "${t}"
-	done
-}
-
-do_configure() {
-	local target=$1
-	shift
-
-	mkdir "${BUILD_DIR}/${target}" || die
-	cd "${BUILD_DIR}/${target}" || die
-
-	local conf=(
-		# We need the basic terminfo files in /etc, bug #37026.  We will
-		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-		# src_install() ...
-		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
-
-		# Enable installation of .pc files.
-		--enable-pc-files
-		# This path is used to control where the .pc files are installed.
-		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-
-		# Now the rest of the various standard flags.
-		--with-shared
-		# (Originally disabled until bug #245417 is sorted out, but now
-		# just keeping it off for good, given nobody needed it until now
-		# (2022) and we're trying to phase out bdb.)
-		--without-hashed-db
-		$(use_with ada)
-		$(use_with cxx)
-		$(use_with cxx cxx-binding)
-		--with-cxx-shared
-		$(use_with debug)
-		$(use_with profile)
-		# The configure script uses ldd to parse the linked output which
-		# is flaky for cross-compiling/multilib/ldd versions/etc...
-		$(use_with gpm gpm libgpm.so.1)
-		# Required for building  on mingw-w64, and possibly other windows
-		# platforms, bug #639670
-		$(use_enable kernel_Winnt term-driver)
-		--disable-termcap
-		--enable-symlinks
-		--with-manpage-format=normal
-		--enable-const
-		--enable-colorfgbg
-		--enable-hard-tabs
-		--enable-echo
-		$(use_enable !ada warnings)
-		$(use_with debug assertions)
-		$(use_enable !debug leaks)
-		$(use_with debug expanded)
-		$(use_with !debug macros)
-		$(multilib_native_with progs)
-		$(use_with test tests)
-		$(use_with trace)
-		$(use_with tinfo termlib)
-		--disable-stripping
-		--disable-pkg-ldflags
-	)
-
-	if [[ ${target} == ncurses*w ]] ; then
-		conf+=( --enable-widec )
-	else
-		conf+=( --disable-widec )
-	fi
-	if [[ ${target} == ncursest* ]] ; then
-		conf+=( --with-{pthread,reentrant} )
-	else
-		conf+=( --without-{pthread,reentrant} )
-	fi
-
-	# Make sure each variant goes in a unique location.
-	if [[ ${target} == "ncurses" ]] ; then
-		# "ncurses" variant goes into "${EPREFIX}"/usr/include
-		# It is needed on Prefix because the configure script appends
-		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
-		conf+=( --enable-overwrite )
-	else
-		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
-	fi
-	# See comments in src_configure.
-	if [[ ${target} != "cross" ]] ; then
-		local cross_path="${WORKDIR}/cross"
-		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
-	fi
-
-	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-	# See comments in src_configure.
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
-	fi
-
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_compile "${t}"
-	done
-}
-
-do_compile() {
-	local target=$1
-	shift
-
-	cd "${BUILD_DIR}/${target}" || die
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.
-	emake -j1 sources
-
-	# For some reason, sources depends on pc-files which depends on
-	# compiled libraries which depends on sources which ...
-	# Manually delete the pc-files file so the install step will
-	# create the .pc files we want.
-	rm -f misc/pc-files || die
-	emake "$@"
-}
-
-multilib_src_install() {
-	local target
-	for target in "${NCURSES_TARGETS[@]}" ; do
-		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
-	done
-
-	# Move main libraries into /.
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a \
-			"${NCURSES_TARGETS[@]}" \
-			$(usex tinfo 'tinfow tinfo' '')
-	fi
-
-	# Don't delete '*.dll.a', needed for linking, bug #631468
-	if ! use static-libs; then
-		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-	fi
-
-	# Build fails to create this ...
-	# -FIXME-
-	# Ugly hackaround for riscv having two parts libdir (bug #689240)
-	# Replace this hack with an official solution once we have one...
-	# -FIXME-
-	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
-		/usr/$(get_libdir)/terminfo
-
-	# Remove obsolete libcurses symlink that is created by the build
-	# system. Technically, this could be also achieved
-	# via --disable-overwrite but it also moves headers implicitly,
-	# and we do not want to do this yet.
-	# bug #836696
-	rm "${ED}"/usr/$(get_libdir)/libcurses* || die
-}
-
-multilib_src_install_all() {
-	local terms=(
-		# Dumb/simple values that show up when using the in-kernel VT.
-		ansi console dumb linux
-		vt{52,100,102,200,220}
-		# [u]rxvt users used to be pretty common.  Probably should drop this
-		# since upstream is dead and people are moving away from it.
-		rxvt{,-unicode}{,-256color}
-		# xterm users are common, as is terminals re-using/spoofing it.
-		xterm xterm-{,256}color
-		# screen is common (and reused by tmux).
-		screen{,-256color}
-		screen.xterm-256color
-	)
-	if use split-usr ; then
-		local x
-		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
-		einfo "Installing basic terminfo files in /etc..."
-		for x in "${terms[@]}"; do
-			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
-			local basedir=$(basename "$(dirname "${termfile}")")
-
-			if [[ -n ${termfile} ]] ; then
-				dodir "/etc/terminfo/${basedir}"
-				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
-				dosym "../../../../etc/terminfo/${basedir}/${x}" \
-					"/usr/share/terminfo/${basedir}/${x}"
-			fi
-		done
-
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
-
-		use minimal && rm -r "${ED}"/usr/share/terminfo*
-		# Because ncurses5-config --terminfo returns the directory we keep it
-		# bug #245374
-		keepdir /usr/share/terminfo
-	elif use minimal ; then
-		# Keep only the basic terminfo files
-		find "${ED}"/usr/share/terminfo/ \
-			\( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \
-			-type d -empty -delete || die
-	fi
-
-	cd "${S}" || die
-	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-	if use doc ; then
-		docinto html
-		dodoc -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/libncurses.so.5
-	preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}
diff --git a/sys-libs/ncurses/ncurses-6.4_p20230415.ebuild b/sys-libs/ncurses/ncurses-6.4_p20230415.ebuild
deleted file mode 100644
index 580cbc428f1e..000000000000
--- a/sys-libs/ncurses/ncurses-6.4_p20230415.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
-
-MY_PV="${PV:0:3}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Console display library"
-HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
-# Keep invisible-mirror.net here as some users reported 403 forbidden with invisible-island.net
-SRC_URI="
-	mirror://gnu/ncurses/${MY_P}.tar.gz
-	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
-	https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
-	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
-"
-
-GENTOO_PATCH_DEV=sam
-GENTOO_PATCH_PV=6.4_p20230415
-GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
-
-# Populated below in a loop. Do not add patches manually here.
-UPSTREAM_PATCHES=()
-
-if [[ ${PV} == *_p* ]] ; then
-	# Sometimes, after releases, there's no megapatch available yet.
-	#
-	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
-	#
-	#	"At times (generally to mark a relatively stable point), I create a rollup
-	#	patch, which consists of all changes from the release through the current date."
-	#
-	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
-	# the patches are considered to be acceptable to use after some testing. They
-	# are both for development but also bug fixes.
-	#
-	# This array should contain a list of all the snapshots since the last
-	# release if there's no megapatch available yet.
-	PATCH_DATES=(
-		20230107
-		20230114
-		20230121
-		20230128
-		20230211
-		20230218
-		20230225
-		20230311
-		20230401
-		20230408
-
-		# Latest patch is just _pN = $(ver_cut 4)
-		$(ver_cut 4)
-	)
-
-	if [[ -z ${PATCH_DATES[@]} ]] ; then
-		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
-		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
-
-		# If we have a rollup patch, use that instead of the individual ones.
-		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
-	else
-		patch_url=
-		my_patch_index=
-
-		# We keep a bunch of mirrors here as we've had reports of invisible*.net
-		# being 403 forbidden for some users.
-		urls=(
-			"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
-			"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
-			"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s"
-		)
-
-		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
-			for url in "${urls[@]}" ; do
-				patch_url="$(printf ${urls} ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
-				SRC_URI+=" ${patch_url}"
-				SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-			done
-
-			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
-		done
-
-		unset patch_url
-		unset my_patch_index
-		unset urls
-	fi
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
-
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
-RESTRICT="!test? ( test )"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# Block the older ncurses that installed all files w/SLOT=5, bug #557472
-RDEPEND="
-	${DEPEND}
-	!<=sys-libs/ncurses-5.9-r4:5
-	!<sys-libs/slang-2.3.2_pre23
-	!<x11-terms/rxvt-unicode-9.06-r3
-	!<x11-terms/st-0.6-r1
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${UPSTREAM_PATCHES[@]}"
-
-	# When rebasing Gentoo's patchset, please use git from a clean
-	# src_prepare with upstream patches already applied. git am --reject
-	# the existing patchset and rebase as required. This makes it easier
-	# to manage future rebasing & adding new patches.
-	#
-	# For the same reasons, please include the original configure.in changes,
-	# NOT just the generated results!
-	"${WORKDIR}"/${GENTOO_PATCH_NAME}
-)
-
-src_unpack() {
-	# Avoid trying to verify our own patchset tarball, there's no point
-	if use verify-sig ; then
-		local file
-		for file in ${A} ; do
-			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
-				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
-			else
-				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
-
-				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	# bug #115036
-	unset TERMINFO
-
-	tc-export_build_env BUILD_{CC,CXX,CPP}
-
-	# bug #214642
-	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
-
-	# bug #852665
-	if [[ ${CHOST} == *-cygwin* ]]; then
-		BUILD_CPPFLAGS+=" -DBUILDING_NCURSES"
-	fi
-
-	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
-	# Order matters here -- we want unicode/thread versions to come last so that the
-	# binaries in /usr/bin support both wide and narrow.
-	# The naming is also important as we use these directly with filenames and when
-	# checking configure flags.
-	NCURSES_TARGETS=(
-		ncurses
-		ncursesw
-		ncursest
-		ncursestw
-	)
-
-	# When installing ncurses, we have to use a compatible version of tic.
-	# This comes up when cross-compiling, doing multilib builds, upgrading,
-	# or installing for the first time.  Build a local copy of tic whenever
-	# the host version isn't available. bug #249363, bug #557598
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		local lbuildflags="-static"
-
-		# some toolchains don't quite support static linking
-		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
-		case ${CHOST} in
-			*-darwin*)  dbuildflags=     ;;
-			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
-		esac
-		echo "int main() {}" | \
-			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
-			|| lbuildflags="${dbuildflags}"
-
-		# We can't re-use the multilib BUILD_DIR because we run outside of it.
-		BUILD_DIR="${WORKDIR}" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		CPP=${BUILD_CPP} \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-		do_configure cross --without-shared --with-normal --with-progs
-	fi
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if [[ ${ABI} == x86 ]] ; then
-		# For compatibility with older binaries at slight performance cost.
-		# bug #616402
-		use stack-realign && append-flags -mstackrealign
-	fi
-
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_configure "${t}"
-	done
-}
-
-do_configure() {
-	local target=$1
-	shift
-
-	mkdir "${BUILD_DIR}/${target}" || die
-	cd "${BUILD_DIR}/${target}" || die
-
-	local conf=(
-		# We need the basic terminfo files in /etc, bug #37026.  We will
-		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-		# src_install() ...
-		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
-
-		# Enable installation of .pc files.
-		--enable-pc-files
-		# This path is used to control where the .pc files are installed.
-		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-
-		# Now the rest of the various standard flags.
-		--with-shared
-		# (Originally disabled until bug #245417 is sorted out, but now
-		# just keeping it off for good, given nobody needed it until now
-		# (2022) and we're trying to phase out bdb.)
-		--without-hashed-db
-		$(use_with ada)
-		$(use_with cxx)
-		$(use_with cxx cxx-binding)
-		--with-cxx-shared
-		$(use_with debug)
-		$(use_with profile)
-		# The configure script uses ldd to parse the linked output which
-		# is flaky for cross-compiling/multilib/ldd versions/etc...
-		$(use_with gpm gpm libgpm.so.1)
-		# Required for building  on mingw-w64, and possibly other windows
-		# platforms, bug #639670
-		$(use_enable kernel_Winnt term-driver)
-		--disable-termcap
-		--enable-symlinks
-		--with-manpage-format=normal
-		--enable-const
-		--enable-colorfgbg
-		--enable-hard-tabs
-		--enable-echo
-		$(use_enable !ada warnings)
-		$(use_with debug assertions)
-		$(use_enable !debug leaks)
-		$(use_with debug expanded)
-		$(use_with !debug macros)
-		$(multilib_native_with progs)
-		$(use_with test tests)
-		$(use_with trace)
-		$(use_with tinfo termlib)
-		--disable-stripping
-		--disable-pkg-ldflags
-	)
-
-	if [[ ${target} == ncurses*w ]] ; then
-		conf+=( --enable-widec )
-	else
-		conf+=( --disable-widec )
-	fi
-	if [[ ${target} == ncursest* ]] ; then
-		conf+=( --with-{pthread,reentrant} )
-	else
-		conf+=( --without-{pthread,reentrant} )
-	fi
-
-	# Make sure each variant goes in a unique location.
-	if [[ ${target} == "ncurses" ]] ; then
-		# "ncurses" variant goes into "${EPREFIX}"/usr/include
-		# It is needed on Prefix because the configure script appends
-		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
-		conf+=( --enable-overwrite )
-	else
-		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
-	fi
-	# See comments in src_configure.
-	if [[ ${target} != "cross" ]] ; then
-		local cross_path="${WORKDIR}/cross"
-		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
-	fi
-
-	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
-}
-
-src_compile() {
-	# See comments in src_configure.
-	if ! has_version -b "~sys-libs/${P}:0" ; then
-		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
-	fi
-
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_compile "${t}"
-	done
-}
-
-do_compile() {
-	local target=$1
-	shift
-
-	cd "${BUILD_DIR}/${target}" || die
-
-	# A little hack to fix parallel builds ... they break when
-	# generating sources so if we generate the sources first (in
-	# non-parallel), we can then build the rest of the package
-	# in parallel.  This is not really a perf hit since the source
-	# generation is quite small.
-	emake -j1 sources
-
-	# For some reason, sources depends on pc-files which depends on
-	# compiled libraries which depends on sources which ...
-	# Manually delete the pc-files file so the install step will
-	# create the .pc files we want.
-	rm -f misc/pc-files || die
-	emake "$@"
-}
-
-multilib_src_install() {
-	local target
-	for target in "${NCURSES_TARGETS[@]}" ; do
-		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
-	done
-
-	# Move main libraries into /.
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a \
-			"${NCURSES_TARGETS[@]}" \
-			$(usex tinfo 'tinfow tinfo' '')
-	fi
-
-	# Don't delete '*.dll.a', needed for linking, bug #631468
-	if ! use static-libs; then
-		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-	fi
-
-	# Build fails to create this ...
-	# -FIXME-
-	# Ugly hackaround for riscv having two parts libdir (bug #689240)
-	# Replace this hack with an official solution once we have one...
-	# -FIXME-
-	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
-		/usr/$(get_libdir)/terminfo
-
-	# Remove obsolete libcurses symlink that is created by the build
-	# system. Technically, this could be also achieved
-	# via --disable-overwrite but it also moves headers implicitly,
-	# and we do not want to do this yet.
-	# bug #836696
-	rm "${ED}"/usr/$(get_libdir)/libcurses* || die
-}
-
-multilib_src_install_all() {
-	local terms=(
-		# Dumb/simple values that show up when using the in-kernel VT.
-		ansi console dumb linux
-		vt{52,100,102,200,220}
-		# [u]rxvt users used to be pretty common.  Probably should drop this
-		# since upstream is dead and people are moving away from it.
-		rxvt{,-unicode}{,-256color}
-		# xterm users are common, as is terminals re-using/spoofing it.
-		xterm xterm-{,256}color
-		# screen is common (and reused by tmux).
-		screen{,-256color}
-		screen.xterm-256color
-	)
-	if use split-usr ; then
-		local x
-		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
-		einfo "Installing basic terminfo files in /etc..."
-		for x in "${terms[@]}"; do
-			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
-			local basedir=$(basename "$(dirname "${termfile}")")
-
-			if [[ -n ${termfile} ]] ; then
-				dodir "/etc/terminfo/${basedir}"
-				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
-				dosym "../../../../etc/terminfo/${basedir}/${x}" \
-					"/usr/share/terminfo/${basedir}/${x}"
-			fi
-		done
-
-		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
-
-		use minimal && rm -r "${ED}"/usr/share/terminfo*
-		# Because ncurses5-config --terminfo returns the directory we keep it
-		# bug #245374
-		keepdir /usr/share/terminfo
-	elif use minimal ; then
-		# Keep only the basic terminfo files
-		find "${ED}"/usr/share/terminfo/ \
-			\( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \
-			-type d -empty -delete || die
-	fi
-
-	cd "${S}" || die
-	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-	if use doc ; then
-		docinto html
-		dodoc -r doc/html/
-	fi
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/libncurses.so.5
-	preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
-	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}
diff --git a/sys-libs/ncurses/ncurses-6.4_p20230418.ebuild b/sys-libs/ncurses/ncurses-6.4_p20230506.ebuild
index b4dfc0b2c9f1..2a1143b22b5b 100644
--- a/sys-libs/ncurses/ncurses-6.4_p20230418.ebuild
+++ b/sys-libs/ncurses/ncurses-6.4_p20230506.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 GENTOO_PATCH_DEV=sam
-GENTOO_PATCH_PV=6.4_p20230418
+GENTOO_PATCH_PV=6.4_p20230506
 GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
 
 # Populated below in a loop. Do not add patches manually here.
@@ -51,6 +51,10 @@ if [[ ${PV} == *_p* ]] ; then
 		20230401
 		20230408
 		20230415
+		20230418
+		20230423
+		20230424
+		20230429
 
 		# Latest patch is just _pN = $(ver_cut 4)
 		$(ver_cut 4)