gentoo auto-resync : 08:05:2024 - 00:00:57

7 files changed, 59 insertions, 20 deletions

diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 57fa8a731f2e..5598c369b8a7 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,11 +1,14 @@
 AUX 50namazu-gentoo.el 72 BLAKE2B 1047f37bcd89dd27714342af9e88ef186860efe6de8be767f37a81164b8d6b821bba292a1785617b1da249f76171d449485b107a315ea4ef0342173d0ec74a65 SHA512 8e316add3dbe93049fd879bc93829b2c141a752133d065c2ee724e180b38f171f5b11dfa72b8651d7721e825e3ff35439c6afc33c6043ce42738739ff4988e8c
 AUX namazu-2.0.21-memmove.patch 2050 BLAKE2B d5a12989489c4db9a6a7c6288ce29ecbe654731bfd84e3baa40c02ad802aa975704dbab2b05dc8f496e30cc76a1cb7bfaf9f2d8a2f0484160465fbb1f41af9c9 SHA512 d445d77c45a30d4e71dd9129ebf7938f48058f89627e4130e0f921ca719918fdd654f8369d0ae24edcbfb5d3801d68eeeaee4b55c887b9d208e0d8df00effae5
+AUX namazu-configure.patch 265 BLAKE2B fbce7f96e97885c2c91a44198ca2e1d2e0ac09eb91e397c31a086feed657ea3223265b7c6505f99a3e14b06ed5e1573a87a206284f156264456edab857ab29df SHA512 6064c68058c9b65e02baa5e76fab84c9c216fce1b3b9ef8f1945307c3ed7c908f29f13265f2bdf11965ca1b4841e6367c217c2858fcda246f01e0b0d7b39dac2
 AUX namazu-emacs-27.patch 422 BLAKE2B 613d43536da45a8f7df12b1e2eb0c7644702a0c2ba8a8f6b1a9806f343dc467b5c20b501a38e7abe732947ebe35c7ec47ae346003c26a8271f88709c62943105 SHA512 65456a1d4bc3a54ddda7360c370fe1c3847711e5e78858e7a35628148fa38a6e844df8bc2e1f1b963697eaedfa0354cedecdc24badeaffb3da02eab5fe241555
 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
+AUX namazu-tests.patch 188 BLAKE2B dd70d9a5f86eebf358183f4bc4b0ea153dd0ce79b05edd0eeb265bb182b550e6336727fd26eda22243fe1d46512c0bc1772f1e3a905175e7b80755e5b6c0e89a SHA512 bbe83bc46024a84227008d7e5132ba1eb5cccd191c58d44b0cebc18f5490df08b4ceca6cca67ba6ebc23753b478d0054583c04b7646970e0a5da40611c340900
+AUX namazu-underlinking.patch 278 BLAKE2B 24a21daf43263fef1d78770a9f2f42958908cb80b18376b4e6fafab76d3ced6c16a587adaee8c05c1e1428a43aee7dc3101d03cef0285a572d8bae194bbd839a SHA512 b4f395697da766c87bb96990288bf54b13616cc053da7079835ab79ab27bfcd86ca0f2d37639fdc47172e1a1f3604799e31418addcb24f4fdad42ebf55a0a764
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
 DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0
-EBUILD namazu-2.0.21.ebuild 1763 BLAKE2B cc3fcd4711e10d41f92a80293d6393af310fd0a95ac51f3b0444aa7ae7242a25ecce511d461de74ba88763ff232d50337320b1cfb9be1aab45a2b0d9dad327ca SHA512 72068431e7a77021767dc3a72556e1fdd1d789d43f6428ddcedfbbba90569dfa78d7a817b70733bc0d08a73304543257df6f1c9c962c9428c940a8a7f449dfe9
-EBUILD namazu-2.0.22_pre8.ebuild 1643 BLAKE2B b87f7691dbc8ab191751d5b66819cdc9c409d4f35d312f0f94ca9a2e65d80ba94a391853135601242cfbbb73ce18feff71b8edfbacede7c1275e0a41c4869858 SHA512 3274b729bb781e93cd8fb692ed36e15350a0a6386bff264be2da11512c69290e54c5229b9a0a1867b16a48668fbdc32426d3da70053e8d8bd084b2d3ca714d22
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
+EBUILD namazu-2.0.21.ebuild 1871 BLAKE2B 44538739b1ad4a638a08bf182fe4bbae67b23635a19f4d8f58b63b4b03ae33ec1905a5c18dd102eef1877647011e838cfd9ef2b2fa818c107ea8e7f9d6730ba0 SHA512 d89c6ffd2e24738be67f85651b8dd0aabc0b637cd80090a174c75d16e70d2b2f3494c71549f39c642d7765b8d279fb9d18139455c8bfef46a54d9e57c968baf7
+EBUILD namazu-2.0.22_pre8.ebuild 1752 BLAKE2B b06ab1d0e67c311da4cfe73e9f1a95f58483d5e7be6c1352051768201144f7063b45a12ffbb977f06c72ecb26dd9b642d66ad1f9519460874bdd7b5b18f62705 SHA512 32673b8ea656fb19b6a73e4905e6d722a7fe0e896881786df9f3c058d387686326dd8c35fa687db48823fa3607d83a24902f2b301858208ddcc2884637bc3fe8
+MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-text/namazu/files/namazu-configure.patch b/app-text/namazu/files/namazu-configure.patch
new file mode 100644
index 000000000000..02b6fcde8dc6
--- /dev/null
+++ b/app-text/namazu/files/namazu-configure.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -165,7 +165,9 @@
+ [AC_TRY_RUN(
+ changequote(<<, >>)dnl
+ <<
+-main()
++#include <stdlib.h>
++#include <string.h>
++int main(void)
+ {
+   /* Some versions of memcmp are not 8-bit clean.  */
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
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/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/metadata.xml b/app-text/namazu/metadata.xml
index 491c88b3a31f..a94766977fa6 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index ef46e76118df..866e3923c180 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-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit autotools elisp-common
 
@@ -35,9 +35,12 @@ BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-configure.patch
 	"${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
 )
 
@@ -74,14 +77,12 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	emake -j1 check
-}
-
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
+	keepdir /var/lib/${PN}/index
+
 	if use emacs; then
 		elisp-install ${PN} lisp/*.el*
 		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
diff --git a/app-text/namazu/namazu-2.0.22_pre8.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 4c8146e3b313..d902b8bc9dbe 100644
--- a/app-text/namazu/namazu-2.0.22_pre8.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit autotools elisp-common
 
@@ -36,7 +36,12 @@ DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-tests.patch
+	"${FILESDIR}"/${PN}-underlinking.patch
+)
 
 src_prepare() {
 	default
@@ -71,14 +76,12 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	emake -j1 check
-}
-
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
+	keepdir /var/lib/${PN}/index
+
 	if use emacs; then
 		elisp-install ${PN} lisp/*.el*
 		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el