gentoo resync : 10.11.2019

3 files changed, 8 insertions, 18 deletions

diff --git a/dev-texlive/texlive-latexrecommended/Manifest b/dev-texlive/texlive-latexrecommended/Manifest
index 890094ca7db0..a07df2cfb843 100644
--- a/dev-texlive/texlive-latexrecommended/Manifest
+++ b/dev-texlive/texlive-latexrecommended/Manifest
@@ -1,4 +1,3 @@
-AUX thumbpdf_invocation.patch 417 BLAKE2B 50d40055bd5cdcfee019704ad5be1f4ee1965006cc47c79b1c75e7c6a48ef3b9f5ab3dae29015feef9d0bb89adb192e4643beffb5a5ef3b2dfcc05d8193bfb0a SHA512 7717d4d1868f60c73dd7e9a0c1cc05aae939652e362c7a6846379db10053dc0430ad30f0b04041e5afbc83d9d492141f81a9c182475c4c74ff389276094cdbc1
 DIST texlive-module-anysize-2019.tar.xz 1384 BLAKE2B 38847e564caf2e01f3ed65e80b174144640009784818e3dde4eae644b740bf3f8ceac2cf62abf5bab2fe0d8d800da2643ef8ed6a236827eece51ec732ae7b5ea SHA512 4439be91f8dd82cdc051c519b5bc36fdfb632cf09941f4e6ec92fa77c2b5f4d767c162018fc9451d48ece17e9cbd5d7d4c574eacea78b8f92b6e07d40d7b590b
 DIST texlive-module-anysize.doc-2019.tar.xz 34460 BLAKE2B f5a57c59379497931aa6b9e3c4fba57e56411dfeb5aacb5e5a574266f9618e04e1a2a34421e1bce84eb97ab14eabb70f0ca9c4e628e2053f51f990d6976fef5b SHA512 96591bba808fc91a876dd49a6e1ede3b679c18952244f14b07e992b40d20f6c4a0f4b4dad00a409c766c5f2e883fc4923c501e65b06ad93193719001c2629f08
 DIST texlive-module-booktabs-2019.tar.xz 2204 BLAKE2B 3bf64116bf7b0012ab576117baabac55c964e6c8e79462089051e65ae8cf3f35ddf98d5c29f6397e378d44615859089e516b99dc72f4daf6c6c23d0ded12b045 SHA512 3857417992accba2d2ce5caa60098a5a8e32ae22a8a5293cb1e557ab79449af792302d918ef3c44ef3560f4a6840253446eba1339d1403c4f09190aaf41c6e27
@@ -154,6 +153,9 @@ DIST texlive-module-underscore.doc-2019.tar.xz 246480 BLAKE2B 9965392451d8d778cd
 DIST texlive-module-unicode-math-2019.tar.xz 43144 BLAKE2B 7b8854a38e4cafd1940117ed1fc7d396e513e30d6dccf265fe8289840544fb5208d03ebe4a0b968f8ac06637db69539ffb399d588b53211719972d7d59eb4c4e SHA512 05b810142d6da7beb889fcb3f11b8b145d6250d18fa2b9d8745fa8ad7c7009a95bf447825ccf08d8e62fc63c57c0761ed907a6bf2bf5e0c9f8e239870bf73a2f
 DIST texlive-module-unicode-math.doc-2019.tar.xz 1741260 BLAKE2B 527384ba374e21451f3d0e6bcb712ea8c27eac876d323a4d28590cce00ee69a6af6f9cb44e81cd76a455bf674669b0da94d3e0ffb8acf4323901494eb28ab584 SHA512 a7bdae5dce94420835ef5af6b6631947ce4829d02a952339b32fa098a75aa6c9fbd7455358815fac0cc4e2d2a5646b47a71405b50ccdd0b0944d9d92c5ccbb7d
 DIST texlive-module-unicode-math.source-2019.tar.xz 38500 BLAKE2B 6d97c0502bbe330d2195ac092a619425a9b910d015a0fb8a0de26df6d189dcc04771b6b3027c2923dd93339e8ba4373b41cc00dd6f3c82f54c4aca7a494ce169 SHA512 077211b8416f3a09c321abe55a5d8a228cce27fd84801fbc2dfb11a57676e83527f3d3fd4e8048c0d27880a976ab43da293a8a22bb97d9ab0fe0d5f4b790d6aa
