diff options
| -rw-r--r-- | dev-tex/biber/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-tex/biber/Manifest | 5 | ||||
| -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 |
4 files changed, 303 insertions, 3 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/Manifest b/dev-tex/biber/Manifest index fea0af3fcb0a..dd048c2e9029 100644 --- a/dev-tex/biber/Manifest +++ b/dev-tex/biber/Manifest @@ -1,5 +1,8 @@ AUX biber-1.8-drop-mozilla-ca.patch 9686 SHA256 552b51cf84dc64439365c264351726a70c3fce29201c473b7f280d65fed41a0d SHA512 c9698599c5f3517e0eedc6b5723694e5da268a77f17e2c9ac274c7460eebecb7c0dc28142e8d1b5b93f0b4946a4fe09f28d90c1eb9cabcf09493b00687c75a69 WHIRLPOOL 163191e128a9251ef8c3087fbb624c7c2e53869b8cf6e35fea2a4a92fe4795dcb29dab949bf3ff6c9b72e15bd9ba6e109ad3510d6b266cdf1950ef80d2bfadd8 +AUX biber-1.9-drop-mozilla-ca.patch 9857 SHA256 ac23ab0bd0c9e86410221539bf6a3e38a138f07d495d3f3515eb81f1db933ede SHA512 4132c49da760243b5f78f7435099c26d2da44a69f6eb3a6bf1d5be33fccd784c6bd83c8fe9902d5f810d88898ec800dea73d6a19fb154ba1a4899f9bf4d3f76f WHIRLPOOL 3787d6c38d19e2bfa636e9b0773d9cf225fabc2c4e4b3d208acd558451dbf852e4276ea7950bcb9c0c3e9befca3f6891003e34d1046294dd56027dd0f8b37dc5 DIST biber-1.8.tar.gz 2080602 SHA256 96cc746e1d10879c7bf56b588433c293683656590a9f7c1079e5ed7689f1d939 SHA512 1112779ec6a142e09a5d6d096663486f744962cef8ece82a1ff8b98f4dc82b0e3d8a9d05b2b62c824f03e138f2091dbbbafd44045acd78a079255fedd38f354f WHIRLPOOL d9165a2260dcd6ea09db45fbeb7af537146ae4bb0119ed5967a0ae458a59c2b9f6c8c8d8e06ec603d5d3aaba454fcede9b1af0537b45aaaf7dc27e1ad578a5aa +DIST biber-1.9.tar.gz 2046569 SHA256 4b8f7ab78f326f2c862c99f8dbb3b224c49f9289820dc226c9529dfa945d9066 SHA512 6b417fd2537e832e8309e3cd1405037a0e1a6e1bc2f2759a208a97f1107a787c269eb3dd9a5b3875855dd50d641dbe7d61b7127d11f986a05d1ceb08ec6ecfda WHIRLPOOL 47b39ab2e0c35e48f4d627bf24f4c03bbeb6b8f499c6492d403da31098b1eb13cd998713f7fbe38c260dff1418b1bd03aede7fa86cd04baf4d5dbe04816e4377 EBUILD biber-1.8.ebuild 1639 SHA256 364469c172ce336d96519d75060b5ac2f0c24449adb3aa56bc8e79148c3023b2 SHA512 4b4164b87bd1735cf3184b918b80b4396e0fdb269e9399dffd15bf23d23ca1902662751ea6fc67d29aaceb8ad1cddc7486ee50e1d2743afa93703391827f4f53 WHIRLPOOL 91c9854f1b772fe5e0393f32372bd6cf3648a4e55071dd26c32d60108f085d678b2a820c7f3a25d41260e4aa2b134c4e4b78c907c2af858e4b76a7e9fea8d6d3 -MISC ChangeLog 868 SHA256 450f9abc70d1c30f6d5db24bbbb245f7f106db0de98fba6ed91ec9f1e53244e7 SHA512 c4a5b9fe919c62c2117a447bf6fd87dea29c39310c752d101e9059642d7a61cca89aa72d983979106f4d5f7e606447a33bdcaad33d4b8d985b9637ad913a4f4d WHIRLPOOL 09b2d7f964ff5c37f10547fc827defe769f8fe660d84925aa0fb96fba1f1f3d7a1267cd2532934325a05a077c59e221087bdcdd6ae64f23584fb78b24e768bc2 +EBUILD biber-1.9.ebuild 1635 SHA256 4d0cacc59c2a51643c285863d40b1ad59eb037bae7a36047dff1f3ad8f896812 SHA512 3831e2d16d05f32a6f689e2e405a1dd0e76cdb57797faae28a9d8dd0ec8b75bf3559066af938309c8df54c247a72204ab6f8c50b8273098746c05865588bc712 WHIRLPOOL f1d689fff6f67df9d6345ed3901b0070daf0a741ab6f30470d2470ab51ac05a21f823c135a0e78240f040faa94ad4ad868e96f5d645fada9800a696e143a2820 +MISC ChangeLog 1020 SHA256 ff365353abdf63cd12a7288e4b0de194b61b4a5d635561336d8279d32a27d2c0 SHA512 49fe8fd1a35219756a254ba3e31ff01a5b2f6ad7702cd8db5cbb62ab2cf53feeedbf368f01c88ae497f26d5e6ce2dfa4769caca9cb0aefd03534408a3b34318a WHIRLPOOL d3ccfd55dbdcf88945801a9191778d3295955874251a90aff7c8287239fa5eaab45cf58c88787f322602dde3bbda4d5be7cc945d6629ba6420fa612150ac5bd0 MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06 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 + |