diff options
Diffstat (limited to 'app-text/texlive-core')
-rw-r--r-- | app-text/texlive-core/Manifest | 8 | ||||
-rw-r--r-- | app-text/texlive-core/texlive-core-2019-r10.ebuild (renamed from app-text/texlive-core/texlive-core-2019-r8.ebuild) | 8 | ||||
-rw-r--r-- | app-text/texlive-core/texlive-core-2019-r11.ebuild (renamed from app-text/texlive-core/texlive-core-2019-r4.ebuild) | 28 |
3 files changed, 31 insertions, 13 deletions
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest index 2642fb55a7e1..c40ce1fda673 100644 --- a/app-text/texlive-core/Manifest +++ b/app-text/texlive-core/Manifest @@ -1,6 +1,6 @@ DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -DIST texlive-core-patches-2019-4.tar.xz 11932 BLAKE2B 5e73e2bd3afeb904f2b8898081ffd770c9ab152368ae5a8699d5f63507e3c0584901d7d6f8fece7724b8e744d7816fe31db4b96962c0550491a57a6d51adb296 SHA512 fce31563f8c7e8f1f0bdcba9c5108d9f5d14529c22c110e33f32a6367560f7f255e51a1e86f1d5c8fb275085ff3ba6d0f5f474acd79ff61d67be795dfb330708 -DIST texlive-core-patches-2019-8.tar.xz 15172 BLAKE2B 97ac7855200fcf86463e09df1bdd30f9ebf50e8d207a136ed9dd380776f15d0a883b5eaec22ede4ae9e5201dc47cc40854e1ac77d197fe2bc8c0f5a1c287c1eb SHA512 1a9af52496a7cb4f8e0223811ac84e7adf6ff8d63ad1c29d5c738716e4a45db1375e3f67324104e6a40a93f68de46d7326b3e851a4e33ab66ae562667e4a883e +DIST texlive-core-patches-2019-10.tar.xz 15384 BLAKE2B 0715e8553db296eb31f88791010c8e5c383758d0ae0b99effdbecf3dee029a865cac594c50262137c33915c3ddd9bdec0daaade9979b932444ef44fa4928fdc2 SHA512 166bb4440e824fed8aacfe0a1a62aa64403c6cd23bfbae4d65b6ee8822d29a54d30664068f0d65b49b30586691f75a21bb3719e41c75481f5cab72e82d0be1a7 +DIST texlive-core-patches-2019-11.tar.xz 15412 BLAKE2B ac0abe035541acf2b4c028e310616a72e47c4c59826535a667bbc439069adabd5c54260d7724ae663ea0d36de01cdf363fa1c3472e8c53b19029fb798d432e53 SHA512 ae624bdbd172de373871dd8a1bd0d8c2e810e89e471705de393caf351d8863e71558ca021a9365821bbcb73956642d8a65f670431a7f94774080e6f821fc1d92 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512 DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954 @@ -157,6 +157,6 @@ DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba681599 DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0 -EBUILD texlive-core-2019-r4.ebuild 11204 BLAKE2B b90ca2c333af24fcdcd14f9b8040d918c33ea481631f60a69337585dcb3cd6ceba1f343159bae31d842d3f47d5536d9e464a0352b0a8bf4acef1b26eaab3c467 SHA512 850e9bdd5f67a867ffb77aef6416f35b00203c49c1e7f0fef003a9314a71ae30a7d6632e9c6624286d2d67cd2f6bd270e6fa7fd1178dfcee4f43abe2e6167b8f -EBUILD texlive-core-2019-r8.ebuild 11567 BLAKE2B 2efa686d908010c3e0dd8d858e4993f573970f61da72f231dcad1fc15b5737692ba30d9ab46f9c841491682134853c59b0c08bdf204262054c9c1391cae01228 SHA512 f77c7da05c36a6615cbd13324fcddfa7946ae1fd2b2e98b702aa9fb0e4004382deb7a3ec3e69d36f684c023f4e3b990e7372e53a55e9620120c8749002f0093e +EBUILD texlive-core-2019-r10.ebuild 11695 BLAKE2B 725219e83562121498c462d3043444e39ae2e299cadcfa852ccefbf9ea62a65ee1a0ba78c0c33a24a253c53f98b0b53c29d4ae32831b484b022757f1d1ccbb35 SHA512 b99844e08899d3201b7cb2cdc990512f39a9637793102065a12fc348cd5d0fd51f679c73cfbf3839f13c848e4bc786426ac3eff68fdac1a539a15e14a45498e8 +EBUILD texlive-core-2019-r11.ebuild 11838 BLAKE2B 44f82f1519a47e13145ecbf8148ef42c96c0bbd0b6ef8ffe2d6cf0cae36c20e85180d989678f1904d661380742e1e55e9c95d9ab3524f080c2f92ef4051f9fb6 SHA512 b233eaa3e54851199b82194d63f07bc7fff9d24396e4c3caa99de17eeb16cd335a3b5927b525bc50d218658aadc65869b2d8d496018f65da6d362c814ddea721 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9 diff --git a/app-text/texlive-core/texlive-core-2019-r8.ebuild b/app-text/texlive-core/texlive-core-2019-r10.ebuild index 093c3748dbda..5cbe8b18298d 100644 --- a/app-text/texlive-core/texlive-core-2019-r8.ebuild +++ b/app-text/texlive-core/texlive-core-2019-r10.ebuild @@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source -PATCHLEVEL=8 +PATCHLEVEL=10 DESCRIPTION="A complete TeX distribution" HOMEPAGE="https://tug.org/texlive/" @@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do done SRC_URI="${SRC_URI} )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cjk X doc source tk +luajittex xetex" TEXMF_PATH=/usr/share/texmf-dist @@ -153,9 +153,11 @@ src_prepare() { eapply "${WORKDIR}"/patches/${P}-no-fcommon.patch # Conditional poppler patching - if has_version ">=app-text/poppler-0.83.0"; then + if has_version ">=app-text/poppler-0.83" && has_version "<app-text/poppler-0.86"; then eapply "${WORKDIR}"/patches/${P}-poppler083.patch eapply "${WORKDIR}"/patches/${P}-poppler084.patch + elif has_version "=app-text/poppler-0.86*"; then + eapply "${WORKDIR}"/patches/${P}-poppler086.patch else eapply "${WORKDIR}"/patches/${P}-poppler076.patch fi diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r11.ebuild index d95f3425d1e5..f8867fc856b8 100644 --- a/app-text/texlive-core/texlive-core-2019-r4.ebuild +++ b/app-text/texlive-core/texlive-core-2019-r11.ebuild @@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source -PATCHLEVEL=4 +PATCHLEVEL=11 DESCRIPTION="A complete TeX distribution" HOMEPAGE="https://tug.org/texlive/" @@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do done SRC_URI="${SRC_URI} )" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cjk X doc source tk +luajittex xetex" TEXMF_PATH=/usr/share/texmf-dist @@ -133,10 +133,12 @@ src_prepare() { mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb" # From texlive-module.eclass. - grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" - { for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist" + grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" || die + { for i in $(<"${T}/reloclist"); do dirname ${i}; done; } | uniq > "${T}/dirlist" for i in $(<"${T}/dirlist"); do - [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}" + if [[ ! -d ${RELOC_TARGET}/${i} ]]; then + mkdir -p "${RELOC_TARGET}/${i}" || die + fi done for i in $(<"${T}/reloclist"); do mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})" @@ -148,7 +150,21 @@ src_prepare() { default - eapply "${WORKDIR}"/patches + # These we need unconditionally + eapply "${WORKDIR}"/patches/{0001..0006}*.patch + eapply "${WORKDIR}"/patches/${P}-no-fcommon.patch + + # Conditional poppler patching + if has_version ">=app-text/poppler-0.83" && has_version "<app-text/poppler-0.86"; then + eapply "${WORKDIR}"/patches/${P}-poppler083.patch + eapply "${WORKDIR}"/patches/${P}-poppler084.patch + elif has_version "=app-text/poppler-0.86*"; then + eapply "${WORKDIR}"/patches/${P}-poppler086.patch + elif has_version "=app-text/poppler-0.87*"; then + eapply "${WORKDIR}"/patches/${P}-poppler087.patch + else + eapply "${WORKDIR}"/patches/${P}-poppler076.patch + fi sed -i \ -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \ |