[gentoo-commits] repo/gentoo:master commit in: app-text/namazu/, app-text/namazu/files/

2021-10-05 Thread Akinori Hattori 
commit: e76243a1745ec781ff56d367d5fabfc8409f54f2
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Oct  5 13:34:34 2021 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Oct  5 13:34:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76243a1

app-text/namazu: fix build with >=app-editors/emacs-27

Closes: https://bugs.gentoo.org/814455
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 app-text/namazu/files/namazu-emacs-27.patch | 14 ++
 app-text/namazu/namazu-2.0.21.ebuild|  1 +
 2 files changed, 15 insertions(+)

diff --git a/app-text/namazu/files/namazu-emacs-27.patch 
b/app-text/namazu/files/namazu-emacs-27.patch
new file mode 100644
index 000..cb9dd4de959
--- /dev/null
+++ b/app-text/namazu/files/namazu-emacs-27.patch
@@ -0,0 +1,14 @@
+--- a/lisp/namazu.el
 b/lisp/namazu.el
+@@ -99,9 +99,9 @@
+ (defmacro defgroup ( args)
+   nil)
+ (defmacro defcustom (var value doc  args) 
+-  (` (defvar (, var) (, value) (, doc
++  `(defvar (, var) (, value) (, doc)))
+ (defmacro defface (var value doc  args)
+-  (` (make-face (, var
++  `(make-face (, var)))
+ (defmacro define-widget ( args)
+   nil)))
+ 

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index a3bcbba9f2e..ef46e76118d 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -35,6 +35,7 @@ BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+   "${FILESDIR}"/${PN}-emacs-27.patch
"${FILESDIR}"/${PN}-perl-5.18.patch
"${FILESDIR}"/${PN}-perl-5.26.patch
"${FILESDIR}"/${P}-memmove.patch

[gentoo-commits] repo/gentoo:master commit in: app-text/namazu/, app-text/namazu/files/

2017-12-10 Thread Akinori Hattori 
commit: 6c59b33c7c49b4613831cc9be5006ad11e38778c
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Dec 10 12:29:16 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Dec 10 12:40:18 2017 +
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 000..8674982312d
--- /dev/null
+++ b/app-text/namazu/files/namazu-perl-5.18.patch
@@ -0,0 +1,48 @@
+2013-12-15  Tadamasa Teranishi  
+
+* scripts/mknmz.in, filter/mhonarc.pl: support random HASH
+  for Perl 5.8.1, 5.18.X.
+
+--- a/filter/mhonarc.pl2008/05/09 07:52:21 1.23.8.8
 b/filter/mhonarc.pl2013/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

[gentoo-commits] repo/gentoo:master commit in: app-text/namazu/, app-text/namazu/files/

2017-12-10 Thread Akinori Hattori 
commit: 090032eb3ccba85d2513657241ca121e32f40d16
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Dec 10 12:32:06 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Dec 10 12:40:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090032eb

app-text/namazu: fix tests with >=dev-lang/perl-5.26

Closes: https://bugs.gentoo.org/623224
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/namazu/files/namazu-perl-5.26.patch | 22 ++
 app-text/namazu/namazu-2.0.21.ebuild |  1 +
 2 files changed, 23 insertions(+)

diff --git a/app-text/namazu/files/namazu-perl-5.26.patch 
b/app-text/namazu/files/namazu-perl-5.26.patch
new file mode 100644
index 000..1b3a4e40bd1
--- /dev/null
+++ b/app-text/namazu/files/namazu-perl-5.26.patch
@@ -0,0 +1,22 @@
+--- a/filter/hnf.pl
 b/filter/hnf.pl
+@@ -244,7 +244,7 @@
+ $uri = '?%year%month%hiday#%year%month%day0'; # for hns-1.x
+   }
+   $uri =~ s/%%/\34/g;
+-  $uri =~ s/%{?([a-z]+)}?/$param{$1}/g;
++  $uri =~ s/%\{?([a-z]+)}?/$param{$1}/g;
+   $uri =~ s/\34/%/g;
+   $uri = $hnf::diary_uri . $uri;
+   $uri =~ s/%7E/~/i;
+--- a/filter/mp3.pl
 b/filter/mp3.pl
+@@ -152,7 +152,7 @@
+ mp3::get_title($$contref, $weighted_str, $fields);
+ mp3::get_author($$contref, $fields);
+ mp3::get_album($$contref, $fields);
+-$$contref =~ s/^\w+:{1,1}?//gm;
++$$contref =~ s/^\w+:?//gm;
+ 
+ return;
+ }

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index 9891e7f58bd..92d9023d9ae 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-perl-5.18.patch
+   "${FILESDIR}"/${PN}-perl-5.26.patch
"${FILESDIR}"/${P}-memmove.patch
 )

[gentoo-commits] repo/gentoo:master commit in: app-text/namazu/, app-text/namazu/files/

2017-12-10 Thread Akinori Hattori 
commit: 9d7fdec908dafa3fcfcf39fb60fa7e4eb335fff9
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Dec 10 12:12:00 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Dec 10 12:40:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7fdec9

app-text/namazu: update patches

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/namazu/files/namazu-2.0.19-gentoo.patch   | 29 
 ...21-search.patch => namazu-2.0.21-memmove.patch} |  4 +-
 app-text/namazu/files/namazu-gentoo.patch  | 54 ++
 app-text/namazu/metadata.xml   |  2 +-
 app-text/namazu/namazu-2.0.21.ebuild   | 36 +--
 app-text/namazu/namazu-2.0.22_p1.ebuild| 14 +++---
 6 files changed, 84 insertions(+), 55 deletions(-)

