commit: 7d464dcbbf955cd20b32049ce8534ffae5e99dfe Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Dec 21 20:07:12 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Dec 21 20:07:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d464dcb
dev-tex/biber: cleanup old Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-tex/biber/Manifest | 1 - dev-tex/biber/biber-2.12.ebuild | 67 ----------- .../biber/files/biber-2.7-drop-mozilla-ca.patch | 122 --------------------- 3 files changed, 190 deletions(-) diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest index c5ad0467c22..e3a98371c2e 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 5feffbec88a..00000000000 --- 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/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 83b625ee4a3..00000000000 --- a/dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch +++ /dev/null @@ -1,122 +0,0 @@ -commit 09ac1811820c2d2b92f8de779f7c389f89dc6c16 -Author: Jason A. Donenfeld <[email protected]> -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})) {
