* [gentoo-commits] repo/gentoo:master commit in: app-text/namazu/files/, app-text/namazu/
@ 2017-12-10 12:40 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-12-10 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 75dcb1f96d13c2207dac4fd7e976fa2c09e1fcee
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 12:21:27 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 12:40:17 2017 +0000
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)
- --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 && myeconfargs+=(
- --with-namazu=/usr/bin/namazu
- --with-mknmz=/usr/bin/mknmz
- --with-indexdir=/var/lib/namazu/index
+ use tk && myconf+=(
+ --with-${PN}="${EPREFIX}"/usr/bin/${PN}
+ --with-mknmz="${EPREFIX}"/usr/bin/mknmz
+ --with-indexdir="${EPREFIX}"/var/lib/${PN}/index
)
- autotools-utils_src_configure
+
+ econf "${myconf[@]}"
}
src_compile() {
- autotools-utils_src_compile
+ emake
if use emacs; then
cd lisp
- elisp-compile gnus-nmz-1.el namazu.el
+ rm -f browse*
+ elisp-compile *.el
fi
}
src_install () {
- autotools-utils_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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/namazu/files/, app-text/namazu/
@ 2024-05-07 12:38 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2024-05-07 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 1f2448146af74f910ee39d069de31aa1d14763fb
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 12:31:12 2024 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue May 7 12:37:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f244814
app-text/namazu: fix build with Clang
Closes: https://bugs.gentoo.org/871450
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-text/namazu/files/namazu-underlinking.patch | 11 +++++++++++
app-text/namazu/namazu-2.0.21.ebuild | 3 ++-
app-text/namazu/namazu-2.0.22_pre8.ebuild | 7 +++++--
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/app-text/namazu/files/namazu-underlinking.patch b/app-text/namazu/files/namazu-underlinking.patch
new file mode 100644
index 000000000000..04af7c21d998
--- /dev/null
+++ b/app-text/namazu/files/namazu-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/nmz/Makefile.am
++++ b/nmz/Makefile.am
+@@ -47,7 +47,7 @@
+ nmzversion.c
+
+ libnmz_la_DEPENDENCIES = @NMZ_LIBOBJS@
+-libnmz_la_LIBADD = @LTLIBINTL@
++libnmz_la_LIBADD = @LTLIBINTL@ @NMZ_LIBOBJS@
+ libnmz_la_LDFLAGS = -version-info $(LTVERSION)
+
+ nmzversion.c: nmzversion.c.in
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index ef46e76118df..be73f786452f 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-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-emacs-27.patch
"${FILESDIR}"/${PN}-perl-5.18.patch
"${FILESDIR}"/${PN}-perl-5.26.patch
+ "${FILESDIR}"/${PN}-underlinking.patch
"${FILESDIR}"/${P}-memmove.patch
)
diff --git a/app-text/namazu/namazu-2.0.22_pre8.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 4c8146e3b313..6dab831697ff 100644
--- a/app-text/namazu/namazu-2.0.22_pre8.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -36,7 +36,10 @@ DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
S="${WORKDIR}"/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-underlinking.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/namazu/files/, app-text/namazu/
@ 2024-05-07 12:38 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2024-05-07 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 8d87e9079a27f2293a908f651e5c736c4e86f8c5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 12:35:32 2024 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue May 7 12:37:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d87e907
app-text/namazu: fix tests
Closes: https://bugs.gentoo.org/882465
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-text/namazu/files/namazu-tests.patch | 8 ++++++++
app-text/namazu/namazu-2.0.21.ebuild | 5 +----
app-text/namazu/namazu-2.0.22_pre8.ebuild | 5 +----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/app-text/namazu/files/namazu-tests.patch b/app-text/namazu/files/namazu-tests.patch
new file mode 100644
index 000000000000..c79f8aade6f3
--- /dev/null
+++ b/app-text/namazu/files/namazu-tests.patch
@@ -0,0 +1,8 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -26,3 +26,5 @@
+ rm -rf test-log tmp-data tmp.* idx[0-9]* ja-idx[0-9]*
+
+ EXTRA_DIST = $(TESTS) select-data commonfuncs
++
++.NOTPARALLEL:
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index daba19585dff..e62835732267 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-emacs-27.patch
"${FILESDIR}"/${PN}-perl-5.18.patch
"${FILESDIR}"/${PN}-perl-5.26.patch
+ "${FILESDIR}"/${PN}-tests.patch
"${FILESDIR}"/${PN}-underlinking.patch
"${FILESDIR}"/${P}-memmove.patch
)
@@ -76,10 +77,6 @@ src_compile() {
fi
}
-src_test() {
- emake -j1 check
-}
-
src_install() {
default
find "${ED}" -name '*.la' -delete || die
diff --git a/app-text/namazu/namazu-2.0.22_pre8.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 972c12327567..8c3793c15d95 100644
--- a/app-text/namazu/namazu-2.0.22_pre8.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -39,6 +39,7 @@ S="${WORKDIR}"/${MY_P}
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-configure.patch
+ "${FILESDIR}"/${PN}-tests.patch
"${FILESDIR}"/${PN}-underlinking.patch
)
@@ -75,10 +76,6 @@ src_compile() {
fi
}
-src_test() {
- emake -j1 check
-}
-
src_install() {
default
find "${ED}" -name '*.la' -delete || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-07 12:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-10 12:40 [gentoo-commits] repo/gentoo:master commit in: app-text/namazu/files/, app-text/namazu/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 12:38 Akinori Hattori
2024-05-07 12:38 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox