9 files changed, 7 insertions, 553 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bf598aeb89de..b277b6d1b31f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 19ae3120b20a..24153206f937 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -2,4 +2,4 @@ DIST JabRef-3.8.2.jar 37003442 BLAKE2B 7414128603c8a3c41c0f88003b504636fa64865fb
 DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19
 EBUILD jabref-bin-3.8.2-r1.ebuild 961 BLAKE2B dbc83b1e5195068139225b6c19fae41ea72ba293b85f0cc1da2838ab45aff5472b17d4e0776141585e46885290bc13120941431349639129228d4dae0c3ec5e3 SHA512 1a7e6ab6f62ff0f6f4cfe2b418f083cf194250383a1a8195101fdf3682eedfff16bebd6f630967f65f5911b0ed6784bfb00d4eccc4fd2db377278c892a31e67c
 EBUILD jabref-bin-4.3.1-r1.ebuild 1183 BLAKE2B 29cf2fc1996c025c81c6d80ba63c63f1721a691578022ee19022d9816db52b59c1eb9ade22c09df8dfabf1922c27d17fd17bed91cea565a368e6481fa424bba9 SHA512 6507dfb4b51284a5037bfd1b41143d4e58ca95e006b7a4075b6f36669a7dddb40a68841648f8a11a2f3b7c064ee7343e38317ba01cdef0f58829febfc27a2165
-MISC metadata.xml 911 BLAKE2B d30b7e97e2d3eb3e136e5bc57664d8f1083214a777f13bd28c69a229b29e8e3f89b5ce23a2ae204b14cb621e2bf88aee4c9e5bf3d4830b41e52d63e6f0b5b220 SHA512 21dd90e022a0e013442fa9f07b9553316b506b38c0475aed71db854fedaf68a9b38640539574ef62445ee8a001c19111146f82802d19de4ee6839936475050f6
+MISC metadata.xml 814 BLAKE2B 1634373a5c27fc2c2d88f45c52c32f47b5e7ff0b2cbb62e0e3685c96b77fe9e27610e41473209cd118bb34b72b1e16b35a55b21b39b9636e7c5b068c1d1a33a5 SHA512 96c6e7b87ba8711e5469a9126f853d6c8d0866e640747923160ca50317a5fe61171f82417e0acbc69b001fd6a1bf74108cde8610a03569e2055b5ac73b9e1260
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index b4fbf1e649a4..3a8e1a85dfc1 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Nicolas Bock</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index 78b7e979dbb3..1b193c5c3b64 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -5,6 +5,5 @@ AUX msort-8.53-fix-missing-prototypes.patch 631 BLAKE2B caf02f1140758160383dd6bc
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53-r2.ebuild 1020 BLAKE2B b22562cf05a6958035c94c6db93db165fa27233227971589a38a025a1972101121b8250edabb241ed3eec5c21fdf339a02a245fa89c7904e0900087f81643a50 SHA512 5bd0c94ccfdf4f43aad1e7fbdc1d06070cb83d1e820aff183179f982d415594721a49e2d920f2944d84f81fe0b604fc9a2bf0ef1f4758a52cc66ea658bd78eb9
-EBUILD msort-8.53-r3.ebuild 1071 BLAKE2B 20781048faa3dff038071d6d18737e2127191ca3cfaa9bb0eafdf4abfce36572e37fd3c1d712328616636fb70ec2943fc8821974f45397eeb322ce7649181887 SHA512 6dd650dbce96978fe29d789f759c3ed57ceba078f07c4bda054bc2e1de28462f7a97d33b9f71cd0be8463d13069d56fe6f647d2db4c65634a1c3643506bf6917
+EBUILD msort-8.53-r3.ebuild 1069 BLAKE2B dba010a2e39de7386f45e626d6b1f1f36f492a03894b0551c7e5899f10002b7508346704a38e3e43c7d97b947963a398f6e32f1a61c37a90bfd15266a97e122f SHA512 20284bf5286cab20ecc30a14bce0bc43848a0bcb3d0830c2a5368fd96384c93aa9698b5a0917ffa2e526ed6212875d234f045b843c3bb07cd88b59c63eeb0ff4
 MISC metadata.xml 1001 BLAKE2B 85c37e686432dc1f791c14ad0d07ece535b835c0fe7b2f220f682abfb494411849a69fb0c197981d1cf97b3f2d3bb7e7d0d621179cec0a1980218dc72115b0ff SHA512 63558ec0d6109f89d80700048f62df5fb57245ba7ba5aed4467f63041777c8cb9d6fa9d0a2c75fd64bdc5f72b23ba8d2c61746e34a4d8a20b18831900fd880f2
diff --git a/app-text/msort/msort-8.53-r2.ebuild b/app-text/msort/msort-8.53-r2.ebuild
deleted file mode 100644
index 39dfa9ff4a68..000000000000
--- a/app-text/msort/msort-8.53-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A program for sorting files in sophisticated ways"
-HOMEPAGE="https://billposer.org/Software/msort.html"
-SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE="heap +icu +libuninum"
-
-RDEPEND="dev-libs/tre
-	icu? ( dev-libs/icu:= )
-	!icu? ( dev-libs/libutf8proc:= )
-	libuninum? ( dev-libs/libuninum:= )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-icu-build.patch"
-	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
-	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
-	"${FILESDIR}/${P}-respect-users-cflags.patch"
-	"${FILESDIR}/${P}-configure-clang16.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable !heap allocaok)
-		$(use_enable !icu utf8proc)
-		$(use_enable libuninum uninum)
-		--disable-debugbuild
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-text/msort/msort-8.53-r3.ebuild b/app-text/msort/msort-8.53-r3.ebuild
index 556def78e40a..8bc338c313a2 100644
--- a/app-text/msort/msort-8.53-r3.ebuild
+++ b/app-text/msort/msort-8.53-r3.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="A program for sorting files in sophisticated ways"
 HOMEPAGE="https://billposer.org/Software/msort.html"
 SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
+KEYWORDS="amd64 x86"
 IUSE="heap +icu +libuninum"
 
 RDEPEND="dev-libs/tre
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 5660f09170c6..14dc0afda849 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -73,6 +73,5 @@ DIST xindy.r65958.tar.xz 143636 BLAKE2B 72c6f4a78e77d3a348c4666dd8e322b446b7dd6d
 DIST xml2pmx.doc.r57972.tar.xz 15512 BLAKE2B dafe9dabe542a746a962a02fd04a483181544afd319b501ea0f4b0c74ce9d049840c65fa5e7e497571ae04c409b8c3cb11815f0dbfff4c8c3ae01a3e639f6ca8 SHA512 973960f65159f5107caa7e9a041dca75f0171fc61f94794c7b7560eb9b6898534974fb8b360a28dfa3a01d422b71618bcaf8aba2ed25ae4d4b9f67d24ab730be
 DIST xml2pmx.r57972.tar.xz 496 BLAKE2B 52d22c6616dc74d3e6600ef18449af31b2c286be9fe0bcacdffa2daa260f409baf8c7af1ce8444486b2fe3e21a05ec22aed280a55f227a1693b27ff3c55eed8b SHA512 9545fb5ca0e95788afab79d8a29336f337619adbcac68472bb5de6af6c54187f19bda655232175223168891c064f6fadc67c4ab8f5a0256e2c55e1a65c5e6f6b
 EBUILD texlive-core-2023-r10.ebuild 14042 BLAKE2B fa74b7a4c099ad13468462baafbe14cd71131150b539c79b1cf729dc2950d02c102ac780b78e25b9e2afe5c41f95a4d9c65d2d5777fbf559dbfd82e54e2f8ec9 SHA512 347049d28c69696336842259ac25c50606c9f63f74da7506737192e86bc6f473e83a8f685f16ba2c6fcacf62568ab9da8578dd2937d946f9f8cbc682faccf485
-EBUILD texlive-core-2023-r9.ebuild 13464 BLAKE2B 8b61725fa055bbb2da3f973c7fb18e14ed7d836d8bb3b10a814873d7e76d2c81696e7d1be7fa9976242e0ef37be8fd1f0383e2ebce2628c01c6c84dc873481d2 SHA512 56b4fbac7a5411624f26f9fcd876a8cff9351f979d916f15cb8348bbe176081045e6b32c37425da1d109fcbdd91298403b016305ea3c015f75a81f395c896d89
-EBUILD texlive-core-2024-r1.ebuild 13873 BLAKE2B 3125c666ae361afffd55cb4e7889c83cd26d4ae5a528861dfcd13f8969fcd2219f3030d2aa99ab5fe8430b5993fdebd0784a23391ccbd5bde215d818cdbc71aa SHA512 7043ed0ad7918de0cffbbe202227b9536651349a98e207afa9321bf0ae8b1cc0c9b29255a5fc372c8a7de3be14406ecc79731806e6f786c0e2cef488d9323e79
+EBUILD texlive-core-2024-r1.ebuild 13914 BLAKE2B 0c8378ef4aa7a7a15be73fcb8257bfa889bfa54eaa18e30698fa9238cd31a6c9a45b4be76bdec679b69652d49faf508acf20f2ac836161673e19dedac81020f1 SHA512 fdbb46deefdacdfa1f6b69cbb4aed23d32a1fecb7d5b94dafe6cce132d2de287e4a49a2beb617b2313b9a794126290011f3a843fc41313cea845679428f01a26
 MISC metadata.xml 653 BLAKE2B 2fdc01669ed91a6d652364af8c23449c9c7551777297742d69fd30aaec01c12d9bfad8316cdc5497ae270968f22f31efe9f151173e235e7992c02dbc645e8574 SHA512 d0d337ba63405d19551b2d1b9f7a96e4a356dace49b52f263c74e0e6febc767c85aae683119a55871b3702a9caf67621b5adfae4a5b2d3bcbd5724278b0e9146
