gentoo resync : 21.05.2019

5 files changed, 2 insertions, 149 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index dc903a535e6b..1f88afaef43f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index f27d8ac67eb9..b6c10194c600 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,4 +1,3 @@
-AUX biber-2.4-drop-mozilla-ca.patch 6398 BLAKE2B c15e736f17164e1f7753eab0fbee30b91101b6fe38781157d8596d4a2db5e4238f0596ee8ab8cb73939319bedf86ceadd8d99fa5c9f4d4fcf8ac520a268448ce SHA512 0fa5014559379094b8284b02e83afe6045f5249a6691c212b2a2130163969bbdbd093c7f743ff398c3d02d22122d8532bb354cd0f098e984dd495ca5a1aadef2
 AUX biber-2.5-unescaped-left-brace-in-regex.patch 601 BLAKE2B c79797c702204c5d41bc7cfda5102a4996b37c2acd7f79d80285330394b1a4e01644cb9e1a540283aa4b54a6dfb92b2833579b7f546677e9ea63c43cf9245f6d SHA512 2d91083bfaae04ea385c56e0c4ff34febb199c2d1f5a1dd538f5d646f52577adc1dcc910058477eb48de83f7af237b9a08da6bca419225f424f07e361483fe46
 AUX biber-2.7-drop-mozilla-ca.patch 5146 BLAKE2B 4380345c27ea3e3a23c787a820486b7fc620cc6b1d3ab5f3ddca35db2c33003f0e490ce35777a3da29b42f675fc3a9c41e31cf3724290eaea2112d50161b0c7c SHA512 83295ada1516e18d4d4f1bab50c70304c1df9c88113a215b31f4bc8c9b250244f4bcb8e5b5f4958b1086327796967b27681c5d574c6dd15ddf73f35092e8cf3a
 DIST biber-2.12.tar.gz 1323440 BLAKE2B 9f124e1bdbfaeba6e3072c6e797d47eef50e4efe419b490975df0a25fa802f5f44a1c246d9c0bcf860767c35e1a399caf088b33223d0267286e0a5f064be7a63 SHA512 72f1a05224dc2735b32e92ac376d392fb631bf788a15de449471fdc5a94182ad4434ce71f95281e4cfc3a06cd275d2ff98e526d540c2979cd3e0dfa15b5c75ff
diff --git a/dev-tex/biber/files/biber-2.4-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-2.4-drop-mozilla-ca.patch
deleted file mode 100644
index d4618a4cb99d..000000000000
--- a/dev-tex/biber/files/biber-2.4-drop-mozilla-ca.patch
+++ /dev/null
@@ -1,146 +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' =>  '20141217',
-         'Regexp::Common' => 0,
-         'Log::Log4perl' => 0,
-         'Unicode::Collate' => '1.14',
-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/lib/Biber/Input/file/ris.pm b/lib/Biber/Input/file/ris.pm
-index 9814723..e849b95 100644
---- a/lib/Biber/Input/file/ris.pm
-+++ b/lib/Biber/Input/file/ris.pm
-@@ -109,19 +109,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/latex2html/Manifest b/dev-tex/latex2html/Manifest
index c6730701ff2e..46e24ce06231 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -16,5 +16,5 @@ EBUILD latex2html-2008-r1.ebuild 2682 BLAKE2B 5a6fac62f1169bb17e006b214220e0bec8
 EBUILD latex2html-2008.ebuild 2376 BLAKE2B 643b90102289a97015fb60326e7a37a9f2cafa5be15d3cff37d94cc024066eebab71367b4b48be71681658e7f97012d0ab3581eac96164b26973011b33c161da SHA512 d8b6d4ae3be4d7be4c419c2a0f13f0817fefa7c11d2d0f9c57a00447f227ad77852134ad86171f960802922f841839fc24968db2dff07c103e0abae3b2d6c27e
 EBUILD latex2html-2015.ebuild 2227 BLAKE2B f6c6c1f7382994a5e99fccbea12ff3cff0bc36c21daa6b92143e7e042917af96e8ac2efe49b7e182a2994cb8bcdeb3de00dd9fb9b706ed51b1c255e775a55acc SHA512 e8c3469e64f414e88cbc1099220c61e71aac9338db7bcff88ebce319b30a8b5e898ed9d0287c5f5b8b6faefbf3db2f4c7f1d7b1497d54b1bf4cefac7b3c2a7b6
 EBUILD latex2html-2017.2-r1.ebuild 2138 BLAKE2B f1361232644f54149a0f857d4bff968025c671076c7948928aab0b57f1d92443e51e9f8acccae70362ae8a7e80be04cc4a716d2bd71fb5034e522f49cd43bbec SHA512 0419754406dd4dac3827cfe26deadade7767bb3ad46270e83032b7ad1ce4d73921ba4e7eca3976bd7fd331a56109616b3105a7c1007a775e5a1b0d3ea85cc1e0
-EBUILD latex2html-2017.2-r2.ebuild 2172 BLAKE2B b04f1624b902bb84684f7b56880e9e68f73ae2e07f996f6f221a80cd88f75ba906098a3dbf951dd544def62e95ddc68b81ce430930de8cf838cb2c674b8cab6d SHA512 5e611f6eda3d3ef8a80e2a78221693ea012415f6cb9a72d6dedfd5779c17849d706f289d860029c6170f3571030104055ef0abbc781d1d55315d926803850d7e
+EBUILD latex2html-2017.2-r2.ebuild 2171 BLAKE2B 16f3ec5e3cd26fd1aaddbcff0a62ef16aaaa9d220a84e6a83dd938d565ed6d91d2d901622be157b160a964a1139f8e31696dcddfdf9655bf6a14143c8820efa2 SHA512 980f5047b94b3581acdb676baf41bb1023ce74068617ea54f992b0ba89e1e5469912c10533fe1d19a857c84a6fa56870e79f506ad1529130a3e4c12f09b1953f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
index 68f635740cb5..fa9d6322de60 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
@@ -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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gif png"
 
 DEPEND="app-text/ghostscript-gpl