gentoo resync : 21.06.2020

6 files changed, 8 insertions, 41 deletions

diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index d11206b60821..0bbe4c756e42 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index 7632a0495a86..72a6761e30b2 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -1,6 +1,4 @@
-AUX exsheets-syntax.patch 761 BLAKE2B 5d5e49f6ad46aaeee296fc29e1f44b29fbf5f649362c166299aeb6404b6b07c0b7a451727b74664dfbf62b31f60610cea6af3b029947682990588582170b84a0 SHA512 2a047ab5cefaf40a7149c9563b39f7d7237ba553ed0d1b9db8526b4a7dbbc190141ee7c6f6cf67f8e72db2736f7d1dfe5296de03ed79e9fce046d1b214598dd9
 AUX lstlinebgrd-syntax.patch 790 BLAKE2B a67f226f9346497d5254a0b8d7142ff2d568f9460898b117497cc67a3f1874a71bc4cb486690d6071ac59881d9070595a6bf5c8acc7aac01e3214d19ea9a73d4 SHA512 53e67c73d60c8d2ec2b2664dde148aab0bfd9a35b3f7a727cad6af73c0b5db0158aafae7f5a740d8ee284d5a03c76be8a915f5d7202247731fd9429febeed211
-AUX vpe_invocation.patch 405 BLAKE2B 40cdd3996332d981823c4799353b752d0e968e776032732af0b413135da15b8ff84a153c2c7def11ddc41453a1b9cc0d9ca4aaa91156a98d6ba8e800bd383675 SHA512 7f70d8293394aca36d459139ea95729cf6acec1ca05933334435e1e9a70f35f834e47d3a18a906bf41ba280cdb7df4e3f9b9f9e517fc6bf64d524730f8cf510a
 DIST tl-2up-2020.tar.xz 4192 BLAKE2B 9dd0043345e9c6e3a721f1d2a4a5554908fbdc39d07384750ea1add7937ee56133b40bdb4323081b29c630dfb15fa27e0e82ff398c374f0393f867819e9a1d4a SHA512 b7844f246ef486d68babff92f2f648ef6b2eab28dbf8d22f649b2c9c26fc857b05f475e766a0c9b4c4cb5be1224afc690c22d19865e9efb9f4e75a8ff6d9dda8
 DIST tl-2up.doc-2020.tar.xz 62740 BLAKE2B 3b3f8f7568e5c112aea4e4c0f750358cdf116968ca6079babb4944cfe11f0d698f474c9de3cb1252ef0249c311ad62de474f11e5f011926f36297de82c03bcae SHA512 c8569e5cec43525d6814816f7fdaa6bc9ce0ea810fd6be60da992c251fcfaaf4c5229a1956c1fc3e6675ea5dfb4529267acc5f198053a80902b69b25a1464b75
 DIST tl-ESIEEcv-2020.tar.xz 1596 BLAKE2B 3b24c225883aff65c4218ae3d4053dfbc370eca966dda6f9efd9a08a80273132c3c24bbad9b1d2348a088b8a581f6d4a73e5a77e97c8359474bc43da7dad0724 SHA512 79fe8175d0adf25ebf30421eca323f9042bc98792290763b06ba53978bf4962dabab228b9aa6220f859f64356eabd2cc94e71351aac441e64afa3fca8f73f742