diff --git a/app-text/texlive-core/texlive-core-2023-r9.ebuild b/app-text/texlive-core/texlive-core-2023-r9.ebuild
deleted file mode 100644
index 23f859292a26..000000000000
--- a/app-text/texlive-core/texlive-core-2023-r9.ebuild
+++ /dev/null
@@ -1,496 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TL_SOURCE_VERSION=20230311
-inherit flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
-GENTOO_TEX_PATCHES_NUM=5
-SRC_URI="
-	https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz
-	https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
-		-> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
-	https://raw.githubusercontent.com/debian-tex/texlive-bin/58a00e704a15ec3dd8abbf3826f28207eb095251/debian/patches/1054218.patch
-		-> texlive-core-2023-pdflatex-big-endian-fix.patch
-"
-
-# Macros that are not a part of texlive-sources or or pulled in from collection-binextra
-# but still needed for other packages during installation.
-TL_CORE_EXTRA_CONTENTS="
-	autosp.r58211
-	axodraw2.r58155
-	chktex.r64797
-	detex.r66186
-	dvi2tty.r66186
-	dvidvi.r65952
-	dviljk.r66186
-	dvipdfmx.r69127
-	dvipos.r66186
-	gsftopk.r52851
-	hyphen-base.r68321
-	lacheck.r66186
-	m-tx.r64182
-	makeindex.r62517
-	pmx.r65926
-	texdoctk.r62186
-	texlive-scripts.r69754
-	texlive-scripts-extra.r62517
-	texlive.infra.r69740
-	tpic2pdftex.r52851
-	upmendex.r66381
-	velthuis.r66186
-	vlna.r66186
-	xindy.r65958
-	xml2pmx.r57972
-"
-TL_CORE_EXTRA_DOC_CONTENTS="
-	autosp.doc.r58211
-	axodraw2.doc.r58155
-	chktex.doc.r64797
-	detex.doc.r66186
-	dvi2tty.doc.r66186
-	dvidvi.doc.r65952
-	dviljk.doc.r66186
-	dvipdfmx.doc.r69127
-	dvipos.doc.r66186
-	gsftopk.doc.r52851
-	lacheck.doc.r66186
-	m-tx.doc.r64182
-	makeindex.doc.r62517
-	pmx.doc.r65926
-	texdoctk.doc.r62186
-	texlive-scripts.doc.r69754
-	texlive-scripts-extra.doc.r62517
-	texlive.infra.doc.r69740
-	tpic2pdftex.doc.r52851
-	upmendex.doc.r66381
-	velthuis.doc.r66186
-	vlna.doc.r66186
-	xindy.doc.r65958
-	xml2pmx.doc.r57972
-"
-TL_CORE_EXTRA_SRC_CONTENTS="
-	axodraw2.source.r58155
-"
-
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/m-tx/m-tx.lua
-	texmf-dist/scripts/texlive/fmtutil-sys.sh
-	texmf-dist/scripts/texlive/fmtutil-user.sh
-	texmf-dist/scripts/texlive/fmtutil.pl
-	texmf-dist/scripts/texlive/mktexlsr
-	texmf-dist/scripts/texlive/mktexlsr.pl
-	texmf-dist/scripts/texlive/mktexmf
-	texmf-dist/scripts/texlive/mktexpk
-	texmf-dist/scripts/texlive/mktextfm
-	texmf-dist/scripts/texlive/rungs.lua
-	texmf-dist/scripts/texlive/tlmgr.pl
-	texmf-dist/scripts/texlive/updmap-sys.sh
-	texmf-dist/scripts/texlive/updmap-user.sh
-	texmf-dist/scripts/texlive/updmap.pl
-	texmf-dist/scripts/texlive-extra/allcm.sh
-	texmf-dist/scripts/texlive-extra/allneeded.sh
-	texmf-dist/scripts/texlive-extra/dvi2fax.sh
-	texmf-dist/scripts/texlive-extra/dvired.sh
-	texmf-dist/scripts/texlive-extra/e2pall.pl
-	texmf-dist/scripts/texlive-extra/kpsetool.sh
-	texmf-dist/scripts/texlive-extra/kpsewhere.sh
-	texmf-dist/scripts/texlive-extra/ps2frag.sh
-	texmf-dist/scripts/texlive-extra/pslatex.sh
-	texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
-	texmf-dist/scripts/texlive-extra/texconfig-sys.sh
-	texmf-dist/scripts/texlive-extra/texconfig.sh
-	texmf-dist/scripts/texlive-extra/texlinks.sh
-"
-
-TEXLIVE_MODULE_BINLINKS="
-	fmtutil:mktexfmt
-	mktexlsr:texhash
-	allcm:allec
-	kpsetool:kpsexpand
-	kpsetool:kpsepath
-"
-texlive-common_append_to_src_uri TL_CORE_EXTRA_CONTENTS
-
-SRC_URI+=" doc? ( "
-texlive-common_append_to_src_uri TL_CORE_EXTRA_DOC_CONTENTS
-SRC_URI+=" )"
-
-SRC_URI+=" source? ( "
-texlive-common_append_to_src_uri TL_CORE_EXTRA_SRC_CONTENTS
-SRC_URI+=" )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-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}
-	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:=
-	media-gfx/potrace:=
-	>=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.4.3
-	xetex? (
-		>=app-text/teckit-2.5.10
-		media-libs/fontconfig
-	)
-	xindy? ( dev-lisp/clisp:= )
-	media-libs/freetype:2
-	>=dev-libs/icu-50:=
-	>=dev-libs/kpathsea-6.3.5:=
-"
-
-BDEPEND="
-	sys-apps/ed
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-"
-
-# !<dev-texlive/texlive-langother-2023 see https://bugs.gentoo.org/928307
-RDEPEND="
-	${COMMON_DEPEND}
-	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
-	)
-	!<dev-texlive/texlive-basic-2023
-	!<dev-texlive/texlive-mathscience-2023
-	!<dev-texlive/texlive-langother-2023
-	!<dev-texlive/texlive-music-2023
-"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${WORKDIR}/${P}_build"
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	mkdir "${BUILDDIR}" || die "failed to create build dir"
-
-	cd "${WORKDIR}" || die
-
-	# 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 -r i; do
-		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
-	done < "${T}/reloclist"
-	mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files"
-
-	cd "${S}" || die
-
-	TL_KPATHSEA_INCLUDES=$($(tc-getPKG_CONFIG) kpathsea --variable=includedir || die "failed to invoke pkg-config")
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${TL_KPATHSEA_INCLUDES}\"," \
-		texk/web2c/configure || die
-
-	local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}"
-	eapply "${patch_dir}"
-
-	# Can be dropped in texlive 2024
-	# https://git.texlive.info/texlive/commit/?id=c45afdc843154fcb09b583f54a2f802c6069b50e
-	eapply "${DISTDIR}"/texlive-core-2023-pdflatex-big-endian-fix.patch
-
-	default
-
-	elibtoolize
-
-	# Drop this once cairo's autoconf patches are gone. See
-	# https://bugs.gentoo.org/927714#c4 and https://bugs.gentoo.org/853121.
-	"${S}"/reautoconf libs/cairo || die
-}
-
-src_configure() {
-	# TODO: report upstream
-	# bug #915223
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# 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
-
-	local my_conf=(
-		--bindir="${EPREFIX}"/usr/bin
-		--datadir="${BUILDDIR}"
-		--with-system-freetype2
-		--with-system-zlib
-		--with-system-libpng
-		--with-system-teckit
-		--with-system-kpathsea
-		--with-kpathsea-includes="${TL_KPATHSEA_INCLUDES}"
-		--with-system-icu
-		--with-system-ptexenc
-		--with-system-harfbuzz
-		--with-system-graphite2
-		--with-system-cairo
-		--with-system-pixman
-		--with-system-zziplib
-		--with-system-libpaper
-		--with-system-gmp
-		--with-system-gd
-		--with-system-mpfr
-		--with-system-potrace
-		--disable-multiplatform
-		--enable-chktex
-		--enable-epsfwin
-		--enable-detex
-		--enable-dvi2tty
-		--enable-mftalkwin
-		--enable-regiswin
-		--enable-shared
-		--enable-tektronixwin
-		--enable-unitermwin
-		--enable-vlna
-		--disable-psutils
-		--disable-t1utils
-		--enable-ipc
-		--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-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)
-		--enable-ptex=no
-		--enable-autosp=yes
-		--enable-axodraw2=yes
-		--enable-devnag=yes
-		--enable-lacheck=yes
-		--enable-m-tx=yes
-		--enable-pmx=yes
-		--enable-tpic2pdftex=yes
-		--with-clisp-runtime=system
-		--enable-xml2pmx=yes
-		$(use_enable X xpdfopen)
-		--enable-web2c=yes
-		--enable-afm2pl=yes
-		--enable-dvidvi=yes
-		--enable-dviljk=yes
-		--enable-dvipdfm-x
-		--enable-dvipos=yes
-		--enable-gregorio=yes
-		--enable-gsftopk=yes
-		--enable-makeindexk=yes
-		--enable-musixtnt=yes
-		--enable-seetexk=yes
-		--enable-ttfdump=yes
-		--enable-upmendex=yes
-		--enable-texlive=yes
-		--enable-linked-scripts=no
-		# web2c afm2pl chktex dtl dvi2tty dvidvi dviljk dviout-util dvipdfm-x gregorio
-	)
-
-	# Enable the following on version bumps. While it makes the build
-	# always fail, presumably because texlive passes these configure
-	# options to sub-configures, it still points out dropped
-	# options. See https://bugs.gentoo.org/828591
-	my_conf+=(
-		# --enable-option-checking=fatal
-	)
-
-	tc-export CC CXX AR RANLIB
-	cd "${BUILDDIR}" || die
-	ECONF_SOURCE="${S}" \
-		econf -C "${my_conf[@]}"
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	tc-export CC CXX AR RANLIB
-
-	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${S}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	while read -r i; do
-		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
-	done > "${T}/updmap_update" < <(grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@')
-	{
-		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_test() {
-	cd "${BUILDDIR}" || die
-
-	sed -i \
-		-e 's;uptexdir/nissya.test;;' \
-		-e 's;uptexdir/upbibtex.test;;' \
-		texk/web2c/Makefile || die
-	sed -i \
-		-e 's;dvispc.test;;' \
-		texk/dviout-util/Makefile || die
-
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	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 "${S}" || 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 "${S}/texk" || die
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${S}/texk/dviljk" || die
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${S}/texk/makeindexk" || die
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${S}/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 "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
-
-	if use cjk; then
-		rm "${ED}/usr/bin/"{,u}ptex || die
-	fi
-
-	if ! use xindy; then
-		rm -rf "${ED}{TEXMF_PATH}"/{,scripts,doc}/xindy
-		rm "${ED}"/usr/share/tlpkg/tlpobj/xindy.* || die
-	fi
-
-	dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
-
-	dodir "/usr/bin"
-	for i in ${TEXLIVE_MODULE_BINLINKS} ; do
-		[[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK ${i%:*}. This should not happen. Please file a bug."
-
-		dosym "${i%:*}" "/usr/bin/${i#*:}"
-	done
-
-	texlive-common_handle_config_files
-
-	# 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() {
-	# Note that the etexmf-update and efmtutil-sys use nonfatal. We are
-	# pkg_postinst, so invoking die will merely print an error message
-	# but not abort the installation as it already happened. However,
-	# unlike the texlive modules, we observed fmtutil-sys failures in
-	# texlive-core.
-
-	# TODO: Research the rationale of calling etexmf-update and
-	# eftmutil-sys here and the reasons why it sometimes fails.
-	nonfatal etexmf-update
-	nonfatal efmtutil-sys
-
-	texlive-common_update_tlpdb
-}
-
-pkg_postrm() {
-	texlive-common_update_tlpdb
-}
diff --git a/app-text/texlive-core/texlive-core-2024-r1.ebuild b/app-text/texlive-core/texlive-core-2024-r1.ebuild
index 53c5981cf91e..c8152c2d8d28 100644
--- a/app-text/texlive-core/texlive-core-2024-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2024-r1.ebuild
@@ -245,6 +245,9 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 	filter-lto
 
+	# bug #946142
+	append-flags -std=gnu17
+
 	# Needed for 32bit architectures, bug 928096
 	# This is upstream recommendation for the moment, see also
 	# https://www.tug.org/texlive/build.html