gentoo resync : 20.03.2022

3 files changed, 193 insertions, 4 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index ed4cde7c7180..877a6ac70870 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,10 @@
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
 DIST weechat-3.3.tar.xz 2564280 BLAKE2B 9cb119c2506ff5f9b4844b8016790af34347e300a1217762afc1307191cd0831c2c23e019a024c8161ff2e46607eddf94f94b3db9bd351bc51b7f057ddb375eb SHA512 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
+DIST weechat-3.4.1.tar.xz 2617856 BLAKE2B a1e2e3e50da79041dc1500fb9c368cc3f3f2f799b867e5c6b2cb0742dac680bf3fd5449dcf19296845266f97cf6ee120c71d10cdb8cf4e20badb56fd4b55888c SHA512 3715975d0b8cb5ac1946ceb0fa87fcecffebccf1687cb3b8c3d91429f31e69000808994885bef580a0cfd9c5b1bcf6a51642bd653cf887be981188281901a04e
+DIST weechat-3.4.1.tar.xz.asc 833 BLAKE2B 4f4a38307f1f60dd03693761605cbab2a2e8249d11e95826ec6e610e38a0625cec66704d5b62d51e83633dc3c06a98be5487c8a535ae75fdc2d53ba91a71e70f SHA512 8e45ba6f8d96f2dbaa617ee9e5071a31e94cbea418881af6866eecc7402bdff558f221db63c2e708e40119d3c5294b49485823f4e62fbae5e89da7cc380d9d6d
 DIST weechat-3.4.tar.xz 2617640 BLAKE2B fb5df8ed7d2b219c60c15f444834017504aebffa0c02c7712f0109216153be97b93560dbbb060e9cb907634856dca2733848222b5f2eea095dcceec623a00397 SHA512 b5e36802bb8b8f0e518da590d675ca63b0fa0b88acd24c2803d4f8468e6bce775691d3994db5090570f1286ad38be31615921b0d3ead697ad51986cddca57330
 EBUILD weechat-3.3.ebuild 4279 BLAKE2B 1ada556de4c02ba23a4c4f7f98fecb0113d8be1ecffd4ae5e74117f14f4db0ae3ef0fcc211d1ea30185f8b1961dfad2c7e5ff3cdf15108bd9e22b4f4e309b997 SHA512 72476c71be9f141d00441affaccf61cc1670e1b66a1610f51a875e87e00f4dfb88cfb08ce3db9d6bf2378f62ce9d4e9b33f6b2a884ac36deac914020981f482b
+EBUILD weechat-3.4.1.ebuild 4534 BLAKE2B 1bd1a856d4a423b6b33bdac82a927a0968718534d506d617a91c723bad8a0ecb95e53a7a6c30502a020becb09c9c0e0dd2e9217e4df8cdd97e91b0aeb7c80578 SHA512 9e720dbd93a9c1d5b528899ccd5939225e6522cba6c85451d6e54f405a918ef0fe95649514cf7b909b720a969a5c0ebc29bde36819af9d7113e82691780a7be0
 EBUILD weechat-3.4.ebuild 4315 BLAKE2B 028b773aaa6dd0ea1ed8cff0cb36ed455dccfb98b33d4b45ac49c8fa0c3ce46a3a977af42469afd95c1c5728453c140fc10bf6d9818477ce7ea6be32d4d5cf07 SHA512 771254004d8b8362f1da777c60f3693ec94a60177a2ac56ec4ab251fcbf2ad9bd5aee7dc4306c93b70dc807f067118a70bdeda4536720c45d96908e4f2be554d
-EBUILD weechat-9999.ebuild 4315 BLAKE2B 028b773aaa6dd0ea1ed8cff0cb36ed455dccfb98b33d4b45ac49c8fa0c3ce46a3a977af42469afd95c1c5728453c140fc10bf6d9818477ce7ea6be32d4d5cf07 SHA512 771254004d8b8362f1da777c60f3693ec94a60177a2ac56ec4ab251fcbf2ad9bd5aee7dc4306c93b70dc807f067118a70bdeda4536720c45d96908e4f2be554d
+EBUILD weechat-9999.ebuild 4535 BLAKE2B 730c0ef6097b4d67040e8e41f45eb68d4d2b8be8be106529fae8dbad4596e8dd05b211783af8f0030f737a250c807a0005aac01a5cbae0698a573a26f5f95875 SHA512 4810b306e168e2042892ffaf60a9952deed4deb52a91deb95fb55c5203f8edd4899313b6321b582ca3e6b420acac9f2d0cfabbb900e9804f6a594f4c46e32900
 MISC metadata.xml 985 BLAKE2B dfb7631e6013d342f1622f582aaa6e485cc5964d4558377987599cc3eff2270a085db1c911aff9978decd7e26c96b7a350a95701da460ec93100e88bcd1e3d3a SHA512 fe353b1581b45779f8851de08d5886514d4fddbf6098e42a290f9907aa268c0c0d5fe7f25b0d53a85d951857c00bab8bdea4aa9d912778aa3dc83970b0a5d37c
diff --git a/net-irc/weechat/weechat-3.4.1.ebuild b/net-irc/weechat/weechat-3.4.1.ebuild
new file mode 100644
index 000000000000..6ba63ba853d4
--- /dev/null
+++ b/net-irc/weechat/weechat-3.4.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+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
+SCRIPT_LANGS="guile lua +perl php +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="
+	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:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.0
+			dev-lang/ruby:2.7
+			dev-lang/ruby:2.6
+		)
+	)
+	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#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/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_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_PHP=$(usex php)
+		-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-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index d1a572afb9da..9588270e0169 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,11 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	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
 
@@ -64,7 +68,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cpputest )
 "
 
-BDEPEND="
+BDEPEND+="
 	virtual/pkgconfig
 	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
 	man? ( >=dev-ruby/asciidoctor-1.5.4 )