gentoo resync : 25.08.2020

6 files changed, 32 insertions, 24 deletions

diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index ebcf08f7330d..dc0f2771cf13 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index b907fd929357..e7c35830ffcf 100644
--- a/dev-texlive/texlive-formatsextra/Manifest
+++ b/dev-texlive/texlive-formatsextra/Manifest
@@ -10,6 +10,9 @@ DIST tl-edmac.source-2020.tar.xz 952 BLAKE2B 8b442ec9f0d7df4a628af53d1e442731bd5
 DIST tl-eplain-2020.tar.xz 42148 BLAKE2B 6597fa8184925961e7ccfa8fd5e026944ff1b28a661489ad91ea7598e87dfc2e34bfa72369150a0c098c6acab449038c4a249987190dd06398d3d4ce80e5f2cd SHA512 28cfcf717d5d874cb277a0c3bd495cc54d10967f922e15306c3e1d33c3db21bd3f81c9bc0c00de9d6429f898c17da47618695d245783bdec245a498ffd9c952e
 DIST tl-eplain.doc-2020.tar.xz 982524 BLAKE2B 0ae43e119e858bcaacabd42168de231bb8e8c77cbd88cc970be2869a832a66da1ede3ada18b7aac1e6cd34043897cf1f2f50ffc4f5086177bb494b0bc2ee2ebf SHA512 80d23f132f19d2c17594b395633bcac19e0039fee094b89f772739210e477d9664739fd780cc5e01cf81aa0a5cf803ac19b81b74c2526e8de5cfe457fdfcdeda
 DIST tl-eplain.source-2020.tar.xz 396216 BLAKE2B 988076b40f799e3816c37f8e3e8606988baff1a0a2f21f90eadcdf2b579f9beece3e2a20d5393f935c08e359def9e52d1baac64b1935453d336349b2eb146522 SHA512 57a9a76e579afc4dc040ff95a1fa36d93beae7175a6d2615e8804361f3ba349893c46c50be84383c8e026236b5067d2c8de9338c3b9204c64f46643129a071ea
+DIST tl-jadetex-2020.tar.xz 29832 BLAKE2B 9521fb42eacc943af0499dff7df60c892621818b568d733f2a6aec516fd9007d5dc7b7a0ce9747c08021b3d0f6ad22d3b7485d80a9ec7b16201c9f044a7c5555 SHA512 2869febdacba1358ec5d4da7871e9b49d19d4ddc8c8222446060d478e2582f39117f4b43897ac9a28b61c79a0b7260f9734e8ae3594a5aaf5d08143abe9887f2
+DIST tl-jadetex.doc-2020.tar.xz 31788 BLAKE2B 3a022de72c8296e910a020bd9fbfaf64abe4040452b7e5fbc9762a515a4e3d32ff9f611ab8cefae1adb7685119cd5809a28db604eeaa46949b3c6e0948f0ca47 SHA512 1c53a83d95610dc767c71871ea041e2d8cb184a13982dfc4a1616110b8b271610980f30a76be15cead2127ee0f1343baa43e5690a6512e96f8704b0123812fe2
+DIST tl-jadetex.source-2020.tar.xz 19312 BLAKE2B a222bd8821d6ef5c118f939e582835806f3f24ae9c2c232836e0a99b2ab7799a2895e59b303de41e7303a0544b571323e386d469188f40dd0d0e3ac64444a355 SHA512 ce97d534155599a9c3b2a8201c8f5a5209279ccd1474f35f073bd12a1a8dc034ffb2993ad5b076b843e02afb08ab5025fd0138bede17ba5cae4fb40a524c222c
 DIST tl-lambda-2020.tar.xz 47360 BLAKE2B f19cd820468f27de6b179645e636c8843aa7a986386be0741c3616ca7996469a131900a63c53ea372b80f768401ebef2e48d3b52733b5c2c597e9b75eecc0a82 SHA512 54da97daf172e3dae434e75425b80d1c617ddc9991f6ee804cd812e2c4bd70b49eb1a01318e243c10998870877d4f76e084b5ef0b0eaa89afa66f77a124a7c02
 DIST tl-lollipop-2020.tar.xz 51304 BLAKE2B 67175e109c6bf22b4dab9d015e2a52182d8dc4dd332aa9c80c5d0130a04e0d747fd77633290ef6425613fd77a879179743be63f71ce58e368c55e0c682c17765 SHA512 81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78
 DIST tl-lollipop.doc-2020.tar.xz 341356 BLAKE2B b8d5363f151eca45bc01a05dba72b84903e0cf2f906b2bf32111415c84c879236360821e1d0ac726e9b99f4f609185d608411116130fcae0e7f3a578b64d7478 SHA512 206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86
