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 E12361382C5 for ; Fri, 30 Apr 2021 11:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3707FE0827; Fri, 30 Apr 2021 11:25:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 07B75E0827 for ; Fri, 30 Apr 2021 11:25:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 778FE340C7B for ; Fri, 30 Apr 2021 11:25:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E85604C3 for ; Fri, 30 Apr 2021 11:25:27 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1619781874.62ac44ed7ae8d5dc78cb68631747d229a96afa82.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/tex4ht/, dev-tex/tex4ht/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tex/tex4ht/Manifest dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild X-VCS-Directories: dev-tex/tex4ht/ dev-tex/tex4ht/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 62ac44ed7ae8d5dc78cb68631747d229a96afa82 X-VCS-Branch: master Date: Fri, 30 Apr 2021 11:25:27 +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: d5323532-97eb-40e3-8cd5-1013b0a55716 X-Archives-Hash: fc2baa5068b54020dc9552fc7d1c9917 commit: 62ac44ed7ae8d5dc78cb68631747d229a96afa82 Author: Ulrich Müller gentoo org> AuthorDate: Fri Apr 30 11:24:08 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Apr 30 11:24:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ac44ed dev-tex/tex4ht: Version bump to 20090611_p1038_p20210428 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> dev-tex/tex4ht/Manifest | 3 ++- .../tex4ht-20090611_p1038_p20210423-hyperref.patch | 17 ----------------- ...r1.ebuild => tex4ht-20090611_p1038_p20210428.ebuild} | 16 +++++++++++----- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest index 340a1e5473e..5bf18fbb21f 100644 --- a/dev-tex/tex4ht/Manifest +++ b/dev-tex/tex4ht/Manifest @@ -1,3 +1,4 @@ DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963 DIST tex4ht-texlive-2020-06-24.tar.xz 880952 BLAKE2B d021efca48571711d06d7ed6ecefce068339a49fa83efeaa476329d892a77f73b27273a711dad2cb7ce212ece87ef8a776a10127cec5dc2e0096ce36adbc42a4 SHA512 b6109d27fd38eb0f2f9aab8b96adee2e69081c7317de3c9f527e47053d1520b93c0499e23fdc66f38f04c50633f72930e4fdf5d07612894427ae31dcbc1f66d4 -DIST tex4ht-texlive-20210423.tar.xz 906180 BLAKE2B 7592380e798385471f3b9675deb557a100650749a58a2724d366cfe8ad9fb4b2d2a678265b5d2166905c4cc9f52e92ef722085cc39df167c7c23f4926a619b49 SHA512 7131a62f9ecbeeb3afbc97f465b20b5bc5c57bdade9d07772661607f5f43fb0ef67f42630fceee8d5988872b158efe1dd99bb220c1e7cd9e936f71feab036888 +DIST tex4ht-texlive-20210428.doc.tar.xz 136156 BLAKE2B cde1e0326eb4d38261f7aae132cd5cbb2a72e05f54b708257e0ad3bb5da3fb82ad60d686c61ecd3854d3cc70df75dcbf90499892937c0adfcc6503fb2088d695 SHA512 1f674179ba4e6ab355bf478778c7a1498e4dfb61da0cf7cf9f4a663396ad9c6bac592f5cb1b32d972288fbc201541927a5e5edde18caf73a298b0b8a618a25c5 +DIST tex4ht-texlive-20210428.tar.xz 906228 BLAKE2B a011425a9e1ddb88610805e4af5b65c42dddcc88ec0ca7b2e02ca9a8276423c4a96adfe86980d21b1f2a568bdf95c3ca43b4e814d98e8b5d53319906af13edaf SHA512 89a13dc4fccbc893a113d2cc43d9cd70b20b65b5f4f642bcf9d14994b61667aabbdcdbb9a91ef05631e02e88fcf10b0e1de3739c741f5975770e4b93166766ba diff --git a/dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch b/dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch deleted file mode 100644 index d3acc4c74ad..00000000000 --- a/dev-tex/tex4ht/files/tex4ht-20090611_p1038_p20210423-hyperref.patch +++ /dev/null @@ -1,17 +0,0 @@ -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_p20210423-r1.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild similarity index 91% rename from dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild rename to dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild index cb06c8c6208..b746096e2af 100644 --- a/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild +++ b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild @@ -15,12 +15,13 @@ 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" + https://dev.gentoo.org/~ulm/distfiles/${MY_P_TEXLIVE}.tar.xz + doc? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P_TEXLIVE}.doc.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" +IUSE="doc java" RDEPEND="app-text/ghostscript-gpl media-gfx/imagemagick @@ -33,7 +34,6 @@ DEPEND="dev-libs/kpathsea BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" -PATCHES=("${FILESDIR}/${P}-hyperref.patch") src_prepare() { cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die @@ -78,8 +78,8 @@ src_install() { 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* + rm -f "${S}"/bin/unix/oo* || die + rm -f "${S}"/bin/unix/jh* || die fi dobin "${S}"/bin/unix/mk4ht @@ -87,6 +87,12 @@ src_install() { insinto ${TEXMF}/tex/generic/tex4ht doins "${S}"/texmf/tex/generic/tex4ht/* + if use doc; then + # install the documentation + insinto ${TEXMF}/doc/generic/tex4ht + doins "${S}"/texmf/doc/generic/tex4ht/* + fi + # install the special htf fonts insinto ${TEXMF}/tex4ht doins -r "${S}/texmf/tex4ht/ht-fonts"