* [gentoo-commits] repo/gentoo:master commit in: dev-tex/biber/, dev-tex/biber/files/
@ 2016-03-12 1:57 Jason Donenfeld
0 siblings, 0 replies; 5+ messages in thread
From: Jason Donenfeld @ 2016-03-12 1:57 UTC (permalink / raw
To: gentoo-commits
commit: b9c4a480b5d786da8c0365ca06a71dcb7145fa64
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 01:56:53 2016 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 01:57:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c4a480
dev-tex/biber: version bump
Package-Manager: portage-2.2.27
dev-tex/biber/Manifest | 1 +
dev-tex/biber/biber-2.4.ebuild | 75 +++++++++++
.../biber/files/biber-2.4-drop-mozilla-ca.patch | 146 +++++++++++++++++++++
3 files changed, 222 insertions(+)
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 3cfd337..3e6f326 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,2 +1,3 @@
DIST biber-2.2.tar.gz 2296128 SHA256 6dd93476b27ac7603bc9f224a3b00558f86617209f93b74f8cb4a51f54480c2f SHA512 508b5a8046a1ff7ef6482b5c1f86ce427fa47f669ca224ee52252109dd6488ff242ea5076cafd47f66f288fed994b5425eab4c2566346046e0b2f656ca679d7c WHIRLPOOL 2006b26277eaeb707211a1828e70c4bbfd04030f56e91062c57050a5b0479d317455352730976f3f9206eafbafdccc71d9f071f4e9dedace1c77e8c79ab826b4
DIST biber-2.3.tar.gz 2288957 SHA256 7a85a7716f0dbe73b118d8d9b8ab26428a3505a1d5b366f2e954ede3e78563e3 SHA512 5d4c0ff32ba69d3f4591c167fc838972f39206a3ba7d73f9052ac10b9f528931a8fe6bdf37812a8e2634592f26a203e332bdc01e42997ce8bc49cf779eac2462 WHIRLPOOL 602acb26e4990e55024d21a7d4ed481133f27112dc7081c939b886c30cd33cb958abe59fc92e97e6a3e6f6fe1c9d4177dec36b0683f7a5b633f8eac9d7b778bc
+DIST biber-2.4.tar.gz 1480095 SHA256 708dbdb6598eba182b6a217bd48ce6d101925b65f5f24e8828bee9465747682e SHA512 dcd4e455ada36299c159e24b70ec208f28ba2254813fd5be471a1dd750da9f2f348282fc012107f6a5b9ba1aefd209802b4ee97b6e82b1fc30927c4c8e8c0b41 WHIRLPOOL 027723040e1b9cb78a7817c8fc73fc0c41bb9684d31ecd6146966c3f1809692affcf2bc3d972317178cda5bee2d8219c2dc7518d5f3d796f4dfb2a093fff621c
diff --git a/dev-tex/biber/biber-2.4.ebuild b/dev-tex/biber/biber-2.4.ebuild
new file mode 100644
index 0000000..5182c14
--- /dev/null
+++ b/dev-tex/biber/biber-2.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils perl-module
+
+MY_PN=biblatex-${PN}
+
+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 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/Data-Uniqid
+ 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/List-MoreUtils-0.408.0
+ dev-perl/Log-Log4perl
+ dev-perl/LWP-Protocol-https
+ dev-perl/regexp-common
+ dev-perl/Readonly
+ dev-perl/Readonly-XS
+ dev-perl/Text-Roman
+ >=dev-perl/Text-BibTeX-0.700.0
+ dev-perl/URI
+ dev-perl/Unicode-LineBreak
+ >=virtual/perl-Unicode-Normalize-1.230.0
+ dev-perl/XML-LibXML-Simple
+ dev-perl/XML-LibXSLT
+ dev-perl/XML-SAX-Base
+ dev-perl/XML-Writer
+ >=dev-tex/biblatex-3.2
+ virtual/perl-IPC-Cmd
+ >=virtual/perl-Unicode-Collate-1.140.0"
+DEPEND="${RDEPEND}
+ dev-perl/Config-AutoConf
+ dev-perl/Module-Build
+ test? ( dev-perl/File-Which
+ dev-perl/Test-Differences
+ dev-perl/Test-Pod
+ dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="parallel"
+
+src_prepare(){
+ epatch "${FILESDIR}"/${PN}-2.4-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-2.4-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-2.4-drop-mozilla-ca.patch
new file mode 100644
index 0000000..d4618a4
--- /dev/null
+++ b/dev-tex/biber/files/biber-2.4-drop-mozilla-ca.patch
@@ -0,0 +1,146 @@
+commit 09ac1811820c2d2b92f8de779f7c389f89dc6c16
+Author: Jason A. Donenfeld <Jason@zx2c4.com>
+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' => '20141217',
+ 'Regexp::Common' => 0,
+ 'Log::Log4perl' => 0,
+ 'Unicode::Collate' => '1.14',
+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})) {
+diff --git a/lib/Biber/Input/file/ris.pm b/lib/Biber/Input/file/ris.pm
+index 9814723..e849b95 100644
+--- a/lib/Biber/Input/file/ris.pm
++++ b/lib/Biber/Input/file/ris.pm
+@@ -109,19 +109,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})) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tex/biber/, dev-tex/biber/files/
@ 2017-05-18 20:47 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2017-05-18 20:47 UTC (permalink / raw
To: gentoo-commits
commit: c6e82bfdc30aa68e582cdd1235610237f5855e44
Author: Hendrik v. Raven <hendrik <AT> consetetur <DOT> de>
AuthorDate: Tue May 2 09:56:26 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 18 20:47:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e82bfd
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(+)
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 6ee0f11d788..9ce79219aae 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 00000000000..4ff72f2779a
--- /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 00000000000..83b625ee4a3
--- /dev/null
+++ b/dev-tex/biber/files/biber-2.7-drop-mozilla-ca.patch
@@ -0,0 +1,122 @@
+commit 09ac1811820c2d2b92f8de779f7c389f89dc6c16
+Author: Jason A. Donenfeld <Jason@zx2c4.com>
+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})) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tex/biber/, dev-tex/biber/files/
@ 2018-08-15 20:16 Virgil Dupras
0 siblings, 0 replies; 5+ messages in thread
From: Virgil Dupras @ 2018-08-15 20:16 UTC (permalink / raw
To: gentoo-commits
commit: c36b43d48b205e711a75566ac5de4f511e67b038
Author: Hendrik v. Raven <hendrik <AT> consetetur <DOT> de>
AuthorDate: Wed Jul 25 19:28:56 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 20:12:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36b43d4
dev-tex/biber: add patch to fix perl-5.26 warnings
Bug: https://bugs.gentoo.org/623410
Package-Manager: Portage-2.3.42, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9349
.../{biber-2.7.ebuild => biber-2.5-r1.ebuild} | 58 +++++++++++++---------
dev-tex/biber/biber-2.7.ebuild | 5 +-
.../biber-2.5-unescaped-left-brace-in-regex.patch | 12 +++++
3 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/dev-tex/biber/biber-2.7.ebuild b/dev-tex/biber/biber-2.5-r1.ebuild
similarity index 53%
copy from dev-tex/biber/biber-2.7.ebuild
copy to dev-tex/biber/biber-2.5-r1.ebuild
index 4e8ada3cfa5..e8797f26ab7 100644
--- a/dev-tex/biber/biber-2.7.ebuild
+++ b/dev-tex/biber/biber-2.5-r1.ebuild
@@ -9,12 +9,12 @@ 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"
+LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
+KEYWORDS="~amd64"
+IUSE="doc test"
-RDEPEND=">=dev-lang/perl-5.24
+RDEPEND=">=dev-lang/perl-5.16
dev-perl/autovivification
dev-perl/Business-ISBN
dev-perl/Business-ISMN
@@ -23,43 +23,55 @@ RDEPEND=">=dev-lang/perl-5.24
dev-perl/Data-Compare
dev-perl/Data-Dump
dev-perl/Data-Uniqid
- dev-perl/DateTime-Calendar-Julian
- dev-perl/DateTime-Format-Builder
+ dev-perl/Date-Simple
dev-perl/Encode-EUCJPASCII
dev-perl/Encode-HanExtra
dev-perl/Encode-JIS2K
- dev-perl/File-Slurp
+ dev-perl/File-Slurp-Unicode
dev-perl/IPC-Run3
dev-perl/libwww-perl[ssl]
- >=dev-perl/Lingua-Translit-0.250
+ >=dev-perl/Lingua-Translit-0.25
dev-perl/List-AllUtils
- dev-perl/List-MoreUtils
- dev-perl/List-MoreUtils-XS
+ >=dev-perl/List-MoreUtils-0.408.0
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/Readonly
+ dev-perl/Readonly-XS
dev-perl/Text-Roman
+ >=dev-perl/Text-BibTeX-0.720.0
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/Unicode-LineBreak
+ >=virtual/perl-Unicode-Normalize-1.230.0
+ dev-perl/XML-LibXML
dev-perl/XML-LibXML-Simple
dev-perl/XML-LibXSLT
+ dev-perl/XML-SAX-Base
dev-perl/XML-Writer
- ~dev-tex/biblatex-3.7
+ ~dev-tex/biblatex-3.4
virtual/perl-IPC-Cmd
- >=virtual/perl-Unicode-Collate-1.190.0"
+ >=virtual/perl-Unicode-Collate-1.140.0"
DEPEND="${RDEPEND}
dev-perl/Config-AutoConf
dev-perl/Module-Build
- dev-perl/ExtUtils-LibBuilder
test? ( dev-perl/File-Which
- dev-perl/Test-Differences )"
+ dev-perl/Test-Differences
+ dev-perl/Test-Pod
+ dev-perl/Test-Pod-Coverage
+ ~virtual/perl-Unicode-Collate-1.140.0 )"
-PATCHES=( "${FILESDIR}/${PN}-2.7-drop-mozilla-ca.patch" )
+SRC_TEST="parallel"
-mydoc="doc/biber.tex"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4-drop-mozilla-ca.patch
+ "${FILESDIR}"/${PN}-2.5-unescaped-left-brace-in-regex.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/biber-2.7.ebuild b/dev-tex/biber/biber-2.7.ebuild
index 4e8ada3cfa5..f74084ea47c 100644
--- a/dev-tex/biber/biber-2.7.ebuild
+++ b/dev-tex/biber/biber-2.7.ebuild
@@ -60,6 +60,9 @@ DEPEND="${RDEPEND}
test? ( dev-perl/File-Which
dev-perl/Test-Differences )"
-PATCHES=( "${FILESDIR}/${PN}-2.7-drop-mozilla-ca.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.7-drop-mozilla-ca.patch"
+ "${FILESDIR}/${PN}-2.5-unescaped-left-brace-in-regex.patch"
+ )
mydoc="doc/biber.tex"
diff --git a/dev-tex/biber/files/biber-2.5-unescaped-left-brace-in-regex.patch b/dev-tex/biber/files/biber-2.5-unescaped-left-brace-in-regex.patch
new file mode 100644
index 00000000000..c84b6cdbbb9
--- /dev/null
+++ b/dev-tex/biber/files/biber-2.5-unescaped-left-brace-in-regex.patch
@@ -0,0 +1,12 @@
+diff -Naur ./lib/Biber/LaTeX/Recode.pm ./lib/Biber/LaTeX/Recode.pm
+--- ./lib/Biber/LaTeX/Recode.pm 2018-07-25 21:20:25.961547631 +0200
++++ ./lib/Biber/LaTeX/Recode.pm 2018-07-25 21:20:06.653779312 +0200
+@@ -292,7 +292,7 @@
+ # Workaround perl's lack of variable-width negative look-behind -
+ # Reverse string (and therefore some of the Re) and use variable width negative look-ahead
+ $text = reverse $text;
+- $text =~ s/}(\pM+\pL){(?!\pL+\\)/$1/g;
++ $text =~ s/}(\pM+\pL)\{(?!\pL+\\)/$1/g;
+ $text = reverse $text;
+ $logger->trace("String in latex_decode() now -> '$text'");
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tex/biber/, dev-tex/biber/files/
@ 2021-04-10 0:09 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-10 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 65871ad2d20b8ab39caf25a0aaec3ab95fbcf511
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Fri Apr 9 19:57:15 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 00:09:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65871ad2
dev-tex/biber: disable 64-bit only tests on 32-bit arches
Closes: https://bugs.gentoo.org/780879
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/20316
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-tex/biber/biber-2.16.ebuild | 7 ++++
.../biber-2.16-disable-64bit-only-tests.patch | 45 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/dev-tex/biber/biber-2.16.ebuild b/dev-tex/biber/biber-2.16.ebuild
index cd8a79b581c..cc5a0781cf0 100644
--- a/dev-tex/biber/biber-2.16.ebuild
+++ b/dev-tex/biber/biber-2.16.ebuild
@@ -67,3 +67,10 @@ DEPEND="${RDEPEND}
dev-perl/Test-Differences )"
mydoc="doc/biber.tex"
+
+src_prepare() {
+ #disable 64-bit only Tests on non 64-bit archs
+ use amd64 || use arm64 || eapply "${FILESDIR}/${P}-disable-64bit-only-tests.patch"
+
+ default
+}
diff --git a/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch b/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch
new file mode 100644
index 00000000000..74e66ab0701
--- /dev/null
+++ b/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch
@@ -0,0 +1,45 @@
+Disable Tests which works only on 64bit architecture
+because they tests int overflows.
+From: Jonas Licht <jonas.licht@gmail.com>
+Bug: https://github.com/plk/biber/issues/349
+Bug: https://bugs.gentoo.org/780879
+
+diff --git a/t/dateformats.t b/t/dateformats.t
+index 9c179f06..d22ffcf6 100644
+--- a/t/dateformats.t
++++ b/t/dateformats.t
+@@ -4,7 +4,7 @@ use warnings;
+ use utf8;
+ no warnings 'utf8';
+
+-use Test::More tests => 56;
++use Test::More tests => 48;
+ use Test::Differences;
+ unified_diff;
+
+@@ -879,16 +879,6 @@ $bibentries->del_entry('unspec2');
+ $biber->prepare;
+ $out = $biber->get_output_obj;
+
+-# Test negative dates and eras
+-eq_or_diff($out->get_output_entry('era1', $main), $era1, 'Date meta information - 1');
+-eq_or_diff($out->get_output_entry('era2', $main), $era2, 'Date meta information - 2');
+-eq_or_diff($out->get_output_entry('era3', $main), $era3, 'Date meta information - 3');
+-eq_or_diff($out->get_output_entry('era4', $main), $era4, 'Date meta information - 4');
+-
+-# Test range markers
+-eq_or_diff($out->get_output_entry('range1', $main), $range1, 'Range - 1');
+-eq_or_diff($out->get_output_entry('range2', $main), $range2, 'Range - 2');
+-
+ # Test seasons
+ eq_or_diff($out->get_output_entry('season1', $main), $season1, 'Seasons - 1');
+
+@@ -904,8 +894,6 @@ eq_or_diff($bibentries->entry('open1')->get_field('labeldatesource'), '', 'Open
+ eq_or_diff($bibentries->entry('open2')->get_field('labeldatesource'), '', 'Open - 2');
+
+ # Test long year formats
+-eq_or_diff($bibentries->entry('y1')->get_field('year'), '17000002', 'Extended years - 1');
+-eq_or_diff($bibentries->entry('y2')->get_field('year'), '-17000002', 'Extended years - 2');
+ eq_or_diff($bibentries->entry('y3')->get_field('year'), undef, 'Extended years - 3');
+
+ # Scripts
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tex/biber/, dev-tex/biber/files/
@ 2022-06-10 2:45 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-06-10 2:45 UTC (permalink / raw
To: gentoo-commits
commit: 471c86c1a081f51a214e040f1a83f7f73374526d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 02:20:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 02:27:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471c86c1
dev-tex/biber: fix runtime w/ Perl 5.36
Closes: https://bugs.gentoo.org/850733
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-tex/biber/biber-2.16-r1.ebuild | 81 ++++++++++++++++++++++
.../files/biber-2.16-perl-5.36-semicolon.patch | 38 ++++++++++
2 files changed, 119 insertions(+)
diff --git a/dev-tex/biber/biber-2.16-r1.ebuild b/dev-tex/biber/biber-2.16-r1.ebuild
new file mode 100644
index 000000000000..ab03abdc1d51
--- /dev/null
+++ b/dev-tex/biber/biber-2.16-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-lang/perl-5.30
+ 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/IO-String
+ 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/Mozilla-CA
+ dev-perl/Parse-RecDescent
+ dev-perl/PerlIO-utf8_strict
+ dev-perl/Regexp-Common
+ dev-perl/Sort-Key
+ >=dev-perl/Text-BibTeX-0.880.0
+ dev-perl/Text-CSV
+ dev-perl/Text-CSV_XS
+ dev-perl/Text-Roman
+ dev-perl/URI
+ >=dev-perl/Unicode-LineBreak-2019.1.0
+ >=virtual/perl-Unicode-Normalize-1.260.0
+ >=dev-perl/XML-LibXML-1.70
+ dev-perl/XML-LibXML-Simple
+ dev-perl/XML-LibXSLT
+ dev-perl/XML-Writer
+ ~dev-tex/biblatex-3.16
+ virtual/perl-IPC-Cmd
+ >=virtual/perl-Unicode-Collate-1.290.0"
+DEPEND="${RDEPEND}
+ dev-perl/Config-AutoConf
+ dev-perl/Module-Build
+ dev-perl/ExtUtils-LibBuilder
+ test? ( dev-perl/File-Which
+ dev-perl/Parse-RecDescent
+ dev-perl/Test-Differences )"
+BDEPEND="dev-perl/Module-Build"
+
+mydoc="doc/biber.tex"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-perl-5.36-semicolon.patch
+)
+
+src_prepare() {
+ # Disable 64-bit only Tests on non 64-bit archs
+ use amd64 || use arm64 || eapply "${FILESDIR}/${P}-disable-64bit-only-tests.patch"
+
+ default
+}
diff --git a/dev-tex/biber/files/biber-2.16-perl-5.36-semicolon.patch b/dev-tex/biber/files/biber-2.16-perl-5.36-semicolon.patch
new file mode 100644
index 000000000000..655a4e8f73e9
--- /dev/null
+++ b/dev-tex/biber/files/biber-2.16-perl-5.36-semicolon.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/850733
+https://github.com/plk/biber/commit/d9e961710074d266ad6bdf395c98868d91952088
+
+From d9e961710074d266ad6bdf395c98868d91952088 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 25 May 2022 12:41:59 +0200
+Subject: [PATCH] Adapt to Perl 5.36
+
+A developmental release of Perl 5.36.0 fails to run tests with:
+
+ $ perl -Ilib t/basic-misc.t
+ 1..72
+ Can't modify undef operator in scalar assignment at lib/Biber/Section.pm line 433, near "undef;"
+ Compilation failed in require at lib/Biber.pm line 24.
+ BEGIN failed--compilation aborted at lib/Biber.pm line 24.
+ Compilation failed in require at t/basic-misc.t line 11.
+ BEGIN failed--compilation aborted at t/basic-misc.t line 11.
+ # Looks like your test exited with 255 before it could output anything.
+
+This is because of a missing semicolon between commands in
+del_everykeys(). The new perl is more strict and raises a compile-time
+error:
+
+ $ perl -e '$a = undef $b = undef;'
+ Can't modify undef operator in scalar assignment at -e line 1, near "undef;"
+ Execution of -e aborted due to compilation errors.
+--- a/lib/Biber/Section.pm
++++ b/lib/Biber/Section.pm
+@@ -429,7 +429,7 @@ sub add_everykey {
+
+ sub del_everykeys {
+ my $self = shift;
+- $self->{everykey} = undef
++ $self->{everykey} = undef;
+ $self->{everykey_lc} = undef;
+ return;
+ }
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-10 2:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-10 0:09 [gentoo-commits] repo/gentoo:master commit in: dev-tex/biber/, dev-tex/biber/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-10 2:45 Sam James
2018-08-15 20:16 Virgil Dupras
2017-05-18 20:47 Michał Górny
2016-03-12 1:57 Jason Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox