From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-989526-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1CAA139083 for <garchives@archives.gentoo.org>; Sun, 10 Dec 2017 12:40:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E00FE1014; Sun, 10 Dec 2017 12:40:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6C51E1014 for <gentoo-commits@lists.gentoo.org>; Sun, 10 Dec 2017 12:40:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7888433BE68 for <gentoo-commits@lists.gentoo.org>; Sun, 10 Dec 2017 12:40:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 096D7AE7E for <gentoo-commits@lists.gentoo.org>; Sun, 10 Dec 2017 12:40:36 +0000 (UTC) From: "Akinori Hattori" <hattya@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" <hattya@gentoo.org> Message-ID: <1512909618.6c59b33c7c49b4613831cc9be5006ad11e38778c.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/namazu/, app-text/namazu/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/namazu/files/namazu-perl-5.18.patch app-text/namazu/namazu-2.0.21.ebuild X-VCS-Directories: app-text/namazu/ app-text/namazu/files/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 6c59b33c7c49b4613831cc9be5006ad11e38778c X-VCS-Branch: master Date: Sun, 10 Dec 2017 12:40:36 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 18d80362-e5da-4062-8290-354cf8a4c62d X-Archives-Hash: b0fa5316f2523603fd142da5ce790269 commit: 6c59b33c7c49b4613831cc9be5006ad11e38778c Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sun Dec 10 12:29:16 2017 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sun Dec 10 12:40:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c59b33c app-text/namazu: fix tests with >=dev-lang/perl-5.18 Closes: https://bugs.gentoo.org/630106 Package-Manager: Portage-2.3.13, Repoman-2.3.4 app-text/namazu/files/namazu-perl-5.18.patch | 48 ++++++++++++++++++++++++++++ app-text/namazu/namazu-2.0.21.ebuild | 5 +++ 2 files changed, 53 insertions(+) diff --git a/app-text/namazu/files/namazu-perl-5.18.patch b/app-text/namazu/files/namazu-perl-5.18.patch new file mode 100644 index 00000000000..8674982312d --- /dev/null +++ b/app-text/namazu/files/namazu-perl-5.18.patch @@ -0,0 +1,48 @@ +2013-12-15 Tadamasa Teranishi <yw3t-trns@asahi-net.or.jp> + + * scripts/mknmz.in, filter/mhonarc.pl: support random HASH + for Perl 5.8.1, 5.18.X. + +--- a/filter/mhonarc.pl 2008/05/09 07:52:21 1.23.8.8 ++++ b/filter/mhonarc.pl 2013/12/15 04:01:53 1.23.8.9 +@@ -1,10 +1,10 @@ + # + # -*- Perl -*- +-# $Id: mhonarc.pl,v 1.23.8.8 2008-05-09 07:52:21 opengl2772 Exp $ ++# $Id: mhonarc.pl,v 1.23.8.9 2013-12-15 04:01:53 opengl2772 Exp $ + # Copyright (C) 1997-2000 Satoru Takabayashi , + # 1999 NOKUBI Takatsugu , + # 2002 Earl Hood , +-# 2000-2008 Namazu Project All rights reserved. ++# 2000-2013 Namazu Project All rights reserved. + # This is free software with ABSOLUTELY NO WARRANTY. + # + # This program is free software; you can redistribute it and/or modify +@@ -141,9 +141,8 @@ + + # Format MHonArc X comment extracted headers as regular headers + my $mha_header = ""; +- my($fld_name, $fld_value); +- while (($fld_name, $fld_value) = each %$mha_fields) { +- $mha_header .= join('', $fld_name, ': ', $fld_value, "\n"); ++ for my $key (sort keys %$mha_fields) { ++ $mha_header .= join('', $key, ': ', $mha_fields->{$key}, "\n"); + } + + # Added header back to content string. +--- a/scripts/mknmz.in 2011/07/23 23:50:59 1.85.4.102 ++++ b/scripts/mknmz.in 2013/12/15 04:01:53 1.85.4.103 +@@ -77,13 +77,6 @@ + sub main { + my $start_time = time; + +- if ($English::PERL_VERSION == 5.008001) { +- unless (defined $ENV{PERL_HASH_SEED} && $ENV{PERL_HASH_SEED} eq 0) { +- print "Run mknmz with the environment variable PERL_HASH_SEED=0\n"; +- exit 1; +- } +- } +- + init(); + + # At first, loading pl/conf.pl to prevent overriding some variables. diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild index 4e9e1946644..9891e7f58bd 100644 --- a/app-text/namazu/namazu-2.0.21.ebuild +++ b/app-text/namazu/namazu-2.0.21.ebuild @@ -35,6 +35,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch + "${FILESDIR}"/${PN}-perl-5.18.patch "${FILESDIR}"/${P}-memmove.patch ) @@ -71,6 +72,10 @@ src_compile() { fi } +src_test() { + emake -j1 check +} + src_install () { emake DESTDIR="${D}" install