gentoo auto-resync : 25:08:2023 - 21:55:22

4 files changed, 196 insertions, 16 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index b326b60dda30..49934c82d810 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index fb45246c2e1e..437ec64d353a 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -4,7 +4,10 @@ DIST weechat-3.8.tar.xz 2777420 BLAKE2B 46a2c2c5f14f1c47c0ef2c7591549e4568c1777a
 DIST weechat-3.8.tar.xz.asc 833 BLAKE2B 3db6467d5a47b86df7eca237bf2def812666fed42b9c1b968760e4999f785ba65fe84be61ae152ac5d5a3fa85953b5442f515afc244249fbc15ff94ca2a06147 SHA512 61154ef33aeb1155004975ee6688d5dcb427e0670e7463549ed0157de7be61309abb5dbad419bceb596e11f494e41a00b72e6f908ed9f02525660f7155dcc2ec
 DIST weechat-4.0.2.tar.xz 2573044 BLAKE2B 17da7769dc40885565d4932910920a4d3b23736fc244063d548e50109dc101ae63287e5467368b40ef3b835b3ef7d55f901bc7d2dfcbad59772afdd340532001 SHA512 271c22cba68fdb5efd14c4111ea9b7f44f2c95282cb7cac10a42432b195aadf5a081831853243ed09535df25d95b30c0d57b23c84d24c3665ae8393bc76db4d5
 DIST weechat-4.0.2.tar.xz.asc 833 BLAKE2B 92e1a2efb9a7e5cd94a0266d5980c88ed1d93ab7e6003c2d9f28b460e805505d6094d461534782fc6e80a366cb5fb6f12ddf8fc41d29fa7ffad5b343ccc06ac3 SHA512 c2ab90223d5bac8551a0b95480b0ccecfbb7c199f4d8a6f8dc4e6b21c78fadb22a7feb7c53c052d3a67ba34cbaf4e7faea83cdd2df5f0dd325aee0d3e4375139
+DIST weechat-4.0.4.tar.xz 2575788 BLAKE2B aa9d2ad5946ddb72a0dc32e58d43f9e6655fb1ceb448dc6f68644dcc760f7531ed275e4d92b121d6873c7bd1c631cd9ee58c476b47581100f64ed907dd88532a SHA512 ddd150dad253cf4d9bc96122d2d3951c696b19f796a7cbf159edc258d4b18f1b2544b7b62362e7b59d6b3ff3e756de3ce4aaff83b02d3fe2d1cb614162965efd
+DIST weechat-4.0.4.tar.xz.asc 833 BLAKE2B 5eed470b576e7980f67eb649bdaddabf6fad33149b5d93702c11f47b0219b0f983641f4b2e0c8a466b472191b49147f732d361ec563fd9317a7735cae22f5ce1 SHA512 7242ae9f71e2b3db19033a522698bf2209651438039aa0aa784b6bcf150e6f6de521b4f84acb11f1208658076c1c97bfb869dacbdf131a438ad68d03e994232d
 EBUILD weechat-3.8.ebuild 4739 BLAKE2B fc42e43668bcabd94c6cba9aa573b63c845086c5d1d775573551e40109df5384ccb4841aad41bf05e65f8e0b06d3ea067254860bee8dd78ed5f8202c7febc27d SHA512 393c2a0d9e8167fde9d2cf8417048cf127bcddf653be2bbad6de6d2b1d02b59755fdcb9a34351dfbbdd1bc5add7b909330664eaece629dfbd3840f5da7cf7c2b
 EBUILD weechat-4.0.2.ebuild 5022 BLAKE2B cf701135b3f5f0cb840ea9a20f5231cb285c55fe2ecd9d0f4580f120b4d07b59a34e04aa0b8c17c004625d1ae4911533b1e49d2b5205885b57f02916d9ad8802 SHA512 984582c8337ecb0ee7e407f21593989d0758edbbc6524eb3220950613a135e11a0a5d2227800b4688c4f8ff2b5d5f9f92cbb60ae4e32c70624c5dac465f674e9
