6 files changed, 44 insertions, 370 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6d89c2d1eb98..b309c95f3698 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index bae11748d9f9..d38e91895fd6 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,5 +1,5 @@
-DIST dos2unix-7.4.3.tar.gz 788278 BLAKE2B da959b06e583bbf27a2cb2ce5b1f1a41380722aa09ac75b3d31260e92fd6f1203d87266d3a12201b036a69796b4aa4f23718741036e20fe686801bb368fbde22 SHA512 1c6d81348de8aca451174794141d0802685487cf6847fa91f7de745d89bcf2af864fc2ec549b9af72031891d4efcb9731fe823ce05da36d1f9e9890ff2cb60fb
 DIST dos2unix-7.4.4.tar.gz 914647 BLAKE2B eb8d33344780bb15201eed571d7a6a21db0bc13e8e94388c70e1daea84cc0d1dfb9f16b7ed1cd216bb31ffd84dee706e7f2fb46050a299602f7c67c53915ded9 SHA512 e7a6b1d90bf0a32aa53b22caa1660dcf58c5874d02a45e80f4cc811cae9bd7b0cb8144301fb6808798100a057c03210925da1d8461e380dff1059f6bee086f55
-EBUILD dos2unix-7.4.3.ebuild 2124 BLAKE2B 926692e61a59b1faeae5c60f3a2c0cac80e0496da2018896fc59603991b008f970a5d73a43f9199fafa480c167238e968e5b5301d88663488bff58b212b67e7a SHA512 480e3539f63c8b7a1f5e884004976c715927a8078cc08eaa1689c15761974008d190c178ea98cadeffdd625a45b3af3bf4aa0c9b987257080224a1b6ca84331c
+DIST dos2unix-7.5.0.tar.gz 957576 BLAKE2B 5a674d61c9f911a2cb9c20c363fdc0e0affd3b6f26531d37a231aedb5e6a7428116b139d4af12ee32f4107f78ea079fb7a8d008c9630375f4afbc2afa0afb39f SHA512 914cbc3255045b1b87ad702c70844b059f9435ccfe636dc67514f092090b86a9f271789fcde28a9ead4d94a869fb92e334aa115d3cfe24133338260ad2233763
 EBUILD dos2unix-7.4.4.ebuild 2146 BLAKE2B bab589028cca2ef76fab63958d111060e83d5ff4977e4cc725d616b44810a056170e276438ec86193ae265552e80cb6f12d7c00ac9dd3e86f263bfb368a61ffc SHA512 a00bd0a29e67907251091cfb6a8772149250b2377e0574521200426bd1bc2d3d52b477349ca93c7a84d3ea81f000dbe38dee83b72fbd728149ee903f42a30bd2
+EBUILD dos2unix-7.5.0.ebuild 2153 BLAKE2B 310d08737df65f2515c810a1970759b7021d8be7f134d48f3ffed74b61625f34b9fd268670c670542ede1337bd8445504d718bcce2dadd800e46e144f88a4d1c SHA512 9bdf0271f8aeb35cc4ee93394767b86835bd350a9535d904bd2dbbc38b3711c57964dd9e517841e154c7aed9351a3cd3bd856ced842c88527ac135192f49a9b9
 MISC metadata.xml 344 BLAKE2B ec6c66c1693ed09d8434840bb0e5eaf6689d629c787a115eedad537972c06c3aae6d739cd55a9acf85ed21043314e9721030b7c570c85eea4361c083d7db9fe1 SHA512 63d5baa4e84950d6cb2fd604f93e60842bc210af298eef73bc9e59e3d811957b99a95e2538ddd6df7d2ac6a50e30ff5bda66af4d7dbb573cec4ef83a38e42919
diff --git a/app-text/dos2unix/dos2unix-7.4.3.ebuild b/app-text/dos2unix/dos2unix-7.5.0.ebuild
index bc7cc8179d7a..ab2e52f35899 100644
--- a/app-text/dos2unix/dos2unix-7.4.3.ebuild
+++ b/app-text/dos2unix/dos2unix-7.5.0.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+PLOCALES="ca da de eo es fr fur hu ja ka ko nb nl pl pt_BR ro ru sr sv uk vi zh_CN zh_TW"
 
 inherit plocale toolchain-funcs
 
 DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
 SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
