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

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

app-text/namazu: update LICENSE

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 app-text/namazu/namazu-2.0.21.ebuild  | 2 +-
 app-text/namazu/namazu-2.0.22_pre7.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index 68d7835962b..a3bcbba9f2e 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/;
 SRC_URI="http://www.namazu.org/stable/${P}.tar.gz;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="emacs l10n_ja nls static-libs tk"

diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild 
b/app-text/namazu/namazu-2.0.22_pre7.ebuild
index e6044e412bd..4c8146e3b31 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/;
 SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="emacs l10n_ja nls static-libs tk"

[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/

2021-10-05 Thread Akinori Hattori 
commit: 0964f4706de78ade27d95aa3cb82bb5d0b58f710
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Oct  5 13:26:38 2021 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Oct  5 13:26:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0964f470

app-text/namazu: update to EAPI 7

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 app-text/namazu/namazu-2.0.21.ebuild  | 14 +++---
 app-text/namazu/namazu-2.0.22_pre7.ebuild | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index 5d0b4d0d14e..68d7835962b 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools elisp-common
 
@@ -30,8 +30,8 @@ RDEPEND="dev-perl/File-MMagic
dev-lang/tk:0
www-client/lynx
)"
-DEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
@@ -43,8 +43,8 @@ PATCHES=(
 src_prepare() {
default
 
-   mv configure.{in,ac}
-   mv tk${PN}/configure.{in,ac}
+   mv configure.{in,ac} || die
+   mv tk${PN}/configure.{in,ac} || die
eautoreconf
 }
 
@@ -64,7 +64,7 @@ src_configure() {
 }
 
 src_compile() {
-   emake
+   default
 
if use emacs; then
cd lisp

diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild 
b/app-text/namazu/namazu-2.0.22_pre7.ebuild
index 8517c855436..e6044e412bd 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools elisp-common
 
@@ -32,8 +32,8 @@ RDEPEND="dev-perl/File-MMagic
dev-lang/tk:0
www-client/lynx
)"
-DEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}"/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
@@ -41,8 +41,8 @@ PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 src_prepare() {
default
 
-   mv configure.{in,ac}
-   mv tk${PN}/configure.{in,ac}
+   mv configure.{in,ac} || die
+   mv tk${PN}/configure.{in,ac} || die
eautoreconf
 }
 
