gentoo resync : 29.06.2020

11 files changed, 88 insertions, 17 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 6f379633c3e8..6119f08c3e29 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index d51294f4b512..a635e4a1c0e0 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,3 +1,5 @@
 DIST glossaries-4.41.zip 6285205 BLAKE2B df3dc8e6a6a8cd2fc741c6891a9d0322b5d012e6ed9428e5b5b016eece4bba72647081a482a338c0b895b6aaf856c75f344b1327f88e854ea8c8c246d50398ff SHA512 4f93d7568e280da96c8e32dbbdeab48c71282fb8bbc2e8b88b74976b74f5f466683b1b3d983aec7c8749ee9807d76236366276754639e5ba68888584850fd243
+DIST glossaries-4.46.zip 7028263 BLAKE2B 3d1479a50ea938eb3bd273b2a17db2675275aece241f4bab0329656966d2d28fae2e82268c667998b111fa35f1a04f24ddb3b5130e897c13e2cef965783f9606 SHA512 6ade1039b91b719035cdaef5381cd4904c4baccdd7b9f9a2e655e47a833bfe5b20c6775e30ce08645c0c30d3cec140ce92e36c5a872b40217c5a82bca2a6ce5c
 EBUILD glossaries-4.41.ebuild 946 BLAKE2B f9157b7e2c2d14e21bfb96ba4fa9695811fe677eb0ea8b273ab88a56e0dc075115aa147579242fd6fcd00c3dce60f93a50a5b2a4e4d1a8bcf14cabff1df8d41e SHA512 195af621c4b81da1b7cc9f7a5e3602d935d1c644e40dd9b36ae6b1bdf3630c7ff51ddb7e8421db744eb4e8fd5acbd92e2a389a4c337740a12d8b020985820972
+EBUILD glossaries-4.46.ebuild 947 BLAKE2B ea36a4db4bdeddf895648b36df6f4b78396370dce0c941b203ad7bdd485e0fcc29f0ceacfb995773aedddb9c72053fd4f019cb6c9611a10a1ba4156fd6823907 SHA512 09741d2f50e95afc65e730a170c94fa3119dfb803c78f392e0e3e90d4bf7c884befb72b10599a9fc1d8924eacf01330e52e5d58a5cda1d283739f844aabd35bc
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/glossaries/glossaries-4.46.ebuild b/dev-tex/glossaries/glossaries-4.46.ebuild
new file mode 100644
index 000000000000..8d66ca465fb8
--- /dev/null
+++ b/dev-tex/glossaries/glossaries-4.46.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="Create glossaries and lists of acronyms"
+HOMEPAGE="http://www.ctan.org/pkg/glossaries/"
+SRC_URI="http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> ${P}.zip"
+
+LICENSE="LPPL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/perl
+	dev-texlive/texlive-latexrecommended
+	>=dev-texlive/texlive-latexextra-2012
+	dev-texlive/texlive-plaingeneric"
+BDEPEND="${RDEPEND}
+	app-arch/unzip"
+
+TEXMF="/usr/share/texmf-site"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	latex-package_src_doinstall styles
+
+	dobin makeglossaries
+
+	dodoc CHANGES
+	if use doc ; then
+		latex-package_src_doinstall pdf
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.tex
+	fi
+}
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 651a6c5c1817..2bc1e79bb847 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -9,6 +9,6 @@ AUX latex2html-perl_name.patch 445 BLAKE2B 5393870cd3c090c03c790235e36a255cf4d06
 AUX latex2html-tests.patch 1052 BLAKE2B 7f8e2f08d0f0dc102a08837333bfef91610075c316831721ea97f1efa3c65649c2efc61c071560621efe93e2789b5b9ee6b28080b56278a83c5dcd7f1dc106fe SHA512 b3c17ded5c45526f114c8bfdc9bc348e41d3297da377b99af2d0507f953b828d362ec9bdcf166677646b6350a7900f073ea7896dcdd7d3e6f7b265274ffaaeda
 DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
 DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
