gentoo auto-resync : 18:10:2023 - 15:59:05

4 files changed, 195 insertions, 4 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 1d2642e73917..3351735897fa 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 18964b0b1a4d..04f7ca50d42c 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -8,9 +8,12 @@ DIST weechat-4.0.4.tar.xz 2575788 BLAKE2B aa9d2ad5946ddb72a0dc32e58d43f9e6655fb1
 DIST weechat-4.0.4.tar.xz.asc 833 BLAKE2B 5eed470b576e7980f67eb649bdaddabf6fad33149b5d93702c11f47b0219b0f983641f4b2e0c8a466b472191b49147f732d361ec563fd9317a7735cae22f5ce1 SHA512 7242ae9f71e2b3db19033a522698bf2209651438039aa0aa784b6bcf150e6f6de521b4f84acb11f1208658076c1c97bfb869dacbdf131a438ad68d03e994232d
 DIST weechat-4.0.5.tar.xz 2578236 BLAKE2B 22025bb2020c3f6b5d92dcfea30cde0689e5eda526726956af07cf5137b52c11b0d2f4192771bbed7e033d10a470fbe5a7c0a8fc8879ffe759fd95e2d6afb50f SHA512 3cf082463c29f8dfe118237ac0d46f5606311634ed1db47f3210a9176020c4f1566a6c4274bd33f5d6b5dd796b169f330a2aacd9928a0feb6181ebf9991177ea
 DIST weechat-4.0.5.tar.xz.asc 833 BLAKE2B 9a3f71eecffc4ac9a9d56ed56a3740f81415952dbf3d5362eed6dd76e6b74dd23b69f9ce2aca3e32d8c57c2525aed273928751fa3b9937a35c9265e3143810d1 SHA512 56a94fec35ffb9612cc999bce1e9c19d2754de20205cb1eb7075e6943cdaf65f128ba8802228c53d70a11cd1b81acd3704a0005b438f356974cb3307e65876b5
+DIST weechat-4.1.0.tar.xz 2634500 BLAKE2B 966569916e1274660348b0076143b8e70f6522690c1bee0c6859bd8ece43e95927f6f3737c63839275206c7a45e0401abc6efb0d4d05c3e97dc846f48dc5951e SHA512 3978e407eec176f812bc696006e40077bf7f2acc7940223fc6d72d06394133c46bc14a953a20433475a42b673db57b6bc6e5fcb4c04c90d07d46332c34b84711
+DIST weechat-4.1.0.tar.xz.asc 833 BLAKE2B 93882ecfebd931ef390ec027b385bd610734b3d49a634d61e1bb4dfdbfd44b8fecadcb4d20eea0ba5e7643dedb5d29678c53249297e8f9540e033f5106c75cc6 SHA512 982ce28123721db23a22e15c1f31266f81e9e5917a0f0566b98e54dd27487550b61954ebcc2aedb257aec6a1cce9489485f540f4606d2966f18dfa13f3013568
 EBUILD weechat-3.8.ebuild 4739 BLAKE2B fc42e43668bcabd94c6cba9aa573b63c845086c5d1d775573551e40109df5384ccb4841aad41bf05e65f8e0b06d3ea067254860bee8dd78ed5f8202c7febc27d SHA512 393c2a0d9e8167fde9d2cf8417048cf127bcddf653be2bbad6de6d2b1d02b59755fdcb9a34351dfbbdd1bc5add7b909330664eaece629dfbd3840f5da7cf7c2b
 EBUILD weechat-4.0.2.ebuild 5022 BLAKE2B cf701135b3f5f0cb840ea9a20f5231cb285c55fe2ecd9d0f4580f120b4d07b59a34e04aa0b8c17c004625d1ae4911533b1e49d2b5205885b57f02916d9ad8802 SHA512 984582c8337ecb0ee7e407f21593989d0758edbbc6524eb3220950613a135e11a0a5d2227800b4688c4f8ff2b5d5f9f92cbb60ae4e32c70624c5dac465f674e9
 EBUILD weechat-4.0.4.ebuild 4836 BLAKE2B 03a74211ff06446b9140b4907aa7f4dd03a90801ff1c491556521e2bae75b275abc6c7be772597c0a6de617e287a2e302d2d81996bd75f23bee2ce4315d57c14 SHA512 216664882d6e72d1af00e77ffcca2bdf69aec75e232e005eb02ad37551dd207d0cc5e773e588e91d2e219331969027a261d0a5c614ce37230eeb116d9ef40e4b
 EBUILD weechat-4.0.5.ebuild 4839 BLAKE2B 9bf2ee3c664ded4033d8a8fb6b589bd82d65298d44105174cf965b4e5e2bbb9951c996539276fa947953e8cf0dc66db43b6cce0fa5b63c9a1e6efbe4869a72c2 SHA512 21b799aae4df4ae1da078b8be3391b4eed12ff4ce2217c786237ad5a9765a34bbe29ef905292537c2f5fd19b9a40c74c8b767cb9e77ef6949fd465602636ff82
