gentoo resync : 28.04.2021

30 files changed, 234 insertions, 55 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 7ebc86f20671..d2b5fd975be7 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 42900662ca6a..cb4b671a4271 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,5 +1,6 @@
+AUX biber-2.16-disable-64bit-only-tests.patch 1766 BLAKE2B fe5ad67ce8e4f08edc63950257c03b37c24e150da1f62ae8703272c210b4615d6c0b4ee61f717b7252e3976ee0d6d738aa7fb3a30161e66f4304b2ee7dc3b11b SHA512 e738e20b34ba96e857bdb3a7e010d7458cdc9dd2876ef7b5aff62bbe6d1e64192392f5ff51aca3f33f17f79bc6843858901f47c270f8cc033983bfab47faad14
 DIST biber-2.14.tar.gz 1589847 BLAKE2B a5f2c1ebbcde68c8ec28d54f10f9217e710c0bb840f455fea2516441653d308666ec3e9c1732f3211f0b205952d59b63d87fe8baf6f846776c781555884730a5 SHA512 dd42aabdb8f469ea759a4a7bb97cbe27ebe57e46d1b6dde7d293d1b046a55e20ac889bf9c8c6b6219ee827b162a280bf7aca239af1f357ee1ccc90600a5dcfc1
 DIST biber-2.16.tar.gz 1594209 BLAKE2B 60c07723c0ee869d3430d0270a2c0bf54adb63c1a842cd1bf0c6f2280bc964a404b2acd3d8a48461c8a22f7abaefcdfe346868e5a435f3e375b1466700176fa9 SHA512 12b939c194e171f4e7d8e0341b6301b55be8376eab3aa3e14a72a780e5bd8f6d61fa601a95f99c9d17894b8c10a785ccc916b23593391ed00ef31e0a8c2a4662
 EBUILD biber-2.14.ebuild 1727 BLAKE2B a06540c0fcd5e28d97566a2ae8ae5045c48091d8683a9b283ad0bc266ce2694c3b7cbcc05b7c4c4fe03f62fe9059c6277621cd677521696e548c1140cd1582f0 SHA512 f3e7891dad50f6145681888cb215ff802be5e39f694869735a6636e4163548056c5b7a14175f525a9b1ed78fc4b0943603a528a63ee8403ba07142be5eebe415
-EBUILD biber-2.16.ebuild 1777 BLAKE2B 5c1f6f1008fb29e52b0211fad7b7171f17eac3d7d48599b243a63d34757a7a4ab6e43a50bf3ceb60487960a63ab96b7d97990930c63c24393c8cca646c4f1dcb SHA512 bf83adfb250878b6b72ce57c2b08cfd1080f5631faf0e7b33de552585814988f95eefa6a90b157559be92365dac4dc4b4ba219c961ff425542105bb5f7141392
+EBUILD biber-2.16.ebuild 1938 BLAKE2B 4bc1c7ec562adfaeb30d125c44faf63b9c77db04356db2e13ccce267eacf7c2fe4b6da13344bd9265ab17af074f3442b92ad603271f6f6326d4d588da5376f25 SHA512 a5567be2169c8e2bd55ecd84354541fafc8cb22d9d685dbfe7a2a90664fbd40ce633cdc9afffd7095b4221b8b3e1a915a75386c9afb84989146bab9fa71d4ab7
 MISC metadata.xml 528 BLAKE2B f62f6ecb8f184573846289279af4d4e8c9fad181b5318f3ef4da039c8449c5fd34ea1639b42623bad65e82c76653ab863a1b2418829b4554ad80818de6bd80d3 SHA512 e00600348f687d55caeb34423aa84f9e6139190890cc30f666af6b77e864a88952cf6f0d6f0e6b5ff734f08d04185daa6195f450aaa61853033128213865bd8f
diff --git a/dev-tex/biber/biber-2.16.ebuild b/dev-tex/biber/biber-2.16.ebuild
index cd8a79b581c8..cc5a0781cf0a 100644
--- a/dev-tex/biber/biber-2.16.ebuild
+++ b/dev-tex/biber/biber-2.16.ebuild
@@ -67,3 +67,10 @@ DEPEND="${RDEPEND}
 			dev-perl/Test-Differences )"
 
 mydoc="doc/biber.tex"
