dev-texlive/texlive-formatsextra: merge passivetex/jadetex"

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>

2 files changed, 8 insertions, 3 deletions

diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index 1e09605f9106..ed6465862871 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
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r1.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
index 5eb1650fafbe..1669f26f8f0d 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r1.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI="7"
 
-TEXLIVE_MODULE_CONTENTS="edmac eplain  lollipop mltex psizzl startex texsis xmltex xmltexconfig aleph antomega lambda mxedruli omega omegaware otibet collection-formatsextra
+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 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 psizzl.source startex.source antomega.source otibet.source "
+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"
 
@@ -17,6 +17,7 @@ IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2020
 >=dev-texlive/texlive-latex-2020
 dev-texlive/texlive-xetex
+!app-text/jadetex
 !dev-tex/xmltex
 "
 RDEPEND="${DEPEND} "