gentoo christmass resync : 25.12.2020

14 files changed, 8 insertions, 362 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 53f90313cab8..c3fe84dc2c11 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 51432b44fc5e..33c19cbc3d5c 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,6 +1,3 @@
-AUX biber-2.7-drop-mozilla-ca.patch 5146 BLAKE2B 4380345c27ea3e3a23c787a820486b7fc620cc6b1d3ab5f3ddca35db2c33003f0e490ce35777a3da29b42f675fc3a9c41e31cf3724290eaea2112d50161b0c7c SHA512 83295ada1516e18d4d4f1bab50c70304c1df9c88113a215b31f4bc8c9b250244f4bcb8e5b5f4958b1086327796967b27681c5d574c6dd15ddf73f35092e8cf3a
-DIST biber-2.12.tar.gz 1323440 BLAKE2B 9f124e1bdbfaeba6e3072c6e797d47eef50e4efe419b490975df0a25fa802f5f44a1c246d9c0bcf860767c35e1a399caf088b33223d0267286e0a5f064be7a63 SHA512 72f1a05224dc2735b32e92ac376d392fb631bf788a15de449471fdc5a94182ad4434ce71f95281e4cfc3a06cd275d2ff98e526d540c2979cd3e0dfa15b5c75ff
 DIST biber-2.14.tar.gz 1589847 BLAKE2B a5f2c1ebbcde68c8ec28d54f10f9217e710c0bb840f455fea2516441653d308666ec3e9c1732f3211f0b205952d59b63d87fe8baf6f846776c781555884730a5 SHA512 dd42aabdb8f469ea759a4a7bb97cbe27ebe57e46d1b6dde7d293d1b046a55e20ac889bf9c8c6b6219ee827b162a280bf7aca239af1f357ee1ccc90600a5dcfc1
-EBUILD biber-2.12.ebuild 1738 BLAKE2B 1a724077c2168c65ac02e6c5d04c3fcafab1317a35a9e5dc0fc134ff94310d8106b20dbeb70944f88a32f2a296b00dbe54e105c144174e48047887273f243716 SHA512 6333bf2e61e71da389b4beea9aa3466861682b37c9aa79971e5ffc6e80bcad065df6ca5a7a0be135b44c78be4a0f4fb7f699a34dfecde1f22c2c08038e67514c
-EBUILD biber-2.14.ebuild 1728 BLAKE2B 1fe53d333ec5bd3ddd0d08190d116a5fb5a6e518c6460cb78a5b1663f983045166afcd7f46ff920a1c0350ab010a1264f29167a7d81488c3124018df6dd458c3 SHA512 512e6af60f0b081e09af4cfa1bdb81bafacd552b16396288c9b865f94bc5078b59cabe2c264b39fabd0d5e99cf7b875de71555179f1d284314494127cb94aa5d
+EBUILD biber-2.14.ebuild 1727 BLAKE2B a06540c0fcd5e28d97566a2ae8ae5045c48091d8683a9b283ad0bc266ce2694c3b7cbcc05b7c4c4fe03f62fe9059c6277621cd677521696e548c1140cd1582f0 SHA512 f3e7891dad50f6145681888cb215ff802be5e39f694869735a6636e4163548056c5b7a14175f525a9b1ed78fc4b0943603a528a63ee8403ba07142be5eebe415
 MISC metadata.xml 498 BLAKE2B 0636fcce7046ba43b2b56c0a793b61e444e83ee7255212c5bf38f21cd89a642c92dc81b55ef34bec16bdf4a0141b824334d5b86eee8cfb562e5ba1af826f43c0 SHA512 f0b734bd7a376c3e3cbabfebe5675dc98cedf5c63c3f6b2e98079fd75eb9d64975fed2f36a618b6a6f23e4b759ad497b6b19cd28d1f8c6bb7386a4aedeedf967