+
+src_prepare() {
+	#disable 64-bit only Tests on non 64-bit archs
+	use amd64 || use arm64 || eapply "${FILESDIR}/${P}-disable-64bit-only-tests.patch"
+
+	default
+}
diff --git a/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch b/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch
new file mode 100644
index 000000000000..74e66ab0701e
--- /dev/null
+++ b/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch
@@ -0,0 +1,45 @@
+Disable Tests which works only on 64bit architecture
+because they tests int overflows.
+From: Jonas Licht <jonas.licht@gmail.com>
+Bug: https://github.com/plk/biber/issues/349
+Bug: https://bugs.gentoo.org/780879
+
+diff --git a/t/dateformats.t b/t/dateformats.t
+index 9c179f06..d22ffcf6 100644
+--- a/t/dateformats.t
++++ b/t/dateformats.t
+@@ -4,7 +4,7 @@ use warnings;
+ use utf8;
+ no warnings 'utf8';
+ 
+-use Test::More tests => 56;
++use Test::More tests => 48;
+ use Test::Differences;
+ unified_diff;
+ 
+@@ -879,16 +879,6 @@ $bibentries->del_entry('unspec2');
+ $biber->prepare;
+ $out = $biber->get_output_obj;
+ 
+-# Test negative dates and eras
+-eq_or_diff($out->get_output_entry('era1', $main), $era1, 'Date meta information - 1');
+-eq_or_diff($out->get_output_entry('era2', $main), $era2, 'Date meta information - 2');
+-eq_or_diff($out->get_output_entry('era3', $main), $era3, 'Date meta information - 3');
+-eq_or_diff($out->get_output_entry('era4', $main), $era4, 'Date meta information - 4');
+-
+-# Test range markers
+-eq_or_diff($out->get_output_entry('range1', $main), $range1, 'Range - 1');
+-eq_or_diff($out->get_output_entry('range2', $main), $range2, 'Range - 2');
+-
+ # Test seasons
+ eq_or_diff($out->get_output_entry('season1', $main), $season1, 'Seasons - 1');
+ 
+@@ -904,8 +894,6 @@ eq_or_diff($bibentries->entry('open1')->get_field('labeldatesource'), '', 'Open
+ eq_or_diff($bibentries->entry('open2')->get_field('labeldatesource'), '', 'Open - 2');
+ 
+ # Test long year formats
+-eq_or_diff($bibentries->entry('y1')->get_field('year'), '17000002', 'Extended years - 1');
+-eq_or_diff($bibentries->entry('y2')->get_field('year'), '-17000002', 'Extended years - 2');
+ eq_or_diff($bibentries->entry('y3')->get_field('year'), undef, 'Extended years - 3');
+ 
+ # Scripts
diff --git a/dev-tex/bibtexu/Manifest b/dev-tex/bibtexu/Manifest
index d5c52031873f..394d4b2330f9 100644
--- a/dev-tex/bibtexu/Manifest
+++ b/dev-tex/bibtexu/Manifest
@@ -1,7 +1,13 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST tl-bibtex8-2020.tar.xz 9216 BLAKE2B 3b03beac8ff92de75c477d5a1a8d675308ba1bd435e5d5f7c75c45039c2fb96984f1539c192e93d7659ef6b07c73f754593ecb56c277ae421a15ede4b1012331 SHA512 69f6b09fbed8a089e18ab7d39e352ad5a1e7512096a1806158ecb4df74822664b6620f3cffc12cb8a938b15a4000df2b46eadc0ff38c8de1d325539f01e8aff8
+DIST tl-bibtex8-2021.tar.xz 9216 BLAKE2B 3b03beac8ff92de75c477d5a1a8d675308ba1bd435e5d5f7c75c45039c2fb96984f1539c192e93d7659ef6b07c73f754593ecb56c277ae421a15ede4b1012331 SHA512 69f6b09fbed8a089e18ab7d39e352ad5a1e7512096a1806158ecb4df74822664b6620f3cffc12cb8a938b15a4000df2b46eadc0ff38c8de1d325539f01e8aff8
 DIST tl-bibtex8.doc-2020.tar.xz 33164 BLAKE2B af786ae0d513377bf11efa9dbfa7ea673fc217144f8e6cd48ceca2058ab22d17c872ed4c01df1d02db9010c1c5ad01ef4962a81848e5ac3a6ac6ef7e57770195 SHA512 d0863c43a5cbb87632a3513ffe75ab8a686647003366fbca1c9c168a4bb234f26078b260e1a3180f941e3eacf4717439a400df1bd180763aa43eec664009f25b
+DIST tl-bibtex8.doc-2021.tar.xz 33164 BLAKE2B af786ae0d513377bf11efa9dbfa7ea673fc217144f8e6cd48ceca2058ab22d17c872ed4c01df1d02db9010c1c5ad01ef4962a81848e5ac3a6ac6ef7e57770195 SHA512 d0863c43a5cbb87632a3513ffe75ab8a686647003366fbca1c9c168a4bb234f26078b260e1a3180f941e3eacf4717439a400df1bd180763aa43eec664009f25b
 DIST tl-bibtexu-2020.tar.xz 292 BLAKE2B a4dc5c282232b3b8c73aa43d5b0e482dc9521f4a1634add66037e2d4d33ec014863ebd96ca8cacf5a6214aedcc169bd328d3a224d9dae2b699553bbede67ba43 SHA512 9f1e27f1d7a76700aaa4f0f19c4e999070dbce873203b80e3ce5d2f4ed14c9b685515b6c648ece8942ba429d698f66f492b58373f348bcfef2523ffec270f466
+DIST tl-bibtexu-2021.tar.xz 292 BLAKE2B a4dc5c282232b3b8c73aa43d5b0e482dc9521f4a1634add66037e2d4d33ec014863ebd96ca8cacf5a6214aedcc169bd328d3a224d9dae2b699553bbede67ba43 SHA512 9f1e27f1d7a76700aaa4f0f19c4e999070dbce873203b80e3ce5d2f4ed14c9b685515b6c648ece8942ba429d698f66f492b58373f348bcfef2523ffec270f466
 DIST tl-bibtexu.doc-2020.tar.xz 67480 BLAKE2B 7885cd45a3914230a002ad37dd045bad38bc737a8258b2c64cd0fcdbd7ec08ea946b3fac33f30498ef0d68c2c35003af98c092f84d94f1ed689c4574a2534bd9 SHA512 0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4
-EBUILD bibtexu-3.71_p20200406.ebuild 1632 BLAKE2B 99778e00fa6e25f45151ecdeb569613edf088440423a7fe180b1795d2f529171870dbcdbc17a2a5eb2c5eb639550a8b95c47caa76f9727bb84bad50288fa501b SHA512 7fdb671b1d2ead5dcd45a9681a4fb58ebb233b0d8f465887f7fb16a296b5eeaaa133da28d3bffcbadef54fa7edce3d1b406ceda9a9adf538c44877c5704ee8ce
+DIST tl-bibtexu.doc-2021.tar.xz 67480 BLAKE2B 7885cd45a3914230a002ad37dd045bad38bc737a8258b2c64cd0fcdbd7ec08ea946b3fac33f30498ef0d68c2c35003af98c092f84d94f1ed689c4574a2534bd9 SHA512 0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4
+EBUILD bibtexu-3.71_p20200406.ebuild 1633 BLAKE2B 8a3dbb6391bc16cdaf58388398c6a20c55b0a9b871549ba95bf57908361e1d49a5f33be10b88a324499867203532fa5b0c353885194668c63dafd96fc81acb08 SHA512 129d428e0094bbd2282dab2ec47b4bd0a7ebece21aebe42a7c00c1306fa3c12a0928a1006f1b7ef623273b2dc370652194780b3d59fb2df6b8461a6da87328d8
+EBUILD bibtexu-3.71_p20210325.ebuild 1641 BLAKE2B c9f3ce3a02f6f2fc1ee05dbb6395a941aaf1e968817ab7ca26bbc21cbbcc94ef5b37126a8f1c4839bc924b2157e9032d5423fbbca347cd706f337ecc1bf67037 SHA512 14bb7da4640bc0a91a98d407281f75ff7cfb8244946623b336ff3b776498246c650d96a54b4387455ed46159a38a53fd6a8c69a250ccf5e7d45d5269f5af635d
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
index c022b026fab1..d0e30caf6f13 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND=">=dev-libs/kpathsea-6.2.1:=
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
new file mode 100644
index 000000000000..d023a8dd5620
--- /dev/null
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="8-bit Implementation of BibTeX 0.99 with a Very Large Capacity"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+RDEPEND=">=dev-libs/kpathsea-6.2.1:=
+	>=dev-libs/icu-4.4:="
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/bibtex-x
+
+TL_VERSION=2021
+EXTRA_TL_MODULES="bibtex8 bibtexu"
+EXTRA_TL_DOC_MODULES="bibtex8.doc bibtexu.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+src_configure() {
+	econf \
+		--with-system-kpathsea \
+		--with-system-icu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		csfdir="${EPREFIX}/usr/share/texmf-dist/bibtexu/csf/base" \
+		btdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+	dodoc 00readme.txt ChangeLog csfile.txt HISTORY
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+}
diff --git a/dev-tex/foiltex/Manifest b/dev-tex/foiltex/Manifest
index 088eef1f1324..e6d1cdb431ef 100644
--- a/dev-tex/foiltex/Manifest
+++ b/dev-tex/foiltex/Manifest
@@ -1,3 +1,3 @@
 DIST foiltex-2.1.4b.zip 380785 BLAKE2B 49d68884efcdbffb716bc0a63d701a8507a6d3558d5edc407bcecebf7ec570d0de31ff2079d66e3fa304c6d2d92510d8f761a3c21b390af0fbdeaf7d4039afba SHA512 62808b2faabe7ebb91ac9e71930e3a11526676bbc6ccf0a2f02088f148a3143bd5362b3fa01fac37088ee83c1329a1ae422d4dc095ea611f5b70c3074b6d894e