-EBUILD latex2html-2015.ebuild 2200 BLAKE2B db67e67585e4eb59b09e6013028bce0142b0a1dd787d7135dab71af53a0cfb132c392d50c1985d8009585cefcd8eef4ef5a4c170c96c22ca41643df1fd6528c6 SHA512 f0288fb21e8df66ecde1a8ddacba7b99ade25aff49e461d4230983a366b96445b14548e9ab0a52d1ef23445a3f3154af40bb167294e062d9ac40e6f37bcaeef5
-EBUILD latex2html-2017.2-r2.ebuild 2142 BLAKE2B 71bfb6fbbc76c055640f67bdaefe7e27223c90a3a7d261c1d3b94254b40cd9a02a39068761369cc35a50a8fa76f1569980865ca1b66be1d55776eb4d872e58de SHA512 5b5853958244a6de6c61b085f1ab2dd2a57693a316f7d69c2ff338b190748480e1612f330705be44c886c6b0b2c632bb993e7e6af9fc9063bab46cfea9e220e2
+EBUILD latex2html-2015.ebuild 2201 BLAKE2B eb029f4ed6a270a451bf30d27390965034bec92509b4aaf7ed4fe929c2c0ddaf7ade5d6adba004e7fa8e13817f7342a04dc59dca64dd61bbfed057fac45d136b SHA512 b4ae674c731fd638cbfe1feaa436e27754a80c2b0a8b3dce71d45bb681cb866283a9b7b8573ce401f95a5ebae50da09989c578cd7de756788caea3d7edef6cf0
+EBUILD latex2html-2017.2-r2.ebuild 2143 BLAKE2B 734e331ff240980a220b2f1de88b41bfb6bd92016b81fa215e57a6e7aab7cd01701374a7c6dffb7b61ad39b5e0a7dafaa59ec3e0387adb6079539c049543576f SHA512 cbb8382b12a75dbb102f95651dc58cfc532a5996ca6f5fb5ce0c84c55d45eddbca151cb78ba6dbc8bec52cee36e3d495f6e4f6acfdbce2d80d2bf4693d5f81df
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
index f71b7ea764e5..608a2b110a6e 100644
--- a/dev-tex/latex2html/latex2html-2015.ebuild
+++ b/dev-tex/latex2html/latex2html-2015.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
-HOMEPAGE="http://www.latex2html.org/"
+HOMEPAGE="https://www.latex2html.org/"
 SRC_URI="http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
index ca88c6d78f4b..5c8fe048f6a7 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
-HOMEPAGE="http://www.latex2html.org/"
+HOMEPAGE="https://www.latex2html.org/"
 SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
 
 LICENSE="GPL-2"
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
 }
diff --git a/dev-tex/vc/Manifest b/dev-tex/vc/Manifest
index 74ce20f21c50..75133f9765ac 100644
--- a/dev-tex/vc/Manifest
+++ b/dev-tex/vc/Manifest
@@ -1,3 +1,3 @@
 DIST vc-0.6.zip 451356 BLAKE2B 776b72f33320e5ac129c646774b65fe3ce1757df31dbd8a70ef6e05ffe0606e6e1a85c7910388efad45503ca488d8d78be9c9219cb066f107ad020592ec703d3 SHA512 dde8f3028742e4de42bda3e77a18155954cac954e54db13b1ecba3c60aff54f6ced4961f808b1f539223032f04a39a6e086ca852d340b42dbe98b6989542678b
 EBUILD vc-0.6.ebuild 582 BLAKE2B ded51ab5059c6255ac0841b72a7391fad8828c082d59a53b76c2886eaf25e48fad911393d1a5380cb3b57a3b77c41cf0958399c429746098e56c5cc9503aa9b2 SHA512 0b300ceebc7fad7b76f62629ee68a24be1970fd951ea45e968169f8aa650db0af24ae5a84f3d2f542764886dfa26935e65277845cb492d593930cf52b228702a
-MISC metadata.xml 670 BLAKE2B 905650a8d2784e14e6de90485fd97c0432f76fecb99ad39f3fc83e6e7229ad0149685606e4e973992f1d0be610a64bf5bcb608c8fb5e28ea1ff90d3ab19de05d SHA512 fbe6ee77419d1305df5cd6656ff45fd334fa3bb9e3a92ce67735d084352faa5fddb600c7bed62071ca6861ea4d08f58ea6b326c14df9a0fc73b7a9b5077e03b9
+MISC metadata.xml 681 BLAKE2B 69cb2d35cac92e22aba343dec46d68d1d04be13fd3afeaf308609c54f981c88546bd2a57faa41f3df3b6feac2c0bc8222c4bdfcd659ef9473750f0aa8a62d14c SHA512 e197fe9936258cee892aa3af1ab7758747ba5489fcf6d8be54d81df4098a499aa7ae20884d65c53501aeaf821b2f0e1ba87ea2809740934f5eca9ad424cd686c
diff --git a/dev-tex/vc/metadata.xml b/dev-tex/vc/metadata.xml
index 13f8b9913d61..79a5740d6bc2 100644
--- a/dev-tex/vc/metadata.xml
+++ b/dev-tex/vc/metadata.xml
@@ -13,7 +13,7 @@
   It works more reliably than keyword substitution based approaches,
   since it tracks all files in a working copy, not only .tex files.
 
-  The vc bundle works with LaTeX and plain TeX. Currently, Bazaar, Git
-  and Subversion are supported.
+  The vc bundle works with LaTeX and plain TeX. Currently, Bazaar, Git,
+  Mercurial and Subversion are supported.
 </longdescription>
 </pkgmetadata>