From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71D31138334 for ; Mon, 30 Dec 2019 19:24:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 898A9E0CD0; Mon, 30 Dec 2019 19:24:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EED6E0CD0 for ; Mon, 30 Dec 2019 19:24:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E4FD34DD78 for ; Mon, 30 Dec 2019 19:24:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EECA2B for ; Mon, 30 Dec 2019 19:24:09 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1577733840.c728d76bf6f7739b4a428ddcdbf7a1213ee4a48b.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/texlive-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/texlive-core/Manifest app-text/texlive-core/texlive-core-2019-r6.ebuild X-VCS-Directories: app-text/texlive-core/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: c728d76bf6f7739b4a428ddcdbf7a1213ee4a48b X-VCS-Branch: master Date: Mon, 30 Dec 2019 19:24:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb024607-0e50-47e4-9dd8-c4f20f3cea25 X-Archives-Hash: 41c4dc51a5c83bb96ffd47be6b6787ed commit: c728d76bf6f7739b4a428ddcdbf7a1213ee4a48b Author: Mikle Kolyada gentoo org> AuthorDate: Mon Dec 30 19:21:31 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon Dec 30 19:24:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c728d76b app-text/texlive-core: fix building with poppler-0.84 Closes: https://bugs.gentoo.org/704166 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> app-text/texlive-core/Manifest | 1 + app-text/texlive-core/texlive-core-2019-r6.ebuild | 360 ++++++++++++++++++++++ 2 files changed, 361 insertions(+) diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest index 4c344d4b23c..84d2d1a0626 100644 --- a/app-text/texlive-core/Manifest +++ b/app-text/texlive-core/Manifest @@ -1,6 +1,7 @@ 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-5.tar.xz 12444 BLAKE2B 0b6b24897a1fd5d6cb22dc126161c4da39a652249a1c9fde8fe771b196332b40af677c8128c561e404c81d5a0e6835d1cf246661957367ac94fce3fc4036b0fc SHA512 ce3b37423c89ba605608158a46e69e7a8aff29034be9583e0c09d41e16176544fda02a9a60071b3744b2b6004ad3f5986a116bb8e01acc1402e94d5cc6203d5c +DIST texlive-core-patches-2019-6.tar.xz 12696 BLAKE2B 6d87cab9040a0bfd8b1ef74d6a1cde4d8edbd977242d4584e94e29877ec7bca377aa7762470ae2aefaf282097f4919745c2d052403848e0805c5cde9dc0241ef SHA512 0382b097fc3b58abdd3550a10a54d9f667cd89a19e3bab747fe932d94563b92641da1516dc32f41c177482d8e3afa21f0575dc5f1e6c6efd63fdfcb21d40d874 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 diff --git a/app-text/texlive-core/texlive-core-2019-r6.ebuild b/app-text/texlive-core/texlive-core-2019-r6.ebuild new file mode 100644 index 00000000000..7f852682af6 --- /dev/null +++ b/app-text/texlive-core/texlive-core-2019-r6.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +TL_SOURCE_VERSION=20190410 + +inherit flag-o-matic toolchain-funcs libtool texlive-common + +MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source + +PATCHLEVEL=6 + +DESCRIPTION="A complete TeX distribution" +HOMEPAGE="https://tug.org/texlive/" +SLOT="0" +LICENSE="GPL-2 LPPL-1.3c TeX" + +SRC_URI="mirror://gentoo/${MY_P}.tar.xz + mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz + mirror://gentoo/texlive-tlpdb-${PV}.tar.xz" + +TL_CORE_BINEXTRA_MODULES=" + a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk + ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy + dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex + installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth + latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht + match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools + pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx + synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot + texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo + web collection-binextra + " +TL_CORE_BINEXTRA_DOC_MODULES=" + a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc + checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc + cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc + dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc + hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc + latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc + latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc + make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc + pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc + pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc + sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc + texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc + texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc +" +TL_CORE_BINEXTRA_SRC_MODULES=" + adhocfilelist.source arara.source checklistings.source hyphenex.source + listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source + texdef.source texosquery.source +" + +TL_CORE_EXTRA_MODULES="tetex hyphen-base gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}" +TL_CORE_EXTRA_DOC_MODULES="tetex.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}" +TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}" + +for i in ${TL_CORE_EXTRA_MODULES}; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz" +done + +SRC_URI="${SRC_URI} doc? ( " +for i in ${TL_CORE_EXTRA_DOC_MODULES}; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz" +done +SRC_URI="${SRC_URI} )" +SRC_URI="${SRC_URI} source? ( " +for i in ${TL_CORE_EXTRA_SRC_MODULES}; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz" +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" +IUSE="cjk X doc source tk +luajittex xetex" + +TEXMF_PATH=/usr/share/texmf-dist + +MODULAR_X_DEPEND="X? ( + x11-libs/libX11 + x11-libs/libXmu + )" + +COMMON_DEPEND="${MODULAR_X_DEPEND} + sys-libs/zlib + >=media-libs/libpng-1.2.43-r2:0= + media-libs/gd[png] + >=x11-libs/cairo-1.12 + >=x11-libs/pixman-0.18 + dev-libs/zziplib + app-text/libpaper + dev-libs/gmp:0 + dev-libs/mpfr:0= + xetex? ( + >=media-libs/harfbuzz-1.4.5[icu,graphite] + >=app-text/teckit-2.5.3 + media-libs/fontconfig + media-gfx/graphite2 + ) + media-libs/freetype:2 + >=dev-libs/icu-50:= + >=dev-libs/kpathsea-6.2.3 + cjk? ( >=dev-libs/ptexenc-1.3.7 ) + >=app-text/poppler-0.76.1:=" + +BDEPEND="sys-apps/ed + sys-devel/flex + virtual/pkgconfig" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + >=app-text/ps2pkm-1.8_p20170524 + >=app-text/dvipsk-5.997 + >=dev-tex/bibtexu-3.71_p20170524 + virtual/perl-Getopt-Long + tk? ( dev-perl/Tk )" + +S="${WORKDIR}/${P}_build" +B="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die "failed to create build dir" +} + +RELOC_TARGET=texmf-dist + +src_prepare() { + cd "${WORKDIR}" || die + + 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" + for i in $(<"${T}/dirlist"); do + [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}" + done + for i in $(<"${T}/reloclist"); do + mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})" + done + + mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files" + + cd "${B}" || die + + default + + # These we need unconditionally + eapply "${WORKDIR}"/patches/{0001..0006}*.patch + + # Conditional poppler patching + if has_version ">=app-text/poppler-0.83.0"; then + eapply "${WORKDIR}"/patches/${P}-poppler083.patch + eapply "${WORKDIR}"/patches/${P}-poppler0.84.patch + else + eapply "${WORKDIR}"/patches/${P}-poppler076.patch + fi + + sed -i \ + -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \ + texk/web2c/configure || die + + elibtoolize +} + +src_configure() { + # It fails on alpha without this + use alpha && append-ldflags "-Wl,--no-relax" + + # Too many regexps use A-Z a-z constructs, what causes problems with locales + # that don't have the same alphabetical order than ascii. Bug #242430 + # So we set LC_ALL to C in order to avoid problems. + export LC_ALL=C + + # Disable freetype-config as this is considered obsolete. + # Also only pkg-config works for prefix as described in bug #690094 + export ac_cv_prog_ac_ct_FT2_CONFIG=no + + tc-export CC CXX AR RANLIB + ECONF_SOURCE="${B}" \ + econf -C \ + --bindir="${EPREFIX}"/usr/bin \ + --datadir="${S}" \ + --with-system-freetype2 \ + --with-system-zlib \ + --with-system-libpng \ + --with-system-xpdf \ + --with-system-poppler \ + --with-system-teckit \ + --with-teckit-includes="${EPREFIX}"/usr/include/teckit \ + --with-system-kpathsea \ + --with-kpathsea-includes="${EPREFIX}"/usr/include \ + --with-system-icu \ + --with-system-ptexenc \ + --with-system-harfbuzz \ + --with-system-icu \ + --with-system-graphite2 \ + --with-system-cairo \ + --with-system-pixman \ + --with-system-zziplib \ + --with-system-libpaper \ + --with-system-gmp \ + --with-system-gd \ + --with-system-mpfr \ + --without-texinfo \ + --disable-dialog \ + --disable-multiplatform \ + --enable-epsfwin \ + --enable-mftalkwin \ + --enable-regiswin \ + --enable-tektronixwin \ + --enable-unitermwin \ + --with-ps=gs \ + --disable-psutils \ + --disable-t1utils \ + --enable-ipc \ + --disable-biber \ + --disable-bibtex-x \ + --disable-dvipng \ + --disable-dvipsk \ + --disable-chktex \ + --disable-lcdf-typetools \ + --disable-pdfopen \ + --disable-ps2eps \ + --disable-ps2pk \ + --disable-detex \ + --disable-ttf2pk2 \ + --disable-tex4htk \ + --disable-cjkutils \ + --disable-xdvik \ + --disable-xindy \ + --enable-luatex \ + --disable-dvi2tty \ + --disable-dvisvgm \ + --disable-vlna \ + --enable-shared \ + --disable-native-texlive-build \ + --disable-largefile \ + --disable-build-in-source-tree \ + --with-banner-add=" Gentoo Linux" \ + $(use_enable luajittex) \ + $(use_enable luajittex mfluajit) \ + $(use_enable xetex) \ + $(use_enable cjk dviout-util) \ + $(use_enable cjk ptex) \ + $(use_enable cjk eptex) \ + $(use_enable cjk uptex) \ + $(use_enable cjk euptex) \ + $(use_enable cjk mendexk) \ + $(use_enable cjk makejvf) \ + $(use_enable cjk pmp) \ + $(use_enable cjk upmp) \ + $(use_enable tk texdoctk) \ + $(use_with X x) +} + +src_compile() { + tc-export CC CXX AR RANLIB + emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} + + cd "${B}" || die + # Mimic updmap --syncwithtrees to enable only fonts installed + # Code copied from updmap script + for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do + texlive-common_is_file_present_in_texmf "$i" || echo "$i" + done > "${T}/updmap_update" + { + sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" + sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" + sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" + } > "${T}/updmap_update2" + sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\ + && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg" +} + +src_install() { + dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c + emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install + + cd "${B}" || die + dodir /usr/share # just in case + cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees" + cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files" + + # When X is disabled mf-nowin doesn't exist but some scripts expect it to + # exist. Instead, it is called mf, so we symlink it to please everything. + use X || dosym mf /usr/bin/mf-nowin + + docinto texk + cd "${B}/texk" || die + dodoc ChangeLog README + + docinto dviljk + cd "${B}/texk/dviljk" || die + dodoc ChangeLog README NEWS + + docinto makeindexk + cd "${B}/texk/makeindexk" || die + dodoc ChangeLog NOTES README + + docinto web2c + cd "${B}/texk/web2c" || die + dodoc ChangeLog NEWS PROJECTS README + + use doc || rm -rf "${ED}/usr/share/texmf-dist/doc" + + dodir /etc/env.d + echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive" + # populate /etc/texmf + keepdir /etc/texmf/web2c + + # take care of updmap.cfg and language.d files + keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d} + + mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed" + + # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files + # by texmf-update + rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" + # Remove bundled and invalid updmap.cfg + rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" + + texlive-common_handle_config_files + + keepdir /usr/share/texmf-site + + # the virtex symlink is not installed + # The links has to be relative, since the targets + # is not present at this stage and MacOS doesn't + # like non-existing targets + dosym tex /usr/bin/virtex + dosym pdftex /usr/bin/pdfvirtex + + # Rename mpost to leave room for mplib + mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die + dosym "mpost-${P}" /usr/bin/mpost + + # Ditto for pdftex + mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die + dosym "pdftex-${P}" /usr/bin/pdftex +} + +pkg_postinst() { + etexmf-update + + einfo "Regenerating TeX formats" + fmtutil-sys --all &> /dev/null + + elog + elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge," + elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update." + elog + ewarn "If you are migrating from an older TeX distribution" + ewarn "Please make sure you have read:" + ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide" + ewarn "in order to avoid possible problems" +}