From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3D583139083 for ; Sun, 10 Dec 2017 12:40:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E923E10D0; 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 4CA93E10D0 for ; Sun, 10 Dec 2017 12:40:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6992533BE19 for ; Sun, 10 Dec 2017 12:40:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C361DAE6F for ; Sun, 10 Dec 2017 12:40:35 +0000 (UTC) From: "Akinori Hattori" 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" Message-ID: <1512909616.9d7fdec908dafa3fcfcf39fb60fa7e4eb335fff9.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-2.0.19-gentoo.patch app-text/namazu/files/namazu-2.0.21-memmove.patch app-text/namazu/files/namazu-2.0.21-search.patch app-text/namazu/files/namazu-gentoo.patch app-text/namazu/metadata.xml app-text/namazu/namazu-2.0.21.ebuild app-text/namazu/namazu-2.0.22_p1.ebuild X-VCS-Directories: app-text/namazu/ app-text/namazu/files/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 9d7fdec908dafa3fcfcf39fb60fa7e4eb335fff9 X-VCS-Branch: master Date: Sun, 10 Dec 2017 12:40:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8cd60c2c-f381-44d9-b2e5-fee2b3a42026 X-Archives-Hash: 2e3435b9296901723256bd83fe15ff4c commit: 9d7fdec908dafa3fcfcf39fb60fa7e4eb335fff9 Author: Akinori Hattori gentoo org> AuthorDate: Sun Dec 10 12:12:00 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sun Dec 10 12:40:16 2017 +0000 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..00000000000 --- 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 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.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 00000000000..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 --- a/app-text/namazu/metadata.xml +++ b/app-text/namazu/metadata.xml @@ -4,7 +4,7 @@ hattya@gentoo.org - + cjk@gentoo.org Cjk diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild index 4609a1dfba2..ac2d382288d 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" -inherit eutils elisp-common +inherit autotools eutils elisp-common DESCRIPTION="Namazu is a full-text search engine" HOMEPAGE="http://www.namazu.org/" @@ -34,20 +34,28 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { - epatch "${FILESDIR}/${PN}-2.0.19-gentoo.patch" - epatch "${FILESDIR}/${PN}-2.0.21-search.patch" + epatch "${FILESDIR}"/${PN}-gentoo.patch + epatch "${FILESDIR}"/${P}-memmove.patch + + 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 tk tknamazu) + --docdir="${EPREFIX}"/usr/share/doc/${PF} + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + ) + use tk && myconf+=( + --with-namazu=/usr/bin/namazu + --with-mknmz=/usr/bin/mknmz + --with-indexdir=/var/lib/namazu/index + ) + + econf "${myconf[@]}" } src_compile() { @@ -61,8 +69,6 @@ src_compile() { 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* diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild b/app-text/namazu/namazu-2.0.22_p1.ebuild index 213abbf2f80..ed4b7d27b3f 100644 --- a/app-text/namazu/namazu-2.0.22_p1.ebuild +++ b/app-text/namazu/namazu-2.0.22_p1.ebuild @@ -1,8 +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" +AUTOTOOLS_AUTORECONF="1" inherit autotools-utils eutils elisp-common DESCRIPTION="Namazu is a full-text search engine" @@ -34,15 +35,14 @@ 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) +PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch ) src_configure() { local myeconfargs=( $(use_enable nls) $(use_enable tk tknamazu) + --docdir="${EPREFIX}"/usr/share/doc/${PF} + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html ) use tk && myeconfargs+=( @@ -64,9 +64,7 @@ src_compile() { 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