From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-tex/tex4ht/Manifest | 7 +- .../tex4ht-20090611_p1038_p20210423-hyperref.patch | 17 +++ dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild | 10 +- dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild | 121 -------------------- .../tex4ht-20090611_p1038_p20210423-r1.ebuild | 126 +++++++++++++++++++++ 5 files changed, 152 insertions(+), 129 deletions(-) create mode 100644 dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch delete mode 100644 dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild create mode 100644 dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild (limited to 'dev-tex/tex4ht') diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest index cf6f3fd72a72..9e45405205cf 100644 --- a/dev-tex/tex4ht/Manifest +++ b/dev-tex/tex4ht/Manifest @@ -1,7 +1,8 @@ AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce028317c8cea9305b7643e540171693ef70bdd364b6f6ff72daabc0baf66f32bb8ea526dcb0406fb065 SHA512 fec1a4ab9a3a493476a255001303c84a30fcf67873bd2639d177b414cf90880a149d31a68d6ce0dfd104b877bfc3fc2d39b1bb38a0f9d7c511bd311e0bfefc48 +AUX tex4ht-20090611_p1038_p20210423-hyperref.patch 383 BLAKE2B 326c972e2ed1a836867eaf2b6c3f77019da0464992f289f163fdcf58bfe753216b7e7253e02a2df9d41ff95a48ee14dadbb79367326ae934ceaf02b3a6781364 SHA512 b0be1a1cd0a76f360280ea55c679aa51099125dfaa095d975af0aa7a355d63e15ac643a9999d23b2fc540eb3bf2f8c7275737a3a2766ce5d640639bad048b158 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963 -DIST tex4ht-texlive-2019-03-22.tar.xz 868992 BLAKE2B 662cc23de1b3b5f4e3d504655b5b3d87740fea045bef7987cbe2d81971e73375bd88d8ab111d48878ce1fe9d1eece4e4003e443ed0bc0f9b643b7e1653a5fc8c SHA512 44d9e2c4f92ae1ea1d7f14432d7fe1a9f11b30ec8602d55c4b8f3f46283671fb75b08641c8170bd46918e16db1bed696a613a0518acd4e195e173fe12e386833 DIST tex4ht-texlive-2020-06-24.tar.xz 880952 BLAKE2B d021efca48571711d06d7ed6ecefce068339a49fa83efeaa476329d892a77f73b27273a711dad2cb7ce212ece87ef8a776a10127cec5dc2e0096ce36adbc42a4 SHA512 b6109d27fd38eb0f2f9aab8b96adee2e69081c7317de3c9f527e47053d1520b93c0499e23fdc66f38f04c50633f72930e4fdf5d07612894427ae31dcbc1f66d4 -EBUILD tex4ht-20090611_p1038-r11.ebuild 3734 BLAKE2B a5e6fcaa472a2cda089c9f4652720ba61c118221b703dac69e340a1f761c4735fe328d33598e061ce99cd6a69647243d57679a77cf49242d3b7e82f9559335db SHA512 0a49cb5061f1d347b9ff7c64b5314be3ac2d0beaeb546bfa7f4f9dfab043df941b52382a2f4b4b24941fa05f11f1da56fc6a97ca3e1cd714d967055a27c1d010 -EBUILD tex4ht-20090611_p1038-r8.ebuild 3645 BLAKE2B 816b209b43cac47f74cefdf1f2a19f1ab999ae080504cd8119b3028fc194ee94f55e19a86c0b20044dd2e689291627e0d40847266a6b5ef655fe839be8b6a911 SHA512 405b3a72d196e6d533d9fdfa178ca45454809ba72a3f35cf65eb74966c834bf9eeab35cbbc86ba2578a35a6a5698bd337330d8db2369c0fb3f81c88a19ca8e6d +DIST tex4ht-texlive-20210423.tar.xz 906180 BLAKE2B 7592380e798385471f3b9675deb557a100650749a58a2724d366cfe8ad9fb4b2d2a678265b5d2166905c4cc9f52e92ef722085cc39df167c7c23f4926a619b49 SHA512 7131a62f9ecbeeb3afbc97f465b20b5bc5c57bdade9d07772661607f5f43fb0ef67f42630fceee8d5988872b158efe1dd99bb220c1e7cd9e936f71feab036888 +EBUILD tex4ht-20090611_p1038-r11.ebuild 3738 BLAKE2B 3bd1ba528bd37b5b5bd8af9fc01501a6245e2b312d8cf5e7c0efb85c7a1726ddfcea491d432b4f13b9209d20e8ddcfba6538ce2166010c21b6d57c5e2cfe1239 SHA512 e009aff4e836f362731ef726ece6da5d4bfdad214d829358a0df4b9dbb32502dfd76c976b16af383c9aa05de5782b27d82c21aead0233ae7bb9d68998268d7b0 +EBUILD tex4ht-20090611_p1038_p20210423-r1.ebuild 3791 BLAKE2B fa00dbf838ef03c743b16f5a3742ff1c0ecc95b4ad009236d92a712a2c75959b1a3fcf885db80006010db71a9285ca03c68d7020f2623028499d4bbe24b1521c SHA512 d0390fd279c36c6ac5fa6a596dc4b19954c0dac15732b73be3bc930ad51283fd8f0eee87ba721e099ccbacc481a91f96afa0712e7f1b7b046dd0380aececc21c MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af diff --git a/dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch b/dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch new file mode 100644 index 000000000000..d3acc4c74adf --- /dev/null +++ b/dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch @@ -0,0 +1,17 @@ +https://puszcza.gnu.org.ua/bugs/?508 + +--- a/texmf/tex/generic/tex4ht/hyperref.4ht ++++ b/texmf/tex/generic/tex4ht/hyperref.4ht +@@ -306,6 +306,12 @@ + \Hy@MakeCurrentHref{#1.\the\Hy@linkcounter}% + } + ++\@ifpackageloaded{nameref}{} ++{% ++ \let\sv:label\label ++ \RequirePackage{nameref}% ++ \let\label\sv:label ++} + \def\hyper@makecurrent#1{% + \begingroup + \edef\Hy@param{#1}% diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild index de926dc3ef37..6511637d4ca3 100644 --- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild +++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,12 +25,12 @@ IUSE="java" RDEPEND="app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea - java? ( >=virtual/jre-1.5 )" + java? ( >=virtual/jre-1.8:* )" -DEPEND="dev-libs/kpathsea" +DEPEND="dev-libs/kpathsea + java? ( >=virtual/jdk-1.8:* )" -BDEPEND="virtual/pkgconfig - java? ( >=virtual/jdk-1.5 )" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild deleted file mode 100644 index 095c26e4d8ac..000000000000 --- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic - -# from ftp://ftp.cstug.cz/pub/tex/local/tlpretest/archive/tex4ht.tar.xz -TL_TEX4HT_VER="2019-03-22" - -# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350 -MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}" - -DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org" -HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/ - http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html" -SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz - mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz" - -LICENSE="LPPL-1.2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="java" - -RDEPEND="app-text/ghostscript-gpl - media-gfx/imagemagick - dev-libs/kpathsea - java? ( >=virtual/jre-1.5 )" - -DEPEND="dev-libs/kpathsea" - -BDEPEND="virtual/pkgconfig - java? ( >=virtual/jdk-1.5 )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die - eapply_user - cd "${S}/texmf/tex4ht/base/unix" || die - sed -i \ - -e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \ - -e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \ - -e "s#%%~#${EPREFIX}${TEXMF}#g" \ - -e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \ - tex4ht.env \ - || die "sed of tex4ht.env failed" - - einfo "Removing precompiled java stuff" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete || die -} - -src_compile() { - has_version '>=dev-libs/kpathsea-6.2.1' \ - && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" - - cd "${S}/src" || die - einfo "Compiling postprocessor sources..." - for f in tex4ht t4ht htcmd ; do - $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \ - -DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \ - -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \ - || die "Compiling $f failed" - done - if use java; then - einfo "Compiling java files..." - cd java || die - ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin - cd "${S}/texmf/tex4ht/bin" || die - # Create the jar needed by oolatex - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" - fi -} - -src_install() { - # install the binaries - dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd" - # install the scripts - if ! use java; then - rm -f "${S}"/bin/unix/oo* - rm -f "${S}"/bin/unix/jh* - fi - dobin "${S}"/bin/unix/mk4ht - - # install the .4ht scripts - insinto ${TEXMF}/tex/generic/tex4ht - doins "${S}"/texmf/tex/generic/tex4ht/* - - # install the special htf fonts - insinto ${TEXMF}/tex4ht - doins -r "${S}/texmf/tex4ht/ht-fonts" - - if use java; then - # install the java files - doins -r "${S}/texmf/tex4ht/bin" - java-pkg_jarinto ${TEXMF}/tex4ht/bin - java-pkg_dojar "${S}/${PN}.jar" - fi - - # install the .4xt files - doins -r "${S}/texmf/tex4ht/xtpipes" - - # install the env file - insinto ${TEXMF}/tex4ht/base - newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env - - insinto /etc/texmf/texmf.d - doins "${FILESDIR}/50tex4ht.cnf" - - insinto ${TEXMF}/tex/generic/${PN} - insopts -m755 - doins "${S}"/bin/ht/unix/* -} - -pkg_postinst() { - use java || elog 'ODF converters (oolatex & friends) require the java use flag' - latex-package_pkg_postinst - elog "In order to avoid collisions with multiple packages" - elog "We are not installing the scripts in /usr/bin anymore" - elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'" -} diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild new file mode 100644 index 000000000000..cb06c8c62089 --- /dev/null +++ b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic readme.gentoo-r1 + +# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350 +MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_$(ver_cut 3)" + +# from https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.tar.xz +MY_P_TEXLIVE="${PN}-texlive-$(ver_cut 5)" + +DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org" +HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/ + http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html" +SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz + https://dev.gentoo.org/~ulm/distfiles/${MY_P_TEXLIVE}.tar.xz" + +LICENSE="LPPL-1.2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="java" + +RDEPEND="app-text/ghostscript-gpl + media-gfx/imagemagick + dev-libs/kpathsea + java? ( >=virtual/jre-1.8:* )" + +DEPEND="dev-libs/kpathsea + java? ( >=virtual/jdk-1.8:* )" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" +PATCHES=("${FILESDIR}/${P}-hyperref.patch") + +src_prepare() { + cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die + default + cd "${S}/texmf/tex4ht/base/unix" || die + sed -i \ + -e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \ + -e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \ + -e "s#%%~#${EPREFIX}${TEXMF}#g" \ + -e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \ + tex4ht.env \ + || die "sed of tex4ht.env failed" + + einfo "Removing precompiled java stuff" + find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete || die +} + +src_compile() { + has_version '>=dev-libs/kpathsea-6.2.1' \ + && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" + + cd "${S}/src" || die + einfo "Compiling postprocessor sources..." + for f in tex4ht t4ht; do + $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \ + -DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \ + -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \ + || die "Compiling $f failed" + done + if use java; then + einfo "Compiling java files..." + cd java || die + ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin + cd "${S}/texmf/tex4ht/bin" || die + # Create the jar needed by oolatex + jar -cf "${S}/${PN}.jar" * || die "failed to create jar" + fi +} + +src_install() { + # install the binaries + dobin "${S}/src/tex4ht" "${S}/src/t4ht" + # install the scripts + if ! use java; then + rm -f "${S}"/bin/unix/oo* + rm -f "${S}"/bin/unix/jh* + fi + dobin "${S}"/bin/unix/mk4ht + + # install the .4ht scripts + insinto ${TEXMF}/tex/generic/tex4ht + doins "${S}"/texmf/tex/generic/tex4ht/* + + # install the special htf fonts + insinto ${TEXMF}/tex4ht + doins -r "${S}/texmf/tex4ht/ht-fonts" + + if use java; then + # install the java files + doins -r "${S}/texmf/tex4ht/bin" + java-pkg_jarinto ${TEXMF}/tex4ht/bin + java-pkg_dojar "${S}/${PN}.jar" + fi + + # install the .4xt files + doins -r "${S}/texmf/tex4ht/xtpipes" + + # install the env file + insinto ${TEXMF}/tex4ht/base + newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env + + insinto /etc/texmf/texmf.d + doins "${FILESDIR}/50tex4ht.cnf" + + insinto ${TEXMF}/tex/generic/${PN} + insopts -m755 + doins "${S}"/bin/ht/unix/* + + local DOC_CONTENTS="In order to avoid collisions with multiple packages, + we are not installing the scripts in /usr/bin any more. + If you want to use, say, htlatex, you can use 'mk4ht htlatex file'." + use java || DOC_CONTENTS+="\n\nODF converters (oolatex & friends) + require the java use flag." + readme.gentoo_create_doc +} + +pkg_postinst() { + latex-package_pkg_postinst + readme.gentoo_print_elog +} -- cgit v1.2.3