-EBUILD weechat-9999.ebuild 5022 BLAKE2B cf701135b3f5f0cb840ea9a20f5231cb285c55fe2ecd9d0f4580f120b4d07b59a34e04aa0b8c17c004625d1ae4911533b1e49d2b5205885b57f02916d9ad8802 SHA512 984582c8337ecb0ee7e407f21593989d0758edbbc6524eb3220950613a135e11a0a5d2227800b4688c4f8ff2b5d5f9f92cbb60ae4e32c70624c5dac465f674e9
+EBUILD weechat-4.0.4.ebuild 4839 BLAKE2B 52b7b8b91637c872c8362c180b8b20f50df2f474169e5258bd682f90ebdb9a8cf1f5e169709b5ebb250bcc818e96be4dd6b469e9507f6a667451cf60b61edca1 SHA512 81735ba07fe50f1265cce897b5e47d50c19cf1e283a43066ed626ee7c39c824c1f462573e74e3efea5fea0e40853beebfc04236d9f4f840f4f1304cb5dd0e1db
+EBUILD weechat-9999.ebuild 4839 BLAKE2B 52b7b8b91637c872c8362c180b8b20f50df2f474169e5258bd682f90ebdb9a8cf1f5e169709b5ebb250bcc818e96be4dd6b469e9507f6a667451cf60b61edca1 SHA512 81735ba07fe50f1265cce897b5e47d50c19cf1e283a43066ed626ee7c39c824c1f462573e74e3efea5fea0e40853beebfc04236d9f4f840f4f1304cb5dd0e1db
 MISC metadata.xml 1282 BLAKE2B dd0da572f2ebdf7ae47b943136060fbe32bb24998e732dc6040b902a87e8178abfa5b2ff4e3792e2273de832da5aa75c908d6826d4caf30b6798d0802386f0bf SHA512 b3027bf372bc1f13c6e07184d2761c24f5f39b9400adef41568b4b2366b02ec5da97842275ea5c6d4752ea6634cebb9653af866e8e3128b867932172515f96e5
diff --git a/net-irc/weechat/weechat-4.0.4.ebuild b/net-irc/weechat/weechat-4.0.4.ebuild
new file mode 100644
index 000000000000..eb8d14968318
--- /dev/null
+++ b/net-irc/weechat/weechat-4.0.4.ebuild
@@ -0,0 +1,186 @@
+# 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_{10..12} )
+
+inherit cmake lua-single python-single-r1 xdg
+
+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 enchant man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	enchant? ( spell )
+	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:12= )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+	)
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.1
+			dev-lang/ruby:3.0
+		)
+	)
+	selinux? ( sec-policy/selinux-irc )
+	spell? (
+		enchant? ( app-text/enchant:* )
+		!enchant? ( 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
+	local j
+	for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \
+			| sed -e 's/.*set(\(\w\+\).*/\1/'); do
+		for j in $(grep set.${i} doc/CMakeLists.txt \
+				| sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do
+			if ! has ${j} ${LINGUAS-${j}} ; then
+				sed -i \
+					-e "s/\(set(${i}.*\) ${j}/\1/" \
+					doc/CMakeLists.txt || die
+			fi
+		done
+	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 requires all plugins (except javascript).
+		# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
+		# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
+		-DENABLE_DOC=OFF
+		-DENABLE_DOC_INCOMPLETE=$(usex doc)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-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
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f7ec70d248a7..eb8d14968318 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake lua-single python-single-r1 xdg-utils
+inherit cmake lua-single python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -52,7 +52,10 @@ RDEPEND="
 	guile? ( >=dev-scheme/guile-2.0:12= )
 	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+	)
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		|| (
@@ -181,15 +184,3 @@ src_test() {
 		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
-}