gentoo resync : 29.06.2020

3 files changed, 39 insertions, 10 deletions

diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 85ffe4949665..ff3114c12d74 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-format-security.patch 510 BLAKE2B 47f58dfb3c082bffa4a856a7cdb3ee52775e1bb79f18e01cdeb74126d8004664c1981ff6fa4592b77d1379169dfc0116169aca50197bb3be7420bb46868d50dd SHA512 892aac24dc46dc196d4cf67834a952a3be80c8a5a0006809e0aa2646af4f9772e9353c927f8f1c42bc5a38bfa4dc1a7c5ede8752fcbe0d0970f38624755eb762
 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 tl-tex4ht-2020.tar.xz 909692 BLAKE2B ef566977a0a5a8d6ae5244fceac4ff378dc8adf86817e7bbbd1d0cd1931fc5fcb618b94353b044d461d94edd426ec3aa185e1b7d678490416bb1c122438046c3 SHA512 c385b90fcff5ba43884918bf616aa4beffc285def1a380b84909bf4dd44cffb479612268a37977adf87f8dc226394d3239503b5d6f2a083a9f078862f282f0c4
+DIST tex4ht-texlive-2020-06-24.tar.xz 880952 BLAKE2B d021efca48571711d06d7ed6ecefce068339a49fa83efeaa476329d892a77f73b27273a711dad2cb7ce212ece87ef8a776a10127cec5dc2e0096ce36adbc42a4 SHA512 b6109d27fd38eb0f2f9aab8b96adee2e69081c7317de3c9f527e47053d1520b93c0499e23fdc66f38f04c50633f72930e4fdf5d07612894427ae31dcbc1f66d4
+EBUILD tex4ht-20090611_p1038-r10.ebuild 3816 BLAKE2B 12218ae356afcdbaeabb323876280883365bd30c4ccf93f491b73809ddff76b8921c029e44d08f21143064204c2983a6e46d1cdec93818432d04d441b6d668b0 SHA512 6209c605fb5ed18463893664c80707fc683a1692861e067b56f3c700ad94ecc5f4234cf63d21fe50adbb886b2a4db698260b958eb103abd61902b5cb83a706ce
 EBUILD tex4ht-20090611_p1038-r8.ebuild 3644 BLAKE2B 57e046a3ee07c5d871d10a5c582002f070f8a8648cf2963075af4670451eb3525b6c7f1661c773e83c2ea4dee450efa1bd231d69922f732f10b65c0b5114692d SHA512 564011601c3af1cd93a28d1cea2fe75eed43be30aaeac50d3c27fcae2e1b2ff3eecce2f0c0092af2782a9c6e3fc4b39aee38b86cd95c3d24999974a4a6a2137e
-EBUILD tex4ht-20090611_p1038-r9.ebuild 3602 BLAKE2B d281be861aa73cacb967b61c8769d057ed47f06deaefec488ecfdd9a9f60fc8cb833188804e131d228bde90eee19e279ca835183ec49da60f2ab07096e636b0b SHA512 a8f2dcb7e37324ff373639c9b814192ba841ed87902f7755f88af5b48761247117a1f5a86f5f16167fd496ac9fa8528b0cb77ac3bcab6b5a4d546a2a6a7dab5a
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/files/tex4ht-format-security.patch b/dev-tex/tex4ht/files/tex4ht-format-security.patch
new file mode 100644
index 000000000000..fde075ce33d3
--- /dev/null
+++ b/dev-tex/tex4ht/files/tex4ht-format-security.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/554636
+
+--- a/src/htcmd.c
++++ b/src/htcmd.c
+@@ -418,7 +418,7 @@
+ #undef SEP
+ #endif
+ {  (IGNORED) fprintf(stderr,"--- error --- ");
+-   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
++   (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
+    exit(EXIT_FAILURE);
+ }
+ 
+@@ -439,7 +439,7 @@
+ #undef SEP
+ #endif
+ {  (IGNORED) fprintf(stderr,"--- error --- ");
+-   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
++   (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
+    exit(EXIT_FAILURE);
+ }
+ 
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
index e5b3574cf7ea..b88bcf3fcf0c 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
-inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic readme.gentoo-r1
 
-TL_TEX4HT_VER="2020"
+# from http://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.tar.xz
+TL_TEX4HT_VER="2020-06-24"
 
 # 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/}"
@@ -14,7 +15,7 @@ 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/~zlogene/distfiles/texlive/tl-${PN}-${TL_TEX4HT_VER}.tar.xz"
+	https://dev.gentoo.org/~ulm/distfiles/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
@@ -32,10 +33,11 @@ BDEPEND="virtual/pkgconfig
 	java? ( >=virtual/jdk-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}"/${PN}-format-security.patch)
 
 src_prepare() {
 	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
-	eapply_user
+	default
 	cd "${S}/texmf/tex4ht/base/unix" || die
 	sed -i \
 		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
@@ -109,12 +111,16 @@ src_install() {
 	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() {
-	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'"
+	readme.gentoo_print_elog
 }