diff --git a/dev-tex/biber/biber-2.12.ebuild b/dev-tex/biber/biber-2.12.ebuild
deleted file mode 100644
index 5feffbec88a1..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="http://biblatex-biber.sourceforge.net/ 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 a307066b4c96..0eb846f6d9a1 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 0a8794d46422..ba070943fbe8 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -1,5 +1,3 @@
-DIST biblatex-3.12.tds.tgz 19858631 BLAKE2B f98d3e0e591eb27b2eccb0a5ed1eee5bd3ace87af7e25938bf66fd946b4980f31304f480e875843c7e60171678c37b86c224c5b8d413abb981562c28c82293b0 SHA512 dfc191a139868248d64f12d588b9879d2921b9a35b8af32e8297173bf1acf4aed81cf300aa0cd4ab5af2a75cd84a46fc48774bc39d54ba38340e3b5336203c45
 DIST biblatex-3.14.tds.tgz 20047529 BLAKE2B e7d058050277d542233be957a0b3b7cff7ff3de99cd8ab1f54c8ad5477005f2622f5f50613f1bef969664603b1deebb4e02315ec6ddb47280b739a37e3347e55 SHA512 2d28ba0be1484e83de9f71fb8c759cd7522b5d933708b7c2bfd9cab5790620634965d5c5e92234f42b15a44180f53f2e38e3fad4b899f23011f0dde8d376f660
-EBUILD biblatex-3.12.ebuild 941 BLAKE2B 9707537db74783677f69f794408f0a7f0ce786ce862f0dc84a3db413896c40f9265d1260a7c09fb578581d959e3c01a0bea28894812ddc8c176b18ddf3361408 SHA512 953443fb09fdccefb05d1e506141f7ed0f00b19a6268c26004ac0d960e6900e3c1f4c2f39a35f7d722eac12fd8ab84fd7718ab1072de3b7fa37c4954966f031a
-EBUILD biblatex-3.14.ebuild 942 BLAKE2B db5ee85c0898280786499757d973968013fd767b3c218a7e7baf1ad1e4487a3fc3c0bc3e251b1edeb4cf2e57133ff9d90de74eb4120216d955f1cd5846469e68 SHA512 f9eff314932257f92575e496ceb2483a3d9a410e8939aed21d2b83b7cb8528eeedbb2e72ae840c4c5f0e544a07c17d7c63ff16ab9704d9844e4cdae89cd83d42
+EBUILD biblatex-3.14.ebuild 941 BLAKE2B 8e6ac93ebb569c466575890d294d7d038389e4e4ac1c60fc2362bf2e64cc83e04165718a8070b38c0b89be0147d2c142cf5ba87bcdfbf410ef17aeb2c51b36a1 SHA512 35813f7d5bf59d0d77db766e5fe79286c184692f36731a487ae053c9ddaaedde04dbefe05344f64904d56c2700da917a19f3d41099e5a789de4563a2d1d45391
 MISC metadata.xml 471 BLAKE2B 3dbb8d0950ee77e96dca4706be13da9affd195b7a3dc739cc61ce3fc1a3f70e90b3ad5130d167c71340b6d14e7365f7cf76ed5e0a61a05194a642d8bc505a685 SHA512 b47b664606a1c9d1d1a45e13f52d06b2a140209003c7002b54b9322f84e688e2a10a5b9c0185114059a8ba826a1afeb4649ac29391dc819f80d8a49c89be9cfe