-	mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
+	https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+	mirror://sourceforge/${PN}/${P/_/-}.tar.gz
+"
 S="${WORKDIR}/${P/_/-}"
 
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 9535b24ebc9d..3b08856fd168 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -2,6 +2,7 @@ AUX texlive-core-2021-cairo-strings.patch 1629 BLAKE2B 447a277f4e50fc62a7f488046
 AUX texlive-core-2021-clang-16.patch 6900 BLAKE2B 8d2cdbb11e2376e8b51647fda3b1ff2ce225217e1e34b32c031ec9113b69b96864fce6ddf7edd4a67a6828519678dea5f5216f26f5df6ed7ccab6f7a128b1ad7 SHA512 cbf05bef786a89f0142ca95d4f1a41864cbaa9c72737c708f01acbae87f1c7218528606d2937eb3e50b0840da71a6c657c8aca40c9114e4032fdda541f99a027
 AUX texlive-core-2021-slibtool.patch 2776 BLAKE2B 6c0c0a89abba948f809c6003f494dd56cb0715e4aea22c0e0c744240fa0aa9f50c8afb911a1d7e325afc8fbf053bc591d8837439c412bf0fe5f1bf2a962d7664 SHA512 e7f0582c90876a1823a602413ddbb26cf9eff37f5478eca2968fc412fdbfc2b5bdf522e8b36ebd3fde7e3d3f874518dfe94e600ddf9aaa62e6c4a1eaefb5ca5c
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+DIST texlive-core-2021-CVE-2023-32700.patch.xz 8824 BLAKE2B 5df988abb12626210b372618cc0a623ed2f6f42cf2f03dca143f94b928fc0fd2e28e53574c9ca23295f55fb56cd908a3e8603161fa3f13c37b9397163479aa9f SHA512 16d34b5b0cc1b85ec412798caa582f71b15c2d57bb486064c5fb48304eea32a13f69677c228c82c88e026ba5885acd201449ec69bc6c7bf9396eebb3d1358717
 DIST texlive-core-patches-2021-1.tar.xz 4820 BLAKE2B 1316cdc65c8f0a7164169fc6a795c50f7fccc99cea7a80290c18189f931b002e47b081de593c47d8da9650498a279f7d0473f115f02b37993859fcd475dbebed SHA512 4267934427265995c2a0c00d837399ec9670ba5c7df5c4599a486a2098de9a05640ff77f29bd7390070f3c973e5cc067356cfdd6b2c9415b7a56b96de789fb82
 DIST texlive-tlpdb-2021.tar.xz 1335040 BLAKE2B a5608b329666ad55032fb9dbf7fc6da9b8b2c94c03aed838cf8575742a23294f3319ad8e45fd6b4f65cc59f673c78b9d96b4f24e2ad07a8a08aa313822eea137 SHA512 ca9d5f2231246984ec489b4dfffb93c8b9540b8479a521aa91658fba3ce452c814e9e24e28d9ab6a0124d8eaf4cf7c14fefb379e84b3495752a9a2b8a2add3db
 DIST tl-a2ping-2021.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
@@ -194,7 +195,6 @@ DIST tl-xindy-2021.tar.xz 140664 BLAKE2B e433084708433d1a40216a63a31fe64ae0afa0b
 DIST tl-xindy.doc-2021.tar.xz 461176 BLAKE2B 602862a30d0c2fed12df2b2c9e1f12014a7f64f87c82525ca275f82abc2edf4b0e5a77b789d68bd7f56916c16932174c973df7721464b25e9d2ec82962dd5a90 SHA512 4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23
 DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b729308616e749447aacfad4b63254b7c4bbbde79a053c20caaf4abc4636f8276c8e60f5320fd3e5305444d0f5d197 SHA512 fe873bb22b94a26720e37671e283e0085619c2129a4568399544ac0df1e5c443a9476590ca7ef76a21409589eb2416a14165b8a48a6182f3773a3009cb7c1a47
 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