+DIST texlive-module-xcolor-2019.tar.xz 17300 BLAKE2B 5a58eec9a1588945a27e9b74bd96525d2c7b0adf23445581dc35434442862cd13aa179e1f90f8a28c00683211310d3220752d9eedb4bbabc32b48f89db37849a SHA512 9fba18460e4488cf2836082952ffff6e5e481b964570ee515f503aed3c8790778e054919e4e24070ff6cf608e21c1356859341eae5704558b1293b01ba8c0925
+DIST texlive-module-xcolor.doc-2019.tar.xz 669996 BLAKE2B 05d9e8863499d570ee62e3e0fe358af9b6af9e116c240355b96d20bca41d611d6eb20d5b5bf935bfdf092801651d7e07bc646ff78fab6e5d137af228451792f3 SHA512 65f15207df8a112a4bccbac1c5259053364b52da3f0d2fdf566e1e734f61e0649ae6cc674c96f775d8c668cc6238dad2993f06b81153d38713ebf96e747e0353
+DIST texlive-module-xcolor.source-2019.tar.xz 76980 BLAKE2B 86783d7f625ea354bef946b9ee825459ca74cb51d3dee8cc6942565c7ced7dbcf298e4ad923d8d159bc791b4c372e807903dca376cb1e4375f9caf9f421f453e SHA512 236eb7d2f94c297e743c2b0508e55910b00495915b7910dba7e0bc107f2ee37b24e3975242bb11c2c64a99f2abc5a55bd799277b9fbcd98058ee8add005d2be7
 DIST texlive-module-xkeyval-2019.tar.xz 13124 BLAKE2B acefefa37e31f4bdf2dc174964248178fcf4b5ba4b1b5b72d840a549398c2b8236838de372be2fe1d76020a09614ed457a0befbbb2d676abf46c521cce007926 SHA512 5d49a32326057d18ebb2bf25d29e06362c23d9a2f9df5058457fd84c9faebb545316c502a7baa19073abdd661e9497255cbcb938684dd006b0c10ba7c957c627
 DIST texlive-module-xkeyval.doc-2019.tar.xz 388344 BLAKE2B 259cc15240027f6944f1fdd1657b9ad5788bb9377784e6fb14d421d54625bdd6bc04f1d5ba2d447b614f4e85af36a7de004cf51e949291210e1e49da54383fda SHA512 a2c51df068c738d598c472143af901392d181db37bb416a2e406ad1d65c6679e428efc1281256edcbd04bf6a64ffd23dd568bed007ea278362ae7378f5371a03
 DIST texlive-module-xkeyval.source-2019.tar.xz 47564 BLAKE2B 15e5ff6d9c7802e1c646643a33f0066a7fc605ca47057929f33df67a25d43c74449a2314b2ed05c0ab299930725491133dc4af804a891915c2b5d486397cea15 SHA512 6764eee7ff0c7649a4f6b809753134dd047ab6bfc3ba1bf16e5ae0fef2df0f3b40cd83b662cde002954ce705e8f8ee5950da36b38b2ee6533e6b089e3a32bf20
@@ -162,5 +164,5 @@ DIST texlive-module-xltxtra.doc-2019.tar.xz 100928 BLAKE2B 647d89696c54c5c6c0d07
 DIST texlive-module-xltxtra.source-2019.tar.xz 6096 BLAKE2B ab97ede05864f91a1f7f8a193c95d2cae748539fd0fcb035eb7817deb9e5171530379314bd3ce120968defeafcffa08b8e2c20bdb9b62d739a274a0a3730e7c2 SHA512 50790bef953636876456586b3908b15f914803fd87ff8c3cf4be576bf9930c2f450c99b60d390508d35d534e5d9bff0cd1b02fbe31bb29444207fff3868ccb1d
 DIST texlive-module-xunicode-2019.tar.xz 25768 BLAKE2B cbbc952fb657459a35f9e55c4adb28ffc9b76ef466f8da48c8882189ef0ac17b0902efabc1b9dd330291b5bbe4e39eb75eb5d4ae2b9a0b8854b8354e7a5429d4 SHA512 f49628013bc54e82bc38a2c749ddde9426c65716f04c5c8d8264398b9595e571d380e07c045db9e7ed5d6df7d0b7b1f8e81eaa28d6b67a6756d2c5023b731176
 DIST texlive-module-xunicode.doc-2019.tar.xz 584 BLAKE2B 09ecbadf1d7739a2d4fd1fa823ab4a21e062006072ffab78d38942d36339bf5dc3bd0188a561013b55bb0ccec657e914cbe2fd8c4a60e160e792c52a8d7654ed SHA512 fbd368180c97649944aa23fae4f50f8a8d1aaa776f643ba520f121b9aae196dca94c11906f9d5b2f961b6d494256329670af1f4563502b44a8fc9633e29373e0