-EBUILD weechat-9999.ebuild 4839 BLAKE2B 9bf2ee3c664ded4033d8a8fb6b589bd82d65298d44105174cf965b4e5e2bbb9951c996539276fa947953e8cf0dc66db43b6cce0fa5b63c9a1e6efbe4869a72c2 SHA512 21b799aae4df4ae1da078b8be3391b4eed12ff4ce2217c786237ad5a9765a34bbe29ef905292537c2f5fd19b9a40c74c8b767cb9e77ef6949fd465602636ff82
+EBUILD weechat-4.1.0.ebuild 4884 BLAKE2B a097efd6aaddf2a54e70de90e67ffa8be60183956bde9ca9d5ef66f3cc116e8762386864e7c61cf1fe246cca4c277ec804b29d32ae733ec055955eee63048de8 SHA512 d5d0d51cdfebc075b8c9cd795e5ff5a15659f1087e66e3113c75fd2ba50a9c129832ae6794323eff9d973c7a00aea7fef3feca0c1c7dd7c6c3953177ab68820c
+EBUILD weechat-9999.ebuild 4885 BLAKE2B de5c59f8ac322bb95062599ee8fe2f34ccb9baca35984d1ba0cd28de8c5c0a01c3dae614fbbd3c4143932624d79a9a0d89f6b024d79ef54514d55b60511949be SHA512 1767e6b0f840d7634653abb063241924135c639c4699839f7d53cb0cbd79a7f138a089f4104716047be135fe8cdf190504f8fea4319c56d294f7dd2d28f11a98
 MISC metadata.xml 1555 BLAKE2B 02c9450e9d8cce403316631c91e211b9a70533fdb23275c5aed39683ac4e0d64e1276c3f4268dfe4b0adc49582a5d3457dd579e1419f6f98470fa784b48ff644 SHA512 ec3d7d9601d7d247af4a707e6b9cead1f7e78497daf1efad99025f7269adcf582deada141e0997398849116d44e89e62fab2d6cfee7e20ae1076799f0cae82e3
diff --git a/net-irc/weechat/weechat-4.1.0.ebuild b/net-irc/weechat/weechat-4.1.0.ebuild
new file mode 100644
index 000000000000..4983e81b236e
--- /dev/null
+++ b/net-irc/weechat/weechat-4.1.0.ebuild
@@ -0,0 +1,187 @@
+# 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 +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	enchant? ( spell )
+	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:12= )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+	)
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.2
+			dev-lang/ruby:3.1
+		)
+	)
+	selinux? ( sec-policy/selinux-irc )
+	spell? (
+		enchant? ( app-text/enchant:* )
+		!enchant? ( app-text/aspell )
+	)
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	zstd? ( app-arch/zstd:= )
+"
+
+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)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+	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 90e2eb2edc62..b12a006a3dcb 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -23,7 +23,7 @@ fi
 DESCRIPTION="Portable and multi-interface IRC client"
 HOMEPAGE="https://weechat.org/"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0/${PV}"
 
 NETWORKS="+irc"
@@ -32,7 +32,7 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe
 # 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}"
+IUSE="doc enchant man nls selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
 	enchant? ( spell )
@@ -42,7 +42,6 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	app-arch/zstd:=
 	dev-libs/libgcrypt:0=
 	net-libs/gnutls:=
 	sys-libs/ncurses:0=
@@ -69,6 +68,7 @@ RDEPEND="
 		!enchant? ( app-text/aspell )
 	)
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	zstd? ( app-arch/zstd:= )
 "
 
 DEPEND="${RDEPEND}
@@ -172,6 +172,7 @@ src_configure() {
 		-DENABLE_TRIGGER=$(usex trigger)
 		-DENABLE_TYPING=$(usex typing)
 		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_ZSTD=$(usex zstd)
 	)
 	cmake_src_configure
 }