commit: 7b74a7ff0a0941e59f1d75c4363c9ccc612741b4 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Fri Mar 8 09:46:58 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Mar 8 09:51:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b74a7ff
texlive: move xindy and texdoctk from binextra into texlive-core xindy is enabled via texlive-core[xindy], causing collisions with xindy in binextra. Same goes for texdoctk, which is enabled via texlive-core[tk]. Bug: https://bugs.gentoo.org/836779 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> app-text/texlive-core/Manifest | 4 ++++ .../{texlive-core-2023-r3.ebuild => texlive-core-2023-r4.ebuild} | 9 +++++++++ dev-texlive/texlive-binextra/Manifest | 4 ---- ...3_p69527-r1.ebuild => texlive-binextra-2023_p69527-r2.ebuild} | 4 ---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest index fd3be303db94..b699c8e6db21 100644 --- a/app-text/texlive-core/Manifest +++ b/app-text/texlive-core/Manifest @@ -29,6 +29,8 @@ DIST makeindex.doc.r62517.tar.xz 466380 BLAKE2B a192f04417e76a387c9dec2170570491 DIST makeindex.r62517.tar.xz 4608 BLAKE2B d86957d1598cdd16025d43cca88547893824ef9bce3f75190874de40949ec0995db039b42d38b4514fd256feb6f3dd4352357de84c0d9a087aa48d0f7d17ca29 SHA512 5967ba4123fd4c708ce841d29211fdb66c28518f4b418903be0ddf2a49964f706af96b250eec814c547e0703460c1273ce72a7acf3ea9fe28cc1c7073af29d3c DIST pmx.doc.r65926.tar.xz 636768 BLAKE2B 5b499d950581b5b6ca1e27aa54dbe1e324d4462999f9a8f52c314c9a4827183079dbc0d945542d304621ad94aca3f7f4cfdcb985e40c7be00c7fdff8fb95825a SHA512 dedba4570b68a8628442716dc3a9b1699e5f531aef2737e4b3f47862a91ba69bda91d6fe6692914d2bd7b8fe3188a83fdfce8bdd219ab7c4f238a9c6ec273ffb DIST pmx.r65926.tar.xz 10184 BLAKE2B 550140955d4033c258c7793c56846d8a0d235fcb2def0469f9b0ca5189eea4c3ba569fc3e7002bafe57f0bb7fbb9738debd7b1d867cfaf32493b3558f0a3ed97 SHA512 433287732fbb2cb47886c6c78c923d5b6a1b5c1e71e3990084cde9bb288a282fff7fb9134a5165e0fc0908b8e60547e23cb900bc82b99717133d7600fa17dc31 +DIST texdoctk.doc.r62186.tar.xz 30728 BLAKE2B 4878654c60e2fb3a1415f492894a3d956d86cdd6f8ebc337e4ec928a55ccd2b8c202a3c06b3c8687530a505f45e740eb33005e2cd4c2f65aa68ec77e3990ed31 SHA512 fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba +DIST texdoctk.r62186.tar.xz 26712 BLAKE2B 4076b8b227dc08762cd7880165fd4b1780f3ed34e0ba68b1b04ce542efd47aefc3f893d71da7dbc8122ebb45107480974da0631f16f849d2990a14cd2db74ce6 SHA512 f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96 DIST texlive-core-2021-CVE-2023-32700.patch.xz 8824 BLAKE2B 5df988abb12626210b372618cc0a623ed2f6f42cf2f03dca143f94b928fc0fd2e28e53574c9ca23295f55fb56cd908a3e8603161fa3f13c37b9397163479aa9f SHA512 16d34b5b0cc1b85ec412798caa582f71b15c2d57bb486064c5fb48304eea32a13f69677c228c82c88e026ba5885acd201449ec69bc6c7bf9396eebb3d1358717 @@ -238,5 +240,7 @@ DIST velthuis.doc.r66186.tar.xz 979936 BLAKE2B e1ac5b3bc747b17c5ab39e89d7f1634ac DIST velthuis.r66186.tar.xz 4149432 BLAKE2B 84e6a6c390e5e2f4082229d688761596880f8115531587df7ac637c6eb53090e035e758d0cde60ba30559d856df2108637d19c8282279d5d95a28dd3e950b635 SHA512 b7901813517790a92a921b1202c39a058d53a4159634cae79960ec7ce2da08acb757b307b5066ab1251e4b460234fd9dd98c2e404c05fc6384c656472302e3ec DIST vlna.doc.r66186.tar.xz 142752 BLAKE2B 2a7a5aa68e189e8297c0bb714ae80ef33b765de542626f5800dc1ef87dc8e66a613eb055ece652124c340b159ec7a317d2d3a44bb2c8e01187b9b9d5392b5a25 SHA512 921d76535cbe7e940617355c74b82acfc61edb840db8ed9cae1aaf987fe6b83245505048c7c550d59829b204f139ae1cfd44601435e2fff2b0d5230b45a27b77 DIST vlna.r66186.tar.xz 380 BLAKE2B 91840e28251f06b724eb5860c853d54db9cc0ce0063b911d7c28d24e1b7bc863bec0eaf7f595e666938d8c2a54c2438d52d086fc5c8b70ebf20f3998d0258381 SHA512 6c66717442bca3306e23f5d546e17929240ce9626a562b9e56512446998996d38f83f78fbb39e46bde0b9faf0db7eb0c0218c79e1d66711d6cd3c64a8778edec +DIST xindy.doc.r65958.tar.xz 461176 BLAKE2B 417d49c0fbc35ea5e24146894284cd2ec9109271570f49aca90352d2d38969ee60b934134babe8107161e2f2975d91787f321b805dded6eae96add1e5ebfa9dc SHA512 d0dacd7cfa169b03b7fa9d0b351133582577c3908323f501d7bca7b0165159b72c34f62abfd73b97065baef8cf179b292e654759f3b3e324112623539e5acfd6 +DIST xindy.r65958.tar.xz 143636 BLAKE2B 72c6f4a78e77d3a348c4666dd8e322b446b7dd6d418c1f9880ea2508e274878d3f2a992e5876fb410ab4c39d7f317a6b236afc65c5486d04dbe0838c0a07eca4 SHA512 9b7fe97c14e3cf30d1e6743c2d7b4460e8bca901ba3ee216001f1518ff4d834fb3d9b67085825a6e152c6acde544c41cf16d56e609016caab89a594305a21599 DIST xml2pmx.doc.r57972.tar.xz 15512 BLAKE2B dafe9dabe542a746a962a02fd04a483181544afd319b501ea0f4b0c74ce9d049840c65fa5e7e497571ae04c409b8c3cb11815f0dbfff4c8c3ae01a3e639f6ca8 SHA512 973960f65159f5107caa7e9a041dca75f0171fc61f94794c7b7560eb9b6898534974fb8b360a28dfa3a01d422b71618bcaf8aba2ed25ae4d4b9f67d24ab730be DIST xml2pmx.r57972.tar.xz 496 BLAKE2B 52d22c6616dc74d3e6600ef18449af31b2c286be9fe0bcacdffa2daa260f409baf8c7af1ce8444486b2fe3e21a05ec22aed280a55f227a1693b27ff3c55eed8b SHA512 9545fb5ca0e95788afab79d8a29336f337619adbcac68472bb5de6af6c54187f19bda655232175223168891c064f6fadc67c4ab8f5a0256e2c55e1a65c5e6f6b diff --git a/app-text/texlive-core/texlive-core-2023-r3.ebuild b/app-text/texlive-core/texlive-core-2023-r4.ebuild similarity index 98% rename from app-text/texlive-core/texlive-core-2023-r3.ebuild rename to app-text/texlive-core/texlive-core-2023-r4.ebuild index 634b0b626b9c..5b88b4fbd447 100644 --- a/app-text/texlive-core/texlive-core-2023-r3.ebuild +++ b/app-text/texlive-core/texlive-core-2023-r4.ebuild @@ -38,6 +38,7 @@ TL_CORE_EXTRA_CONTENTS=" m-tx.r64182 makeindex.r62517 pmx.r65926 + texdoctk.r62186 texlive-scripts.r69754 texlive-scripts-extra.r62517 texlive.infra.r69740 @@ -45,6 +46,7 @@ TL_CORE_EXTRA_CONTENTS=" upmendex.r66381 velthuis.r66186 vlna.r66186 + xindy.r65958 xml2pmx.r57972 " TL_CORE_EXTRA_DOC_CONTENTS=" @@ -62,6 +64,7 @@ TL_CORE_EXTRA_DOC_CONTENTS=" m-tx.doc.r64182 makeindex.doc.r62517 pmx.doc.r65926 + texdoctk.doc.r62186 texlive-scripts.doc.r69754 texlive-scripts-extra.doc.r62517 texlive.infra.doc.r69740 @@ -69,6 +72,7 @@ TL_CORE_EXTRA_DOC_CONTENTS=" upmendex.doc.r66381 velthuis.doc.r66186 vlna.doc.r66186 + xindy.doc.r65958 xml2pmx.doc.r57972 " TL_CORE_EXTRA_SRC_CONTENTS=" @@ -418,6 +422,11 @@ src_install() { rm "${ED}/usr/bin/"{,u}ptex || die fi + if ! use xindy; then + rm -rf "${ED}{TEXMF_PATH}"/{,scripts,doc}/xindy + rm "${ED}"/usr/share/tlpkg/tlpobj/xindy.* || die + fi + dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} dodir "/usr/bin" diff --git a/dev-texlive/texlive-binextra/Manifest b/dev-texlive/texlive-binextra/Manifest index b1c7325c85fd..33a6df6a8df4 100644 --- a/dev-texlive/texlive-binextra/Manifest +++ b/dev-texlive/texlive-binextra/Manifest @@ -159,8 +159,6 @@ DIST texdirflatten.doc.r55064.tar.xz 11016 BLAKE2B e48d4b9da81e21a574c203ac8cc21 DIST texdirflatten.r55064.tar.xz 4836 BLAKE2B b3f57b0921471a8c41564129f39c0eb6d4d6f898e9279c96de90d22fc52c5d5d34ad37c0abe14e30dc264e0e6396e4dec0f62e74d45c147cd1eabe0f647c7f4a SHA512 3cd6cf4d9ff3a1a3daef0bd5a998417696f6645cb54679e99e5424ebbe3926c45acad7b999ee4371392a7ba13fe3f2899438ce66efca7829c7aa1eaef84aa6e5 DIST texdoc.doc.r69672.tar.xz 140724 BLAKE2B a2ffc507f3744e629909477960a9dcefebb23cc473e6aa8951e4280189062e37eb57959d48e8e251380f97f4475a9d180f413a978c4c24f9a04961697c956573 SHA512 ff22900ed4674e4eba80fcbe28c7d4d9eade4a671e04f6854eaddecf5d690751a3b5dc300024ed5da610c1b14017fa6633e86bb0b071b699ce512045180330d5 DIST texdoc.r69672.tar.xz 29860 BLAKE2B 191c085aa63aa1a8c40beb7232c20488ca1635df9ccbec52341e59f1e1357e25541f7e8e58a3711d77ca15b86aa89776f77aed7f164d4488167a26b5dccc1f37 SHA512 523fe734969fd9553221825d5722c7606bc2312c5134a1718f1651044c753906a3e095c56c09c0d6e533379e13602e5a99ad8d14e33e8f40a9b8232d068020df -DIST texdoctk.doc.r62186.tar.xz 30728 BLAKE2B 4878654c60e2fb3a1415f492894a3d956d86cdd6f8ebc337e4ec928a55ccd2b8c202a3c06b3c8687530a505f45e740eb33005e2cd4c2f65aa68ec77e3990ed31 SHA512 fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba -DIST texdoctk.r62186.tar.xz 26712 BLAKE2B 4076b8b227dc08762cd7880165fd4b1780f3ed34e0ba68b1b04ce542efd47aefc3f893d71da7dbc8122ebb45107480974da0631f16f849d2990a14cd2db74ce6 SHA512 f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe DIST texfot.doc.r68110.tar.xz 35164 BLAKE2B 47f10b3bb639330c3517392ed19469fb36280bffd786792cc6c4b608c92c61a091b1c6143f707d4be09d46aa4dda48f928cc4cf1811ebbc487ca7e5eb677b58a SHA512 d652523552ad401598c68227b3e0e11c84261a3a243afc731f54892fc971c8f22e74bb58b6eb45ac15f70c8789e5a4a9c4dfca81a3dc304762ab97c8bc74e3c4 DIST texfot.r68110.tar.xz 6936 BLAKE2B 1104fc5319d2dd5b71eee5f8e6e0a79edc4ad40215253591828b3fcc36cda0c7e538eb1751bc790994332b882af8e5618b0d908a6bb079e04370a3be2a296156 SHA512 0886ab706ce0f18b0eab304afa1d570fd55b57bc02c8b3b1aacde77c73ee260f688bd395b2e362cb998cc1aa9a2d1e228b118f5234eb9c40ce867a97d86f4ac9 DIST texliveonfly.doc.r55777.tar.xz 700 BLAKE2B 7cd2a7e87773157ebee19a01792735176c50e7b965ddc7bdacdd1c740bf7bb10308b956e0f833e9f05f8c7b3eeb28313efc3c7cb926346dbefa2c343a8b5472a SHA512 46d57a6ebd68a56d55ccddc68006693fcbad8ed8f809243a3ffac7adb82da58cbc28239b57556d5d8d6388ea034b6571557588ff9365d4891145d5cc3fabfaea @@ -190,7 +188,5 @@ DIST web.doc.r66186.tar.xz 42388 BLAKE2B c1cfca0c0ee7ed5493aecae33f17c54e512621b DIST web.r66186.tar.xz 500 BLAKE2B 8f0b0f09404fca5eda7b7b49da31dd4adbf23db5cdbdbcf5477674d05eb901943fd98a307222127dccc0b5fb32957a3ef8b5f8fb4d4dcba5aee68234646e843c SHA512 cc8b2b6525ef1ee49162dc157e8d735225f5fc3bee54e56ac01ad47f85f639e4c43b4409e949d68804e650e243da0a8a6d098ca7c37587f14c810112cc82abee DIST xindex.doc.r67771.tar.xz 608088 BLAKE2B 21e0fc9e6e17987688048afe2e6b2081006725b1b6a8d92d17912c763afd69aecfbe3799fca14d75e230da5d4749c078d546dce68b79c8093d1656672720e034 SHA512 ec93cf3bb639326dc6905be018481da8438ebc5558e4c161419910e1a4427f6f7bb7bbf35ac779ea6769b6c009f9b6bf657b78c7c42bf7100725e8cc6252c975 DIST xindex.r67771.tar.xz 36356 BLAKE2B eb8b918aa0edf67340089073963ff275ee608112a0f2ab72c647114e2800f3c92efd4e732b3c42e75c4eb12324a7e85a1bf855d72100bbd7d6a0daa7f3d16283 SHA512 bf812f7ea5f981969b1963f470a0006c4afd937ab27f6b40f7897dc2b6ddd1a0ae60f347b8ed13483ec4fd9feccff257a79dd7b8a2720be1d49a40fe2b325fc6 -DIST xindy.doc.r65958.tar.xz 461176 BLAKE2B 417d49c0fbc35ea5e24146894284cd2ec9109271570f49aca90352d2d38969ee60b934134babe8107161e2f2975d91787f321b805dded6eae96add1e5ebfa9dc SHA512 d0dacd7cfa169b03b7fa9d0b351133582577c3908323f501d7bca7b0165159b72c34f62abfd73b97065baef8cf179b292e654759f3b3e324112623539e5acfd6 -DIST xindy.r65958.tar.xz 143636 BLAKE2B 72c6f4a78e77d3a348c4666dd8e322b446b7dd6d418c1f9880ea2508e274878d3f2a992e5876fb410ab4c39d7f317a6b236afc65c5486d04dbe0838c0a07eca4 SHA512 9b7fe97c14e3cf30d1e6743c2d7b4460e8bca901ba3ee216001f1518ff4d834fb3d9b67085825a6e152c6acde544c41cf16d56e609016caab89a594305a21599 DIST xpdfopen.doc.r65952.tar.xz 28176 BLAKE2B c7e92d0ee94574c752a26613ede400c8e6762f1491fc8c2498239df59c5431bad725c35d05c78e12cca5a6b9d8d841e6ecf448b0790898639539d3f3773c46a0 SHA512 b4f332054a5fe85c9404a05673b373ac2b1275b79a1f0b57061cda614350df230dba60ed3be590e0688840334a113ce5c64847c1dc4e6ebae6cc29524c1f6bd5 DIST xpdfopen.r65952.tar.xz 556 BLAKE2B c5a23476975e3299dbf09259572777f1a8be429cc4b22af9d6c3998275029521758d73c123ef088fdbfb3a8ec748d03ae952bce3f339a1ba3b25212be7e875e2 SHA512 927b6a17422a3573efef6767f4835492df27764bc7fe729ed2697665d5fca697fe1a76e141ff30d5cb483bb4ef8e2021ecf2476c5bdf83ebc5dc6e7778b70765 diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r1.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r2.ebuild similarity index 99% rename from dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r1.ebuild rename to dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r2.ebuild index 7eeb62ed2dde..8728574f73af 100644 --- a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r1.ebuild +++ b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r2.ebuild @@ -79,7 +79,6 @@ TEXLIVE_MODULE_CONTENTS=" texdiff.r29752 texdirflatten.r55064 texdoc.r69672 - texdoctk.r62186 texfot.r68110 texliveonfly.r55777 texloganalyser.r54526 @@ -93,7 +92,6 @@ TEXLIVE_MODULE_CONTENTS=" typeoutfileinfo.r67526 web.r66186 xindex.r67771 - xindy.r65958 xpdfopen.r65952 " TEXLIVE_MODULE_DOC_CONTENTS=" @@ -172,7 +170,6 @@ TEXLIVE_MODULE_DOC_CONTENTS=" texdiff.doc.r29752 texdirflatten.doc.r55064 texdoc.doc.r69672 - texdoctk.doc.r62186 texfot.doc.r68110 texliveonfly.doc.r55777 texloganalyser.doc.r54526 @@ -186,7 +183,6 @@ TEXLIVE_MODULE_DOC_CONTENTS=" typeoutfileinfo.doc.r67526 web.doc.r66186 xindex.doc.r67771 - xindy.doc.r65958 xpdfopen.doc.r65952 " TEXLIVE_MODULE_SRC_CONTENTS="
