6 files changed, 468 insertions, 2 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2bb57cfb0631..a975570adacf 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index bd2b0375a94b..fc8b64b55d81 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -6,5 +6,5 @@ DIST qpdf-11.1.0-doc.zip 7053772 BLAKE2B 8e2d377fc40a8206567e82733125b4abf23f07d
 DIST qpdf-11.1.0.tar.gz 18452386 BLAKE2B 1df1f148db3132073f5e504b0dc79f8029e7049b334591d5dbd0adb425964d2d97ae5e086a3cbfcd82c82b22491b7b8897db8c3f20dab35feac3657066c6a776 SHA512 4c4daf3e6ae40e57d0d099abb7c9e694b7bec0c6657ffa4dc084f295d57799b8a5cbe5827d346fcbb89fa88a84c4dbd9a5437cc649b617cd479231c9ecc3fb5a
 EBUILD qpdf-10.6.3.ebuild 1855 BLAKE2B 3579d2303c15c8fc84a6bcb804986574f4a7e36f66e69b2411494c8106d6b1874e979809bf828b9a7af410494579da7fad762ff5df374abd0afbb105b7df6175 SHA512 2ceadd6b80689c2ae8a5ddd5e4960f441883005c61d3c6e18d52666421ac747330a6479485a606043e54f2530c8ab1426f6d1d554f7830bdd9d35dc7471f0077
 EBUILD qpdf-11.0.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
