Updating liguros repo21.1.2

38 files changed, 199 insertions, 393 deletions

diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index c5ad0467c22d..e3a98371c2e3 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,2 +1 @@
-DIST biber-2.12.tar.gz 1323440 BLAKE2B 9f124e1bdbfaeba6e3072c6e797d47eef50e4efe419b490975df0a25fa802f5f44a1c246d9c0bcf860767c35e1a399caf088b33223d0267286e0a5f064be7a63 SHA512 72f1a05224dc2735b32e92ac376d392fb631bf788a15de449471fdc5a94182ad4434ce71f95281e4cfc3a06cd275d2ff98e526d540c2979cd3e0dfa15b5c75ff
 DIST biber-2.14.tar.gz 1589847 BLAKE2B a5f2c1ebbcde68c8ec28d54f10f9217e710c0bb840f455fea2516441653d308666ec3e9c1732f3211f0b205952d59b63d87fe8baf6f846776c781555884730a5 SHA512 dd42aabdb8f469ea759a4a7bb97cbe27ebe57e46d1b6dde7d293d1b046a55e20ac889bf9c8c6b6219ee827b162a280bf7aca239af1f357ee1ccc90600a5dcfc1
diff --git a/dev-tex/biber/biber-2.12.ebuild b/dev-tex/biber/biber-2.12.ebuild
deleted file mode 100644
index b021e8d19e25..000000000000
--- a/dev-tex/biber/biber-2.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="A BibTeX replacement for users of biblatex"
-HOMEPAGE="https://sourceforge.net/projects/biblatex-biber/ https://github.com/plk/biber/"
-SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/perl-5.26
-	dev-perl/autovivification
-	dev-perl/Business-ISBN
-	dev-perl/Business-ISMN
-	dev-perl/Business-ISSN
-	dev-perl/Class-Accessor
-	dev-perl/Data-Compare
-	dev-perl/Data-Dump
-	dev-perl/Data-Uniqid
-	dev-perl/DateTime-Calendar-Julian
-	dev-perl/DateTime-Format-Builder
-	dev-perl/Encode-EUCJPASCII
-	dev-perl/Encode-HanExtra
-	dev-perl/Encode-JIS2K
-	dev-perl/File-Slurper
-	dev-perl/IPC-Run3
-	dev-perl/libwww-perl[ssl]
-	>=dev-perl/Lingua-Translit-0.280
-	dev-perl/List-AllUtils
-	dev-perl/List-MoreUtils
-	dev-perl/List-MoreUtils-XS
-	dev-perl/Log-Log4perl
-	dev-perl/LWP-Protocol-https
-	dev-perl/PerlIO-utf8_strict
-	dev-perl/Regexp-Common
-	dev-perl/Sort-Key
-	>=dev-perl/Text-BibTeX-0.850.0
-	dev-perl/Text-CSV
-	dev-perl/Text-CSV_XS
-	dev-perl/Text-Roman
-	dev-perl/URI
-	>=dev-perl/Unicode-LineBreak-2016.3.0
-	>=virtual/perl-Unicode-Normalize-1.250.0
-	>=dev-perl/XML-LibXML-1.70
-	dev-perl/XML-LibXML-Simple
-	dev-perl/XML-LibXSLT
-	dev-perl/XML-Writer
-	~dev-tex/biblatex-3.12
-	virtual/perl-IPC-Cmd
-	>=virtual/perl-Unicode-Collate-1.250.0"
-DEPEND="${RDEPEND}
-	dev-perl/Config-AutoConf
-	dev-perl/Module-Build
-	dev-perl/ExtUtils-LibBuilder
-	test? ( dev-perl/File-Which
-			dev-perl/Test-Differences )"
-
-PATCHES=( "${FILESDIR}/${PN}-2.7-drop-mozilla-ca.patch" )
-
-mydoc="doc/biber.tex"
diff --git a/dev-tex/biber/biber-2.14.ebuild b/dev-tex/biber/biber-2.14.ebuild
index 818045046831..767694333ecb 100644
--- a/dev-tex/biber/biber-2.14.ebuild
+++ b/dev-tex/biber/biber-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch
deleted file mode 100644
index 83b625ee4a3e..000000000000
--- a/dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-commit 09ac1811820c2d2b92f8de779f7c389f89dc6c16
-Author: Jason A. Donenfeld <Jason@zx2c4.com>
-Date:   Sat Mar 12 02:54:35 2016 +0100
-
-    Remove Mozilla::CA dependency
-
-diff --git a/Build.PL b/Build.PL
-index 6031458..8de2f2a 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -53,7 +53,6 @@ my $builder = $class->new(
-                  'List::AllUtils' => 0,
-                  'List::MoreUtils' => 0,
-                  'List::MoreUtils::XS' => 0,
--                 'Mozilla::CA' =>  '20160104',
-                  'Regexp::Common' => 0,
-                  'Log::Log4perl' => 0,
-                  'Unicode::Collate' => '1.19',
-diff --git a/bin/biber b/bin/biber
-index f9e28fb..8d614e5 100755
---- a/bin/biber
-+++ b/bin/biber
-@@ -78,7 +78,6 @@ GetOptions(
-            'sortgiveninits|sortfirstinits=s',
-            'sortlocale|l=s',
-            'sortupper=s',
--           'ssl-nointernalca',
-            'ssl-noverify-host',
-            'strip_comments|strip-comments',
-            'tool',
-@@ -710,12 +709,6 @@ default sorting (B<--collate|-C>). When
- using B<--fastsort|-f>, your OS collation locale determines
- this and this option is ignored (default is true).
- 
--=item B<--ssl-nointernalca>
--
--Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data.
--This assumes that the user will set one of the perl LWP::UserAgent module environment variables
--to find the CA certs.
--
- =item B<--ssl-noverify-host>
- 
- Turn off host verification when using HTTPS to fetch remote data sources.
-diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc
-index 7baf386..f3d321e 100644
---- a/data/schemata/config.rnc
-+++ b/data/schemata/config.rnc
-@@ -79,7 +79,6 @@ start =
-         map+
-       }+
-     }? &
--    element ssl-nointernalca     { "0" | "1" }? &
-     element ssl-noverify-host    { "0" | "1" }? &
-     element tool                 { "0" | "1" }? &
-     element tool_config          { text }? &
-diff --git a/data/schemata/config.rng b/data/schemata/config.rng
-index f11b38e..fff209a 100644
---- a/data/schemata/config.rng
-+++ b/data/schemata/config.rng
-@@ -353,14 +353,6 @@
-           </element>
-         </optional>
-         <optional>
--          <element name="ssl-nointernalca">
--            <choice>
--              <value>0</value>
--              <value>1</value>
--            </choice>
--          </element>
--        </optional>
--        <optional>
-           <element name="ssl-noverify-host">
-             <choice>
-               <value>0</value>
-diff --git a/lib/Biber/Input/file/biblatexml.pm b/lib/Biber/Input/file/biblatexml.pm
-index 8139cd4..14018da 100644
---- a/lib/Biber/Input/file/biblatexml.pm
-+++ b/lib/Biber/Input/file/biblatexml.pm
-@@ -115,19 +115,6 @@ sub extract_entries {
-     else {
-       if ($1) {                 # HTTPS
-         # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--        # We have to explicitly set the cert path because otherwise the https module
--        # can't find the .pem when PAR::Packer'ed
--        # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--        # It may, however, have been removed by some biber unpacked dists
--        if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--            not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--            not defined(Biber::Config->getoption('ssl-nointernalca')) and
--            eval {require Mozilla::CA}) {
--          # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--          (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--          $dir =~ s/\/$//;      # splitpath sometimes leaves a trailing '/'
--          $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--        }
- 
-         # fallbacks for, e.g., linux
-         unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
-diff --git a/lib/Biber/Input/file/bibtex.pm b/lib/Biber/Input/file/bibtex.pm
-index 6cc365a..b41e946 100644
---- a/lib/Biber/Input/file/bibtex.pm
-+++ b/lib/Biber/Input/file/bibtex.pm
-@@ -138,19 +138,6 @@ sub extract_entries {
-     else {
-       if ($1) {                 # HTTPS
-         # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--        # We have to explicitly set the cert path because otherwise the https module
--        # can't find the .pem when PAR::Packer'ed
--        # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--        # It may, however, have been removed by some biber unpacked dists
--        if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--            not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--            not defined(Biber::Config->getoption('ssl-nointernalca')) and
--            eval {require Mozilla::CA}) {
--          # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--          (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--          $dir =~ s/\/$//;      # splitpath sometimes leaves a trailing '/'
--          $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--        }
- 
-         # fallbacks for, e.g., linux
-         unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest
index b4a8d4d298f1..0a4be8d20572 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -1,2 +1 @@
-DIST biblatex-3.12.tds.tgz 19858631 BLAKE2B f98d3e0e591eb27b2eccb0a5ed1eee5bd3ace87af7e25938bf66fd946b4980f31304f480e875843c7e60171678c37b86c224c5b8d413abb981562c28c82293b0 SHA512 dfc191a139868248d64f12d588b9879d2921b9a35b8af32e8297173bf1acf4aed81cf300aa0cd4ab5af2a75cd84a46fc48774bc39d54ba38340e3b5336203c45
 DIST biblatex-3.14.tds.tgz 20047529 BLAKE2B e7d058050277d542233be957a0b3b7cff7ff3de99cd8ab1f54c8ad5477005f2622f5f50613f1bef969664603b1deebb4e02315ec6ddb47280b739a37e3347e55 SHA512 2d28ba0be1484e83de9f71fb8c759cd7522b5d933708b7c2bfd9cab5790620634965d5c5e92234f42b15a44180f53f2e38e3fad4b899f23011f0dde8d376f660
diff --git a/dev-tex/biblatex/biblatex-3.12.ebuild b/dev-tex/biblatex/biblatex-3.12.ebuild
deleted file mode 100644
index 443e3ddd17fb..000000000000
--- a/dev-tex/biblatex/biblatex-3.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX"
-HOMEPAGE="https://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
-
-LICENSE="LPPL-1.3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="+biber doc examples"
-
-DEPEND="dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-plaingeneric"
-RDEPEND="${DEPEND}"
-PDEPEND="biber? ( ~dev-tex/biber-2.12 )"
-
-S="${WORKDIR}"
-TEXMF=/usr/share/texmf-site
-
-src_install() {
-	insinto "${TEXMF}"
-	doins -r bibtex tex
-
-	dodoc doc/latex/biblatex/{README,CHANGES.md}
-	if use doc ; then
-		pushd doc || die
-		latex-package_src_doinstall doc
-		popd || die
-	fi
-
-	if use examples ; then
-		dodoc -r doc/latex/biblatex/examples
-	fi
-}
diff --git a/dev-tex/biblatex/biblatex-3.14.ebuild b/dev-tex/biblatex/biblatex-3.14.ebuild
index 945204ba25c0..2f3666da3dd5 100644
--- a/dev-tex/biblatex/biblatex-3.14.ebuild
+++ b/dev-tex/biblatex/biblatex-3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
 
 LICENSE="LPPL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+biber doc examples"
 
 DEPEND="dev-texlive/texlive-bibtexextra
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
index 22e874a44c8d..7e88efbf25bc 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20200406.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
@@ -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 ~x86-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/dot2tex/dot2tex-2.11.3.ebuild b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
index 4979aeb14b03..86b768f6aabf 100644
--- a/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
+++ b/dev-tex/dot2tex/dot2tex-2.11.3.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kjellmf/dot2tex/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="doc examples"
 
 DEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
diff --git a/dev-tex/glossaries/glossaries-4.41.ebuild b/dev-tex/glossaries/glossaries-4.41.ebuild
index a71e7eb8682b..42921e414a88 100644
--- a/dev-tex/glossaries/glossaries-4.41.ebuild
+++ b/dev-tex/glossaries/glossaries-4.41.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
@@ -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 ~x86-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 bec165d1c267..eee7bb837ec1 100644
--- a/dev-tex/glossaries/glossaries-4.46.ebuild
+++ b/dev-tex/glossaries/glossaries-4.46.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
@@ -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 ~x86-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/hevea/Manifest b/dev-tex/hevea/Manifest
index d7e742761f47..f78a06497411 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,3 +1,2 @@
-DIST hevea-2.29.tar.gz 969599 BLAKE2B 88724c0a1a139d370fa852af473e4f21f7c1f8a8ed79cf0a59fa6098d63a3956423f7b1403316aa2e296b00d77ddc529938f98476243795b6a00971532918d90 SHA512 4ea2f3d60fd43d183712a868cb3894b38f6d9809ba7905d69123a7672faba0d6dfe73ad1379d7996ede98ceb645bba903e5b7550bdf92e7950ce69ba7f4f3994
-DIST hevea-2.30.tar.gz 965635 BLAKE2B 7f23c6f793be1515b689571f0ae25d76d45c7bd8df9cc6fe1f73697b34dec598f64b0ed30e4b2cd5e456990c80ac0bba50c60e0294a825c6a0af59b228456cbd SHA512 75c700e009070bff4845ccc6f984ade8068f90ea78630a2e6ab1d27618a225a4bbbb7c4aa07c08be03094ddad4aac5d0c9e83fa01d41ff501f5c1eed9f4428eb
 DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
+DIST hevea-2.35.tar.gz 1006773 BLAKE2B 80a8f80955a4eee641c53784cbe4543072062d0bf4d757fe0c8270d6370d54495eeab3a9279bd992dc45b80b23de0438ee4fe6fa932981c777b25782c42ca4a8 SHA512 dc1a5179489626176b1fcae47a9c7eb4cf9c1c6127c749cb938808697ccd6179277089fb20f4d5da7b82056d15b1d64acd9ba9884d1950a74d98c98864b4180a
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
deleted file mode 100644
index 7921167cf68b..000000000000
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="https://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild
deleted file mode 100644
index 04bb4d075ec3..000000000000
--- a/dev-tex/hevea/hevea-2.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="https://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index 04bb4d075ec3..b66e5822f46c 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
 RDEPEND="${DEPEND}
diff --git a/dev-tex/hevea/hevea-2.35.ebuild b/dev-tex/hevea/hevea-2.35.ebuild
new file mode 100644
index 000000000000..9698753da613
--- /dev/null
+++ b/dev-tex/hevea/hevea-2.35.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
+HOMEPAGE="https://hevea.inria.fr/"
+SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
+
+LICENSE="QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt=]"
+RDEPEND="
+	${DEPEND}
+	dev-texlive/texlive-latexextra
+"
+BDEPEND="dev-ml/ocamlbuild"
+
+# bug #734350
+QA_FLAGS_IGNORED=(
+	/usr/bin/bibhva
+	/usr/bin/hevea
+	/usr/bin/esponja
+	/usr/bin/hacha
+)
+
+src_compile() {
+	rm -f config.sh || die
+
+	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
+
+	if use ocamlopt; then
+		emake PREFIX="${EPREFIX}"/usr
+	else
+		emake PREFIX="${EPREFIX}"/usr TARGET=byte
+	fi
+}
+
+src_install() {
+	if use ocamlopt; then
+		emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	else
+		emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr TARGET=byte install
+	fi
+
+	dodoc README CHANGES
+}
+
+# If texmf-update is present this means we have a latex install; update it so
+# that hevea.sty can be found
+# Do not (r)depend on latex though because hevea does not need it itself
+# If latex is installed later, it will see hevea.sty
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then
+		"${EPREFIX}"/usr/sbin/texmf-update
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then
+		"${EPREFIX}"/usr/sbin/texmf-update
+	fi
+}
diff --git a/dev-tex/hevea/metadata.xml b/dev-tex/hevea/metadata.xml
index ac0a2b420201..4f3cc9691341 100644
--- a/dev-tex/hevea/metadata.xml
+++ b/dev-tex/hevea/metadata.xml
@@ -5,5 +5,8 @@
 		<email>tex@gentoo.org</email>
 		<name>Gentoo TeX Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">maranget/hevea</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-tex/html2latex/html2latex-1.1-r1.ebuild b/dev-tex/html2latex/html2latex-1.1-r1.ebuild
index ac749a355aca..e54f18f7691d 100644
--- a/dev-tex/html2latex/html2latex-1.1-r1.ebuild
+++ b/dev-tex/html2latex/html2latex-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/html2latex/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="imagemagick libwww"
 
diff --git a/dev-tex/ivritex/ivritex-1.1.2.ebuild b/dev-tex/ivritex/ivritex-1.1.2.ebuild
index cc5f867247c8..564e98725a64 100644
--- a/dev-tex/ivritex/ivritex-1.1.2.ebuild
+++ b/dev-tex/ivritex/ivritex-1.1.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Hebrew support for TeX"
 HOMEPAGE="https://sourceforge.net/projects/ivritex/"
 SRC_URI="mirror://sourceforge/ivritex/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RESTRICT="mirror"
 
diff --git a/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild b/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
index 085f4c1fa6a4..ad5a4864a629 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.56-r1.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
@@ -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 ~x86-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.57.ebuild b/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
index 1723ec5cab73..43f18d6cdbd4 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.57.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
@@ -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 ~x86-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.59.ebuild b/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
index 1723ec5cab73..43f18d6cdbd4 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.59.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
@@ -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 ~x86-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/latex2html/Manifest b/dev-tex/latex2html/Manifest
index ea66d1f10f87..99f8970b9335 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -1,2 +1,3 @@
 DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
 DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
+DIST latex2html-2021.tar.gz 1130224 BLAKE2B c3775b2546a866834c0ed94362a428f2cfe48e8fe7337261993fe1f473350ddb778c50cc4393fe33c9f3829e5dc6f5c0ef43ae6a4c21481746023ef5939308da SHA512 f1f087a58911410b3ca9f4b60149b66d17608a9a56d0e8f74f08e6d6595e3e9c4f5378a7ab5cfc7488cd182a0dc3d4c151283b57636a70271c7f734e69ed0608
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
index 608a2b110a6e..f1632d9a8e92 100644
--- a/dev-tex/latex2html/latex2html-2015.ebuild
+++ b/dev-tex/latex2html/latex2html-2015.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
 HOMEPAGE="https://www.latex2html.org/"
-SRC_URI="http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz"
+SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gif png"
 
 DEPEND="app-text/ghostscript-gpl
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
index 43e315b1d8b9..e1f125f80d8f 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.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=6
@@ -9,7 +9,7 @@ SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
 
 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 ~x86-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="gif png"
 
 DEPEND="app-text/ghostscript-gpl
diff --git a/dev-tex/latex2html/latex2html-2021.ebuild b/dev-tex/latex2html/latex2html-2021.ebuild
new file mode 100644
index 000000000000..3fa7095e6091
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2021.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
+HOMEPAGE="https://www.latex2html.org/"
+SRC_URI="https://github.com/latex2html/latex2html/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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="gif png"
+
+DEPEND="
+	app-text/ghostscript-gpl
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng:0 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/latex2html-destdir.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	local dir="${ED}/usr/$(get_libdir)/latex2html"
+	if use png || use gif; then
+		# pstoimg isn't built unless gif or png useflags are enabled
+		sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die
+	fi
+	sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die
+
+	dodoc BUGS Changes FAQ MANIFEST README.md TODO
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
diff --git a/dev-tex/latex2html/metadata.xml b/dev-tex/latex2html/metadata.xml
index b975e4386b46..5a1e2b33d874 100644
--- a/dev-tex/latex2html/metadata.xml
+++ b/dev-tex/latex2html/metadata.xml
@@ -5,5 +5,8 @@
 	<email>tex@gentoo.org</email>
 	<name>Gentoo TeX Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">latex2html/latex2html</remote-id>
+</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
index 1c23f0bd61f0..9a043174580e 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/latex2rtf/"
 SRC_URI="mirror://sourceforge/latex2rtf/${P}a.tar.gz" # 'a' is only for 2.3.11 version for fixing a tarball generation bug
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-tex/latexdiff/latexdiff-1.3.0.ebuild b/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
index 7b903bf5592f..9330b2a48162 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.0.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
@@ -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 ~x86-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/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 2926345b876e..157df8a32ccb 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.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
@@ -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 ~x86-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/latexdiff/latexdiff-9999.ebuild b/dev-tex/latexdiff/latexdiff-9999.ebuild
index 2926345b876e..53f8ebb29d0a 100644
--- a/dev-tex/latexdiff/latexdiff-9999.ebuild
+++ b/dev-tex/latexdiff/latexdiff-9999.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
@@ -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 ~x86-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/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild
index 2388e3b10b70..7c0197af104e 100644
--- a/dev-tex/latexmk/latexmk-456.ebuild
+++ b/dev-tex/latexmk/latexmk-456.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
@@ -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 ~x86-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/latexmk/latexmk-465.ebuild b/dev-tex/latexmk/latexmk-465.ebuild
index 1d08f42e3618..7c3b60b9ac42 100644
--- a/dev-tex/latexmk/latexmk-465.ebuild
+++ b/dev-tex/latexmk/latexmk-465.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
@@ -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 ~x86-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/latexmk/latexmk-469.ebuild b/dev-tex/latexmk/latexmk-469.ebuild
index 31ca52b0b4de..57823233b167 100644
--- a/dev-tex/latexmk/latexmk-469.ebuild
+++ b/dev-tex/latexmk/latexmk-469.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
@@ -11,7 +11,7 @@ SRC_URI="http://personal.psu.edu/jcc8/software/latexmk/${PN}-${PV/a}.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 ~x86-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/pgf-3.1.4b-r2.ebuild b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
index 564276bceee8..5e578c7ce128 100644
--- a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4b-r2.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
@@ -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 ~x86-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 73c994a29c6d..b3f2456dc8b5 100644
--- a/dev-tex/pgf/pgf-3.1.5b.ebuild
+++ b/dev-tex/pgf/pgf-3.1.5b.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
@@ -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 ~x86-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/tex4ht/tex4ht-20090611_p1038-r11.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
index d466795dd7d6..1b7fefc50280 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 
 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
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
index 32139f031766..dee39739222d 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 
 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