gentoo auto-resync : 16:03:2024 - 12:48:37

3 files changed, 77 insertions, 3 deletions

diff --git a/app-i18n/multiskkserv/Manifest b/app-i18n/multiskkserv/Manifest
index 1bcaca5c5f23..8744ebf0955d 100644
--- a/app-i18n/multiskkserv/Manifest
+++ b/app-i18n/multiskkserv/Manifest
@@ -1,6 +1,7 @@
 AUX multiskkserv-cdb.patch 1558 BLAKE2B 971f4d0b4ea977daac15aceb9cded091475c6beb9eab505dc2a4c90c0b7d68697fffb99d1f9af57774d0986f994f7e17ff986b520677ef9a9d48dcc39b207432 SHA512 3f2cbabcff1c7f4ba2f52636cb30aaa887ae4b29f9ad5a4f9d08d5271d05d84b363f2d17bca2adb945fbc7b4bff0f1d0448c72c833cc7444be2073de2bf88ff8
+AUX multiskkserv-slibtool.patch 3625 BLAKE2B 8b37557457ba46a0082ee408fc0b895de63b2e43515b4cf416489030bb6c2f8e21d62b97afc7c41f40ea1d1dbe1e6e5bb9c5d4d484d6517dd6ce3f7841fc9f43 SHA512 0403ab839c9f947b78d9c7ce9aaf4087e0d7aec9d9fc254a2b8c6b742327f42d4bb604f195abf11dab11d7e63e7119a62aa6519877a847e087c52e08de43f6d3
 AUX multiskkserv.confd 230 BLAKE2B af91367b448db6815176cad5ada7207efdb2b775e60fc6cfd213e8fdf03b743fcff554f551d6013a269554cbd218efc74d4777fb411b85a3e267ef646c9c982a SHA512 3751257be6a4ee994b7dff2293b0c724cdfef7006db18b970f5a0e23fb1620d0fd76ebce80bd6ac6c2623bf2f8759f99e26b4087b7ecc83f1b3fdd1de877ce13
 AUX multiskkserv.initd 305 BLAKE2B 04a1fe5303e2e7b25f51d53e9668f4f216be9d4954452bd643bd11d74d4373732281bc621b33b83bff4c9ebd3adcc3ab146fdb526f3cb009c7fb7634b53ebcac SHA512 eae9fcbfe18baec133ad0ee624a758cec1ceeb0134e11a4fe2b10099877b0f5bf96032704683521e5c874442595212950ab5164dc689ea523cec9213b7c2bec2
 DIST multiskkserv-20100128.tar.xz 250004 BLAKE2B e2182155869b36c7eaccb04fc41ffb71f88eb89e387754a61f4a0b3c2b1658f15908e3190cfad7d16d62e7897e8a8796124ce41260f7fddbdd641efc180630f4 SHA512 27409600f549317dd2e2fcd0f0a35406a5d445c74e0ba266ed3c19cec849b6d508a30edd65bf72931b0222f003d934a802e5c3c979d5b52ab30da473cabbf5a5