-EBUILD foiltex-2.1.4b.ebuild 598 BLAKE2B ff64e106cf4b932ca8b78e56ce718d1f302dc838b45dc4940a856d59723de1fe9f15d6e165ab90ef231e3b4cdc17d869dc22798aa9547fe66108086b24bffd58 SHA512 58bfcbf9ac45220efe6ef90eb1aa7f9b1cbe6e253e63b244d615fd32884aa12831879bf7d782f499a630096399719fde1e4a0b1e3c68b92bd91920c562f5e073
+EBUILD foiltex-2.1.4b.ebuild 588 BLAKE2B 4a87d1c33f1bde45282db016f7f43d522918029e3a429298bace58391d5775951226186216433e56e0aa8b9d3dc7e4346f7bb4260daf7b8b6a1b2f8e3da6b0ca SHA512 6b5de44e3ce47ca7fc0cd9c510325f69a35942618dcf3fb645e96b477fc197acbc35dde7aa5ad01e3976a2b508e8ca1969cf9c58d0649ef7a9a734d75af8fcff
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/foiltex/foiltex-2.1.4b.ebuild b/dev-tex/foiltex/foiltex-2.1.4b.ebuild
index ea43f3430588..d68bbf8fed87 100644
--- a/dev-tex/foiltex/foiltex-2.1.4b.ebuild
+++ b/dev-tex/foiltex/foiltex-2.1.4b.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
@@ -15,8 +15,7 @@ LICENSE="FoilTeX"
 SLOT="0"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 TEXMF=/usr/share/texmf-site
 
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index c8fce93d3833..c388722ee467 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,5 +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 936 BLAKE2B 42009d4bcdfb1f0fc86fc86592d2e5e170343a91a7c05d8dda23b26625754e0a140d7ee43bca737d4a0360543ae1b149c118a3e87b88d607027d9529efb225e7 SHA512 3508a42b461d8e4fd79b2bce9a228be6830f8b24f80ac87fc21143a51cbec40cda65b28d1a86da14a99a35666778b725c6acbeb1e46b5ecd939a7b4dbbf4218c
-EBUILD glossaries-4.46.ebuild 936 BLAKE2B 8b3cd0dfef1cb8f8578a0dcc76f95bcd0a7e17dcb53beb8a6180246d59ef866627de1dac1aa758a7a622b06a2f3c241c4fd360983aeb5bdcf18e6b7d3ed5eb10 SHA512 a4db24c7b7eb297554372fe8c617e519799fa5e4ea93f632a134067c92e03be6b251b5606425eec9298534e36b2a3dbb4bf88564ffd17f2682d475fe164c0a58
+EBUILD glossaries-4.41.ebuild 937 BLAKE2B 0a4ac18d21b03496b97bc1f72a7975b9a698c2e46eca521f1d201cf604c6fb71290800cbea3552dc91a4a75110a40126f0b8bf15a798c4e22a0a2a26c51459e8 SHA512 06fbef0603f9b2ffe60be5404c66ff13e98721050cc91afef1f7f60396b4a342422ff2af52f586126da8969749a9bebaf00360e580d9481f8b16ea67aa9838a8
+EBUILD glossaries-4.46.ebuild 930 BLAKE2B a146dfdb9ffcb8f74f25da57384f6e7ae8ebf6fd78cb1e4177194533ba3a29a6956f974cdf1bcd5a6963a327bd783ba2756a386908d97e8617b4e564fba426d6 SHA512 f78ce77c11c47a92fb864489cfbbda2549a31e753dd6a261de4c36601d285567c2814e18848e0300007b36ef64c5dba3805ebba530ee3dc02674cea34c000175
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/glossaries/glossaries-4.41.ebuild b/dev-tex/glossaries/glossaries-4.41.ebuild
index 588cf1a95b94..258722127a49 100644
--- a/dev-tex/glossaries/glossaries-4.41.ebuild
+++ b/dev-tex/glossaries/glossaries-4.41.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/perl
diff --git a/dev-tex/glossaries/glossaries-4.46.ebuild b/dev-tex/glossaries/glossaries-4.46.ebuild
index 55d551110e9d..d698d9105176 100644
--- a/dev-tex/glossaries/glossaries-4.46.ebuild
+++ b/dev-tex/glossaries/glossaries-4.46.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/perl
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 28bcbdfdfb9e..634ba1564151 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -1,7 +1,9 @@
 DIST latex-beamer-3.59.tar.gz 662040 BLAKE2B 17fac01d2fde92300e1c678bbb7302a318a98e542196647dc4f5fa24b34df82f246f206a73a7af1d1b80244ae3ee04387cc77a8c77922f3eb1ea81e70a08b24f SHA512 0bc7dbcabf2f699f11c703d628f304d6b9658bbd260aaeac6c97813f14ed48b14b9a1a1d2eedfd4d8c8c31a91f1b57b1e9520a78ab962814f65a0b9781b55f79
 DIST latex-beamer-3.60.tar.gz 662128 BLAKE2B 99e9bb915494bb0d3b58fb139e019c26f630aebd31bb10871490457f6582f9a8b7296c7af6fdb2f25715773ef26e48728b760010e1fefccba2adb8b3d2dc6f69 SHA512 e9e4cd3edc479cf5fea4bf88c0bccda5a1c80a899972fdae91f7310685e00aad1c61fd94a3b01fe50e3eba0b7ec6948f8bc59486ebfe5e7c36476aaf229201d3
 DIST latex-beamer-3.61.tar.gz 662181 BLAKE2B 90e30f1380368dc98bbe6fca98dba28b041072c3c0e6a13fb53869d834cad20f5ed3769d045a9269bd4c8b5220bc0463eed6dee1998310fa4339ca5044deddd9 SHA512 9977bfb76bd485c37244663734fe09e3690b4e26ddf34e3d982b7b36920660dd92cea95eca163e5262c31ad256567a56a6a364f4ba88ea0e68235c0eb76249fb