-EBUILD texlive-latexrecommended-2019.ebuild 2845 BLAKE2B d3d9e1ea33ccbd30c4033ecaf4b5bc99f1a3dd934dc1f6895299efc08604cbe6b25667b2e187e6b0de2febac0b10fa4d836d59689320cb921419e119c2a8682c SHA512 4de7766c5f500e419dde8af6aa5d13b38d9f581d0e76a40342e12dec737cb7db24ce390a04dc9fdd3fe5ef9c518e184cd0c87dc0e3ddb5ef06c4d8646ea77130
+EBUILD texlive-latexrecommended-2019-r2.ebuild 2892 BLAKE2B 2a57c5d793a61333cbcc06cabd4e9431f1bf30dd79c6d576ba36d287325cd4fc5fad3f33713cc33397ac41f89119a330bad2f6b75212ab826b13063561a4a378 SHA512 b6d8fda7d4bf8ded2718bbb41c37afbabcf0074dd08d7b35e8be898986324302793e9e0676ebbc07f54f422116ad4f6625ac77c8d921afc6bd921d49bd70408e
 MISC metadata.xml 493 BLAKE2B 2863d00d1b302441682fdc631273218535ce353c050c295b9f9f0fd133cd687a281e4cb634eeb58c89421dc9cecb3bf32e7816dfa2745e139a90f5760e7d0927 SHA512 815d4e8c1dee309cee3f6f0fc553903a7129a3fb9be6dd413e3c0b81f8924c82e8377b11eddeae17192b2451209ecc25d15dc19a925a58ec979c10f2342a6869
diff --git a/dev-texlive/texlive-latexrecommended/files/thumbpdf_invocation.patch b/dev-texlive/texlive-latexrecommended/files/thumbpdf_invocation.patch
deleted file mode 100644
index 94b8d03f1c73..000000000000
--- a/dev-texlive/texlive-latexrecommended/files/thumbpdf_invocation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: work/texmf-dist/scripts/thumbpdf/thumbpdf.pl
-===================================================================
---- work.orig/texmf-dist/scripts/thumbpdf/thumbpdf.pl
-+++ work/texmf-dist/scripts/thumbpdf/thumbpdf.pl
-@@ -1,7 +1,4 @@
--eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
--  if 0;
--use strict;
--$^W=1; # turn warning on
-+#!/usr/bin/perl -w
- #
- # thumbpdf.pl
- #
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild
index c105ff339700..0a18e4ea8690 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI="7"
 
-TEXLIVE_MODULE_CONTENTS="anysize  booktabs breqn caption cite cmap crop ctable eso-pic euenc euler etoolbox extsizes fancybox fancyref fancyvrb filehook float fontspec footnotehyper fp index jknapltx koma-script latexbug l3experimental l3kernel l3packages lineno listings lwarp mathspec mathtools mdwtools memoir metalogo microtype ms ntgclass parskip pdfpages polyglossia powerdot psfrag rcs sansmath section seminar sepnum setspace subfig textcase thumbpdf translator typehtml ucharcat underscore unicode-math  xkeyval xltxtra xunicode collection-latexrecommended
+TEXLIVE_MODULE_CONTENTS="anysize  booktabs breqn caption cite cmap crop ctable eso-pic euenc euler etoolbox extsizes fancybox fancyref fancyvrb filehook float fontspec footnotehyper fp index jknapltx koma-script latexbug l3experimental l3kernel l3packages lineno listings lwarp mathspec mathtools mdwtools memoir metalogo microtype ms ntgclass parskip pdfpages polyglossia powerdot psfrag rcs sansmath section seminar sepnum setspace subfig textcase thumbpdf translator typehtml ucharcat underscore unicode-math xcolor xkeyval xltxtra xunicode collection-latexrecommended
 "
