gentoo resync : 04.05.2021

3 files changed, 14 insertions, 25 deletions

diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 9e45405205cf..58cc0333c0f2 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,8 +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-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
 EBUILD tex4ht-20090611_p1038-r11.ebuild 3738 BLAKE2B 3bd1ba528bd37b5b5bd8af9fc01501a6245e2b312d8cf5e7c0efb85c7a1726ddfcea491d432b4f13b9209d20e8ddcfba6538ce2166010c21b6d57c5e2cfe1239 SHA512 e009aff4e836f362731ef726ece6da5d4bfdad214d829358a0df4b9dbb32502dfd76c976b16af383c9aa05de5782b27d82c21aead0233ae7bb9d68998268d7b0
-EBUILD tex4ht-20090611_p1038_p20210423-r1.ebuild 3791 BLAKE2B fa00dbf838ef03c743b16f5a3742ff1c0ecc95b4ad009236d92a712a2c75959b1a3fcf885db80006010db71a9285ca03c68d7020f2623028499d4bbe24b1521c SHA512 d0390fd279c36c6ac5fa6a596dc4b19954c0dac15732b73be3bc930ad51283fd8f0eee87ba721e099ccbacc481a91f96afa0712e7f1b7b046dd0380aececc21c
+EBUILD tex4ht-20090611_p1038_p20210428.ebuild 3973 BLAKE2B 6a200e1b48e9fcd7bad319f25dd94ee22abfe6b30ba13264c2416080bbab19d5914ed826ff909b12ea203efef2b2e317aa8c5dbcda58d0492376cbd1c115b5d9 SHA512 250e5e31a52fff2ec15125ac7b0b1c0291dee144d03f3cc3d25ba4c366afa6502b2f8c4e92f1207045349c8b019b42b52e59afd488737a5140e9f266fb5a28b2
 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
deleted file mode 100644
index d3acc4c74adf..000000000000
--- 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
index cb06c8c62089..b746096e2afd 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"