From c6e82bfdc30aa68e582cdd1235610237f5855e44 Mon Sep 17 00:00:00 2001 From: "Hendrik v. Raven" Date: Tue, 2 May 2017 11:56:26 +0200 Subject: dev-tex/biber: version bump Closes: https://github.com/gentoo/gentoo/pull/4532 Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-tex/biber/Manifest | 1 + dev-tex/biber/biber-2.7.ebuild | 65 +++++++++++ .../biber/files/biber-2.7-drop-mozilla-ca.patch | 122 +++++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 dev-tex/biber/biber-2.7.ebuild create mode 100644 dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch (limited to 'dev-tex') diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest index 6ee0f11d788c..9ce79219aaef 100644 --- a/dev-tex/biber/Manifest +++ b/dev-tex/biber/Manifest @@ -1 +1,2 @@ DIST biber-2.5.tar.gz 1247783 SHA256 1be7e690845d2ee40cdf4a932cab3ca1fc09a4a8030021b7e53f4f3ec8687a98 SHA512 5b67aa221e690f17d33ab918e041e8a542e1fdfb9733d99eb41abc87ca9c10b193072e5aac5bc70c19c5f68df009b93be879a4cdfa51392ff63cf755adac90dc WHIRLPOOL 48bad706f1f708d42e87c65ffa7b52069f473dbe188cddc252b071093567ba099a8337705a6d113cfb6ac20cbd4ec5f689b743c005b85150f30de25e2648221d +DIST biber-2.7.tar.gz 1274716 SHA256 a0afc4cd97d56f4f433e476de1d4bd9bf9740eb29191bf616b1ea3f424408d9f SHA512 a62c116d4278b177c9e05a1cac857358dd0ebc6283465e74bb557d13fa343843d8b84050a466b2308a309345309bd584ccd2e90ccbbefbd01f2203a8eea77609 WHIRLPOOL 60044d0a08bc7db80aa52924665417c7c4d7eb8a8e8bd16218728556063ff0f446fae36a321404380428f8bb067706d699b60bf392616f0f560b96d2fa3b1bb3 diff --git a/dev-tex/biber/biber-2.7.ebuild b/dev-tex/biber/biber-2.7.ebuild new file mode 100644 index 000000000000..4ff72f2779a5 --- /dev/null +++ b/dev-tex/biber/biber-2.7.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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" +IUSE="test" + +RDEPEND=">=dev-lang/perl-5.24 + 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-Slurp + dev-perl/IPC-Run3 + dev-perl/libwww-perl[ssl] + >=dev-perl/Lingua-Translit-0.250 + dev-perl/List-AllUtils + dev-perl/List-MoreUtils + dev-perl/List-MoreUtils-XS + dev-perl/Log-Log4perl + dev-perl/LWP-Protocol-https + dev-perl/Regexp-Common + dev-perl/Sort-Key + >=dev-perl/Text-BibTeX-0.760.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.7 + virtual/perl-IPC-Cmd + >=virtual/perl-Unicode-Collate-1.190.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 new file mode 100644 index 000000000000..83b625ee4a3e --- /dev/null +++ b/dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch @@ -0,0 +1,122 @@ +commit 09ac1811820c2d2b92f8de779f7c389f89dc6c16 +Author: Jason A. Donenfeld +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 @@ + + + +- +- +- 0 +- 1 +- +- +- +- + + + 0 +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})) { -- cgit v1.2.3-65-gdbad