6 files changed, 17 insertions, 209 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 377bb75af474..981fd8266e6c 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index bb89a019b858..a03738358c21 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,10 +1,7 @@
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
-AUX weechat-3.8-workaround-broken-translations.patch 571 BLAKE2B e03d6e2341a844879dccc3eed4a3af24b02191632917ef5abc08ad11bdf93d4e797f331cd8dc86bbb8d302b4a064f8ab56ebd702dbc9ab2d62337bb7a944cc32 SHA512 226699bebb1b6bb469e5f4004106fb62cc1641a46876af44ac79ba6011747d9e6c9323319eb541276109676f6dba7a8af954d6d4131f5c1127be4700690f22c1
-DIST weechat-3.7.1.tar.xz 2745164 BLAKE2B 021ce5dc0a0199e820cdc06d44b25157435121ae6702a6922f0950f340896a451c21a7acd81bfc88f28ad5f6b8e0ce746fb58409ee368826ab8738f628140bb1 SHA512 998ebc0a6c423bca03eeacda1eca98f2edf28687635231718c2de1e2da4fb5cb07ed5f97745b68e318668d1afec9daf27b140143d2d3f6934b26f785a6db7d49
-DIST weechat-3.7.1.tar.xz.asc 833 BLAKE2B 66b324267bd654cea90032479fd66b616d54a44b4f66df36e94035a26b3afefa1104258149e2536c501967af01fc786978311a8eeacba9fee97bad973116fc86 SHA512 861b1510cb89d337f6816563eb36f32f150288e8bda20e7c34c2533d88b149a65ff9b94d607551e7f21c78320968debed6dfa0659288a58ae0e17924f948a359
+AUX weechat-3.8-gettext-0.22.patch 471 BLAKE2B 7247e6b6ecd5ae7c07f6e2b7cfd6c633e7e16df589c04ab831ffef2ca5c52df3f8f378c30f6e84c3e0ece571738599d2446a331cf46a628de6b15987c54c1ef0 SHA512 fc71c2ac4bae427dcac6a296701a44d5f2b77537d5900551417a603725032046c255808a173b80fbf664bcab7e3eb20e1216024c5be43c40a6a07d17a1088dc0
 DIST weechat-3.8.tar.xz 2777420 BLAKE2B 46a2c2c5f14f1c47c0ef2c7591549e4568c1777a70c571ab6d0e5938685262a0806c1fd301eb0d840245b7df2c42a69b089d6eac82706ae5b2a8e590a910080a SHA512 f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516
 DIST weechat-3.8.tar.xz.asc 833 BLAKE2B 3db6467d5a47b86df7eca237bf2def812666fed42b9c1b968760e4999f785ba65fe84be61ae152ac5d5a3fa85953b5442f515afc244249fbc15ff94ca2a06147 SHA512 61154ef33aeb1155004975ee6688d5dcb427e0670e7463549ed0157de7be61309abb5dbad419bceb596e11f494e41a00b72e6f908ed9f02525660f7155dcc2ec