diff --git a/dev-tex/biblatex/biblatex-3.12.ebuild b/dev-tex/biblatex/biblatex-3.12.ebuild
deleted file mode 100644
index 692188ecb54b..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="http://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 1a0ecc11fc9a..d821b64c0d4d 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/hevea/Manifest b/dev-tex/hevea/Manifest
index a4f2d963ecd9..649dab13c5e6 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD hevea-2.29.ebuild 1399 BLAKE2B b292b879fffbb1bfcc25cd391948575dcf258138ac1894f3e667c77666bb87d966c87725b3f91e23814bd34914eb932edb0679a27a206fde62640d770e95f6c1 SHA512 0d234ea448643a386d84df7add23c65f8be2367bdb9b068aab4864ba5e300082419ab1356fd7eefeaf81b2f1bf6d8fa91a8117163d10599efa0bc0450312cf19
-EBUILD hevea-2.30.ebuild 1402 BLAKE2B a1c8918296823122ad0d80282305389e9b76f79d06e35d56be2ccb1448500f73ca58073a1915725d22d1aec97248a8fbb260025799e5d36579391a25617fbea7 SHA512 cab09c6eca6883ff939229219f99966e775d595405371eef40a1b7ca2706b97b88ed3414cd7a6e92a0a67ad1c03353c71583372a7f6fb310c8873c8da1418269
-EBUILD hevea-2.31.ebuild 1397 BLAKE2B 626d89eb778519de4a635fd04e1abb997299713e198f41f6094a88df55b53859a6d67fa97e5be711dee6132698dea797544a4a00f18b5eef36f9a5b8014b14d0 SHA512 5153ebeff752d7a2fd2308aadb0bd2d95f9ad3a0d261c359e41a983aa1f310dc48a4d4cb334d71d73bb59643dd8110d885ade96c6b010637f8815b651fda9f3c
+EBUILD hevea-2.31.ebuild 1396 BLAKE2B 79d87379ff6e312de88206d2e582e9311136ca43b8348a017364e2e4b021c2a5fe320488f764f7ecb8816843957c6540858478166b883a09110863afb5f9fbc8 SHA512 53c1281028ac03459b9993026f4c8ad42f54084cd58a4d83ac3da81dcf88513695dc8d8ed4cf5b683c7f78921d232f702bc1a9601e7aa66f69d3fe7259975de0
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
deleted file mode 100644
index 190fc255058d..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="http://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 c5dfa8e05aaf..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="http://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 80046a30f85d..3c1e67628b19 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -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/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index 862d39e955d5..ce1bda75b516 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -1,6 +1,6 @@
 DIST latexdiff-1.3.0.tar.gz 1791127 BLAKE2B e394dcf29d529f47a87eb7615d0da42a2d30c0e3a40938903cee75c2241ee8543713ee735f94f9eb9fe59829be85a5dad681183d96b2651e0e09d20ecae9e207 SHA512 d1b47ff4733bbba0ecadd71e6c54362b78ad8e97cac54b99b9ead4565dd0a56a8a5d4ce27866cabb4dc43c47a3c2230ce7743909f2d30bb94ecbae75c6ecbaae
 DIST latexdiff-1.3.1.1.tar.gz 1879814 BLAKE2B 1f537dff75ff12eeacfcdfa05c0199a29a0ffc4e8ff728b390dcbd35b3ba490e4e1c2e7201b7313335aabd8b870e764b9573d6322c34141be9d4fa141349db0a SHA512 bdc573b4fdb4d647ab3208f350e89843e4602e81c293665e1d08ff9b1b0d531c665d687be0185ff9ae229b9f43fd9bbd6aac437b6b1bcdca9d72d39f360b6136
 EBUILD latexdiff-1.3.0.ebuild 1175 BLAKE2B da8a2ee81250501bcd2b4a623c424b1ad66e08d1016ad834721e38da17fe20e345552d0af603b3299105788785a0c8c70e2ae8ec811e27d025b67b33822ba1b2 SHA512 ad2f76582f4a86d254adfff2406f86f79354acbe6b8425b3a663549ea7b37e3ca830cbe07fdfc06d18bffbedb3e392cea8a470506c3a96214455309fae4e0ffb
-EBUILD latexdiff-1.3.1.1.ebuild 1179 BLAKE2B fd9d237ba4b41c6a798ea966f967d4d4fe0867bb069a49f19e3c770139f1c5791ceb9375b7bb30958894946023693365829563f2803e39b4afe00ff054d754ed SHA512 639f94db2df15bf62992506fca1255613cfdbb6a4ec7ec45373ffe564802f5fe617882c5d31911ba010f9f536662d454323dbd6fa7d0a61a98238a1e2d3802cf
+EBUILD latexdiff-1.3.1.1.ebuild 1176 BLAKE2B 96f30d43473f0c5d2040842e35e1dd1698e0348c9c8d5eaac43b3011c5c90dc156d67e25b865deec06ee10d5c78937b9ffe2ad7ff3442ac07c62a6c256e86bb4 SHA512 96dce49ad3f55b7960e63d0200b582a321eeb0a28583ef4b3b9fa21036f890ca8f037b1a1e79368b37adda02f75434ec92ea40476d54b08cafbef115138e0e0d
 EBUILD latexdiff-9999.ebuild 1182 BLAKE2B 6aab4e29b22e72953edf34229ad41a795a41f64f399620e838c08f71354bcfd11d17f2b4a6237255428f3aff03f2ba5ab4e1fcbdceaac152d683d709df27c53b SHA512 5f4a7b47fb985d1785006d57e37b904f1bece9e1cf45004ab5ac8da62a34116b040d089447cecdcec4869820b4432298b8e1c073fa194815904f7965f07f6f65
 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 e73f64b0bb9e..6b2671ba5f95 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 ~x86-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-3"