-EBUILD latex-beamer-3.59.ebuild 1008 BLAKE2B effdd774b716761a14b5b49590d16842389c3eca97204881b99fff18dc718cb41c1ff336c92e238d5b2f7b99a87cccef3815ff45f69e23c24587e421f344a989 SHA512 5c1dd14c77682e3e8a273eacca56cde79fcc44c4686d5f13337883027325749d2861a04b237c08b5382e0ef3b5457b1fd00ba7e6a6314f9818aa7ac8658478ad
-EBUILD latex-beamer-3.60.ebuild 1010 BLAKE2B 62564e9efeca091fac7cddce55bdb16526b613178c8fc272080cd00cb54b6feadfbeb99b39d8beaa71ba6b21e4e9d851e3fffac872f571210fdac1e5a45d10a6 SHA512 7542a937a67283a41cb567c84887ba06455b6c977f6473dbb32c8fe4dba7b7734d486ef0124ecd16d20ab9aa0e81a7dc9c48c551c7b97d4e211ded7a654cce1c
-EBUILD latex-beamer-3.61.ebuild 1017 BLAKE2B 4438af750253370b3b55c8e30ce4b258e331fdc8a138b27a6b2a64951ae82a6a82dd1e6cf19ed9c1ecaf41764d740ec287e148bbef5afccf61e5507771d478e5 SHA512 0bac6634ed40628d3e2a5f0221bb6d1ecf07e43ee1bb0247d8928eea3f2532e7c0ee9e9234caa7a4b1b80e2b188793f90198a162812fbe6a852d575c71925a2a
+DIST latex-beamer-3.62.tar.gz 662385 BLAKE2B f34563716092c83da5bfafbf4730e4a4175fa68eebfd6749c3da6b45ffd337b3ee8aea8c1e000dd73be356d6525afd59931c57c1652f0ec23d2383b558418dcd SHA512 e0a787e5806cf371f0ec08326156f7fbcfcb6dd5fb0587247dc495f5d585f339eec5ea10b0d6d071a9cd30ab040a3c68512c1f7232bec37042265f5468819708
+EBUILD latex-beamer-3.59.ebuild 1009 BLAKE2B 1ebcb4c3912b2eff4fbe2d9512c26ea5d6c9dd75c25c7ad9e14779d0b9a8dd2bf26fc29ab73a29a2fe29a2d9f378f1851d53f8c3af1f30ef4c7046771c2c2059 SHA512 ef5a2e3d08b0f9c312f0d0fe327bc1e7ae01e896a993f7ec318b7b2259b5cc915f47f43b2a2a62e7a90109d11bbc433082eecc8e9f1669f10245b270a0b645f6
+EBUILD latex-beamer-3.60.ebuild 1011 BLAKE2B d2f510738a518d8675c0c3ee51faf3f4b548055cab3759129f1f42055952413eded688124a4032352430f2842e412711e51453e3c32fdabc29261078e24639f9 SHA512 d919e99f7bb4b3c60a4141737c417934b931bdb570801c3bf86cb7f78dd38a3da292781df8b3bf880b5fc1763b056b4e31a3d0dab5f805343771e266bd050872
+EBUILD latex-beamer-3.61.ebuild 1011 BLAKE2B d2f510738a518d8675c0c3ee51faf3f4b548055cab3759129f1f42055952413eded688124a4032352430f2842e412711e51453e3c32fdabc29261078e24639f9 SHA512 d919e99f7bb4b3c60a4141737c417934b931bdb570801c3bf86cb7f78dd38a3da292781df8b3bf880b5fc1763b056b4e31a3d0dab5f805343771e266bd050872
+EBUILD latex-beamer-3.62.ebuild 1017 BLAKE2B 4438af750253370b3b55c8e30ce4b258e331fdc8a138b27a6b2a64951ae82a6a82dd1e6cf19ed9c1ecaf41764d740ec287e148bbef5afccf61e5507771d478e5 SHA512 0bac6634ed40628d3e2a5f0221bb6d1ecf07e43ee1bb0247d8928eea3f2532e7c0ee9e9234caa7a4b1b80e2b188793f90198a162812fbe6a852d575c71925a2a
 MISC metadata.xml 446 BLAKE2B da66d52e35985a328e4bc6994c84f554aab9eee80bfe3988e1f4a27c2c1f5a4f07100921a1ca21d9087ce7c800137d932b87632b86b354a16e352237e16d4ee4 SHA512 f119998212dee08dae68bf33317f5855910fa2565d2549de15c0e895bb2af6ee4e452048cc8ebb9cdf62b6e1cc06eaf6233defd14815cb500585ad7b205919a4