-EBUILD weechat-3.7.1.ebuild 4582 BLAKE2B 8f6010bd95c38c80e80ad48c9bd8216f449947c5bc842c2b979b8626555aece90fa8088e3bb0228dd42fdebbee2c80c5eabba78f36ad65847d917f9106ee6472 SHA512 939a437a94c81a8b813ce5fb64f5c2d93467ea48431e308549443ef9caaed5190fb699389d6a3217119c30ee523815bef4741ab63a52d636175417959cac27e6
-EBUILD weechat-3.8.ebuild 4757 BLAKE2B b989a04baf708b245cff0f5e8f0089397e856a4fba03d498ad21e88218ac3c654debfd170214a891a0f9f319996db06bb2d6dd7550a90bd4d5c92142711cc97a SHA512 ff6780ec61816b13e983119b9387545cf8789cc26b4b77d31a77cca0c57e4b19e5742951ddab8e8b4309c11d16998398e356dbd6686a019c26ea7b0df6cdcbdd
+EBUILD weechat-3.8.ebuild 4739 BLAKE2B fc42e43668bcabd94c6cba9aa573b63c845086c5d1d775573551e40109df5384ccb4841aad41bf05e65f8e0b06d3ea067254860bee8dd78ed5f8202c7febc27d SHA512 393c2a0d9e8167fde9d2cf8417048cf127bcddf653be2bbad6de6d2b1d02b59755fdcb9a34351dfbbdd1bc5add7b909330664eaece629dfbd3840f5da7cf7c2b
 EBUILD weechat-9999.ebuild 4698 BLAKE2B 69c9244864665db4e4a4121d24287d7ea5160c2ab5c1ce0e0f28754ec77bac6ed15c69d550da9437fe1ac78e25a94ba720d0576f74e21263b0524eace74c8939 SHA512 9edac02831a3c9e3893a29f7f6f652a323dfcf27b0310909406618d9611dc5aa9b9a8592b842c07d43c92f0975eaa26502b75b2d766c7cb79bace4110832f7d9
 MISC metadata.xml 1282 BLAKE2B dd0da572f2ebdf7ae47b943136060fbe32bb24998e732dc6040b902a87e8178abfa5b2ff4e3792e2273de832da5aa75c908d6826d4caf30b6798d0802386f0bf SHA512 b3027bf372bc1f13c6e07184d2761c24f5f39b9400adef41568b4b2366b02ec5da97842275ea5c6d4752ea6634cebb9653af866e8e3128b867932172515f96e5
diff --git a/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch b/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
new file mode 100644
index 000000000000..6292cd5e175b
--- /dev/null
+++ b/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/908976
+Backported from https://github.com/weechat/weechat/commit/11177a096707ed75cd15c8933a3346e350cf7b18
+
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -144,7 +144,7 @@
+ 
+ #, c-format
+ msgid "End of command '%s', timeout reached (%.1fs)"
+-msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
++msgstr "Konec příkazu '%s', vypršel časový limit (%.1fs)"
+ 
+ #, c-format
+ msgid "System clock skew detected (%+ld seconds), reinitializing all timers"
diff --git a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch b/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
deleted file mode 100644
index 339b3ebe2d26..000000000000
--- a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/908976
-
-From 7c811ad118d073c23038e61ee68ecdc07d5b563a Mon Sep 17 00:00:00 2001
-From: blockiv <blockiv@tuta.io>
-Date: Thu, 22 Jun 2023 05:26:02 +0000
-Subject: [PATCH] Mark breaking translation as fuzzy
-
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -142,7 +142,7 @@ msgstr "%sChyba: příkaz \"%s\" již existuje pro plugin \"%s\""
- msgid "%sBad file descriptor (%d) used in hook_fd"
- msgstr ""
- 
--#, c-format
-+#, c-format, fuzzy
- msgid "End of command '%s', timeout reached (%.1fs)"
- msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
- 
--- 
-2.41.0
diff --git a/net-irc/weechat/weechat-3.7.1.ebuild b/net-irc/weechat/weechat-3.7.1.ebuild
deleted file mode 100644
index 37a0a0e99a99..000000000000
--- a/net-irc/weechat/weechat-3.7.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	inherit verify-sig
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
-		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	app-arch/zstd:=
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		|| (
-			dev-lang/ruby:3.1
-			dev-lang/ruby:3.0
-			dev-lang/ruby:2.7
-		)
-	)
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND+="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_PHP=OFF
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_TYPING=$(usex typing)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.8.ebuild b/net-irc/weechat/weechat-3.8.ebuild
index ef801944230e..6053570ece4a 100644
--- a/net-irc/weechat/weechat-3.8.ebuild
+++ b/net-irc/weechat/weechat-3.8.ebuild
@@ -82,7 +82,7 @@ BDEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-	"${FILESDIR}"/${PN}-3.8-workaround-broken-translations.patch
+	"${FILESDIR}"/${PN}-3.8-gettext-0.22.patch
 )
 
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"