-EBUILD texlive-core-2021-r2.ebuild 11763 BLAKE2B 6b19b129ff0b44430669471a9ac0ba65adbba2bb99ee5c3afac1f0f50ab546f498f1f006abe8365470379427463a680d87b994b0eef7078fe9d076bfd73754eb SHA512 56399d10e28b5ac5d9e86895dfe6db3268bf9f9969c3662ebd9ed8279ba8aac888aa32774563ad59d68b13f5b19708ac35ecef629bfc0821c1492b25c86f5488
-EBUILD texlive-core-2021-r3.ebuild 11931 BLAKE2B 6412230c4d1e0ab0fc437520642e278e6cca88d689c41de36acb365679769435012f437d84662e6adc7de4cb6af034c39ba85552a874321aee65347872ef6fad SHA512 c255d75e24425027077984978b5f6fceb585408149f00320bf02a71ce48ccbcbeb2e33b392f77c7aad11d60256e8eba7315e8b185c281301d5237cf8dee8c552
 EBUILD texlive-core-2021-r6.ebuild 12537 BLAKE2B 17818176ef199082673471d9e355f4d80e0ec64292b4c3d1f970fd6e1cf94bd5af862a27a9fb260134d070adefcdfce7704cd64541c835dd0c6f6d08282a36da SHA512 2c512ac199592b61e25a18bf96c7cb90b1f7e18674c103ccc948217ebff857618d638fc3b8cf13f51c897f135797128290d42ace5222208bc72485c9bba4b599
+EBUILD texlive-core-2021-r7.ebuild 12694 BLAKE2B 3957e08425e05d921c3da5719d0edcb68c5bf145acbd45c7f4f0b3fcea30f24a855648b38cefe5a349128d416ce5060319d1fa58a9c039d254749abf189e680b SHA512 dfc555c8a61becafb59c0c05687928e9abba632ac7c69aff58df946d7137b8dfcb84ec3bdd3ad5180dc12d7ec6db0eef297cd86839fb0cc346f09746bc3c6d59
 MISC metadata.xml 763 BLAKE2B 32e271e244979763c3ed20da203b4a6fdd1646b1b5e92ea0fd3a3172e7f633cec56b55a4a638fa1f98394d4fa1ca443c3949528d30a5bf2564edc9979cc77515 SHA512 efe8b04dc9ea326a12eadccc2f5432563b0b87434028a7f2e671124d3fb08cbb384cd022471d44fec466f8558bab4344d2cbb47fe7e49461bbc802f4416c33e0
