gentoo auto-resync : 24:07:2022 - 08:52:43

4 files changed, 194 insertions, 5 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 1343b0f198da..31443b74f9bd 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -8,6 +8,7 @@ DIST weechat-3.5.tar.xz.asc 833 BLAKE2B 539ddb256ebeb4871b8e881358500fe8bda560ae
 EBUILD weechat-3.3.ebuild 4279 BLAKE2B 1ada556de4c02ba23a4c4f7f98fecb0113d8be1ecffd4ae5e74117f14f4db0ae3ef0fcc211d1ea30185f8b1961dfad2c7e5ff3cdf15108bd9e22b4f4e309b997 SHA512 72476c71be9f141d00441affaccf61cc1670e1b66a1610f51a875e87e00f4dfb88cfb08ce3db9d6bf2378f62ce9d4e9b33f6b2a884ac36deac914020981f482b
 EBUILD weechat-3.4.1.ebuild 4532 BLAKE2B 25dfe4ca246a347f57d5d2f932cdebeb72434dcdf76a2e22c47d09f76e5b80d6ebcde986e2b48f29640c837c896a38af5886fd1485d555bfa17d879e19562bf7 SHA512 354aef7f602959032c43b5d49c6f90a230f325e7eeb49234a0667c9102bfbdab1611007db758fc7575503bf25f03f2fc8b4abd9a89f8cf6680f3483c844fab99
 EBUILD weechat-3.4.ebuild 4315 BLAKE2B 028b773aaa6dd0ea1ed8cff0cb36ed455dccfb98b33d4b45ac49c8fa0c3ce46a3a977af42469afd95c1c5728453c140fc10bf6d9818477ce7ea6be32d4d5cf07 SHA512 771254004d8b8362f1da777c60f3693ec94a60177a2ac56ec4ab251fcbf2ad9bd5aee7dc4306c93b70dc807f067118a70bdeda4536720c45d96908e4f2be554d
+EBUILD weechat-3.5-r1.ebuild 4601 BLAKE2B d098c92105827d96670ee431ff39aeb6d41b2811efee658c18000779ae009bc1edf36a9b85ae9674fe887f015034ba282ad76c4c3bda3c5638552a94b7685ebe SHA512 2df72d14e331536868cb1a77d3d2e3d6f48db99733348c39b72660c5ff9b40efcb6fc14e22e84db577d97fa41a728e33905465712071933c1b6ec074944f9e9c
 EBUILD weechat-3.5.ebuild 4573 BLAKE2B 702f726f4dce5d0cece6c1a0f90e0d6f1021c32806aa4b3c44bedc800d1ac93c7f0426a0eda239607fc00b7512b6165b18c6bfdc5f336dc5945fe149f34b12ef SHA512 9b8c448b9b07fb6aa8c96411522075f4edb345491bfbd9863eb25b296d165a23c4d2c06d2c1a8a36e88e5c6f554daf602f3ad2108e08478c2aec9c5febbaff6e
-EBUILD weechat-9999.ebuild 4573 BLAKE2B 702f726f4dce5d0cece6c1a0f90e0d6f1021c32806aa4b3c44bedc800d1ac93c7f0426a0eda239607fc00b7512b6165b18c6bfdc5f336dc5945fe149f34b12ef SHA512 9b8c448b9b07fb6aa8c96411522075f4edb345491bfbd9863eb25b296d165a23c4d2c06d2c1a8a36e88e5c6f554daf602f3ad2108e08478c2aec9c5febbaff6e
-MISC metadata.xml 985 BLAKE2B dfb7631e6013d342f1622f582aaa6e485cc5964d4558377987599cc3eff2270a085db1c911aff9978decd7e26c96b7a350a95701da460ec93100e88bcd1e3d3a SHA512 fe353b1581b45779f8851de08d5886514d4fddbf6098e42a290f9907aa268c0c0d5fe7f25b0d53a85d951857c00bab8bdea4aa9d912778aa3dc83970b0a5d37c
+EBUILD weechat-9999.ebuild 4601 BLAKE2B d098c92105827d96670ee431ff39aeb6d41b2811efee658c18000779ae009bc1edf36a9b85ae9674fe887f015034ba282ad76c4c3bda3c5638552a94b7685ebe SHA512 2df72d14e331536868cb1a77d3d2e3d6f48db99733348c39b72660c5ff9b40efcb6fc14e22e84db577d97fa41a728e33905465712071933c1b6ec074944f9e9c
+MISC metadata.xml 1110 BLAKE2B 680fa0a147a63328b7414c8465b46ee9e1f59b740c0c04d975760679023c01b5f811c7b9ab5e3c424ab0620dde0d16d2e8cba2f254be58e9fbe9921af8b202dd SHA512 9e985580c0b4998bbd8b749acf8c11adc1a5e2e8a5877c5bc0a52569fb35517170ad56314ac92c6467fc7ac2b7be89d0c808e698898fffebb0ea2908ec0d3078
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 185437d9ca99..dfb1adbe95c7 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
 	<use>
 		<flag name="alias">Enable plugin for alias control</flag>
 		<flag name="buflist">Enable buflist plugin</flag>
diff --git a/net-irc/weechat/weechat-3.5-r1.ebuild b/net-irc/weechat/weechat-3.5-r1.ebuild
new file mode 100644
index 000000000000..e06ceeeda127
--- /dev/null
+++ b/net-irc/weechat/weechat-3.5-r1.ebuild
@@ -0,0 +1,184 @@
+# 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
+# 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
+			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_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-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f1a4b884780e..e06ceeeda127 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -29,7 +29,8 @@ 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"
+# 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}"
 
@@ -51,7 +52,6 @@ RDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		|| (
@@ -132,6 +132,7 @@ src_configure() {
 		-DENABLE_JAVASCRIPT=OFF
 		-DENABLE_LARGEFILE=ON
 		-DENABLE_NCURSES=ON
+		-DENABLE_PHP=OFF
 		-DENABLE_ALIAS=$(usex alias)
 		-DENABLE_BUFLIST=$(usex buflist)
 		-DENABLE_CHARSET=$(usex charset)
@@ -146,7 +147,6 @@ src_configure() {
 		-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)