commit: 2cdb8878605e7db482ea873cb23ac51282022a02
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 08:43:23 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 08:43:23 2024 +0000
URL: https://gitweb.gentoo.org/proj/tex-overlay.git/commit/?id=2cdb8878
app-text/texlive-core: sync with ::gentoo
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-text/texlive-core/Manifest | 4 ++
app-text/texlive-core/texlive-core-2023-r2.ebuild | 10 ++++-
...-2023-r2.ebuild => texlive-core-2023-r6.ebuild} | 45 ++++++++++++++++++----
3 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 9484ef4..02aecd9 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-20230311-source.tar.xz 68359984 BLAKE2B
6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035
SHA512
93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
DIST texlive-scripts-extra.doc.r62517.tar.xz 197196 BLAKE2B
80d2fd7b53ffbe21f975156cf0d5f52826faebc422d3e66c342c8237d7da27ba58b1ffc56f83a040ae4b4e870c8063c0d53392f9cc7e3bb3da30ebe5a258a40a
SHA512
22cf59bf4dafc7ad9425086bc0aaedb2bf5f7d8aa6ea9c65abde2d523be37665b9c9bee4acb399857eae03613e7241ca1d6099f43cab77a95c10eced8813ad80
DIST texlive-scripts-extra.r62517.tar.xz 23540 BLAKE2B
85762b7a74f5132ec550033e08caef5f6fd145ef367475a1b3ebaccfefdcfb426f2e12e647e45a35daa2a44cf0c2fba8d6ed8afec88ed6fccee0cf7eb52c2c50
SHA512
46ac37826d3c60de6c9260bf83d6275d49a35cbde88fb03481a050f92e87b698e9a94b2e520a74edc0417419f5a2dee53000a529b9c81ea6f6244a83480e56e7
@@ -44,5 +46,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-r2.ebuild
b/app-text/texlive-core/texlive-core-2023-r2.ebuild
index 829ec0c..906d98f 100644
--- a/app-text/texlive-core/texlive-core-2023-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2023-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
"
# Macros that are not a part of texlive-sources or or pulled in from
collection-binextra
-# but still needed for other packages during installation
+# but still needed for other packages during installation.
TL_CORE_EXTRA_CONTENTS="
autosp.r58211
axodraw2.r58155
@@ -45,6 +45,7 @@ TL_CORE_EXTRA_CONTENTS="
upmendex.r66381
velthuis.r66186
vlna.r66186
+ xindy.r65958
xml2pmx.r57972
"
TL_CORE_EXTRA_DOC_CONTENTS="
@@ -69,6 +70,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="
@@ -417,6 +419,10 @@ src_install() {
rm "${ED}/usr/bin/"{,u}ptex || die
+ if ! use xindy; then
+ rm -rf "${ED}{TEXMF_PATH}"/{,scripts,doc}/xindy
+ fi
+
dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
dodir "/usr/bin"
@@ -427,7 +433,7 @@ src_install() {
done
# https://bugs.gentoo.org/832139
- rm "${ED}"/usr/bin/tlmgr || die
+ rm "${ED}"/usr/bin/tlmgr || die
texlive-common_handle_config_files
diff --git a/app-text/texlive-core/texlive-core-2023-r2.ebuild
b/app-text/texlive-core/texlive-core-2023-r6.ebuild
similarity index 91%
copy from app-text/texlive-core/texlive-core-2023-r2.ebuild
copy to app-text/texlive-core/texlive-core-2023-r6.ebuild
index 829ec0c..4c3cc6a 100644
--- a/app-text/texlive-core/texlive-core-2023-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2023-r6.ebuild
@@ -12,7 +12,6 @@ DESCRIPTION="A complete TeX distribution"
HOMEPAGE="https://tug.org/texlive/";
SLOT="0"
LICENSE="BSD GPL-1 GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
-RESTRICT="mirror"
GENTOO_TEX_PATCHES_NUM=3
SRC_URI="
https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz
@@ -21,7 +20,7 @@ SRC_URI="
"
# Macros that are not a part of texlive-sources or or pulled in from
collection-binextra
-# but still needed for other packages during installation
+# but still needed for other packages during installation.
TL_CORE_EXTRA_CONTENTS="
autosp.r58211
axodraw2.r58155
@@ -38,6 +37,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 +45,7 @@ TL_CORE_EXTRA_CONTENTS="
upmendex.r66381
velthuis.r66186
vlna.r66186
+ xindy.r65958
xml2pmx.r57972
"
TL_CORE_EXTRA_DOC_CONTENTS="
@@ -62,6 +63,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 +71,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="
@@ -169,6 +172,7 @@ DEPEND="
${COMMON_DEPEND}
"
+# !<dev-texlive/texlive-langother-2023 see https://bugs.gentoo.org/928307
RDEPEND="
${COMMON_DEPEND}
virtual/perl-Getopt-Long
@@ -180,6 +184,9 @@ RDEPEND="
dev-lang/tk
dev-perl/Tk
)
+ !<dev-texlive/texlive-basic-2023
+ !<dev-texlive/texlive-mathscience-2023
+ !<dev-texlive/texlive-langother-2023
"
S="${WORKDIR}/${MY_P}"
@@ -209,8 +216,9 @@ src_prepare() {
cd "${S}" || die
+ TL_KPATHSEA_INCLUDES=$($(tc-getPKG_CONFIG) kpathsea
--variable=includedir || die "failed to invoke pkg-config")
sed -i \
- -e "s,/usr/include /usr/local/include.*echo
\$KPATHSEA_INCLUDES.*,$(pkg-config kpathsea --variable=includedir)\"," \
+ -e "s,/usr/include /usr/local/include.*echo
\$KPATHSEA_INCLUDES.*,${TL_KPATHSEA_INCLUDES}\"," \
texk/web2c/configure || die
local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}"
@@ -219,9 +227,18 @@ src_prepare() {
default
elibtoolize
+
+ # Drop this once cairo's autoconf patches are gone. See
+ # https://bugs.gentoo.org/927714#c4 and https://bugs.gentoo.org/853121.
+ "${S}"/reautoconf libs/cairo || die
}
src_configure() {
+ # TODO: report upstream
+ # bug #915223
+ append-flags -fno-strict-aliasing
+ filter-lto
+
# It fails on alpha without this
use alpha && append-ldflags "-Wl,--no-relax"
@@ -242,6 +259,7 @@ src_configure() {
--with-system-libpng
--with-system-teckit
--with-system-kpathsea
+ --with-kpathsea-includes="${TL_KPATHSEA_INCLUDES}"
--with-system-icu
--with-system-ptexenc
--with-system-harfbuzz
@@ -265,7 +283,6 @@ src_configure() {
--enable-tektronixwin
--enable-unitermwin
--enable-vlna
- --enable-year2038
--disable-psutils
--disable-t1utils
--enable-ipc
@@ -304,7 +321,6 @@ src_configure() {
$(use_with X x)
$(use_enable xindy)
--enable-ptex=no
- --enable-uptex=no
--enable-autosp=yes
--enable-axodraw2=yes
--enable-devnag=yes
@@ -319,7 +335,7 @@ src_configure() {
--enable-afm2pl=yes
--enable-dvidvi=yes
--enable-dviljk=yes
- $(use_enable cjk dvipdfm-x)
+ --enable-dvipdfm-x
--enable-dvipos=yes
--enable-gregorio=yes
--enable-gsftopk=yes
@@ -415,7 +431,14 @@ src_install() {
# by texmf-update
rm "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
- rm "${ED}/usr/bin/"{,u}ptex || die
+ if use cjk; then
+ 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}
@@ -427,7 +450,7 @@ src_install() {
done
# https://bugs.gentoo.org/832139
- rm "${ED}"/usr/bin/tlmgr || die
+ rm "${ED}"/usr/bin/tlmgr || die
texlive-common_handle_config_files
@@ -452,4 +475,10 @@ pkg_postinst() {
# eftmutil-sys here and the reasons why it sometimes fails.
nonfatal etexmf-update
nonfatal efmtutil-sys
+
+ texlive-common_update_tlpdb
+}
+
+pkg_postrm() {
+ texlive-common_update_tlpdb
}