diff --git a/dev-texlive/texlive-latexextra/files/exsheets-syntax.patch b/dev-texlive/texlive-latexextra/files/exsheets-syntax.patch
deleted file mode 100644
index 3b6763488a60..000000000000
--- a/dev-texlive/texlive-latexextra/files/exsheets-syntax.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/texmf-dist/tex/latex/exsheets/exsheets.sty	2017-02-11 00:30:33.000000000 +0100
-+++ b/texmf-dist/tex/latex/exsheets/exsheets.sty	2019-06-09 10:13:30.917543183 +0200
-@@ -2760,7 +2760,7 @@
-       }
-   }
-   
--\cs_new_protected:Npn \__exsheets_blank_skip:N #1
-+\cs_new_protected:Npn \__exsheets_blank_skip:n #1
-   {
-     \bool_if:NTF \l__exsheets_blank_width_bool
-       { \dim_set:Nn \l__exsheets_tmpa_dim {#1} }
-@@ -2791,7 +2791,7 @@
-       }
-       { \exsheets_write_blank:n { \skip_horizontal:N \l__exsheets_tmpa_dim } }
-   }
--\cs_generate_variant:Nn \__exsheets_blank_skip:N { n }
-+\cs_generate_variant:Nn \__exsheets_blank_skip:n { n, V }
- 
- % the following code from Heiko Oberdieck in d.c.t.t served as inspiration
- % and basis for the \blank command:
diff --git a/dev-texlive/texlive-latexextra/files/vpe_invocation.patch b/dev-texlive/texlive-latexextra/files/vpe_invocation.patch
deleted file mode 100644
index 06f4534fd5b8..000000000000
--- a/dev-texlive/texlive-latexextra/files/vpe_invocation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use a shebang:
-https://bugs.gentoo.org/show_bug.cgi?id=289818
-
-Index: work/texmf-dist/scripts/vpe/vpe.pl
-===================================================================
---- a/texmf-dist/scripts/vpe/vpe.pl
-+++ b/texmf-dist/scripts/vpe/vpe.pl
-@@ -1,5 +1,4 @@
--eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
--  if 0;
-+#!/usr/bin/perl -w
- use strict;
- #
- # vpe.pl
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index 545d8c69b1b8..794fdd2d7008 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -25,6 +25,9 @@ DIST tl-exteps-2020.tar.xz 2988 BLAKE2B 4dbb23d7395884e68817278e23b758ea481ad6a8
 DIST tl-exteps.doc-2020.tar.xz 108708 BLAKE2B b12bdd5be5e0bc62fb4cca61b9fe29b9b39e85f7312b9527b75eab6db92ff273794affba916b977afcfa0f130868b5431644d6c3b54b010cab939860852fe63e SHA512 aac2e20a993818576f9e1efb153e9285b17b48827a1547a0c1033f22fa1a52f84ede214b4322ce4c6ddff69b8736f214f27370b3f1c006ea6e5fe2ab9fd64304
 DIST tl-featpost-2020.tar.xz 31996 BLAKE2B a8499d9c0c0b97c037312f26f259b04826dfd13d628938fc1f8b7fffb8e7627efdd0073ba187761df4dd9f1a09a9cb29d4e79f27c947b18f9f04a9e4e98eec26 SHA512 9d7c35499df5c8c8efe8ea51d88c4cd9ddc6bd5238ec527d842aaa9ce42c30bb1d73c667f5aca22f385d3725c7443f043a2b63cd337a7f6d5b5d5810ea34bf64
 DIST tl-featpost.doc-2020.tar.xz 17968016 BLAKE2B 2a2fab1a30ec82f26e16b7d9ad957e042420252b3017687e9a9589a162af1502f496218bbcb4020197eed49b4327fa479876b81ac7cf4b3d55b1928d752037cd SHA512 e4eefb43d63c6522c3080a76b4df3a369932bc9e2f868ed0143d62fd2365bb74e6891705b287d19b4ca4b2560b0573d6ff9a0e5cf2a3da2e4b21482cd6cdd0b9
+DIST tl-feynmf-2020.tar.xz 19484 BLAKE2B 0a3fa1326232868308414e90aafe97cc101eb9aafe55f383870fb010c114483d6cf4e74e351030ff0dcdc3607e6ab5bfeb66ae4e3dc5c42b6d8549052ae0c1a1 SHA512 d4eb87e3f086f2d39c87eba057fc490ce5d39e9c5ae39aa1c04ee8c3be9c4a188ef123f860fe74d31e0e9e9182909c39df3434ddcc618632723f00627f66397f
+DIST tl-feynmf.doc-2020.tar.xz 466364 BLAKE2B 9f20fc8932efc8b726922aa1626408de43831c1574732e2f5a5485f47a9ca263278891cd51748a3ee2fa6360d7ec307a40ad0664bba410bf6454d7c1323e8643 SHA512 933edaceff112f7442f7c662fda43f343b0e7e41f65aae4f1a45bfd2de18c1e4bda505a235eebc4daf2451846dab376449242217ec803f2932a4a1584038f4ee
+DIST tl-feynmf.source-2020.tar.xz 64056 BLAKE2B b16f8637c54c61b2665f241b885cc28d192ac5a8b37afef7e77d7b825979a372a5dd7c240db09830035c1ef0f998b1c2c40ab5c4cfe582b798e5115a067c0e34 SHA512 bdc4dbbc449c911c0d516b10da18c1d541645ec57fd95c163d571a039c70ad46e6111717ffc86c802123c272509c85ce1d71d90f49578b2e228a9229f4d40f02
 DIST tl-feynmp-auto-2020.tar.xz 1912 BLAKE2B 929ee0c074a66666b48950ee24d51e7ded4daca7acc202eec5fd76e17c8660af57959fedba0e1ba67e946c32566e0253df7f5e596d10c3bb025af4573b740a5d SHA512 64ca275292b12847d823322ced9dbad615a34089c8cbe43262e676b34db205ed56509f641e18e949523bd252ed1ea73eeb5f019e2cd052274c02b1df67860a25
 DIST tl-feynmp-auto.doc-2020.tar.xz 375268 BLAKE2B 70afacd0b4315fe6d0d0070290c112088a5351a9b9dc0731c60d576e728923d5c282e0eb208a30dc14b7c2d84aca0050a61285008997b8f19d365e9f8657c24b SHA512 3dd88f5af739013ace4fd8eea70ce247b997e887c0f7067040ff9bf4e0300126aff53845ecefafa7bb52dfc4d05d181a1e96847e6a534c718c5a7447231539ba
 DIST tl-feynmp-auto.source-2020.tar.xz 4768 BLAKE2B 351277874171bdf37d3347636fcad168718a73078ae0b14c85773d82011fcb06668180b99fd98f512c70bd6fced218aec08a214449aa961493cb637c88bdc5b9 SHA512 ea29f32f9f1c628d63b81c958f7c8064e884ba1764953dd62fbe5d90506547846f52fe378f813a09090ef6991c9b7d2905095b04fdc0e26aea4c8cbcb5e2b2b1
@@ -96,5 +99,5 @@ DIST tl-textpath-2020.tar.xz 4328 BLAKE2B 01e843dcc2c950564b5327b5724fda70654c9c
 DIST tl-textpath.doc-2020.tar.xz 237628 BLAKE2B b576a1b5a8e64c439c768dcf696332403c6ed82d629b70397f55cb3531d61b03a0faf8375b637d7164c4c267d8b851f666d0e4999e205ca3e882c82ee64f260b SHA512 5507082be0235ec2253ddc0b03e239607b9d140952799684e5193e4d3d584846d33a59aa9b1630d058f17cacf7cedd2fe0a180b40207ea8f10947b534784fc02
 DIST tl-threeddice-2020.tar.xz 2212 BLAKE2B 9c71fc87f54336849981ad347015810d86f89aaca438246c99e9d2fe72b65236ee9f13b6dfd38bc0d0dd5e7cb49662baca0dd209f6b803a6658a8ee808893690 SHA512 66e6a27aa277b45b44c156d408c764da5bee6dc540f2058a783f02bbe806c95052267a5ed79ea49b5dc356d0f03747e9b186542640b34753a693ecffa158a6a4
 DIST tl-threeddice.doc-2020.tar.xz 119008 BLAKE2B ba4ff5556dbf6d86660882ec889e3fa22dee32c41c6b93e479d1962822ce073d84d30111bd8b85c682f757d2ce571378bcb2c94ba9af6b341d4692fcd7e114de SHA512 c750497229b8bd41eca05b221ed2ca2ca49db8cbbff03bfce2712869d352ae0385e4c10e9730e0b2f8286db9af1e1b87f10d599788a3dfe8d41c28efb8b0e4a6
-EBUILD texlive-metapost-2020.ebuild 2272 BLAKE2B dbc05773f218e525a532b4be1b362eaad22f459e700e6b019f416cd132436f9ffc8bfdb6f511af869e888db978fda615cff8604660b458abec124a8d28e7c190 SHA512 9baa939afabe8a37ec4e083d315c04690b00b28c1e17b058c08f8da1d80b6873f52067fa0b4297050d43cf77cd8ddbfaea0b8b399651c2406179d7cf5e183dcd
+EBUILD texlive-metapost-2020-r1.ebuild 2311 BLAKE2B c0b56f625adf19313da59994a98db8ac0121c92f57fd4eb0aa4f8fba32acd1ea55d13f9d627caea4ef2acdf379156b7137fa0c306548b79ba82d2eceda1dab90 SHA512 0e3ffd76b33587784179d8269a6493f68847df86c92466e3473f4000524a20c2863955ddbc31db45f95181f992b6a8d8fe29d433a6bacb740a7120948b1bfed6
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2020.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild
index 256d4f740df1..7261052cc84f 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2020.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI="7"
 
-TEXLIVE_MODULE_CONTENTS="automata bbcard blockdraw_mp bpolynomial cmarrows drv dviincl emp epsincl expressg exteps featpost feynmp-auto fiziko garrigues gmp hatching latexmp mcf2graph metago metaobj metaplot metapost metapost-colorbrewer metauml mfpic mfpic4ode mp3d mparrows mpattern mpcolornames mpgraphics mptrees piechartmp repere roex roundrect shapes slideshow splines suanpan textpath threeddice collection-metapost
+TEXLIVE_MODULE_CONTENTS="automata bbcard blockdraw_mp bpolynomial cmarrows drv dviincl emp epsincl expressg exteps featpost feynmf feynmp-auto fiziko garrigues gmp hatching latexmp mcf2graph metago metaobj metaplot metapost metapost-colorbrewer metauml mfpic mfpic4ode mp3d mparrows mpattern mpcolornames mpgraphics mptrees piechartmp repere roex roundrect shapes slideshow splines suanpan textpath threeddice collection-metapost
 "
-TEXLIVE_MODULE_DOC_CONTENTS="automata.doc bbcard.doc blockdraw_mp.doc bpolynomial.doc cmarrows.doc drv.doc dviincl.doc emp.doc epsincl.doc expressg.doc exteps.doc featpost.doc feynmp-auto.doc fiziko.doc garrigues.doc gmp.doc hatching.doc latexmp.doc mcf2graph.doc metago.doc metaobj.doc metaplot.doc metapost.doc metapost-colorbrewer.doc metauml.doc mfpic.doc mfpic4ode.doc mp3d.doc mparrows.doc mpattern.doc mpcolornames.doc mpgraphics.doc mptrees.doc piechartmp.doc repere.doc roundrect.doc shapes.doc slideshow.doc splines.doc suanpan.doc textpath.doc threeddice.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="emp.source expressg.source feynmp-auto.source gmp.source mfpic.source mfpic4ode.source mpcolornames.source mpgraphics.source roex.source roundrect.source shapes.source splines.source "
+TEXLIVE_MODULE_DOC_CONTENTS="automata.doc bbcard.doc blockdraw_mp.doc bpolynomial.doc cmarrows.doc drv.doc dviincl.doc emp.doc epsincl.doc expressg.doc exteps.doc featpost.doc feynmf.doc feynmp-auto.doc fiziko.doc garrigues.doc gmp.doc hatching.doc latexmp.doc mcf2graph.doc metago.doc metaobj.doc metaplot.doc metapost.doc metapost-colorbrewer.doc metauml.doc mfpic.doc mfpic4ode.doc mp3d.doc mparrows.doc mpattern.doc mpcolornames.doc mpgraphics.doc mptrees.doc piechartmp.doc repere.doc roundrect.doc shapes.doc slideshow.doc splines.doc suanpan.doc textpath.doc threeddice.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="emp.source expressg.source feynmf.source feynmp-auto.source gmp.source mfpic.source mfpic4ode.source mpcolornames.source mpgraphics.source roex.source roundrect.source shapes.source splines.source "
 inherit  texlive-module
 DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
-LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
+LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+ GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
 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 ~x64-solaris ~x86-solaris"
 IUSE=""