diff --git a/dev-tex/latex-beamer/latex-beamer-3.59.ebuild b/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
index ad5a4864a629..632559bbee46 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/josephwright/beamer/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex-beamer/latex-beamer-3.60.ebuild b/dev-tex/latex-beamer/latex-beamer-3.60.ebuild
index 7c0d98c2a58e..bd2b9ecb452b 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.60.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.60.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"
 
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex-beamer/latex-beamer-3.61.ebuild b/dev-tex/latex-beamer/latex-beamer-3.61.ebuild
index 87efaae27beb..bd2b9ecb452b 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.61.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.61.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"
 
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex-beamer/latex-beamer-3.62.ebuild b/dev-tex/latex-beamer/latex-beamer-3.62.ebuild
new file mode 100644
index 000000000000..87efaae27beb
--- /dev/null
+++ b/dev-tex/latex-beamer/latex-beamer-3.62.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="LaTeX class for creating presentations using a video projector"
+HOMEPAGE="https://github.com/josephwright/beamer"
+SRC_URI="https://github.com/josephwright/beamer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/beamer-${PV}"
+
+LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+BDEPEND="dev-texlive/texlive-latex"
+RDEPEND="
+	>=dev-tex/pgf-1.10
+	dev-texlive/texlive-latexrecommended
+	!dev-tex/translator
+"
+
+src_prepare() {
+	default
+	rm -r doc/licenses || die
+}
+
+src_install() {
+	insinto /usr/share/texmf-site/tex/latex/beamer
+	doins -r base
+
+	dodoc README.md
+
+	if use doc ; then
+		docinto doc
+		dodoc -r  doc
+		dosym ../../../../../usr/share/doc/${PF}/doc/ "${TEXMF}/doc/latex/beamer"
+	fi
+}
diff --git a/dev-tex/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index ed2f35aa2968..eca569574184 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -1,4 +1,4 @@
 DIST latexdiff-1.3.1.1.tar.gz 1879814 BLAKE2B 1f537dff75ff12eeacfcdfa05c0199a29a0ffc4e8ff728b390dcbd35b3ba490e4e1c2e7201b7313335aabd8b870e764b9573d6322c34141be9d4fa141349db0a SHA512 bdc573b4fdb4d647ab3208f350e89843e4602e81c293665e1d08ff9b1b0d531c665d687be0185ff9ae229b9f43fd9bbd6aac437b6b1bcdca9d72d39f360b6136