@@ -62,7 +62,7 @@ src_configure() {
 }
 
 src_compile() {
-   emake
+   default
 
if use emacs; then
cd lisp

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

2021-10-05 Thread Akinori Hattori 
commit: 1ea700944a9a9f1212706b2257febaa05e07
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Oct  5 13:36:22 2021 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Oct  5 13:36:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea70094

app-text/namazu: new upstream release

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 app-text/namazu/Manifest| 2 +-
 .../namazu/{namazu-2.0.22_pre7.ebuild => namazu-2.0.22_pre8.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 8629ab62e8e..a234f038899 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,2 +1,2 @@
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 
86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2
 SHA512 
c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 
4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76
 SHA512 
e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
+DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 
91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23
 SHA512 
2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0

diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild 
b/app-text/namazu/namazu-2.0.22_pre8.ebuild
similarity index 100%
rename from app-text/namazu/namazu-2.0.22_pre7.ebuild
rename to app-text/namazu/namazu-2.0.22_pre8.ebuild

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

2018-07-20 Thread Akinori Hattori 
commit: 857e386e6ba95fc19874f978465d36f25f22dbfb
Author: Akinori Hattori  gentoo  org>
AuthorDate: Fri Jul 20 13:42:57 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Fri Jul 20 13:42:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857e386e

app-text/namazu: drop ltprune

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/namazu/namazu-2.0.21.ebuild  | 9 -
 app-text/namazu/namazu-2.0.22_pre7.ebuild | 9 -
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index 92d9023d9ae..7a542c06eb9 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools elisp-common ltprune
+inherit autotools elisp-common
 
 DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/;
@@ -78,7 +78,8 @@ src_test() {
 }
 
 src_install () {
-   emake DESTDIR="${D}" install
+   default
+   find "${ED}" -name '*.la' -delete || die
 
if use emacs; then
elisp-install ${PN} lisp/*.el*
@@ -87,8 +88,6 @@ src_install () {
docinto lisp
dodoc lisp/ChangeLog*
fi
-
-   prune_libtool_files
 }
 
 pkg_postinst() {

diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild 
b/app-text/namazu/namazu-2.0.22_pre7.ebuild
index 92c919dbac5..b0e98040e37 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools elisp-common ltprune
+inherit autotools elisp-common
 
 MY_P="${P/_pre/pre}"
 
@@ -76,7 +76,8 @@ src_test() {
 }
 
 src_install () {
-   emake DESTDIR="${D}" install
+   default
+   find "${ED}" -name '*.la' -delete || die
 
if use emacs; then
elisp-install ${PN} lisp/*.el*
@@ -85,8 +86,6 @@ src_install () {
docinto lisp
dodoc lisp/ChangeLog*
fi
-
-   prune_libtool_files
 }
 
 pkg_postinst() {

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

2017-12-12 Thread Akinori Hattori 
commit: 3cf4c62b07c8d518b8322bd0dce608f3ab3cda8e
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Dec 12 13:17:59 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Dec 12 13:17:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cf4c62b

app-text/namazu: update patch

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/namazu/files/namazu-gentoo.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/namazu/files/namazu-gentoo.patch 
b/app-text/namazu/files/namazu-gentoo.patch
index 027804e3fa7..8f0275ba27c 100644
--- a/app-text/namazu/files/namazu-gentoo.patch
+++ b/app-text/namazu/files/namazu-gentoo.patch
@@ -7,7 +7,7 @@
 -etcdir = $(pkgdatadir)/etc
 -etc_DATA   = AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING INSTALL \
 -   INSTALL-ja README README-es README-ja NEWS THANKS TODO \
-+etcdir = @docdir@
++etcdir = $(docdir)
 +etc_DATA   = AUTHORS ChangeLog ChangeLog.1 CREDITS \
 +   README README-es README-ja NEWS THANKS TODO \
 HACKING HACKING-ja
@@ -20,7 +20,7 @@
  SUBDIRS = en ja
  
 -cssdir = $(pkgdatadir)/doc
-+cssdir = @htmldir@
++cssdir = $(htmldir)
  
  css_DATA   = namazu.css
  EXTRA_DIST = $(css_DATA)

[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/files/, app-text/namazu/

2017-12-10 Thread Akinori Hattori 
commit: 75dcb1f96d13c2207dac4fd7e976fa2c09e1fcee
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Dec 10 12:21:27 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Dec 10 12:40:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75dcb1f9

app-text/namazu: update to EAPI 6

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/namazu/files/50namazu-gentoo.el |  3 --
 app-text/namazu/namazu-2.0.21.ebuild | 34 +--
 app-text/namazu/namazu-2.0.22_p1.ebuild  | 47 +++-
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/app-text/namazu/files/50namazu-gentoo.el 
b/app-text/namazu/files/50namazu-gentoo.el
index 56bbce50af8..e2f6e501241 100644
--- a/app-text/namazu/files/50namazu-gentoo.el
+++ b/app-text/namazu/files/50namazu-gentoo.el
@@ -1,5 +1,2 @@
-
-;; namazu site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'namazu "namazu" nil t)

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index ac2d382288d..4e9e1946644 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit autotools eutils elisp-common
+inherit autotools elisp-common ltprune
 
 DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/;
@@ -12,9 +12,9 @@ SRC_URI="http://www.namazu.org/stable/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="emacs nls tk l10n_ja"
+IUSE="emacs l10n_ja nls static-libs tk"
 
-RDEPEND=">=dev-perl/File-MMagic-1.20
+RDEPEND="dev-perl/File-MMagic
emacs? ( virtual/emacs )
l10n_ja? (
app-i18n/nkf
@@ -33,9 +33,13 @@ RDEPEND=">=dev-perl/File-MMagic-1.20
 DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-gentoo.patch
+   "${FILESDIR}"/${P}-memmove.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-gentoo.patch
-   epatch "${FILESDIR}"/${P}-memmove.patch
+   default
 
mv configure.{in,ac}
mv tk${PN}/configure.{in,ac}
@@ -45,14 +49,13 @@ src_prepare() {
 src_configure() {
local myconf=(
$(use_enable nls)
-   $(use_enable tk tknamazu)
-   --docdir="${EPREFIX}"/usr/share/doc/${PF}
-   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+   $(use_enable static-libs static)
+   $(use_enable tk tk${PN})
)
use tk && myconf+=(
-   --with-namazu=/usr/bin/namazu
-   --with-mknmz=/usr/bin/mknmz
-   --with-indexdir=/var/lib/namazu/index
+   --with-${PN}="${EPREFIX}"/usr/bin/${PN}
+   --with-mknmz="${EPREFIX}"/usr/bin/mknmz
+   --with-indexdir="${EPREFIX}"/var/lib/${PN}/index
)
 
econf "${myconf[@]}"
@@ -63,7 +66,8 @@ src_compile() {
 
if use emacs; then
cd lisp
-   elisp-compile gnus-nmz-1.el namazu.el
+   rm -f browse*
+   elisp-compile *.el
fi
 }
 
@@ -71,12 +75,14 @@ src_install () {
emake DESTDIR="${D}" install
 
if use emacs; then
-   elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el*
+   elisp-install ${PN} lisp/*.el*
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
 
docinto lisp
dodoc lisp/ChangeLog*
fi
+
+   prune_libtool_files
 }
 
 pkg_postinst() {

diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild 
b/app-text/namazu/namazu-2.0.22_p1.ebuild
index ed4b7d27b3f..8889da50fc4 100644
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-AUTOTOOLS_AUTORECONF="1"
-inherit autotools-utils eutils elisp-common
+inherit autotools elisp-common ltprune
 
 DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/;
@@ -13,9 +12,9 @@ SRC_URI="http://www.namazu.org/test/${P/_p/pre}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="emacs nls tk l10n_ja"
+IUSE="emacs l10n_ja nls static-libs tk"
 
-RDEPEND=">=dev-perl/File-MMagic-1.20
+RDEPEND="dev-perl/File-MMagic
emacs? ( virtual/emacs )
l10n_ja? (
app-i18n/nkf
@@ -37,41 +36,51 @@ S="${WORKDIR}"/${P/_p/pre}
 
 PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 
+src_prepare() {
+   default
+
+   mv configure.{in,ac}
+   mv tk${PN}/configure.{in,ac}
+   eautoreconf
+}
+
 src_configure() {
-   local myeconfargs=(
+   local myconf=(
$(use_enable nls)
-   $(use_enable tk tknamazu)
-

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

2017-12-10 Thread Akinori Hattori 
commit: 2dae0890abe08748861be73568fe22f4a1613928
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Dec 10 12:38:21 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Dec 10 12:40:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dae0890

app-text/namazu: new upstream release

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/namazu/Manifest   |  2 +-
 .../{namazu-2.0.22_p1.ebuild => namazu-2.0.22_pre7.ebuild} | 10 --
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 1595d7ea964..8629ab62e8e 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,2 +1,2 @@
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 
86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2
 SHA512 
c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre1.tar.gz 1394798 BLAKE2B 
1bcf50b78dacffa4fb537f235ab280b1bda9cebeddd2984b6ec484a798fc3093872b666d09f1369cd5d3bc200f54173b2c5d40bb51e4e2e0acb1220f2dad4c63
 SHA512 
de982a45a7e8d11f901e0e5db3ba8047d065569c56de676d6b876747e8bf5c358f0d3037a6539421cbff2c0f0cbc889d379b33500e308d038e663d62cd4b5005
+DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 
4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76
 SHA512 
e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989

diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild 
b/app-text/namazu/namazu-2.0.22_pre7.ebuild
similarity index 91%
rename from app-text/namazu/namazu-2.0.22_p1.ebuild
rename to app-text/namazu/namazu-2.0.22_pre7.ebuild
index 8889da50fc4..92c919dbac5 100644
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -5,9 +5,11 @@ EAPI="6"
 
 inherit autotools elisp-common ltprune
 
+MY_P="${P/_pre/pre}"
+
 DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/;
-SRC_URI="http://www.namazu.org/test/${P/_p/pre}.tar.gz;
+SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,7 +34,7 @@ RDEPEND="dev-perl/File-MMagic
)"
 DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
-S="${WORKDIR}"/${P/_p/pre}
+S="${WORKDIR}"/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 
@@ -69,6 +71,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/

2017-12-10 Thread Akinori Hattori 
commit: 24d32f3d87fa0c859cfcf7573fb2f137554f8afc
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sun Dec 10 12:24:16 2017 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sun Dec 10 12:40:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d32f3d

app-text/namazu: update metadata.xml

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/namazu/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index 3a5b4fa8acc..e1a49f49888 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,9 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-hat...@gentoo.org
-  
   
 c...@gentoo.org
 Cjk

[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
---

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

2016-06-25 Thread Ulrich Müller 
commit: 3b9dd08dad90477bba7c8c837223d87e67983198
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jun 25 15:38:42 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jun 25 15:39:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9dd08d

app-text/namazu: Migrate from LINGUAS to L10N.

Package-Manager: portage-2.3.0

 app-text/namazu/namazu-2.0.21.ebuild| 8 
 app-text/namazu/namazu-2.0.22_p1.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-text/namazu/namazu-2.0.21.ebuild 
b/app-text/namazu/namazu-2.0.21.ebuild
index fecdf0f..025fe24 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,11 +13,11 @@ SRC_URI="http://www.namazu.org/stable/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="emacs nls tk linguas_ja"
+IUSE="emacs nls tk l10n_ja"
 
 RDEPEND=">=dev-perl/File-MMagic-1.20
emacs? ( virtual/emacs )
-   linguas_ja? (
+   l10n_ja? (
app-i18n/nkf
|| (
dev-perl/Text-Kakasi
@@ -28,7 +28,7 @@ RDEPEND=">=dev-perl/File-MMagic-1.20
)
nls? ( virtual/libintl )
tk? (
-   dev-lang/tk
+   dev-lang/tk:0
www-client/lynx
)"
 DEPEND="${RDEPEND}

diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild 
b/app-text/namazu/namazu-2.0.22_p1.ebuild
index 2634665..366920e 100644
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,11 +13,11 @@ SRC_URI="http://www.namazu.org/test/${P/_p/pre}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="emacs nls tk linguas_ja"
+IUSE="emacs nls tk l10n_ja"
 
 RDEPEND=">=dev-perl/File-MMagic-1.20
emacs? ( virtual/emacs )
-   linguas_ja? (
+   l10n_ja? (
app-i18n/nkf
|| (
dev-perl/Text-Kakasi
@@ -28,7 +28,7 @@ RDEPEND=">=dev-perl/File-MMagic-1.20
)
nls? ( virtual/libintl )
tk? (
-   dev-lang/tk
+   dev-lang/tk:0
www-client/lynx
)"
 DEPEND="${RDEPEND}