diff options
author | Manuel Rüger <mrueg@gentoo.org> | 2014-05-29 12:56:31 +0000 |
---|---|---|
committer | Manuel Rüger <mrueg@gentoo.org> | 2014-05-29 12:56:31 +0000 |
commit | 5877f29df20ef7f568f450921ea6f49ef1761d1f (patch) | |
tree | edc85622470a4856d24623c78eb6646148ced009 /dev-tex | |
parent | Add python3 compat for wtforms-2.0 (bug 485018) (diff) | |
download | gentoo-2-5877f29df20ef7f568f450921ea6f49ef1761d1f.tar.gz gentoo-2-5877f29df20ef7f568f450921ea6f49ef1761d1f.tar.bz2 gentoo-2-5877f29df20ef7f568f450921ea6f49ef1761d1f.zip |
Version bump.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'dev-tex')
-rw-r--r-- | dev-tex/biber/ChangeLog | 10 | ||||
-rw-r--r-- | dev-tex/biber/biber-1.9.ebuild | 70 | ||||
-rw-r--r-- | dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch | 221 |
3 files changed, 299 insertions, 2 deletions
diff --git a/dev-tex/biber/ChangeLog b/dev-tex/biber/ChangeLog index 37a343618354..fc287cefb0a6 100644 --- a/dev-tex/biber/ChangeLog +++ b/dev-tex/biber/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-tex/biber -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/biber/ChangeLog,v 1.4 2013/12/22 14:19:13 mrueg Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-tex/biber/ChangeLog,v 1.5 2014/05/29 12:56:31 mrueg Exp $ + +*biber-1.9 (29 May 2014) + + 29 May 2014; Manuel Rüger <mrueg@gentoo.org> +biber-1.9.ebuild, + +files/biber-1.9-drop-mozilla-ca.patch: + Version bump. 22 Dec 2013; Manuel Rüger <mrueg@gentoo.org> -biber-1.7-r1.ebuild: Cleanup old. diff --git a/dev-tex/biber/biber-1.9.ebuild b/dev-tex/biber/biber-1.9.ebuild new file mode 100644 index 000000000000..89a16370a779 --- /dev/null +++ b/dev-tex/biber/biber-1.9.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-tex/biber/biber-1.9.ebuild,v 1.1 2014/05/29 12:56:31 mrueg Exp $ + +EAPI=5 + +inherit eutils perl-module + +MY_PN=biblatex-${PN} + +DESCRIPTION="A BibTeX replacement for users of biblatex" +HOMEPAGE="http://biblatex-biber.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${PV}/${MY_PN}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +RDEPEND=">=dev-lang/perl-5.16 + dev-perl/autovivification + dev-perl/Business-ISBN + dev-perl/Business-ISMN + dev-perl/Business-ISSN + dev-perl/Data-Compare + dev-perl/Data-Dump + dev-perl/Date-Simple + dev-perl/Encode-EUCJPASCII + dev-perl/Encode-HanExtra + dev-perl/Encode-JIS2K + dev-perl/File-Slurp-Unicode + dev-perl/IPC-Run3 + dev-perl/libwww-perl[ssl] + dev-perl/List-AllUtils + dev-perl/Log-Log4perl + dev-perl/regexp-common + dev-perl/Readonly + dev-perl/Readonly-XS + >=dev-perl/Text-BibTeX-0.66 + dev-perl/URI + dev-perl/Unicode-LineBreak + dev-perl/XML-LibXML-Simple + dev-perl/XML-LibXSLT + dev-perl/XML-SAX-Base + dev-perl/XML-Writer + >=dev-tex/biblatex-2.7 + virtual/perl-IPC-Cmd" +DEPEND="${RDEPEND} + dev-perl/Config-AutoConf + virtual/perl-Module-Build + test? ( dev-perl/File-Which + dev-perl/Test-Pod + dev-perl/Test-Pod-Coverage )" + +S=${WORKDIR}/${MY_PN}-${PV} + +SRC_TEST="parallel" + +src_prepare(){ + epatch "${FILESDIR}"/${P}-drop-mozilla-ca.patch +} + +src_install(){ + perl-module_src_install + use doc && dodoc -r doc/* +} + +src_test() { + BIBER_SKIP_DEV_TESTS=1 perl-module_src_test +} diff --git a/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch new file mode 100644 index 000000000000..54732a603989 --- /dev/null +++ b/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch @@ -0,0 +1,221 @@ +From f31062a94aefff64cc193aa3a394fd3a623c2aa7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu> +Date: Thu, 29 May 2014 14:23:06 +0200 +Subject: [PATCH] Remove Mozilla::CA dependency. + + +diff --git a/Build.PL b/Build.PL +index 3ea589b..76acdc7 100644 +--- a/Build.PL ++++ b/Build.PL +@@ -49,7 +49,6 @@ my $builder = $class->new( + 'IPC::Run3' => 0, + 'List::AllUtils' => 0, + 'List::MoreUtils' => 0, +- 'Mozilla::CA' => '20130114', + 'Regexp::Common' => 0, + 'Log::Log4perl' => 0, + 'Unicode::Collate' => '1.04', +diff --git a/META.json b/META.json +index cf91a91..1855294 100644 +--- a/META.json ++++ b/META.json +@@ -44,7 +44,6 @@ + "List::AllUtils" : "0", + "List::MoreUtils" : "0", + "Log::Log4perl" : "0", +- "Mozilla::CA" : "20130114", + "Regexp::Common" : "0", + "Text::BibTeX" : "0.69", + "URI" : "0", +diff --git a/META.yml b/META.yml +index 7091ddb..82706ee 100644 +--- a/META.yml ++++ b/META.yml +@@ -114,7 +114,6 @@ requires: + List::AllUtils: 0 + List::MoreUtils: 0 + Log::Log4perl: 0 +- Mozilla::CA: 20130114 + Regexp::Common: 0 + Text::BibTeX: 0.69 + URI: 0 +diff --git a/bin/biber b/bin/biber +index 6038535..4c3ea1c 100755 +--- a/bin/biber ++++ b/bin/biber +@@ -73,7 +73,6 @@ GetOptions( + 'sortfirstinits=s', + 'sortlocale|l=s', + 'sortupper=s', +- 'ssl-nointernalca', + 'ssl-noverify-host', + 'tool', + 'tool_align|tool-align', # legacy alias for output_align +@@ -664,12 +663,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 e798733..5fcce6d 100644 +--- a/data/schemata/config.rnc ++++ b/data/schemata/config.rnc +@@ -72,7 +72,6 @@ start = element config { + 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 185cde6..f7e4176 100644 +--- a/data/schemata/config.rng ++++ b/data/schemata/config.rng +@@ -335,14 +335,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 d3f7377..21b1471 100644 +--- a/lib/Biber/Input/file/biblatexml.pm ++++ b/lib/Biber/Input/file/biblatexml.pm +@@ -97,19 +97,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 33185a6..f3fd9f2 100644 +--- a/lib/Biber/Input/file/bibtex.pm ++++ b/lib/Biber/Input/file/bibtex.pm +@@ -140,19 +140,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/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm +index 14adc38..b880e8a 100644 +--- a/lib/Biber/Input/file/endnotexml.pm ++++ b/lib/Biber/Input/file/endnotexml.pm +@@ -111,19 +111,6 @@ sub extract_entries { + $logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ..."); + 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 0dbeacc..dda7466 100644 +--- a/lib/Biber/Input/file/ris.pm ++++ b/lib/Biber/Input/file/ris.pm +@@ -110,19 +110,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/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm +index 0d05d2b..79ba19e 100644 +--- a/lib/Biber/Input/file/zoterordfxml.pm ++++ b/lib/Biber/Input/file/zoterordfxml.pm +@@ -123,19 +123,6 @@ sub extract_entries { + $logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ..."); + 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})) { +-- +2.0.0 + |