-EBUILD latexdiff-1.3.1.1.ebuild 1164 BLAKE2B af36ea53969ffb300bcc5a46d4f8318f87b5c6bbe8205d64c653d4620dbdf10e0034f2a38d1571331a04e519e42f17c7c6acfe52363ebd500712ec0ad2a7bf24 SHA512 38a11d5e70656f8e5edaff5bcdd7d2efaa09b749e407de555a4ed142991f945113c772d5716c87a7808f0cb77147f7e83f4693650c6ab354d27aa975195a0b1e
+EBUILD latexdiff-1.3.1.1.ebuild 1165 BLAKE2B 22dc838a53ec04a1559e9071d007b3db0b8cb5d9b55347839d229df50cb319d27a0b676d8454b6307a58a273f08a9a8065280b34cf4a84ba76f74455cf953ff8 SHA512 682772d8b994e37ace8449d4036b6ba547189e283a94c97b711eaebecf4e9799c713f83cf650d972a463dbc8b3bd4aa36dfd1fb28650d622229f6659c34eb7db
 EBUILD latexdiff-9999.ebuild 1171 BLAKE2B f1b65ed80eb08cb4d6820119104a6f11404a9c831a10eaa562677a292f2e65a1586eb214c9fca304a37aab98a40dc3c6654d14cfc42d18abd93ed6e7b0042ea9 SHA512 4bde7fae0334539eb290615ae79b9ee2cd972a5a2dd9ff936680b5c8a369bb8c6ed95d40edb2ca4897c17493a398f4b34d72fcfc05c9e5772dc64924ed7b1122
 MISC metadata.xml 332 BLAKE2B e23b9e1ce0df618f8130ae9291147e4c2cdd33e0aaa3f26e6900cf30f41dae7f4954144180ca0886a8a3370910e1e4bba21dd87b303e23e6bbb8ceea484e00bc SHA512 a0e324d4d38574f5f5af8003e9e048f4c0628022e5b6553d1ce4b20cf12424f15e1bea07c6bd6cf87b7f7ba54c9983e2c025b42d517ef31c9fa3853def50ba3c
diff --git a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 9330b2a48162..157df8a32ccb 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/dev-tex/latexmk/Manifest b/dev-tex/latexmk/Manifest
index 0a0055221ee6..4296b15a11fb 100644
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@@ -3,7 +3,7 @@ DIST latexmk-456.zip 425179 BLAKE2B 1cd2fcaff070bb9809a263763164f364f13146ba4a51
 DIST latexmk-465.zip 447290 BLAKE2B 2f11667e674122aad88604aad3f61da1503d220b27bae9b95c29922fc6304c227c5c5257666a6de3da6f6dee77b466d7e3c6f06fc6c03f4102cce43879765dd0 SHA512 132cdd95c0274f98946b37a0c1554a82bb649dcd61284386f3005aa78895d51c382d5d8f6cf1ecd8ece60c1877a0dc80660367e0ad82a44036334b3f4634ee86
 DIST latexmk-469.zip 455039 BLAKE2B 373ce1c6fca0c57fd7350149fa5c1ecc4a301d4305adad79dda230f0a4c3c7ad4b6c8b8b07a9d76749f000251389673f152c7a56b97c552369f1f258cb869460 SHA512 b1ca496cc424167296b3a5305d1a6fcf4a35d33020dcbbac88d14c102ec3d92be100c5daca54168b69846e3f8b6a3ac326e2e35b0c9a84ff141ed31592aec857
 DIST latexmk-470b.zip 458908 BLAKE2B b82f09227412a05fcb662530b2c6691bac72640e5e1bc431de1710ca13b2c97f62f23fbf18a11eff21b222483367c7a4ba88cc197148d8f0b37edc53a96e1490 SHA512 2f984fd9c1785177fd58eb6bad44061bc7b397ed627599557704bae2cef1f53c186d161f99e4aaae5fa33fc66d56936dc9f5b6385f00d85bd634016bac0d555d