-EBUILD qpdf-11.1.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
+EBUILD qpdf-11.1.0-r1.ebuild 1802 BLAKE2B bd33adbe53e1ab6af05c2dae7b7a555de842199bf9eab206c2797e5db70fb0377f6ecd5c41c508137f46bc6e5274c493c19d89e7d7374379567b0090ce9df3d4 SHA512 3d32632abe0a6611905c5d7d0783d51acd48f48e124bda5f8a0043492555d6893377f6e517fa55539144eebde9045b2335a2710f1a332cfe0fd53612b5e965a9
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.1.0.ebuild b/app-text/qpdf/qpdf-11.1.0-r1.ebuild
index bd30e1e661fc..f0a13b28829a 100644
--- a/app-text/qpdf/qpdf-11.1.0.ebuild
+++ b/app-text/qpdf/qpdf-11.1.0-r1.ebuild
@@ -52,7 +52,7 @@ src_configure() {
 
 	if use ssl ; then
 		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
-		myconf+=(
+		mycmakeargs+=(
 			-DDEFAULT_CRYPTO=${crypto_provider}
 			-DREQUIRE_CRYPTO_${crypto_provider}=ON
 		)
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index b09b22f39227..d59ba1fef62c 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,4 +1,5 @@
 AUX texlive-core-2021-cairo-strings.patch 1629 BLAKE2B 447a277f4e50fc62a7f48804680b59133277a5c05f7705bc6545656e4bc139f3172000bc782483792d1219bfbcecd89bf1891f4fb08b447b76d0cabc8b278dfd SHA512 f1b487b2a3c3294c960e1bef9d5f37284439b2befdcb3b31e13af6df7ed54c2cc74b8212009887e14e6d505261d1691f05ed7335de6f66181ab49666fca93d85
+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-patches-2021-1.tar.xz 4820 BLAKE2B 1316cdc65c8f0a7164169fc6a795c50f7fccc99cea7a80290c18189f931b002e47b081de593c47d8da9650498a279f7d0473f115f02b37993859fcd475dbebed SHA512 4267934427265995c2a0c00d837399ec9670ba5c7df5c4599a486a2098de9a05640ff77f29bd7390070f3c973e5cc067356cfdd6b2c9415b7a56b96de789fb82
 DIST texlive-tlpdb-2021.tar.xz 1335040 BLAKE2B a5608b329666ad55032fb9dbf7fc6da9b8b2c94c03aed838cf8575742a23294f3319ad8e45fd6b4f65cc59f673c78b9d96b4f24e2ad07a8a08aa313822eea137 SHA512 ca9d5f2231246984ec489b4dfffb93c8b9540b8479a521aa91658fba3ce452c814e9e24e28d9ab6a0124d8eaf4cf7c14fefb379e84b3495752a9a2b8a2add3db
@@ -194,4 +195,5 @@ DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b7293
 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
 EBUILD texlive-core-2021-r2.ebuild 11787 BLAKE2B ae5ce4b5d4c3ac4a90859550952e2f301665721061a8c016a4d1306d4ee86bc005652686dc8e5442208dc10844bbbd8238a796c7fae45cda5618cc9f37d68db3 SHA512 84777c8ac15505324fdcdb54b25b31897a5f78e6a9f4de00cfc3ed6fcbc632d7ebd46cbff41d60f15eb8130ef5c2ee305949f1ffe8418a02a5973e67145c532a
 EBUILD texlive-core-2021-r3.ebuild 11955 BLAKE2B e959f428044529b8f98f53b08b492abb470d4ff4c13e7051c16e070469cd2a3975fb32a748c78139a6b036b6cc82f82575176b7ab25a8fb04127ed31a80b8bbe SHA512 5b851199d3697a6bebc8550825d59349abec05adbc3d9a6d655c802cf638133fcf89034c1f4449c997b2fc378935ea55c80a158229b012f1e695506f44033da9
+EBUILD texlive-core-2021-r4.ebuild 12027 BLAKE2B 96d048108b0606758a58a20344d34cfb43754d50e8f3e471e8b76b68b105aceeb199417044d5b6ffe7f21a41a1e7a16c074c581b52fc31f0b35fd022147ccdd8 SHA512 6a283d1fa5db523fac32ab7bb103b9489eb1e21b72f5ae8a4d52453cabd2df3cf5c997a654afa1e18341a5f9add75e5eb306e9c07080ccfddf5f2d3fe459b888
 MISC metadata.xml 675 BLAKE2B c3c5ad96f142e46a568b45ee9398a2b787710acfb560bd4403af8c6b140027ee33f0af0e8244232c91144abc2ed401d239697323215cfff5d158bccb2b539117 SHA512 3be6794e2fc9464abf350fdf1d515608e6bb2992fe12d378e5f87ea6435d732c5aedc0ff111721f3f8ed9143a6af1e1fc5a0decb066a187e760de4e11affa48f
diff --git a/app-text/texlive-core/files/texlive-core-2021-slibtool.patch b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
new file mode 100644
index 000000000000..4b026177b686
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
@@ -0,0 +1,98 @@
+https://bugs.gentoo.org/775170
+https://tug.org/svn/texlive?view=revision&revision=61639
+--- a/texk/web2c/web2c/Makefile.in
++++ b/texk/web2c/web2c/Makefile.in
+@@ -127,8 +127,7 @@
+ libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
+ am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
+ fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
+-am__DEPENDENCIES_1 =
+-fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1)
++fixwrites_DEPENDENCIES = $(web2c_LDADD)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -138,11 +137,11 @@
+ makecpool_LDADD = $(LDADD)
+ am_splitup_OBJECTS = splitup.$(OBJEXT)
+ splitup_OBJECTS = $(am_splitup_OBJECTS)
+-splitup_DEPENDENCIES = $(am__DEPENDENCIES_1)
++splitup_DEPENDENCIES = $(web2c_LDADD)
+ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
+ 	main.$(OBJEXT)
+ web2c_OBJECTS = $(am_web2c_OBJECTS)
+-web2c_DEPENDENCIES =
++web2c_DEPENDENCIES = libweb2c.a
+ SCRIPTS = $(dist_noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -416,7 +415,7 @@
+ 	main.c \
+ 	web2c.h
+ 
+-web2c_LDADD = -L. -lweb2c
++web2c_LDADD = libweb2c.a
+ fixwrites_SOURCES = \
+ 	fixwrites.c
+ 
+--- a/texk/web2c/web2c/Makefile.in
++++ b/texk/web2c/web2c/Makefile.in
+@@ -127,7 +127,6 @@
+ libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
+ am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
+ fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
+-fixwrites_DEPENDENCIES = $(web2c_LDADD)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -137,11 +136,9 @@
+ makecpool_LDADD = $(LDADD)
+ am_splitup_OBJECTS = splitup.$(OBJEXT)
+ splitup_OBJECTS = $(am_splitup_OBJECTS)
+-splitup_DEPENDENCIES = $(web2c_LDADD)
+ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
+ 	main.$(OBJEXT)
+ web2c_OBJECTS = $(am_web2c_OBJECTS)
+-web2c_DEPENDENCIES = libweb2c.a
+ SCRIPTS = $(dist_noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -395,6 +392,7 @@
+ AM_CFLAGS = $(WARNING_CFLAGS)
+ EXTRA_LIBRARIES = libweb2c.a
+ BUILT_SOURCES = w2c/config.h
++#
+ DISTCLEANFILES = w2c/config.h web2c-parser.output
+ noinst_HEADERS = coerce.h
+ dist_noinst_SCRIPTS = convert
+@@ -415,14 +413,17 @@
+ 	main.c \
+ 	web2c.h
+ 
++web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
+ web2c_LDADD = libweb2c.a
+ fixwrites_SOURCES = \
+ 	fixwrites.c
+ 
++fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
+ fixwrites_LDADD = $(web2c_LDADD)
+ splitup_SOURCES = \
+ 	splitup.c
+ 
++splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
+ splitup_LDADD = $(web2c_LDADD)
+ makecpool_SOURCES = \
+ 	makecpool.c
+@@ -973,11 +974,8 @@
+ 	fi
+ 
+ $(libweb2c_a_OBJECTS): w2c/config.h
+-
+ $(web2c_OBJECTS): web2c-parser.h stamp-lib
+-
+ $(fixwrites_OBJECTS): stamp-lib
+-
+ $(splitup_OBJECTS): stamp-lib
+ 
+ stamp-lib:
+
diff --git a/app-text/texlive-core/texlive-core-2021-r4.ebuild b/app-text/texlive-core/texlive-core-2021-r4.ebuild
new file mode 100644
index 000000000000..1d9065ebab6c
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r4.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20210325
+
+# autotools/reautoconf in src_prepare only needed for Cairo patch
+inherit autotools 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/~zlogene/distfiles/texlive/${MY_P}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+	https://dev.gentoo.org/~zlogene/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/~zlogene/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/~zlogene/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/~zlogene/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
+	eapply "${FILESDIR}"/${P}-cairo-strings.patch
+	eapply "${FILESDIR}"/${P}-slibtool.patch
+
+	default
+
+	elibtoolize
+
+	# Drop this on 2022 bump!
+	"${B}"/reautoconf libs/cairo || die
+}
+
+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"
+}