diff --git a/app-text/namazu/files/namazu-2.0.19-gentoo.patch 
b/app-text/namazu/files/namazu-2.0.19-gentoo.patch
deleted file mode 100644
index 6d7f649507b..000
--- a/app-text/namazu/files/namazu-2.0.19-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur namazu-2.0.19.orig/filter/Makefile.am 
namazu-2.0.19/filter/Makefile.am
 namazu-2.0.19.orig/filter/Makefile.am  2008-05-03 02:07:03.0 
+0900
-+++ namazu-2.0.19/filter/Makefile.am   2009-03-13 01:04:20.0 +0900
-@@ -51,9 +51,3 @@
- 
- ETAGS_ARGS = $(filter_DATA) --lang=perl
- TAGS_DEPENDENCIES = $(filter_DATA)
--
--# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1
--# and old gfilter.pl (Namazu 2.0.7 or earlier).
--install-data-local:
--  rm -f $(filterdir)/ole*.pl
--  rm -f $(filterdir)/gfilter.pl
-diff -Naur namazu-2.0.19.orig/filter/Makefile.in 
namazu-2.0.19/filter/Makefile.in
 namazu-2.0.19.orig/filter/Makefile.in  2009-03-12 23:24:48.0 
+0900
-+++ namazu-2.0.19/filter/Makefile.in   2009-03-13 01:05:08.0 +0900
-@@ -455,12 +455,6 @@
-   uninstall uninstall-am uninstall-filterDATA uninstall-info-am \
-   uninstall-info-recursive uninstall-recursive
- 
--
--# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1
--# and old gfilter.pl (Namazu 2.0.7 or earlier).
--install-data-local:
--  rm -f $(filterdir)/ole*.pl
--  rm -f $(filterdir)/gfilter.pl
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

diff --git a/app-text/namazu/files/namazu-2.0.21-search.patch 
b/app-text/namazu/files/namazu-2.0.21-memmove.patch
similarity index 94%
rename from app-text/namazu/files/namazu-2.0.21-search.patch
rename to app-text/namazu/files/namazu-2.0.21-memmove.patch
index 6a8e10e8e1a..30ad490e44f 100644
--- a/app-text/namazu/files/namazu-2.0.21-search.patch
+++ b/app-text/namazu/files/namazu-2.0.21-memmove.patch
@@ -1,5 +1,5 @@
 a/nmz/search.c 2011-08-05 09:26:47.0 +0900
-+++ b/nmz/search.c 2011-08-05 09:32:25.0 +0900
+--- a/nmz/search.c
 b/nmz/search.c
 @@ -572,7 +572,7 @@
  {
  if (*expr == '*' && expr[strlen(expr) - 1] != '*') {

diff --git a/app-text/namazu/files/namazu-gentoo.patch 
b/app-text/namazu/files/namazu-gentoo.patch
new file mode 100644
index 000..027804e3fa7
--- /dev/null
+++ b/app-text/namazu/files/namazu-gentoo.patch
@@ -0,0 +1,54 @@
+--- a/Makefile.am
 b/Makefile.am
+@@ -19,9 +19,9 @@
+ 
+ bin_SCRIPTS = nmz-config
+ 
+-etcdir = $(pkgdatadir)/etc
+-etc_DATA   = AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING INSTALL \
+-   INSTALL-ja README README-es README-ja NEWS THANKS TODO \
++etcdir = @docdir@
++etc_DATA   = AUTHORS ChangeLog ChangeLog.1 CREDITS \
++   README README-es README-ja NEWS THANKS TODO \
+HACKING HACKING-ja
+ 
+ EXTRA_DIST = $(etc_DATA) maintMakefile namazu.spec namazu.spec.in \
+--- a/doc/Makefile.am
 b/doc/Makefile.am
+@@ -2,7 +2,7 @@
+ AUTOMAKE_OPTIONS = 1.4 no-dependencies
+ SUBDIRS = en ja
+ 
+-cssdir = $(pkgdatadir)/doc
++cssdir = @htmldir@
+ 
+ css_DATA   = namazu.css
+ EXTRA_DIST = $(css_DATA)
+--- a/doc/en/Makefile.am
 b/doc/en/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir = $(pkgdatadir)/doc/en
++htmldir = @htmldir@/en
+ 
+ html_DATA = manual.html nmz.html tutorial.html tips.html
+ EXTRA_DIST = $(html_DATA)
+--- a/doc/ja/Makefile.am
 b/doc/ja/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir = $(pkgdatadir)/doc/ja
++htmldir = @htmldir@/ja
+ 
+ html_DATA  = manual.html nmz.html tips.html tutorial.html
+ EXTRA_DIST = $(html_DATA)
+--- a/filter/Makefile.am
 b/filter/Makefile.am
+@@ -51,9 +51,3 @@
+ 
+ ETAGS_ARGS = $(filter_DATA) --lang=perl
+ TAGS_DEPENDENCIES = $(filter_DATA)
+-
+-# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1
+-# and old gfilter.pl (Namazu 2.0.7 or earlier).
+-install-data-local:
+-  rm -f $(filterdir)/ole*.pl
+-  rm -f $(filterdir)/gfilter.pl

diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index d84b2e08fb4..3a5b4fa8acc 100644
---