summaryrefslogtreecommitdiff
path: root/app-text/namazu
diff options
context:
space:
mode:
Diffstat (limited to 'app-text/namazu')
-rw-r--r--app-text/namazu/Manifest16
-rw-r--r--app-text/namazu/files/50namazu-gentoo.el3
-rw-r--r--app-text/namazu/files/namazu-2.0.19-gentoo.patch29
-rw-r--r--app-text/namazu/files/namazu-2.0.21-memmove.patch (renamed from app-text/namazu/files/namazu-2.0.21-search.patch)4
-rw-r--r--app-text/namazu/files/namazu-gentoo.patch54
-rw-r--r--app-text/namazu/files/namazu-perl-5.18.patch48
-rw-r--r--app-text/namazu/files/namazu-perl-5.26.patch22
-rw-r--r--app-text/namazu/metadata.xml5
-rw-r--r--app-text/namazu/namazu-2.0.21.ebuild58
-rw-r--r--app-text/namazu/namazu-2.0.22_p1.ebuild85
-rw-r--r--app-text/namazu/namazu-2.0.22_pre7.ebuild98
11 files changed, 272 insertions, 150 deletions
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index b6994d40d9fb..27c989fcdac6 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,8 +1,10 @@
-AUX 50namazu-gentoo.el 108 BLAKE2B dee72fe5ffc80f36873e180e3d0386979eb20a25b03e45811f90e381f5d19eb9d25249ba3e5e319936a441044eb760183b2b87138ebb992a062204e8bf46c1b8 SHA512 aec608edb1a428de7bf0365b0ed181096b742e3eaf49c1f68d7f24d0843fc130304ef110d2060a531c9594bc7c8f6f9fd5dd5b0d51a31eff6c497bc01ad6c1f9
-AUX namazu-2.0.19-gentoo.patch 1258 BLAKE2B 5a9c7c462c37084816ebc4cae4e820edb7ae295ed4f252507fbf21d997d78b90015f4049799db639e79b32256f32a0f800aa12121b0f4fbf11fca7964410accf SHA512 bf6c7e3b91114b2be955440436a921a2428a5b833a89d64940ce1a8038060419fd9714421e0f1c4d0ba0180e4f1b4d2236b22469089622864db65ed2e7db4d0b
-AUX namazu-2.0.21-search.patch 2122 BLAKE2B 1668a912048f206ef2fc2afe809a749373f2ce0331d8b95fcd73efab8374e00d7ba8ec5d7b609c8ebb34908decb2bf61639be1801e4ace66371d4161d860e30b SHA512 b69d347ba10d88d99f335bfa2dca61d52c284ef2f5375f43f0c7fe16fc8d39cb4b8e3ad57a1bfbc07d463284ec53dbdc805233e0c6f441b451ae50dba1e960c8
+AUX 50namazu-gentoo.el 72 BLAKE2B 1047f37bcd89dd27714342af9e88ef186860efe6de8be767f37a81164b8d6b821bba292a1785617b1da249f76171d449485b107a315ea4ef0342173d0ec74a65 SHA512 8e316add3dbe93049fd879bc93829b2c141a752133d065c2ee724e180b38f171f5b11dfa72b8651d7721e825e3ff35439c6afc33c6043ce42738739ff4988e8c
+AUX namazu-2.0.21-memmove.patch 2050 BLAKE2B d5a12989489c4db9a6a7c6288ce29ecbe654731bfd84e3baa40c02ad802aa975704dbab2b05dc8f496e30cc76a1cb7bfaf9f2d8a2f0484160465fbb1f41af9c9 SHA512 d445d77c45a30d4e71dd9129ebf7938f48058f89627e4130e0f921ca719918fdd654f8369d0ae24edcbfb5d3801d68eeeaee4b55c887b9d208e0d8df00effae5
+AUX namazu-gentoo.patch 1471 BLAKE2B 949429187d765e37a3fcfbcb9c455d4b92e5d1af11a4b0550a40240523b3862de8cf3b2cbab85c15be9848d1614cdccbeb0df346a006f445eea35aad35a05bc1 SHA512 bdc4946197f48fe87fe1e2eacbefaaf775458e28a96f2c5af70c1264e883f29c89673feaffd71afff9d9744bb7b81c3b3ede3258f585dab3b7f117c8fa77f93e
+AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a79811d0a651599b0e4d22ff4a8a515aca2047684e988d6a434025aca40d744c2aabe310f20ebbbb4ff43af72 SHA512 4a5faf2a889f9eb02a57db80c834a60560bbe2df718f541a24fbfc137145121336055c157458b5d3c4d9c5f573cf3964329adc1ae1e2448c254531df4fee8267
+AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre1.tar.gz 1394798 BLAKE2B 1bcf50b78dacffa4fb537f235ab280b1bda9cebeddd2984b6ec484a798fc3093872b666d09f1369cd5d3bc200f54173b2c5d40bb51e4e2e0acb1220f2dad4c63 SHA512 de982a45a7e8d11f901e0e5db3ba8047d065569c56de676d6b876747e8bf5c358f0d3037a6539421cbff2c0f0cbc889d379b33500e308d038e663d62cd4b5005
-EBUILD namazu-2.0.21.ebuild 1550 BLAKE2B bd9aeedc0b1469e3d18634239f41cd2ab64ead364650f277d798a96c22b0f4e765c6f1a42ab43f313cefc7ae76e7903f68ee253aa049bf175ccc6d5b363e3a42 SHA512 dc909c71022555bb77e4ba1a47baef8c310eb3aa3a43cf395a178ae2652c0c26a1139835469a868594dce8a4c907de234f3f3304a3b3ed234c6b2031293de5b9
-EBUILD namazu-2.0.22_p1.ebuild 1607 BLAKE2B 2181408d5d9d564beabc0d300e68ab7eb849b19ae960627e30efb5dd8929215f515087c10a6fdfb9a14df4f5a3c30860c353a4979071dd80652c50da29e50577 SHA512 4da30b1aabb027dda91b95732a1d5ae5457f8b8615a02be26a0e153b89d3e7d3a7927c9df36cc2333b4af9d5042f95ddb52af971310514a3601fb1a0cf7ac3e5
-MISC metadata.xml 320 BLAKE2B 8d76e1f00c1e897380215a17e3776f9e58efb3591a3af9c492037b069594947a6015763cf54dabaada7e21a0e46331a92e8edf23a4b3f8301f96f00e74f27097 SHA512 7fefedc1acd2f81eaf89ea57b6963d1e308be3be6d85dc2c56d52c1c3a4f5ff1531f07db5b560838c51185dc105de1f72dfda565549cbe58c519ba8e6099f478
+DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
+EBUILD namazu-2.0.21.ebuild 1701 BLAKE2B eb2b1e6bf30958ded4787682c081fdb8c80c1251fd6d9d3bed29adbedf8681f5c33150bba62269bd018a4ad3d6a1174e46e1528f49e80e26c4b3bcc0e948ebe6 SHA512 5789736e5c0d0e855db5a16ef08dbd1b65fc50e8d2cc188850a02c6810b5a88f478bb1258a981d32bb4f83de4d8e9a2417ec2253493876d9966b57a452586264
+EBUILD namazu-2.0.22_pre7.ebuild 1617 BLAKE2B 277f90e3c9129d46c87503bea0f8d39c866716aec8f20bbb21ebd1efbc7065939213c3aed9d935601cab6dafb1af46bfa01efb93ef7942c6f1c38795d715a2b1 SHA512 a5adc472b8382d1267915410bd055335a45588aa9f6851f869e67783998be338a4f3a587f428cc19d2cf98f2bcf7666bdcc6c51e9ecd4bff9ab184bc27f74c5a
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-text/namazu/files/50namazu-gentoo.el b/app-text/namazu/files/50namazu-gentoo.el
index 56bbce50af82..e2f6e501241c 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/files/namazu-2.0.19-gentoo.patch b/app-text/namazu/files/namazu-2.0.19-gentoo.patch
deleted file mode 100644
index 6d7f649507bd..000000000000
--- 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.000000000 +0900
-+++ namazu-2.0.19/filter/Makefile.am 2009-03-13 01:04:20.000000000 +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.000000000 +0900
-+++ namazu-2.0.19/filter/Makefile.in 2009-03-13 01:05:08.000000000 +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
index 6a8e10e8e1a0..30ad490e44fa 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.000000000 +0900
-+++ b/nmz/search.c 2011-08-05 09:32:25.000000000 +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 000000000000..8f0275ba27c5
--- /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/files/namazu-perl-5.18.patch b/app-text/namazu/files/namazu-perl-5.18.patch
new file mode 100644
index 000000000000..8674982312d4
--- /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/files/namazu-perl-5.26.patch b/app-text/namazu/files/namazu-perl-5.26.patch
new file mode 100644
index 000000000000..1b3a4e40bd10
--- /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/metadata.xml b/app-text/namazu/metadata.xml
index d84b2e08fb4d..e1a49f498885 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hattya@gentoo.org</email>
- </maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 4609a1dfba2b..92d9023d9ae1 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-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
-inherit 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,21 +33,34 @@ RDEPEND=">=dev-perl/File-MMagic-1.20
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-perl-5.18.patch
+ "${FILESDIR}"/${PN}-perl-5.26.patch
+ "${FILESDIR}"/${P}-memmove.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.19-gentoo.patch"
- epatch "${FILESDIR}/${PN}-2.0.21-search.patch"
+ default
+
+ mv configure.{in,ac}
+ mv tk${PN}/configure.{in,ac}
+ eautoreconf
}
src_configure() {
- local myconf
- use tk && myconf="--with-namazu=/usr/bin/namazu
- --with-mknmz=/usr/bin/mknmz
- --with-indexdir=/var/lib/namazu/index"
-
- econf \
- $(use_enable nls) \
- $(use_enable tk tknamazu) \
- ${myconf}
+ local myconf=(
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ $(use_enable tk tk${PN})
+ )
+ use tk && myconf+=(
+ --with-${PN}="${EPREFIX}"/usr/bin/${PN}
+ --with-mknmz="${EPREFIX}"/usr/bin/mknmz
+ --with-indexdir="${EPREFIX}"/var/lib/${PN}/index
+ )
+
+ econf "${myconf[@]}"
}
src_compile() {
@@ -55,22 +68,27 @@ src_compile() {
if use emacs; then
cd lisp
- elisp-compile gnus-nmz-1.el namazu.el
+ rm -f browse*
+ elisp-compile *.el
fi
}
+src_test() {
+ emake -j1 check
+}
+
src_install () {
emake DESTDIR="${D}" install
- dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png
- dohtml -r doc/*
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
deleted file mode 100644
index 213abbf2f808..000000000000
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils eutils elisp-common
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="emacs nls tk l10n_ja"
-
-RDEPEND=">=dev-perl/File-MMagic-1.20
- emacs? ( virtual/emacs )
- l10n_ja? (
- app-i18n/nkf
- || (
- dev-perl/Text-Kakasi
- app-i18n/kakasi
- app-text/chasen
- app-text/mecab
- )
- )
- nls? ( virtual/libintl )
- tk? (
- dev-lang/tk:0
- www-client/lynx
- )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-S="${WORKDIR}"/${P/_p/pre}
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.19-gentoo.patch"
-)
-DOCS=(AUTHORS CREDITS NEWS THANKS TODO)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable nls)
- $(use_enable tk tknamazu)
- )
-
- use tk && myeconfargs+=(
- --with-namazu=/usr/bin/namazu
- --with-mknmz=/usr/bin/mknmz
- --with-indexdir=/var/lib/namazu/index
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use emacs; then
- cd lisp
- elisp-compile gnus-nmz-1.el namazu.el
- fi
-}
-
-src_install () {
- autotools-utils_src_install
- dodoc ChangeLog* HACKING* README* etc/*.png
- dohtml -r doc/*
- rm -r "${ED}"/usr/share/namazu/doc || die
- if use emacs; then
- elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el*
- elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-
- docinto lisp
- dodoc lisp/ChangeLog*
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre7.ebuild
new file mode 100644
index 000000000000..92c919dbac58
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="emacs l10n_ja nls static-libs tk"
+
+RDEPEND="dev-perl/File-MMagic
+ emacs? ( virtual/emacs )
+ l10n_ja? (
+ app-i18n/nkf
+ || (
+ dev-perl/Text-Kakasi
+ app-i18n/kakasi
+ app-text/chasen
+ app-text/mecab
+ )
+ )
+ nls? ( virtual/libintl )
+ tk? (
+ dev-lang/tk:0
+ www-client/lynx
+ )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac}
+ mv tk${PN}/configure.{in,ac}
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ $(use_enable tk tk${PN})
+ )
+ use tk && myconf+=(
+ --with-${PN}="${EPREFIX}"/usr/bin/${PN}
+ --with-mknmz="${EPREFIX}"/usr/bin/mknmz
+ --with-indexdir="${EPREFIX}"/var/lib/${PN}/index
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use emacs; then
+ cd lisp
+ rm -f browse*
+ elisp-compile *.el
+ fi
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+
+ if use emacs; then
+ 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() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}