diff options
author | 2014-08-08 12:24:25 +0000 | |
---|---|---|
committer | 2014-08-08 12:24:25 +0000 | |
commit | 07baaf8f333ee3ca5ee740dde045b1562d5967ee (patch) | |
tree | 1c819ddcb02e0cbe4754506db7cf28663cb6c852 /dev-tex | |
parent | Version bump. Cleanup old. (diff) | |
download | gentoo-2-07baaf8f333ee3ca5ee740dde045b1562d5967ee.tar.gz gentoo-2-07baaf8f333ee3ca5ee740dde045b1562d5967ee.tar.bz2 gentoo-2-07baaf8f333ee3ca5ee740dde045b1562d5967ee.zip |
Version bump. Cleanup old.
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'dev-tex')
-rw-r--r-- | dev-tex/biber/ChangeLog | 6 | ||||
-rw-r--r-- | dev-tex/biber/biber-1.8.ebuild | 70 | ||||
-rw-r--r-- | dev-tex/biber/files/biber-1.8-drop-mozilla-ca.patch | 215 |
3 files changed, 5 insertions, 286 deletions
diff --git a/dev-tex/biber/ChangeLog b/dev-tex/biber/ChangeLog index fc287cefb0a6..50ea942866f7 100644 --- a/dev-tex/biber/ChangeLog +++ b/dev-tex/biber/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tex/biber # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-tex/biber/ChangeLog,v 1.6 2014/08/08 12:24:25 mrueg Exp $ + + 08 Aug 2014; Manuel Rüger <mrueg@gentoo.org> -biber-1.8.ebuild, + -files/biber-1.8-drop-mozilla-ca.patch: + Version bump. Cleanup old. *biber-1.9 (29 May 2014) diff --git a/dev-tex/biber/biber-1.8.ebuild b/dev-tex/biber/biber-1.8.ebuild deleted file mode 100644 index f29270b2e675..000000000000 --- a/dev-tex/biber/biber-1.8.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/biber/biber-1.8.ebuild,v 1.1 2013/11/05 05:31:38 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.8-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-1.8-drop-mozilla-ca.patch deleted file mode 100644 index 056941e1b888..000000000000 --- a/dev-tex/biber/files/biber-1.8-drop-mozilla-ca.patch +++ /dev/null @@ -1,215 +0,0 @@ -diff --git a/Build.PL b/Build.PL -index 2e0a08f..bfb3c4e 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' => '0.98', -diff --git a/META.json b/META.json -index 250b29c..910dd77 100644 ---- a/META.json -+++ b/META.json -@@ -47,7 +47,6 @@ - "List::AllUtils" : "0", - "List::MoreUtils" : "0", - "Log::Log4perl" : "0", -- "Mozilla::CA" : "20130114", - "Regexp::Common" : "0", - "Text::BibTeX" : "0.66", - "URI" : "0", -diff --git a/META.yml b/META.yml -index 3229db9..305f42e 100644 ---- a/META.yml -+++ b/META.yml -@@ -113,7 +113,6 @@ requires: - List::AllUtils: 0 - List::MoreUtils: 0 - Log::Log4perl: 0 -- Mozilla::CA: 20130114 - Regexp::Common: 0 - Text::BibTeX: 0.66 - URI: 0 -diff --git a/bin/biber b/bin/biber -index 80f68da..d90e839 100755 ---- a/bin/biber -+++ b/bin/biber -@@ -72,7 +72,6 @@ GetOptions( - 'sortfirstinits=s', - 'sortlocale|l=s', - 'sortupper=s', -- 'ssl-nointernalca', - 'ssl-noverify-host', - 'tool', - 'tool_align', # legacy alias for output_align -@@ -656,12 +655,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 c469196..23e553d 100644 ---- a/data/schemata/config.rnc -+++ b/data/schemata/config.rnc -@@ -162,7 +162,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 b33160a..d6ed700 100644 ---- a/data/schemata/config.rng -+++ b/data/schemata/config.rng -@@ -566,14 +566,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 3f5a1ea..3bb1f0c 100644 ---- a/lib/Biber/Input/file/biblatexml.pm -+++ b/lib/Biber/Input/file/biblatexml.pm -@@ -93,19 +93,6 @@ sub extract_entries { - $logger->info("Data source '$filename' is a remote .xml - 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/bibtex.pm b/lib/Biber/Input/file/bibtex.pm -index 2389c8a..ca89e17 100644 ---- a/lib/Biber/Input/file/bibtex.pm -+++ b/lib/Biber/Input/file/bibtex.pm -@@ -134,19 +134,6 @@ sub extract_entries { - $logger->info("Data source '$source' is a remote BibTeX 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})) { -diff --git a/lib/Biber/Input/file/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm -index 4c13732..9dfcd00 100644 ---- a/lib/Biber/Input/file/endnotexml.pm -+++ b/lib/Biber/Input/file/endnotexml.pm -@@ -112,19 +112,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 6e82c60..9d33e07 100644 ---- a/lib/Biber/Input/file/ris.pm -+++ b/lib/Biber/Input/file/ris.pm -@@ -107,19 +107,6 @@ sub extract_entries { - $logger->info("Data source '$source' is a remote RIS 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})) { -diff --git a/lib/Biber/Input/file/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm -index f5e064f..5de6cce 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})) { --- -1.8.4.2 - |