gentoo auto-resync : 20:06:2024 - 00:10:56

3 files changed, 57 insertions, 23 deletions

diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index b82cb62600b9..b466bb385a4a 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,8 +1,9 @@
+AUX freewnn-1.1.1-implicit-configure.patch 595 BLAKE2B 7fddef1b42c3bb76e123997a3f3441994a509f9f8ca8c042501249409d55ceabab00765fbe5bc259ab28e58a355cdf2ca29b6fd59aef61c0aaaee32755901339 SHA512 2653079081b8ff7fa2f61e8f188146a0b8f8726d22c2f3c62cb2813e11888a30a01fde03c48d369d18671854f5a728b1703be8ee54eae462357c6a1d6b8bebc3
 AUX freewnn-Wformat-security.patch 3658 BLAKE2B 4bce67e8190ec4a6e6a4b8cee446b8beb492057cfedd49c06e631a5949e9ff20b35c4defe9ed0466dc2f0b5edb8a483f5886b8eda30a77435ee8614b0878d7f6 SHA512 7e01d516978eb024fe723a84c6c7cc8e138e7947ed3d4d5ec6e15b28783498e084cd2655ccd2ce7377c9837332ae1b0caec654c0f7f2bb9f78b9657f4cd00830
 AUX freewnn-uum-EUC-JP.patch 279 BLAKE2B a0fe740a49aabb72f8d9b0bcbae59e5841152c02ebb4bb27817c8621a4e6be2fd17b8a18c5104d94f8c7def90342682a015a98883856027901265a11d7d4aa4c SHA512 a065873fe70435a4364a111eed334ea574cd3178ffde947beabac5bb45e468a725f73c5b35c22b577127d03139a6386eebc815b85014048eaf59ca958687c96b
 AUX freewnn.confd-r1 16 BLAKE2B 2a2b2a93adf66e719f035900b0efa1f7ccf66912f8c5cddddb8e7b7c1e83c91136d4e747e1b96cad6a54fbbddc29a6b61fc37f7f01330909d27fc1f0cf978723 SHA512 3392644bb5404b83ee3bf3bceffaa769d1dce858fd2a8bd92b79101d0db863002a4f30205498a00777b25b7940fc8dbb41a0e0c4e20be0f6d61be50eb4ddf49e
 AUX freewnn.initd 283 BLAKE2B 363b8b99876aa0552f49a10bc973925d7d23900c24601e40ff2c99a3d6476c9b41c60465feb9e01e6fb17324957bb810d63eef52d97b49a61e0f48c96452db6e SHA512 81b5a6246d513f567710e2973bc8fffe86462e8afdee13e1a2aa9b6e5e8a852521a23fd5b20af536092b59f626a5e34be77409d63dcab005473dd11631b67111
 AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151b68c9f1392056c8faccda4ce3dff5b4dc0f9da5d1557c8799ca663c1b20d9c3b2208b72a26f78adc3 SHA512 306ad8dd6ae7060fc937f2ac2b266f385480961ed0c2074f1dcfc77fa82bb7a23042019672b47c32fc8d55079730ccda68c616c0f5411b0704db2c34d2caaf02
 DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385