-EBUILD latexmk-456.ebuild 782 BLAKE2B a311af8ac0aff5f446d8ce7ae48cf52d57d6e520df65e59282a3605f986849c69bd1225be9bade4232b63c5ef60d669690072ed5cffd740ff4a97b2553cbc061 SHA512 6731634537a95f2928dd189d9937519977629be905c88aaa2e2044d6642a4600281f8ed84ebefe8f5c5166a88a4e9efb735ecff26f643b6177ee539f7a2d9972
+EBUILD latexmk-456.ebuild 783 BLAKE2B 211c57009909d356554db027246e7113153fb1085fe5d748fa9323ca8ca690b6f1cf4ed8d132fd75a3213ea8d9fb059be675e0b65dd2d9e9a72de008e3da4242 SHA512 caae6e1fa8ca68f022f820fed24170f59812612d0210c4f09d41f52596dca911dfd5d15943c72d2971628e7c736a244e78363735a9a9d9ac74b9a652bc498cb7
 EBUILD latexmk-465.ebuild 790 BLAKE2B 3b76a87568185539e32c52b6f48ed306695b6fccb77339950c3f7a34f7aea0e656bc8043cbb731831f64b63e95aae59d14eb1017ee96d0ee17ca9c9f8824a236 SHA512 e264c72b3ad2e8c4481937c908afa5eed885344c54a185c7e2472dbd8e4414752e09672798c184911604947c0bb1f7aaabf28723550a98c2d3c79f94d4a26a76
 EBUILD latexmk-469.ebuild 806 BLAKE2B 5dbed5e5ae2f770940e7730914588c643112f3807714b451bc32a3c04fca4d72c646dfaf83e083696acf6141e9327a1a70fcb48b53f2bdc1a600580c1093aaea SHA512 e8fefd6ba3b85db4802572c2ea30229a097a245a9b0336203c5c1b435fe3f8b973847985e555ba07456a8e2b6a45523b9c1eac07697d4b62d2bc6982c9f864f7
 EBUILD latexmk-470b.ebuild 822 BLAKE2B 57186a45acdac301e1203e6abf65891cad71d8e116b8b478ee28e7b56b390caed3dfc98f8372c2dee1ac549bc2030198c7e8580665c2a6a4899a3a6afa57675b SHA512 03dd5cf4a9ff4a84543cce80df84cc377b974f59e407cf792f620100700ab9a59662dcac7973fdba116d9ec20e16b3e26c322e842b6a88f025986d9ab5186a07
diff --git a/dev-tex/latexmk/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild
index a52dab2f94b8..7be8d249f0ba 100644
--- a/dev-tex/latexmk/latexmk-456.ebuild
+++ b/dev-tex/latexmk/latexmk-456.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="virtual/latex-base
 	dev-lang/perl"
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 543ee57d409e..063df1ef6b54 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -4,6 +4,6 @@ DIST pgf-3.1.4b.tar.gz 2426541 BLAKE2B 91f1b0ea1f2f3526da6a57cd2deec76b49b420404
 DIST pgf-3.1.5b-pgfmanual.pdf 10531853 BLAKE2B 5bae5c0fa8a5427e93a779fecf76483ae3c29500a9637f4c1f22ef5d994fef20d64ece69fc78778c07095003e9b8c77b394f26cd649dfb0d6cc3efba63bb3937 SHA512 980e11182adf58b5a029bc807ef5e57110b566c836548df37aed9d2493803fa72bdead0b05220d844c9de8c416fd8439dcb9e9dc50626f15955f97ced3cb582c
 DIST pgf-3.1.5b-revisioned.xz 244 BLAKE2B 7072ba9a8f22bc26fda64dcdb9a272ed71a718d0c99b5ee53acdf14e472bc7bc220ffc3a7d95bbef221f44bad5f136f8247d69dcd8b22f3d6215fd9c59ea3b67 SHA512 09803852bea5768186fbee86390249a046a9c9e9b60624d02de7e8ea34789e3640ba762b17dd717fc751d869ca3b30cc66e7c4237746ddc1390c65e70ab97302
 DIST pgf-3.1.5b.tar.gz 2597080 BLAKE2B 33b2ec65202d65a839db50ec084e0708d3f3b413e7bf1d09cf78d39bc2da1390b06a05f2e386de5f7a94c60634bf1e99354851245152c57bda67ecf20a980318 SHA512 a7473526746e8ba2485ece61f4b5dafb78d1714ba616fb7707ea22451f5b64c307474988ab6914a98e94773b7dc07492325c3e11037f3db2bf11f32396b8dc40