-EBUILD multiskkserv-20100128.ebuild 799 BLAKE2B f6f4252f277e24d69d29955eb85dc353cf7f90ba3ea1017c643148f0f3c239593333442a6f6f8c7353009a19e04954663e5206cd1ad3a4050b3dd23c59aad0c4 SHA512 de5f7f27ec01053d24351da4ed563975cfa6a5b8e1bbb6a6ccda7d269ec20df1b605a42e6d7bffd571e698805b745dbdd9fd4bb489f2ceaf8d0833ae2f13e22c
+EBUILD multiskkserv-20100128.ebuild 844 BLAKE2B d02e03eed0afe4f1918da082daa27007a52ac809e918034373f371126d88c37ffd56b923bc6ef16ce7c5c82dfb186a6366aba0e97f74506ecc6d19e4cc2b2b56 SHA512 3606d841df3b7372c3a98be5d5ab3a7e1a8ed35c551d05ec87a5fe8f55f0d3a4db30f5402ff47be6a06a6f8797672731bd07461e42da3212e1df108950988ad2
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch b/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch
new file mode 100644
index 000000000000..99024e093392
--- /dev/null
+++ b/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch
@@ -0,0 +1,70 @@
+https://github.com/sina-ht/multiskkserv/pull/1
+https://github.com/sina-ht/multiskkserv/commit/20983c7ea43e4a0c12df123e17901fa40ed2f914
+
+From aa0f1cca52eb95ce859aa8a4f20fad9c12757080 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 21 Feb 2024 09:16:47 -0800
+Subject: [PATCH] build: avoid killall(1) for 'make check'
+
+When building the multiskkserv tests with slibtool instead of GNU
+libtool it fails when 'killall src/multiskkserv' fails to find any
+processes. This is because with slibtool it is a shell wrapper script
+for 'src/.libs/multiskkserv'.
+
+To avoid this issue a more robust 'check.sh' script was added to run the
+tests and correctly kill the multiskkserv process with both GNU libtool
+and slibtool.
+
+This was reported for Gentoo: https://bugs.gentoo.org/924142
+---
+ Makefile.am | 11 +----------
+ check.sh    | 18 ++++++++++++++++++
+ 2 files changed, 19 insertions(+), 10 deletions(-)
+ create mode 100755 check.sh
+
+diff --git a/Makefile.am b/Makefile.am
+index b98060a..940d61c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,16 +6,7 @@ EXTRA_DIST = COPYING.j README.j common.h compat.h test/SKK-JISYO.S test/henkan-e
+ 
+ check:
+ 	@mkdir -p $(top_builddir)/test
+-	$(top_builddir)/tools/skkdic-p2cdb $(top_builddir)/test/SKK-JISYO.S.cdb < $(top_srcdir)/test/SKK-JISYO.S
+-	$(top_builddir)/src/multiskkserv -s 127.0.0.1 -p 12347 $(top_builddir)/test/SKK-JISYO.S.cdb &
+-	@sleep 1
+-	@$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 stat
+-	$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/kan-euc.txt` tran > $(top_builddir)/test/kan-euc-tran.txt
+-	$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/ka-euc.txt` tran > $(top_builddir)/test/ka-euc-tran.txt
+-	$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/kanji-euc.txt` tran > $(top_builddir)/test/kanji-euc-tran.txt
+-	$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/henkan-euc.txt` tran > $(top_builddir)/test/henkan-euc-tran.txt
+-	$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/henkandekinai-euc.txt` tran > $(top_builddir)/test/henkandekinai-euc-tran.txt
+-	killall src/multiskkserv
++	$(top_srcdir)/check.sh "$(top_builddir)" "$(top_srcdir)"
+ 	@nkf -w $(top_srcdir)/test/kan-euc.txt
+ 	@nkf -w $(top_builddir)/test/kan-euc-tran.txt
+ 	@nkf -w $(top_srcdir)/test/ka-euc.txt
+diff --git a/check.sh b/check.sh
+new file mode 100755
+index 0000000..64705bf
+--- /dev/null
++++ b/check.sh
+@@ -0,0 +1,18 @@
++#!/bin/sh
++
++set -euvx
++
++builddir="${1:?}"
++srcdir="${2:?}"
++
++"$builddir"/tools/skkdic-p2cdb "$builddir"/test/SKK-JISYO.S.cdb < "$srcdir"/test/SKK-JISYO.S
++"$builddir"/src/multiskkserv -s 127.0.0.1 -p 12347 "$builddir"/test/SKK-JISYO.S.cdb &
++multiskkserv_pid=$!
++sleep 1
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 stat
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/kan-euc.txt` tran > "$builddir"/test/kan-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/ka-euc.txt` tran > "$builddir"/test/ka-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/kanji-euc.txt` tran > "$builddir"/test/kanji-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/henkan-euc.txt` tran > "$builddir"/test/henkan-euc-tran.txt
++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/henkandekinai-euc.txt` tran > "$builddir"/test/henkandekinai-euc-tran.txt
++kill -15 "$multiskkserv_pid"
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
index a12237346057..ff88aaa52024 100644
--- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -23,7 +23,10 @@ RDEPEND="app-i18n/skk-jisyo[cdb]
 DEPEND="${RDEPEND}
 	test? ( app-i18n/nkf )"
 
-PATCHES=( "${FILESDIR}"/${PN}-cdb.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-cdb.patch
+	"${FILESDIR}"/${PN}-slibtool.patch #924142
+)
 
 src_prepare() {
 	default