-EBUILD freewnn-1.1.1_alpha23-r1.ebuild 1611 BLAKE2B 86003ec77fa150c5e733aa75332d3d40c1535e8e7982019e7b09aded549b04309679b9785394b1d1a4a761334a997ab57fa2cfaab6c57730d9db8727dd94d9c9 SHA512 87654f7839c034d2117d59377c0989af59867d27bb8315075f450ce92e8da8c6f36f3bfb57744e53eddb4c728094c9d9a5993fee23bd9951b388517a84f4d2f5
+EBUILD freewnn-1.1.1_alpha23-r2.ebuild 1975 BLAKE2B 87aad540d0e160730b28b51470a6d6e82acebb1cbfbb003d54c3d9300593fee5508575e8fc30ab3a547f1ba6b2c8f3bb4fb3e61b46e8a5f4f87ff866189de10f SHA512 f17ff838ff9ef56449ed8d82c62f7cdce95cc48080d01529705aca31bf02cd9c21ff30cfdcdaadeaa920022342aa94b259b16b35abc19a21de8713041ffc5e19
 MISC metadata.xml 370 BLAKE2B 4af1f1ad79d90077709e87ce1e65cca7ba4953d067ddee1dfbe6e6e605ebf80f63927012276c5c11e98c1a06717fcec433f0dca9c722f6a6cc88bf6208f07de8 SHA512 42405726236b8a4c7f95479583edafd1b78d0537930f668126c6d429d9fe8af141fe76c8dc2d506ed16614d02f920f81bee1f47cd7274aaf297b2e7255e10f19
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1-implicit-configure.patch b/app-i18n/freewnn/files/freewnn-1.1.1-implicit-configure.patch
new file mode 100644
index 000000000000..a46f2f405e5d
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-1.1.1-implicit-configure.patch
@@ -0,0 +1,19 @@
+--- a/configure.in	2024-06-19 23:14:54.243999953 +0300
++++ b/configure.in	2024-06-19 23:15:21.253961581 +0300
+@@ -549,6 +549,7 @@
+ #ifdef HAVE_TERMCAP_H
+ # include <termcap.h>
+ #endif
++#include <stdlib.h>
+ main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }],
+ 	res="OK", res="FAIL", res="FAIL")
+       if test "$res" = "OK"; then
+@@ -571,6 +572,8 @@
+ #ifdef HAVE_TERMCAP_H
+ # include <termcap.h>
+ #endif
++#include <stdlib.h>
++#include <string.h>
+ main()
+ {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }],
+ 	[ AC_MSG_RESULT([no -- we are in termcap land])
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r2.ebuild
index 9aa3cdbb9b15..293df70e0050 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r2.ebuild
@@ -1,59 +1,69 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 MY_P="FreeWnn-${PV/_alpha/-a0}"
 
 DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
 HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
 SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="ipv6 uum"
+IUSE="+uum"
 
-RDEPEND="virtual/libcrypt:=
-	uum? ( sys-libs/ncurses:= )"
-DEPEND="${RDEPEND}
-	uum? ( virtual/pkgconfig )"
-S="${WORKDIR}/${MY_P}"
+RDEPEND="
+	sys-apps/tcp-wrappers
+	virtual/libcrypt:=
+	uum? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-uum-EUC-JP.patch
 	"${FILESDIR}"/${PN}-Wformat-security.patch
+	"${FILESDIR}"/${PN}-1.1.1-implicit-configure.patch
 )
-DOCS="ChangeLog* CONTRIBUTORS"
+
+# linked for tests which we skip
+QA_CONFIG_IMPL_DECL_SKIP=( hosts_access )
 
 src_prepare() {
 	sed -i \
 		-e "s/WNNOWNER = wnn/WNNOWNER = root/" \
 		-e "s|@mandir@/|@mandir@/ja/|" \
 		-e "s/@INSTPGMFLAGS@//" \
-		makerule.mk.in
+		makerule.mk.in || die
 
 	# bug #542534
 	sed -i \
-		-e "s/egrep -v/egrep -av/" \
+		-e "s/egrep -v/grep -Eav/" \
 		PubdicPlus/Makefile.in \
 		Wnn/pubdicplus/Makefile.in \
 		cWnn/[ct]dic/Makefile.in \
-		kWnn/kdic/Makefile.in
+		kWnn/kdic/Makefile.in  || die
 
 	default
+	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable uum client) \
-		$(use_with ipv6) \
-		--disable-cWnn \
-		--disable-kWnn \
-		--disable-traditional-layout \
-		--with-term-libs="$($(tc-getPKG_CONFIG) --libs ncurses)"
+	local myeconfargs=(
+		$(use_enable uum client)
+		--enable-ipv6
+		--disable-cWnn
+		--disable-kWnn
+		--disable-traditional-layout
+		--enable-static # needed for correct compilation
+		--with-term-libs="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -61,13 +71,17 @@ src_compile() {
 
 	local m
 	for m in $(find Wnn/man -name "*.man"); do
-		iconv -f EUC-JP -t UTF-8 "${m}" > "${m}".UTF-8 || die
+		iconv --from-code=EUC-JP --to-code=UTF-8 --output="${m}".UTF-8 "${m}" || die
 		mv "${m}"{.UTF-8,} || die
 	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install.man
+	emake DESTDIR="${ED}" install install.man
+
+	find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
+
+	local DOCS=( ChangeLog* CONTRIBUTORS )
 	einstalldocs
 
 	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}