gentoo resync : 25.08.2020

2 files changed, 13 insertions, 18 deletions

diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 79edbaf50761..a37971d477e3 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-DIST texlive-core-patches-2020-4.tar.xz 12188 BLAKE2B 7162ef9e3d22367f76a9759a5ed3995f7bd5cb5ac7961778216eaf57e81611483481c72a45ec76666cf9fdc0bb05a2b5b33f3de8270efc96640847f8c6f1a9fd SHA512 13b3ca5d86dead6af53774ad5c4c74a6f1c63805fe6f3ba10ada07e081a5d3d47e06e398c139e015eeee2c5110c295de4f366f1e4bb4fb6b72d99a2a2fadeef9
+DIST texlive-core-patches-2020-5.tar.xz 13132 BLAKE2B 2117b0b44078cc4af26337c6407441ee660848e29bc190340b36be80fe2d52998da2d8799f0f7943670c29f33968c06464d92c2bce6fb238170be72d6acb2337 SHA512 65063f212732c801926bc97d639a9b71389f30b247b0299decb3d1d8a4c9770d314f348c50b9dde1d455f2531e1b8a8513eaf5fc0c35455d5dd87f3b3374d5e3
 DIST texlive-tlpdb-2020.tar.xz 1261796 BLAKE2B b070f09024a8a12ffc73f8ef6e82026b0d1cc963e50fb0b4c1226043f642db90cf18cd888b3bd4a1b559080b4a55b78b29b44d3456f39b7b9ce09e8edc29a166 SHA512 587433bada2333df2462b4adc012278f4f5f01cf85243fb0c2e46bfffa46e1ec7b34abfb8a0415eb071acd87f4abaa509b1f1c7b2500f3cdb6e127b89a1a58ab
 DIST tl-a2ping-2020.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
 DIST tl-a2ping.doc-2020.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb
@@ -184,5 +184,5 @@ DIST tl-xindy-2020.tar.xz 141192 BLAKE2B 47a053cf02e7ead9a86801731e211663c5ead7f
 DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5c8ceb6a1055e6916489a306b40bfd6977a7b17b3434ee04c88ee975a5313c3beffb536b1e867ce6e7eeab1df3b1b5 SHA512 9e6c10388a7a707695e2965c3e3b851f939a68997cf880560a4a05ca3a167febeee9f1a7803cff1927bf7aecf0d6baac65bc4827c367f9c2d086d17d5947d64c
 DIST tl-xpdfopen-2020.tar.xz 580 BLAKE2B dd5bba56ad86e209daf6030f5aabf59c41a0474142e81a840b647ae2abf744d0a53ff76ba1581bf2f7de0db4432bcd607553fc3a2e5bb739e483357f02ed454b SHA512 4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
-EBUILD texlive-core-2020-r5.ebuild 12079 BLAKE2B fd9a7b37e52bda9290eb88fc19a5af4551002aa505f52009dde37a822be657273e06e218eafa8ce08e0879bc19b7582f786456e18e95bac3cda5ab06ba4651dd SHA512 f8f08cf86bff653a375829bbc6ec5ffb4ce79b4938007e827b23bf405c63a5e60c1b3a98ed8c66f7e727a12e83bd506f3db5ad7c0bf001346add3927db984cbf
+EBUILD texlive-core-2020-r9.ebuild 11849 BLAKE2B 0573d85de0bccd65f82da5950d6c46c08384e56582399521a57f9ceb8fcf947d7a2edde56dde8a40035eaa5014b0c7e9cf8b37a2cbaa31ebaf7ef1314037e90d SHA512 1777a296244379b11ec75cb06e6cc4348a6aa468e99488d67e9a63eb925100fc85825b6535c3381657e95eeec2de157d6b8c84a7e44bb0b54644dc77a8cfd407
 MISC metadata.xml 747 BLAKE2B 86f6b1dbfe55c17e841ed5cf89a20e3da7bcf895b0481a7460ee2577dd1927548b6dc7f7c618c3bc08bac73a8a33ac20632391a9533cade342d78f2ef92caedf SHA512 96e9763e09319a9f49ba9b62f09497ed422ad5d1111c3c850351f5cd13537bdeedd2cb0539aeafe09fd3cbab6dc87db7366de3994189f2123fbfc2b8090ed98d
diff --git a/app-text/texlive-core/texlive-core-2020-r5.ebuild b/app-text/texlive-core/texlive-core-2020-r9.ebuild
index 525e0874fe5a..44eb986c0a9b 100644
--- a/app-text/texlive-core/texlive-core-2020-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r9.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
-PATCHLEVEL=4
+PATCHLEVEL=5
 
 DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/"
@@ -75,7 +75,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -86,6 +86,9 @@ MODULAR_X_DEPEND="X? (
 	)"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/vlna
+	!app-eselect/eselect-mpost
+	!app-eselect/eselect-pdftex
 	!app-text/xindy
 	!~dev-texlive/texlive-basic-2019
 	!~dev-texlive/texlive-fontutils-2019
@@ -96,7 +99,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	media-gfx/graphite2
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
+	dev-libs/zziplib:=
 	app-text/libpaper
 	dev-libs/gmp:0
 	dev-libs/mpfr:0=
@@ -157,14 +160,14 @@ src_prepare() {
 
 	cd "${B}" || die
 
-	default
-
-	eapply "${WORKDIR}"/patches
-
 	sed -i \
 		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
 		texk/web2c/configure || die
 
+	eapply "${WORKDIR}"/patches
+
+	default
+
 	elibtoolize
 }
 
@@ -215,6 +218,7 @@ src_configure() {
 		--enable-regiswin \
 		--enable-tektronixwin \
 		--enable-unitermwin \
+		--enable-vlna \
 		--with-ps=gs \
 		--disable-psutils \
 		--disable-t1utils \
@@ -236,7 +240,6 @@ src_configure() {
 		--enable-luatex \
 		--disable-dvi2tty \
 		--disable-dvisvgm \
-		--disable-vlna \
 		--enable-shared \
 		--disable-native-texlive-build \
 		--disable-largefile \
@@ -338,14 +341,6 @@ src_install() {
 	# like non-existing targets
 	dosym tex /usr/bin/virtex
 	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
-	dosym "pdftex-${P}" /usr/bin/pdftex
 }
 
 pkg_postinst() {