diff --git a/app-text/texlive-core/texlive-core-2021-r2.ebuild b/app-text/texlive-core/texlive-core-2021-r2.ebuild
deleted file mode 100644
index ccbe7bcbde77..000000000000
--- a/app-text/texlive-core/texlive-core-2021-r2.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TL_SOURCE_VERSION=20210325
-
-inherit flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-PATCHLEVEL=1
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
-
-# We ship binextra collection alongside
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
-	clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
-	dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
-	fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
-	latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
-	listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam
-	pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
-	seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
-	texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
-	texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
-	checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
-	ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
-	dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
-	dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
-	ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
-	latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc
-	pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
-	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc
-	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
-	texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc
-	typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
-	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
-	texdef.source texosquery.source texplate.source tlcockpit.source
-"
-# Macros that are not a part of texlive-sources or collection-binextra but still needed
-# for other packages during installation
-TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
-IUSE="cjk X doc source tk +luajittex xetex xindy"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXmu
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/epspdf
-	!app-text/pdfjam
-	sys-libs/zlib
-	>=media-libs/harfbuzz-1.4.5:=[icu,graphite]
-	>=media-libs/libpng-1.2.43-r2:0=
-	media-libs/gd[png]
-	media-gfx/graphite2
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib:=
-	app-text/libpaper:=
-	dev-libs/gmp:=
-	dev-libs/mpfr:=
-	>=dev-libs/ptexenc-1.3.8
-	xetex? (
-		>=app-text/teckit-2.5.3
-		media-libs/fontconfig
-	)
-	xindy? ( dev-lisp/clisp:= )
-	media-libs/freetype:2
-	>=dev-libs/icu-50:=
-	>=dev-libs/kpathsea-6.3.2:="
-
-BDEPEND="sys-apps/ed
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.8_p20170524
-	>=app-text/dvipsk-5.997
-	>=dev-tex/bibtexu-3.71_p20170524
-	virtual/perl-Getopt-Long
-	dev-perl/File-HomeDir
-	dev-perl/Log-Dispatch
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	tk? (
-	dev-lang/tk
-	dev-perl/Tk
-	)"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-
-	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
-
-	# From texlive-module.eclass.
-	sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
-	sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
-		sort -u |
-		xargs mkdir -p || die
-	local i
-	while read i; do
-		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
-	done < "${T}/reloclist"
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}" || die
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	eapply "${WORKDIR}"/patches
-
-	default
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	# Disable freetype-config as this is considered obsolete.
-	# Also only pkg-config works for prefix as described in bug #690094
-	export ac_cv_prog_ac_ct_FT2_CONFIG=no
-
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-gd \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-chktex \
-		--enable-epsfwin \
-		--enable-detex \
-		--enable-dvi2tty \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-shared \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--enable-vlna \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-lcdf-typetools \
-		--disable-ps2pk \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--enable-luatex \
-		--disable-dvisvgm \
-		--disable-ps2eps \
-		--disable-static \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		--disable-build-in-source-tree \
-		--disable-xindy-docs \
-		--disable-xindy-rules \
-		--with-banner-add=" Gentoo Linux" \
-		$(use_enable luajittex) \
-		$(use_enable luajittex luajithbtex) \
-		$(use_enable luajittex mfluajit) \
-		$(use_enable xetex) \
-		$(use_enable cjk dviout-util) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x) \
-		$(use_enable xindy)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk" || die
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk" || die
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk" || die
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c" || die
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	einfo "Regenerating TeX formats"
-	fmtutil-sys --all &> /dev/null
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-}
diff --git a/app-text/texlive-core/texlive-core-2021-r3.ebuild b/app-text/texlive-core/texlive-core-2021-r7.ebuild
index 3ff277adb3d6..7b78ecb0b21e 100644
--- a/app-text/texlive-core/texlive-core-2021-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2021-r7.ebuild
@@ -17,9 +17,12 @@ HOMEPAGE="https://tug.org/texlive/"
 SLOT="0"
 LICENSE="GPL-2 LPPL-1.3c TeX"
 
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz
+SRC_URI="
+	https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz
 	https://dev.gentoo.org/~sam/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
+	https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/texlive-core-2021-CVE-2023-32700.patch.xz
+"
 
 # We ship binextra collection alongside
 TL_CORE_BINEXTRA_MODULES="
@@ -165,10 +168,15 @@ src_prepare() {
 
 	eapply "${WORKDIR}"/patches
 	eapply "${FILESDIR}"/${P}-cairo-strings.patch
+	eapply "${FILESDIR}"/${P}-slibtool.patch
+	eapply "${FILESDIR}"/${P}-clang-16.patch
+	eapply "${WORKDIR}"/${P}-CVE-2023-32700.patch
 
 	default
 
 	elibtoolize
+
+	# Drop this on 2022 bump!
 	"${B}"/reautoconf libs/cairo || die
 }
 
@@ -185,6 +193,9 @@ src_configure() {
 	# Also only pkg-config works for prefix as described in bug #690094
 	export ac_cv_prog_ac_ct_FT2_CONFIG=no
 
+	# revisit/upstream once we bupm to 2022, bug #882245
+	append-cppflags -D_GNU_SOURCE
+
 	tc-export CC CXX AR RANLIB
 	ECONF_SOURCE="${B}" \
 		econf -C \
@@ -266,6 +277,7 @@ src_configure() {
 
 src_compile() {
 	tc-export CC CXX AR RANLIB
+
 	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
 
 	cd "${B}" || die
@@ -285,6 +297,7 @@ src_compile() {
 
 src_install() {
 	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
 	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
 
 	cd "${B}" || die
@@ -354,6 +367,24 @@ pkg_postinst() {
 	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
 	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
 	elog
+
+	local display_migration_hint=false
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local new_texlive_ver=$(ver_cut 1)
+		local replaced_version
+		for replaced_version in ${REPLACING_VERSIONS}; do
+			replaced_version=$(ver_cut 1 ${replaced_version})
+			if (( replaced_version < new_texlive_version )); then
+				display_migration_hint=true
+				break
+			fi
+		done
+	fi
+
+	if ! ${display_migration_hint}; then
+		return
+	fi
+
 	ewarn "If you are migrating from an older TeX distribution"
 	ewarn "Please make sure you have read:"
 	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"