-EBUILD pgf-3.1.4b-r2.ebuild 1374 BLAKE2B 9a9bd369213a5fadbc606d1c250fe8033b647712ac89888609007ddf625e3767142be8ef3e505d0f655ec8375c02fdbcd479ea72f20e170f05c7c156828396de SHA512 83f28ad92790b29d37ce1c2cb0cf04fab41523e3ea3ea711ef8035671ef4ebd312ef2e132c79803ad922f01bcf2ae46a1d79201fd5d56c663c4ae738502e71ae
-EBUILD pgf-3.1.5b.ebuild 1383 BLAKE2B 84c0ad820c49c095bc5c895c7dfa34883c2df24910a87b15764b5675bad02f8ba11fe1ed13348938312d16722129c1b48693bcb15e98d051219a38dc31960623 SHA512 76fe52492ab8e3dd3135e010546c1860f918acad5e2bea28a48dea70e1deb9782c39ea85bbf1ef69d3d8e7a408765eeead3532aff0061aed3f1e859b89241360
+EBUILD pgf-3.1.4b-r2.ebuild 1375 BLAKE2B ceb94a8679fe2ed0f348ace4d53ce0a447aa964838b29f523d0ac3472d7c1a4ba3011a33453cfd53fce17945aa4277b30e711a33261a559e17566842f79280fd SHA512 c2fb86dc65026b0fe4dcff8691b92a5a707a782ef54041ec9643f73c402ce15fc3225c270dfda43a9889171bca9aa57cd83b3ce6419eb6ba577cd29369e8ae5c
+EBUILD pgf-3.1.5b.ebuild 1375 BLAKE2B ceb94a8679fe2ed0f348ace4d53ce0a447aa964838b29f523d0ac3472d7c1a4ba3011a33453cfd53fce17945aa4277b30e711a33261a559e17566842f79280fd SHA512 c2fb86dc65026b0fe4dcff8691b92a5a707a782ef54041ec9643f73c402ce15fc3225c270dfda43a9889171bca9aa57cd83b3ce6419eb6ba577cd29369e8ae5c
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
index 5e578c7ce128..74694bbb1382 100644
--- a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-tex/pgf/pgf-3.1.5b.ebuild b/dev-tex/pgf/pgf-3.1.5b.ebuild
index b3f2456dc8b5..74694bbb1382 100644
--- a/dev-tex/pgf/pgf-3.1.5b.ebuild
+++ b/dev-tex/pgf/pgf-3.1.5b.ebuild
@@ -13,7 +13,7 @@ SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-tex/sketch/Manifest b/dev-tex/sketch/Manifest
index 4efe56d8eacb..e67699abdd16 100644
--- a/dev-tex/sketch/Manifest
+++ b/dev-tex/sketch/Manifest
@@ -1,3 +1,3 @@
 DIST sketch-0.3.7.tgz 2882384 BLAKE2B eba29a8e76e3f173f3229944894415e70a38de878eda1b6d930c89422cf64ac9c758453c80cd633c3d8858207606773d6777e5adc049bb573e8d9d7a3ae5cd85 SHA512 efa827ab2427177ea83dd153f1f99c8e8eb339220b5edd68bfb3854d2280287158967e8b024cf0ebd92b18627183efba34693e84cec4431de0f323fe468342d3
-EBUILD sketch-0.3.7.ebuild 846 BLAKE2B d30a9b9b74a1ce08105997e9a6b4a3b8bec96699cadd1cc4966dcfca22a0fe292312414fc185905947ed7c1d804f2c602aa519e374c77bbe1359474cd554c75c SHA512 fcd3aae29c863d997efc33cc00fc4fc107472757d00b9479ba144cd865aa7303ebb20ae0fb29ac0cdebd10cf14c3d80204920da2c40a458caa843581db82c306
+EBUILD sketch-0.3.7.ebuild 849 BLAKE2B 993ba4e7df83cadc393a353288b679d4ca2b14de5d83f0ea2d7b6c2728d0515f34c1fcffaac36244d8cc31f192fd12caa8f6ae90118c5b372c6f43ca7b91c7fb SHA512 a139c443b55e90fe03f26328cfe3e0894c2d9c364712d48a3afb19d1f8ac3507495ee76f84db6bf0828e4b027a8c1ad7b46ffe838173daf5443a2935f5104ab7
 MISC metadata.xml 351 BLAKE2B db0a1b8a3516e77dbd3354a246087abe127715729ecb99e1c4fc24533322e7ddb1a63851be7b48536f280d2d48a2802129b5a032dd05c020dc64f8a9f46faee1 SHA512 de8a00b0c5bd29688d04cdb44e00c5783343ae47fdf94a0cd7b0933e98cd476c4f92193f097c4c6d51e91967f2651e550d0c86489d4126f9b582b6d4902707ad
diff --git a/dev-tex/sketch/sketch-0.3.7.ebuild b/dev-tex/sketch/sketch-0.3.7.ebuild
index ac587f8b176b..224a68f6c88c 100644
--- a/dev-tex/sketch/sketch-0.3.7.ebuild
+++ b/dev-tex/sketch/sketch-0.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit edos2unix toolchain-funcs
 
 DESCRIPTION="Produces drawings of two- or three-dimensional solid objects and scenes for TeX"
 HOMEPAGE="https://www.frontiernet.net/~eugene.ressler/"
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_p20210423-r1.ebuild
index 095c26e4d8ac..cb06c8c62089 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210423-r1.ebuild
@@ -1,42 +1,43 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
-
-# from ftp://ftp.cstug.cz/pub/tex/local/tlpretest/archive/tex4ht.tar.xz
-TL_TEX4HT_VER="2019-03-22"
+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}_${PV/*_p/}"
+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
-	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
+	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"
+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 )"
+	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}"
+PATCHES=("${FILESDIR}/${P}-hyperref.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#" \
@@ -56,7 +57,7 @@ src_compile() {
 
 	cd "${S}/src" || die
 	einfo "Compiling postprocessor sources..."
-	for f in tex4ht t4ht htcmd ; do
+	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 \
@@ -74,7 +75,7 @@ src_compile() {
 
 src_install() {
 	# install the binaries
-	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht"
 	# install the scripts
 	if ! use java; then
 		rm -f "${S}"/bin/unix/oo*
@@ -110,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
 }