@@ -24,6 +27,7 @@ DIST tl-omegaware.doc-2020.tar.xz 149076 BLAKE2B 7d163e912b3c2ea21cef1fadc55039f
 DIST tl-otibet-2020.tar.xz 96688 BLAKE2B b6f892a66254988d3297c2fdf941eea9c25442dc32e2bbbf3a56b6b297c1d0992efbf0750de1170e1502613b547c90f7f26499ec518cbde2c8b25b9e4a7fac14 SHA512 8fdc06f22bc9d25b61cb7b3b151919b7d2d6cf3d78f3cfe5a11284d9246acb858410ccab56996cd521eb98518be9c232a4c8e0f8ebbe52d7e93c510e3a0ac070
 DIST tl-otibet.doc-2020.tar.xz 21248 BLAKE2B ed29a5352b67ad937a9765d7966f55a6eab67b7236609b9204e9630886611b345a52e8886f796a74211e0cfa23dda523a85e684b088c8a4f805e4922c21d5d39 SHA512 96f9d64c8f668f67afe20dad97d1cd3cfec19df3300204831fbfe0d245c1e15d8d0cea48bb94fb002cfa18db45d3ade730848908b0d77b867fff7557b0fb826f
 DIST tl-otibet.source-2020.tar.xz 19456 BLAKE2B 836a015c23f81912809f626667a29314a0689cfeceac5b4c8b365621381a921f5a8ab6b45de450b95f930b1c076668048570fd9c729eb99b5287887ca6a6326b SHA512 4b51b49e3d3a802a3a19aea604a63f1e9503f7d9d86c81200dc5e2f2051b06e184add9292321f4895905a07595de6771eeda2463ae0c1b096a98f2d2fd210721
+DIST tl-passivetex-2020.tar.xz 44652 BLAKE2B 24ca08029392e6987ae7e6ad50ecc9084a38a24985eb7c6e760f39685789170d07d86ea03e4fc481933ea8c12a9c775f1c5dad811d7a44c958102487b36d4d1d SHA512 dec61bb52bc1bf8588474e6d8971ca16f691d13b9c1be1f131cf0a720a205df1a95830f2f172df2efc30799d4aff9af064f9d851d9c705235aaf96e4b50decdd
 DIST tl-psizzl-2020.tar.xz 23084 BLAKE2B e670a271f9084374c30e533a26492a86bec87c2b2e91f3e7deb6be8066f345b6afbac3b75e188ab45f347b1fe750a466e9f474cf399cf16e74d75cdabd2cd694 SHA512 adcd254a9991839c623b3f75098276dc26df935db1528d39f8588681b87237febe81f8289aab747486df92bc9af2103638734fc22c43ace8cdea1733d2a66360
 DIST tl-psizzl.doc-2020.tar.xz 5448 BLAKE2B 2cd318bdd169a57584359afcd90f2fb48291f4b471eb272b2e74fa56648b5b0e475cd0c3c0379caa6e8505d95196335e09ff951c79d6c19cfc7eea80b4ddf18c SHA512 e9d65b3b0c364fcc7632ab83974d8685568d4135cbd8568cbf69e9162dbb80283724ada72891a72dce2fabe35d846c6f09b05f1123f8fe72ae749215170ee996
 DIST tl-psizzl.source-2020.tar.xz 640 BLAKE2B 5482b881ab5b7e804b20d04ef3630ca2a0ade016f6da1764909de0c8ead3fc95ecdd11d06185049d5c66807687bf6c37106d78a6617db9a4dfbb1b9fa3fb3d30 SHA512 fabcb5343912bf005f5ad73b2ff9444172ad6f36fe42ec492903ed6d19d3c2b67775790b15cb37a688d9c0b8d78145963f8594b67e91d07284adb5d26cd2ea52