-TEXLIVE_MODULE_DOC_CONTENTS="anysize.doc booktabs.doc breqn.doc caption.doc cite.doc cmap.doc crop.doc ctable.doc eso-pic.doc euenc.doc euler.doc etoolbox.doc extsizes.doc fancybox.doc fancyref.doc fancyvrb.doc filehook.doc float.doc fontspec.doc footnotehyper.doc fp.doc index.doc jknapltx.doc latexbug.doc l3experimental.doc l3kernel.doc l3packages.doc lineno.doc listings.doc lwarp.doc mathspec.doc mathtools.doc mdwtools.doc memoir.doc metalogo.doc microtype.doc ms.doc ntgclass.doc parskip.doc pdfpages.doc polyglossia.doc powerdot.doc psfrag.doc rcs.doc sansmath.doc section.doc seminar.doc sepnum.doc setspace.doc subfig.doc textcase.doc thumbpdf.doc translator.doc typehtml.doc ucharcat.doc underscore.doc unicode-math.doc xkeyval.doc xltxtra.doc xunicode.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="booktabs.source breqn.source caption.source crop.source ctable.source eso-pic.source euenc.source euler.source fancyref.source filehook.source float.source fontspec.source footnotehyper.source index.source latexbug.source l3experimental.source l3kernel.source l3packages.source lineno.source listings.source lwarp.source mathtools.source mdwtools.source memoir.source metalogo.source microtype.source ms.source ntgclass.source parskip.source pdfpages.source polyglossia.source powerdot.source psfrag.source rcs.source subfig.source textcase.source typehtml.source ucharcat.source unicode-math.source xkeyval.source xltxtra.source "
+TEXLIVE_MODULE_DOC_CONTENTS="anysize.doc booktabs.doc breqn.doc caption.doc cite.doc cmap.doc crop.doc ctable.doc eso-pic.doc euenc.doc euler.doc etoolbox.doc extsizes.doc fancybox.doc fancyref.doc fancyvrb.doc filehook.doc float.doc fontspec.doc footnotehyper.doc fp.doc index.doc jknapltx.doc latexbug.doc l3experimental.doc l3kernel.doc l3packages.doc lineno.doc listings.doc lwarp.doc mathspec.doc mathtools.doc mdwtools.doc memoir.doc metalogo.doc microtype.doc ms.doc ntgclass.doc parskip.doc pdfpages.doc polyglossia.doc powerdot.doc psfrag.doc rcs.doc sansmath.doc section.doc seminar.doc sepnum.doc setspace.doc subfig.doc textcase.doc thumbpdf.doc translator.doc typehtml.doc ucharcat.doc underscore.doc unicode-math.doc xcolor.doc xkeyval.doc xltxtra.doc xunicode.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="booktabs.source breqn.source caption.source crop.source ctable.source eso-pic.source euenc.source euler.source fancyref.source filehook.source float.source fontspec.source footnotehyper.source index.source latexbug.source l3experimental.source l3kernel.source l3packages.source lineno.source listings.source lwarp.source mathtools.source mdwtools.source memoir.source metalogo.source microtype.source ms.source ntgclass.source parskip.source pdfpages.source polyglossia.source powerdot.source psfrag.source rcs.source subfig.source textcase.source typehtml.source ucharcat.source unicode-math.source xcolor.source xkeyval.source xltxtra.source "
 inherit  texlive-module
 DESCRIPTION="TeXLive LaTeX recommended packages"
 
@@ -21,6 +21,7 @@ DEPEND=">=dev-texlive/texlive-latex-2019
 !dev-texlive/texlive-mathextra
 !=dev-texlive/texlive-luatex-2017*
 !=dev-texlive/texlive-latexextra-2017*
+!dev-tex/xcolor
 "
 RDEPEND="${DEPEND} "
 TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/thumbpdf/thumbpdf.pl texmf-dist/scripts/lwarp/lwarpmk.lua"