gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

www-apps/bugzilla: Fix tests for Perl 5.26, bug 632064

Browse Source 
The required modules are not installed into any Perl default search
paths, but into the BZ web directory. This means that not finding
the modules is a test-specific problem; in actual usage they will
be found otherwise.

Closes: https://bugs.gentoo.org/632064
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel
2018-12-25 21:40:22 +01:00
parent 8bf19fa722
commit bce34290b1
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -75,6 +75,10 @@ RDEPEND="
want_apache modperl
need_httpd_cgi
PATCHES=(
"${FILESDIR}/${PN}"-5.0.3-leftbrace.patch
)
pkg_setup() {
depend.apache_pkg_setup modperl
webapp_pkg_setup
@@ -86,11 +90,12 @@ src_prepare() {
# Remove bundled perl modules
rm -r lib/ || die
eapply_user
default
}
src_test() {
perl runtests.pl || die
perl -I. runtests.pl || die
}
src_install () {

11
www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -79,6 +79,10 @@ RDEPEND="
want_apache modperl
need_httpd_cgi
PATCHES=(
"${FILESDIR}/${PN}"-5.0.3-leftbrace.patch
)
pkg_setup() {
depend.apache_pkg_setup modperl
webapp_pkg_setup
@@ -90,11 +94,12 @@ src_prepare() {
# Remove bundled perl modules
rm -r lib/ || die
eapply_user
default
}
src_test() {
perl runtests.pl || die
perl -I. runtests.pl || die
}
src_install () {

26
www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch Normal file
View File

@@ -0,0 +1,26 @@
From 3c60fba26b1fa51ec302d05dc6e76236d2f54ba4 Mon Sep 17 00:00:00 2001
From: Simon Green <mail@simon.green>
Date: Sun, 30 Oct 2016 14:55:23 +1000
Subject: [PATCH] Bug 228444 - Checking for unquoted non regex variable
interpolated into regex
---
t/010dependencies.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/010dependencies.t b/t/010dependencies.t
index 4b7ca223d..1b6c270a8 100644
--- a/t/010dependencies.t
+++ b/t/010dependencies.t
@@ -69,7 +69,7 @@ foreach my $module (keys %mods) {
$used =~ s#/#::#g;
$used =~ s#\.pm$##;
$used =~ s#\$module#[^:]+#;
- $used =~ s#\${[^}]+}#[^:]+#;
+ $used =~ s#\$\{[^}]+}#[^:]+#;
$used =~ s#[" ]##g;
push(@use, grep(/^\Q$used\E$/, keys %mods));
}
--
2.20.1