@@ -32,6 +36,8 @@ DIST tl-startex.doc-2020.tar.xz 511988 BLAKE2B 56f1c6af0805f36da321118b350820297
 DIST tl-startex.source-2020.tar.xz 25196 BLAKE2B e0c85e108a7974cffa665e26431df676c1bb91e0c4f35ac539c13c3b2341465ca2563427d59e6e87c088151f576ddb314f2e9c389229f19461c9784a83397cf8 SHA512 af1bdf22db048334823bdd18fd87fd8729c0bb4cb729ee53271f7e0b9ec4cea243840657e1a8ebba61728755d022d37495ef40f9962ce8e203d402b71d2d45cd
 DIST tl-texsis-2020.tar.xz 111124 BLAKE2B 25d2efbbded73835b9a59ee8a2c3cd3e1f3e03835f262dafd6bafca072cca92b7961eecf6d6593dce9c3b7a1669fe7c502fc26e33793ba27f8eea9e9a18b5616 SHA512 7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e
 DIST tl-texsis.doc-2020.tar.xz 130016 BLAKE2B 3eaea8f7da61ce56cb3867ba821a9c47c79aec556e4ea5f49e4928b77598a0467a55f09fc79810df1bd182d66e37dee00498b3a97186546cf7943827480127f9 SHA512 2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90
+DIST tl-xmltex-2020.tar.xz 18236 BLAKE2B 5638c55a49aa50ae5b748575c4b24460a866c4a5c5175629c69a5ce7c8ac4e6796dab8be5ba5750431930475c888647f26bfdca381148889c7a0bf5481a5a19f SHA512 0fd2ab53c983706e42c33804e886f20956a08410e0e32976fb956cecf224c9ed397cb7ceb8aa9b717e3459084d597d715363752a346322f9c04e16acc86c9e46
+DIST tl-xmltex.doc-2020.tar.xz 17004 BLAKE2B 9ff482a5d8e793702253a9693598a1f3149bdf5bc5fe7f46b98d5246220fbffc0e395c0b17ef938f124e9624a745b97b5b346e750777ffbc2d3e02f72973a7da SHA512 51f8a23a2f59a079909d580a8587d1a403bc0fc75b13adda212cca8fb9f58d8f19debbf53783eada1e80389d8556b742f62f575712eb5fa15f90e4c9933ede8c
 DIST tl-xmltexconfig-2020.tar.xz 488 BLAKE2B 74992dea02ef50bac91256980c919df27a313a5d35fb41faa9847d19465d91a22faae30444d818bc78a5a7c16e63474dad5ab083695786dc9f75a52eea39c7c0 SHA512 2620dde42acffee6561f406527794cc62d87c1104135da846b7cd3c7f4109c4d1986d562ea612f2b5246e1863eff86795c4789075f8475d45de00763cfb539fc
-EBUILD texlive-formatsextra-2020.ebuild 1020 BLAKE2B 8c4e49e1b3d1fb37a078a5abcdf65099c0a15d23156a6f98351ecaecf2a7621098bcfa0d4513c00da9a0181a9723ef23c76a5ea3cbd59aab6e43bd5c5038b0af SHA512 d2b6da81b2bbfc201931608b87db648f99b1aec9f4aad4f7985f9e357ddfa26b916221115095ef8f2ef0a7289950083d346ea955254e5f984fb3225ea7f2eaf7
+EBUILD texlive-formatsextra-2020-r2.ebuild 1115 BLAKE2B d401a22bef33b2fbda9587e920e3162599dca5c92b9012103f5b357738bc7f88fc462e9a513275033c1164ff7a7c731fc901c94ee86b2cda70f77b3282059e80 SHA512 0a7da15e9ad7e2504252796820a91c39b4cdb2b64b9100364cbec253e50180a80d07889d684a3836bda06b1bb1175d591edaa2ea15c7562115e6ff1238185451
 MISC metadata.xml 683 BLAKE2B d76a08b76354e21ad30a29835dc19c8c280313b330106276ff74f9221265472565ae8dc5582cab4963450482513f48a281af0adf7e2ebaa9adc7de2a14274975 SHA512 044d70fc0c48a776f9d169e0c5abd41c29ffc2508f05c175f301833cbc64f39f841effa2dab8a3b8c7ca94d487c25f3412593d3b173914c826874236e66db556
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
new file mode 100644
index 000000000000..5a5ffa5103e4
--- /dev/null
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TEXLIVE_MODULE_CONTENTS="edmac eplain jadetex lollipop mltex psizzl startex texsis xmltex xmltexconfig aleph antomega lambda mxedruli omega omegaware otibet passivetex collection-formatsextra
+"
+TEXLIVE_MODULE_DOC_CONTENTS="edmac.doc eplain.doc jadetex.doc lollipop.doc mltex.doc psizzl.doc startex.doc texsis.doc aleph.doc antomega.doc mxedruli.doc omega.doc omegaware.doc otibet.doc xmltex.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="edmac.source eplain.source jadetex.source psizzl.source startex.source antomega.source otibet.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive Additional formats"
+
+LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
+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=""
+DEPEND=">=dev-texlive/texlive-basic-2020
+>=dev-texlive/texlive-latex-2020
+dev-texlive/texlive-xetex
+!app-text/jadetex
+!dev-tex/xmltex
+"
+RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020.ebuild
deleted file mode 100644
index 1c6e6051ec03..000000000000
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-TEXLIVE_MODULE_CONTENTS="edmac eplain  lollipop mltex psizzl startex texsis  xmltexconfig aleph antomega lambda mxedruli omega omegaware otibet collection-formatsextra
-"
-TEXLIVE_MODULE_DOC_CONTENTS="edmac.doc eplain.doc lollipop.doc mltex.doc psizzl.doc startex.doc texsis.doc aleph.doc antomega.doc mxedruli.doc omega.doc omegaware.doc otibet.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="edmac.source eplain.source psizzl.source startex.source antomega.source otibet.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Additional formats"
-
-LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
-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=""
-DEPEND=">=dev-texlive/texlive-basic-2020
->=dev-texlive/texlive-latex-2020
-dev-texlive/texlive-xetex
-"
-RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index b7f15cc4b322..e1fe79b3e6f0 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -3365,5 +3365,5 @@ DIST tl-zwgetfdate-2020.tar.xz 1384 BLAKE2B 66eb7b908d42263478e92ba65da89482110d
 DIST tl-zwgetfdate.doc-2020.tar.xz 246032 BLAKE2B bcd8426a8fbc14f895243e70ae9b570d03a2854f68222cfd52f01d2d063136ff40a847343a8d932db2ebb0ce64f018ff2d82060e747f4bfa4d4393faacf9f7b6 SHA512 7ab61dc4252ef7f60d1d5be8d4415bcaeaed194384a1da14a3400617b36c6efae3679dbbd6c8d64b8cc9f9947babe88c064d637379f663408cbe63ca42334bfb
 DIST tl-zwpagelayout-2020.tar.xz 8880 BLAKE2B 566315ec2e12e47b766a77ec8c98259cfbb3f717493704050ee76bfcb6ebb0756590632ee5ef1b4446b1b89cf00ebaef8a38bb053151398be8704b601d706542 SHA512 b960d63e610cf28ff74d7ade9c297d1c6d23a801eaea2b4f9fde71a3b77defe43ea5625c098ded915b8c011cc0041177d3e4c3fb28359b522af63214accd362f
 DIST tl-zwpagelayout.doc-2020.tar.xz 635808 BLAKE2B 5827aeab15882c2c20d065595aedb248dbece1f717898c23776e17482074a292e8f5a8de9741634eed931205cb18d9d50fa4490759a559d1309f4f213046dee6 SHA512 16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817
-EBUILD texlive-latexextra-2020-r2.ebuild 44713 BLAKE2B c1f6c9fb27a2c4a19ae904057a12f978261b5a6e2d8ceb9e933e4e48652fb934cd6ef17a2249e377d67af21ca7ae63c506be5f26db8495106575e5cee2f4bea0 SHA512 0f5bb17a169901096b75509a508094c090c38060350438e202edc351ae20eb1330953374f474cfc63d9dbf56ae2077ad49acbb16d3a12564876fa8453aa09632
+EBUILD texlive-latexextra-2020-r2.ebuild 44698 BLAKE2B 051a1fc591803d03141a4347df228ebd2cdcf4ca3389ca391000ff5f250e6130cb0e1f46a80a949d2b8ac4a7f6f73c5837faff2abeb47986de290ea84d32697e SHA512 e7820677bede6f6ccd511d3e77c289024818b77486fa50a5f6546e9ce2647f6573f4ce367677e4243785ccd92bdcbfb2b0fc254cd9c130bb7023b27429e12c3b
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
index 8a1040034261..f615f068f06b 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LPPL-1.3 "
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2020
 >=dev-texlive/texlive-pictures-2020